diff --git a/.gitignore b/.gitignore
index c53b1f290..5fd852778 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,3 +201,5 @@ automate_json/automate_tickets.json
 /automate_json/
 /Out/
 /merged_spec.json
+merged_spec1.json
+postprocess.py
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000000000..a55e7a179
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4aebd380e..132392ac7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,7 +6,7 @@
     <option name="pathToExecutable" value="C:\Users\Bailey\AppData\Local\Programs\Python\Python310\Scripts\black.exe" />
     <option name="sdkUUID" value="fd78a183-968e-41d2-ac4a-6c04dcde6680" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (pywise-datamodels)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (pw-dm)" project-jdk-type="Python SDK" />
   <component name="PythonCompatibilityInspectionAdvertiser">
     <option name="version" value="3" />
   </component>
diff --git a/.idea/pywise-datamodels.iml b/.idea/pywise-datamodels.iml
index c40477653..5de9633f0 100644
--- a/.idea/pywise-datamodels.iml
+++ b/.idea/pywise-datamodels.iml
@@ -5,7 +5,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.11 (pywise-datamodels)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 82cb6aaa4..7e1df7c8b 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectTasksOptions">
-    <TaskOptions isEnabled="true">
+    <TaskOptions isEnabled="false">
       <option name="arguments" value="$FilePath$" />
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />
diff --git a/generate_models.sh b/generate_models.sh
new file mode 100644
index 000000000..39aeacbac
--- /dev/null
+++ b/generate_models.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+source venv/scripts/activate
+
+echo Enter JSON path
+read jsonPath
+echo Enter output filename/directory
+read output
+
+datamodel-codegen --input ${jsonPath} --output ${output} --target-python-version 3.10 --collapse-root-models --reuse-model --output-model-type pydantic_v2.BaseModel --base-class pyconnectwise.models.base.connectwise_model.ConnectWiseModel --use-union-operator --use-field-description --use-default --snake-case-field --disable-timestamp --use-standard-collections --use-schema-description --remove-special-field-name-prefix --capitalise-enum-members --set-default-enum-member --enum-field-as-literal all --use-default-kwarg --field-constraints
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index e3d748326..be60ac1f0 100644
Binary files a/requirements.txt and b/requirements.txt differ
diff --git a/src/pyconnectwise/clients/automate_client.py b/src/pyconnectwise/clients/automate_client.py
index c872cbeaf..9defbd4bd 100644
--- a/src/pyconnectwise/clients/automate_client.py
+++ b/src/pyconnectwise/clients/automate_client.py
@@ -52,10 +52,10 @@ def __init__(
             username (str): Your ConnectWise Automate API username.
             password (str): Your ConnectWise Automate API password.
         """
-        self.client_id = client_id
-        self.automate_url = automate_url
-        self.username = username
-        self.password = password
+        self.client_id: str = client_id
+        self.automate_url: str = automate_url
+        self.username: str = username
+        self.password: str = password
         self.token_expiry_time: datetime = datetime.utcnow()
 
         # Grab first access token
diff --git a/src/pyconnectwise/clients/manage_client.py b/src/pyconnectwise/clients/manage_client.py
index e320f726a..6fe442696 100644
--- a/src/pyconnectwise/clients/manage_client.py
+++ b/src/pyconnectwise/clients/manage_client.py
@@ -43,11 +43,11 @@ def __init__(
             private_key (str): Your ConnectWise Manage API Private key.
             codebase (str, optional): Your ConnectWise Manage Codebase. If not provided, it will be fetched from the API. Defaults to None.
         """
-        self.client_id = client_id
-        self.company_name = company_name
-        self.manage_url = manage_url
-        self.public_key = public_key
-        self.private_key = private_key
+        self.client_id: str = client_id
+        self.company_name: str = company_name
+        self.manage_url: str = manage_url
+        self.public_key: str = public_key
+        self.private_key: str = private_key
 
         # Retrieve codebase from the API if not provided
         if not codebase:
@@ -60,7 +60,7 @@ def __init__(
             if codebase_request is None:
                 # we need to except here
                 raise Exception("Could not retrieve codebase from API.")
-            self.codebase = codebase_request
+            self.codebase: str = codebase_request
 
         # Initializing endpoints
         self.company = CompanyEndpoint(self)
diff --git a/src/pyconnectwise/endpoints/automate/ApitokenEndpoint.py b/src/pyconnectwise/endpoints/automate/ApitokenEndpoint.py
index fe739ba7f..a34df5c1f 100644
--- a/src/pyconnectwise/endpoints/automate/ApitokenEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ApitokenEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Security import AuthInformation
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateAuthInformation, AutomateTokenResult
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class ApitokenEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Apitoken", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AuthInformation:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateAuthInformation:
         """
         Performs a GET request against the /Apitoken endpoint.
 
@@ -18,11 +17,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            AuthInformation: The parsed response data.
+            AutomateAuthInformation: The parsed response data.
         """
-        return self._parse_one(AuthInformation, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(AutomateAuthInformation, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TokenResult:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateTokenResult:
         """
         Performs a POST request against the /Apitoken endpoint.
 
@@ -30,6 +29,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            TokenResult: The parsed response data.
+            AutomateTokenResult: The parsed response data.
         """
-        return self._parse_one(TokenResult, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(AutomateTokenResult, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ApprovalpoliciesEndpoint.py b/src/pyconnectwise/endpoints/automate/ApprovalpoliciesEndpoint.py
index 6d851b58d..a30f166ad 100644
--- a/src/pyconnectwise/endpoints/automate/ApprovalpoliciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ApprovalpoliciesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/AvtemplatepoliciesEndpoint.py b/src/pyconnectwise/endpoints/automate/AvtemplatepoliciesEndpoint.py
index c6622881d..f06a71d65 100644
--- a/src/pyconnectwise/endpoints/automate/AvtemplatepoliciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/AvtemplatepoliciesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import AVTemplatePolicy
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechAVTemplatePolicy
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class AvtemplatepoliciesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Avtemplatepolicies", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AVTemplatePolicy:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechAVTemplatePolicy:
         """
         Performs a POST request against the /Avtemplatepolicies endpoint.
 
@@ -18,6 +17,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            AVTemplatePolicy: The parsed response data.
+            LabTechAVTemplatePolicy: The parsed response data.
         """
-        return self._parse_one(AVTemplatePolicy, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechAVTemplatePolicy, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/AvtemplatepolicydataEndpoint.py b/src/pyconnectwise/endpoints/automate/AvtemplatepolicydataEndpoint.py
index f3d9499cc..0521fc3a8 100644
--- a/src/pyconnectwise/endpoints/automate/AvtemplatepolicydataEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/AvtemplatepolicydataEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import AVTemplatePolicyData
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechAVTemplatePolicyData
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class AvtemplatepolicydataEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Avtemplatepolicydata", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AVTemplatePolicyData:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechAVTemplatePolicyData:
         """
         Performs a POST request against the /Avtemplatepolicydata endpoint.
 
@@ -18,6 +17,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            AVTemplatePolicyData: The parsed response data.
+            LabTechAVTemplatePolicyData: The parsed response data.
         """
-        return self._parse_one(AVTemplatePolicyData, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            LabTechAVTemplatePolicyData, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ClientsEndpoint.py b/src/pyconnectwise/endpoints/automate/ClientsEndpoint.py
index b2efcb899..623d59587 100644
--- a/src/pyconnectwise/endpoints/automate/ClientsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ClientsEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.ClientsIdEndpoint import ClientsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Client
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechClient
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -24,7 +23,9 @@ def id(self, id: int) -> ClientsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Client]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechClient]:
         """
         Performs a GET request against the /Clients endpoint and returns an initialized PaginatedResponse object.
 
@@ -33,19 +34,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Client]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechClient]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Client,
+            LabTechClient,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Client]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechClient]:
         """
         Performs a GET request against the /Clients endpoint.
 
@@ -53,11 +54,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Client]: The parsed response data.
+            list[LabTechClient]: The parsed response data.
         """
-        return self._parse_many(Client, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechClient, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Client:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechClient:
         """
         Performs a POST request against the /Clients endpoint.
 
@@ -65,6 +66,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Client: The parsed response data.
+            LabTechClient: The parsed response data.
         """
-        return self._parse_one(Client, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechClient, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ClientsIdDocumentsEndpoint.py b/src/pyconnectwise/endpoints/automate/ClientsIdDocumentsEndpoint.py
index 9fbf36ea1..74baf6993 100644
--- a/src/pyconnectwise/endpoints/automate/ClientsIdDocumentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ClientsIdDocumentsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Document
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDocument
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class ClientsIdDocumentsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Documents", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Document]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechDocument]:
         """
         Performs a GET request against the /Clients/{id}/Documents endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Document]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDocument]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Document,
+            LabTechDocument,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Document]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechDocument]:
         """
         Performs a GET request against the /Clients/{id}/Documents endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Document]: The parsed response data.
+            list[LabTechDocument]: The parsed response data.
         """
-        return self._parse_many(Document, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechDocument, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ClientsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ClientsIdEndpoint.py
index a4f39d5c0..2f98e34c5 100644
--- a/src/pyconnectwise/endpoints/automate/ClientsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ClientsIdEndpoint.py
@@ -5,8 +5,7 @@
 from pyconnectwise.endpoints.automate.ClientsIdPermissionsEndpoint import ClientsIdPermissionsEndpoint
 from pyconnectwise.endpoints.automate.ClientsIdProductkeysEndpoint import ClientsIdProductkeysEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Client
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechClient
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -14,12 +13,14 @@ class ClientsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.productkeys = self._register_child_endpoint(ClientsIdProductkeysEndpoint(client, parent_endpoint=self))
+        self.licenses = self._register_child_endpoint(ClientsIdLicensesEndpoint(client, parent_endpoint=self))
         self.permissions = self._register_child_endpoint(ClientsIdPermissionsEndpoint(client, parent_endpoint=self))
         self.documents = self._register_child_endpoint(ClientsIdDocumentsEndpoint(client, parent_endpoint=self))
-        self.licenses = self._register_child_endpoint(ClientsIdLicensesEndpoint(client, parent_endpoint=self))
-        self.productkeys = self._register_child_endpoint(ClientsIdProductkeysEndpoint(client, parent_endpoint=self))
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Client]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechClient]:
         """
         Performs a GET request against the /Clients/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -28,19 +29,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Client]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechClient]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Client,
+            LabTechClient,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Client:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechClient:
         """
         Performs a GET request against the /Clients/{id} endpoint.
 
@@ -48,6 +49,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Client: The parsed response data.
+            LabTechClient: The parsed response data.
         """
-        return self._parse_one(Client, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechClient, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ClientsIdLicensesEndpoint.py b/src/pyconnectwise/endpoints/automate/ClientsIdLicensesEndpoint.py
index 9142b81c6..85c3335f1 100644
--- a/src/pyconnectwise/endpoints/automate/ClientsIdLicensesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ClientsIdLicensesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ManagedLicense
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechManagedLicense
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ManagedLicense]:
+    ) -> PaginatedResponse[LabTechManagedLicense]:
         """
         Performs a GET request against the /Clients/{id}/Licenses endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ManagedLicense]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechManagedLicense]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ManagedLicense,
+            LabTechManagedLicense,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ManagedLicense]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechManagedLicense]:
         """
         Performs a GET request against the /Clients/{id}/Licenses endpoint.
 
@@ -41,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ManagedLicense]: The parsed response data.
+            list[LabTechManagedLicense]: The parsed response data.
         """
-        return self._parse_many(ManagedLicense, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechManagedLicense, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ManagedLicense:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechManagedLicense:
         """
         Performs a POST request against the /Clients/{id}/Licenses endpoint.
 
@@ -53,6 +52,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ManagedLicense: The parsed response data.
+            LabTechManagedLicense: The parsed response data.
         """
-        return self._parse_one(ManagedLicense, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechManagedLicense, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ClientsIdPermissionsEndpoint.py b/src/pyconnectwise/endpoints/automate/ClientsIdPermissionsEndpoint.py
index 6976862c1..b289ce5ad 100644
--- a/src/pyconnectwise/endpoints/automate/ClientsIdPermissionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ClientsIdPermissionsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.ClientsIdPermissionsIdEndpoint import ClientsIdPermissionsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ClientsIdPermissionsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ClientsIdPermissionsIdEndpoint.py
index eb7251e31..f68ad2b62 100644
--- a/src/pyconnectwise/endpoints/automate/ClientsIdPermissionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ClientsIdPermissionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class ClientsIdPermissionsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Clients/{id}/Permissions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/ClientsIdProductkeysEndpoint.py b/src/pyconnectwise/endpoints/automate/ClientsIdProductkeysEndpoint.py
index 51a09cdc1..d9b8bf8f2 100644
--- a/src/pyconnectwise/endpoints/automate/ClientsIdProductkeysEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ClientsIdProductkeysEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ProductKey
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechProductKey
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class ClientsIdProductkeysEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Productkeys", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[ProductKey]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechProductKey]:
         """
         Performs a GET request against the /Clients/{id}/Productkeys endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ProductKey]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechProductKey]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ProductKey,
+            LabTechProductKey,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ProductKey]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechProductKey]:
         """
         Performs a GET request against the /Clients/{id}/Productkeys endpoint.
 
@@ -39,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ProductKey]: The parsed response data.
+            list[LabTechProductKey]: The parsed response data.
         """
-        return self._parse_many(ProductKey, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechProductKey, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProductKey:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechProductKey:
         """
         Performs a POST request against the /Clients/{id}/Productkeys endpoint.
 
@@ -51,6 +52,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ProductKey: The parsed response data.
+            LabTechProductKey: The parsed response data.
         """
-        return self._parse_one(ProductKey, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechProductKey, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/CommandsEndpoint.py b/src/pyconnectwise/endpoints/automate/CommandsEndpoint.py
index 311d6a627..4bc1f9290 100644
--- a/src/pyconnectwise/endpoints/automate/CommandsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/CommandsEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.CommandsIdEndpoint import CommandsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Command
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechCommand
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -24,7 +23,9 @@ def id(self, id: int) -> CommandsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Command]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechCommand]:
         """
         Performs a GET request against the /Commands endpoint and returns an initialized PaginatedResponse object.
 
@@ -33,19 +34,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Command]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechCommand]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Command,
+            LabTechCommand,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Command]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechCommand]:
         """
         Performs a GET request against the /Commands endpoint.
 
@@ -53,6 +54,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Command]: The parsed response data.
+            list[LabTechCommand]: The parsed response data.
         """
-        return self._parse_many(Command, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechCommand, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/CommandsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/CommandsIdEndpoint.py
index bd7fd0ebb..0583ce448 100644
--- a/src/pyconnectwise/endpoints/automate/CommandsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/CommandsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Command
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechCommand
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class CommandsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Command]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechCommand]:
         """
         Performs a GET request against the /Commands/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Command]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechCommand]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Command,
+            LabTechCommand,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Command:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechCommand:
         """
         Performs a GET request against the /Commands/{id} endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Command: The parsed response data.
+            LabTechCommand: The parsed response data.
         """
-        return self._parse_one(Command, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechCommand, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputermenusEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputermenusEndpoint.py
index aee2d9616..ad6558c0a 100644
--- a/src/pyconnectwise/endpoints/automate/ComputermenusEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputermenusEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerMenu
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerMenu
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerMenu]:
+    ) -> PaginatedResponse[LabTechComputerMenu]:
         """
         Performs a GET request against the /Computermenus endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerMenu]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerMenu]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerMenu,
+            LabTechComputerMenu,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerMenu]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerMenu]:
         """
         Performs a GET request against the /Computermenus endpoint.
 
@@ -41,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerMenu]: The parsed response data.
+            list[LabTechComputerMenu]: The parsed response data.
         """
-        return self._parse_many(ComputerMenu, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerMenu, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ComputerMenu:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechComputerMenu:
         """
         Performs a POST request against the /Computermenus endpoint.
 
@@ -53,6 +52,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ComputerMenu: The parsed response data.
+            LabTechComputerMenu: The parsed response data.
         """
-        return self._parse_one(ComputerMenu, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechComputerMenu, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersChassisEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersChassisEndpoint.py
index 8f5d20f99..fdd23288e 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersChassisEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersChassisEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerChassis
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerChassis
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerChassis]:
+    ) -> PaginatedResponse[LabTechComputerChassis]:
         """
         Performs a GET request against the /Computers/Chassis endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerChassis]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerChassis]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerChassis,
+            LabTechComputerChassis,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerChassis]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerChassis]:
         """
         Performs a GET request against the /Computers/Chassis endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerChassis]: The parsed response data.
+            list[LabTechComputerChassis]: The parsed response data.
         """
-        return self._parse_many(ComputerChassis, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerChassis, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersDrivesEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersDrivesEndpoint.py
index b3eea194b..5ecbfa677 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersDrivesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersDrivesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerDrive
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerDrive
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerDrive]:
+    ) -> PaginatedResponse[LabTechComputerDrive]:
         """
         Performs a GET request against the /Computers/Drives endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerDrive]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerDrive]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerDrive,
+            LabTechComputerDrive,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerDrive]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerDrive]:
         """
         Performs a GET request against the /Computers/Drives endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerDrive]: The parsed response data.
+            list[LabTechComputerDrive]: The parsed response data.
         """
-        return self._parse_many(ComputerDrive, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerDrive, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersEndpoint.py
index e4d8bcc1c..4b7cee8fe 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersEndpoint.py
@@ -7,8 +7,7 @@
 from pyconnectwise.endpoints.automate.ComputersMemoryslotsEndpoint import ComputersMemoryslotsEndpoint
 from pyconnectwise.endpoints.automate.ComputersSoftwareEndpoint import ComputersSoftwareEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Computer
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputer
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -16,13 +15,13 @@ class ComputersEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Computers", parent_endpoint=parent_endpoint)
 
+        self.chassis = self._register_child_endpoint(ComputersChassisEndpoint(client, parent_endpoint=self))
+        self.software = self._register_child_endpoint(ComputersSoftwareEndpoint(client, parent_endpoint=self))
         self.memoryslots = self._register_child_endpoint(ComputersMemoryslotsEndpoint(client, parent_endpoint=self))
+        self.drives = self._register_child_endpoint(ComputersDrivesEndpoint(client, parent_endpoint=self))
         self.maintenancemodes = self._register_child_endpoint(
             ComputersMaintenancemodesEndpoint(client, parent_endpoint=self)
         )
-        self.software = self._register_child_endpoint(ComputersSoftwareEndpoint(client, parent_endpoint=self))
-        self.drives = self._register_child_endpoint(ComputersDrivesEndpoint(client, parent_endpoint=self))
-        self.chassis = self._register_child_endpoint(ComputersChassisEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> ComputersIdEndpoint:
         """
@@ -37,7 +36,9 @@ def id(self, id: int) -> ComputersIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Computer]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechComputer]:
         """
         Performs a GET request against the /Computers endpoint and returns an initialized PaginatedResponse object.
 
@@ -46,19 +47,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Computer]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputer]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Computer,
+            LabTechComputer,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Computer]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputer]:
         """
         Performs a GET request against the /Computers endpoint.
 
@@ -66,6 +67,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Computer]: The parsed response data.
+            list[LabTechComputer]: The parsed response data.
         """
-        return self._parse_many(Computer, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputer, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdAlertsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdAlertsEndpoint.py
index 2eebe491c..7bf3f0a5f 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdAlertsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdAlertsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsEndpoint.py
index 7b099ebaf..259781367 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.automate.ComputersIdAlertsuspensionsTemplatediversionEndpoint import \
     ComputersIdAlertsuspensionsTemplatediversionEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsMaintenancewindowEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsMaintenancewindowEndpoint.py
index df7f29c7f..ef1b018b3 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsMaintenancewindowEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsMaintenancewindowEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsTemplatediversionEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsTemplatediversionEndpoint.py
index b0a62e37a..5aee9b749 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsTemplatediversionEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdAlertsuspensionsTemplatediversionEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdBiosEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdBiosEndpoint.py
index 0da3e0784..1ede1e11b 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdBiosEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdBiosEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerBios
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerBios
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerBios]:
+    ) -> PaginatedResponse[LabTechComputerBios]:
         """
         Performs a GET request against the /Computers/{id}/Bios endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerBios]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerBios]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerBios,
+            LabTechComputerBios,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ComputerBios:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechComputerBios:
         """
         Performs a GET request against the /Computers/{id}/Bios endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ComputerBios: The parsed response data.
+            LabTechComputerBios: The parsed response data.
         """
-        return self._parse_one(ComputerBios, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechComputerBios, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdCommandexecuteEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdCommandexecuteEndpoint.py
index c3eabe52a..03d5b9506 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdCommandexecuteEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdCommandexecuteEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import CommandExecute
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechCommandExecute
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[CommandExecute]:
+    ) -> PaginatedResponse[LabTechCommandExecute]:
         """
         Performs a GET request against the /Computers/{id}/Commandexecute endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[CommandExecute]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechCommandExecute]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            CommandExecute,
+            LabTechCommandExecute,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CommandExecute]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechCommandExecute]:
         """
         Performs a GET request against the /Computers/{id}/Commandexecute endpoint.
 
@@ -41,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[CommandExecute]: The parsed response data.
+            list[LabTechCommandExecute]: The parsed response data.
         """
-        return self._parse_many(CommandExecute, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechCommandExecute, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CommandExecute:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechCommandExecute:
         """
         Performs a POST request against the /Computers/{id}/Commandexecute endpoint.
 
@@ -53,6 +52,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CommandExecute: The parsed response data.
+            LabTechCommandExecute: The parsed response data.
         """
-        return self._parse_one(CommandExecute, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechCommandExecute, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdCommandhistoryEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdCommandhistoryEndpoint.py
index 6f822d031..0e877b711 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdCommandhistoryEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdCommandhistoryEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Compatibility import CommandHistory
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateCommandHistory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[CommandHistory]:
+    ) -> PaginatedResponse[AutomateCommandHistory]:
         """
         Performs a GET request against the /Computers/{id}/Commandhistory endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[CommandHistory]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateCommandHistory]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            CommandHistory,
+            AutomateCommandHistory,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CommandHistory]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AutomateCommandHistory]:
         """
         Performs a GET request against the /Computers/{id}/Commandhistory endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[CommandHistory]: The parsed response data.
+            list[AutomateCommandHistory]: The parsed response data.
         """
-        return self._parse_many(CommandHistory, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(AutomateCommandHistory, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdComputerpatchingpoliciesEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdComputerpatchingpoliciesEndpoint.py
index 820983bff..96527da1c 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdComputerpatchingpoliciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdComputerpatchingpoliciesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerPatchingPolicy
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerPatchingPolicy
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerPatchingPolicy]:
+    ) -> PaginatedResponse[LabTechComputerPatchingPolicy]:
         """
         Performs a GET request against the /Computers/{id}/Computerpatchingpolicies endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerPatchingPolicy]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerPatchingPolicy]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerPatchingPolicy,
+            LabTechComputerPatchingPolicy,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerPatchingPolicy]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerPatchingPolicy]:
         """
         Performs a GET request against the /Computers/{id}/Computerpatchingpolicies endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerPatchingPolicy]: The parsed response data.
+            list[LabTechComputerPatchingPolicy]: The parsed response data.
         """
-        return self._parse_many(ComputerPatchingPolicy, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            LabTechComputerPatchingPolicy, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdDevicesEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdDevicesEndpoint.py
index 452dd48e0..07e9ca79c 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdDevicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdDevicesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerDevice
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerDevice
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerDevice]:
+    ) -> PaginatedResponse[LabTechComputerDevice]:
         """
         Performs a GET request against the /Computers/{id}/Devices endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerDevice]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerDevice]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerDevice,
+            LabTechComputerDevice,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerDevice]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerDevice]:
         """
         Performs a GET request against the /Computers/{id}/Devices endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerDevice]: The parsed response data.
+            list[LabTechComputerDevice]: The parsed response data.
         """
-        return self._parse_many(ComputerDevice, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerDevice, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdDriversEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdDriversEndpoint.py
index 742b276dc..54194f897 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdDriversEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdDriversEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import ComputerDriver
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerDriver
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerDriver]:
+    ) -> PaginatedResponse[LabTechComputerDriver]:
         """
         Performs a GET request against the /Computers/{id}/Drivers endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerDriver]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerDriver]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerDriver,
+            LabTechComputerDriver,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerDriver]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerDriver]:
         """
         Performs a GET request against the /Computers/{id}/Drivers endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerDriver]: The parsed response data.
+            list[LabTechComputerDriver]: The parsed response data.
         """
-        return self._parse_many(ComputerDriver, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerDriver, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdDrivesEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdDrivesEndpoint.py
index 6d1b76921..2db249e78 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdDrivesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdDrivesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.ComputersIdDrivesIdEndpoint import ComputersIdDrivesIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdDrivesIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdDrivesIdEndpoint.py
index 187eef7a4..6c707c89f 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdDrivesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdDrivesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.ComputersIdDrivesIdSmartdataEndpoint import ComputersIdDrivesIdSmartdataEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdDrivesIdSmartdataEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdDrivesIdSmartdataEndpoint.py
index 6f8aa2c50..e7492bbe1 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdDrivesIdSmartdataEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdDrivesIdSmartdataEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import SmartData
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechSmartData
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class ComputersIdDrivesIdSmartdataEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Smartdata", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[SmartData]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechSmartData]:
         """
         Performs a GET request against the /Computers/{id}/Drives/{id}/Smartdata endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[SmartData]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechSmartData]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            SmartData,
+            LabTechSmartData,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[SmartData]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechSmartData]:
         """
         Performs a GET request against the /Computers/{id}/Drives/{id}/Smartdata endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[SmartData]: The parsed response data.
+            list[LabTechSmartData]: The parsed response data.
         """
-        return self._parse_many(SmartData, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechSmartData, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdEffectivepatchingpolicyEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdEffectivepatchingpolicyEndpoint.py
index ed1511120..0361175a6 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdEffectivepatchingpolicyEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdEffectivepatchingpolicyEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerEffectivePatchingPolicy
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerEffectivePatchingPolicy
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerEffectivePatchingPolicy]:
+    ) -> PaginatedResponse[LabTechComputerEffectivePatchingPolicy]:
         """
         Performs a GET request against the /Computers/{id}/Effectivepatchingpolicy endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerEffectivePatchingPolicy]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerEffectivePatchingPolicy]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerEffectivePatchingPolicy,
+            LabTechComputerEffectivePatchingPolicy,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ComputerEffectivePatchingPolicy:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> LabTechComputerEffectivePatchingPolicy:
         """
         Performs a GET request against the /Computers/{id}/Effectivepatchingpolicy endpoint.
 
@@ -41,8 +42,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ComputerEffectivePatchingPolicy: The parsed response data.
+            LabTechComputerEffectivePatchingPolicy: The parsed response data.
         """
         return self._parse_one(
-            ComputerEffectivePatchingPolicy, super()._make_request("GET", data=data, params=params).json()
+            LabTechComputerEffectivePatchingPolicy, super()._make_request("GET", data=data, params=params).json()
         )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdEndpoint.py
index f8a070ca3..10a484c22 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdEndpoint.py
@@ -33,8 +33,7 @@
 from pyconnectwise.endpoints.automate.ComputersIdUpsEndpoint import ComputersIdUpsEndpoint
 from pyconnectwise.endpoints.automate.ComputersIdVideocardsEndpoint import ComputersIdVideocardsEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Computer
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputer
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -42,65 +41,67 @@ class ComputersIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.videocards = self._register_child_endpoint(ComputersIdVideocardsEndpoint(client, parent_endpoint=self))
-        self.software = self._register_child_endpoint(ComputersIdSoftwareEndpoint(client, parent_endpoint=self))
-        self.monitors = self._register_child_endpoint(ComputersIdMonitorsEndpoint(client, parent_endpoint=self))
+        self.drivers = self._register_child_endpoint(ComputersIdDriversEndpoint(client, parent_endpoint=self))
+        self.patchjobs = self._register_child_endpoint(ComputersIdPatchjobsEndpoint(client, parent_endpoint=self))
+        self.printers = self._register_child_endpoint(ComputersIdPrintersEndpoint(client, parent_endpoint=self))
+        self.services = self._register_child_endpoint(ComputersIdServicesEndpoint(client, parent_endpoint=self))
+        self.sensors = self._register_child_endpoint(ComputersIdSensorsEndpoint(client, parent_endpoint=self))
+        self.scheduledtasks = self._register_child_endpoint(
+            ComputersIdScheduledtasksEndpoint(client, parent_endpoint=self)
+        )
         self.scripthistory = self._register_child_endpoint(
             ComputersIdScripthistoryEndpoint(client, parent_endpoint=self)
         )
+        self.patchingstats = self._register_child_endpoint(
+            ComputersIdPatchingstatsEndpoint(client, parent_endpoint=self)
+        )
+        self.drives = self._register_child_endpoint(ComputersIdDrivesEndpoint(client, parent_endpoint=self))
+        self.systemslots = self._register_child_endpoint(ComputersIdSystemslotsEndpoint(client, parent_endpoint=self))
+        self.ups = self._register_child_endpoint(ComputersIdUpsEndpoint(client, parent_endpoint=self))
+        self.monitors = self._register_child_endpoint(ComputersIdMonitorsEndpoint(client, parent_endpoint=self))
+        self.microsoftupdates = self._register_child_endpoint(
+            ComputersIdMicrosoftupdatesEndpoint(client, parent_endpoint=self)
+        )
+        self.effectivepatchingpolicy = self._register_child_endpoint(
+            ComputersIdEffectivepatchingpolicyEndpoint(client, parent_endpoint=self)
+        )
+        self.alerts = self._register_child_endpoint(ComputersIdAlertsEndpoint(client, parent_endpoint=self))
         self.thirdpartypatches = self._register_child_endpoint(
             ComputersIdThirdpartypatchesEndpoint(client, parent_endpoint=self)
         )
-        self.printers = self._register_child_endpoint(ComputersIdPrintersEndpoint(client, parent_endpoint=self))
+        self.videocards = self._register_child_endpoint(ComputersIdVideocardsEndpoint(client, parent_endpoint=self))
+        self.runningscripts = self._register_child_endpoint(
+            ComputersIdRunningscriptsEndpoint(client, parent_endpoint=self)
+        )
         self.alertsuspensions = self._register_child_endpoint(
             ComputersIdAlertsuspensionsEndpoint(client, parent_endpoint=self)
         )
-        self.bios = self._register_child_endpoint(ComputersIdBiosEndpoint(client, parent_endpoint=self))
-        self.drives = self._register_child_endpoint(ComputersIdDrivesEndpoint(client, parent_endpoint=self))
-        self.operatingsystem = self._register_child_endpoint(
-            ComputersIdOperatingsystemEndpoint(client, parent_endpoint=self)
-        )
-        self.scheduledscripts = self._register_child_endpoint(
-            ComputersIdScheduledscriptsEndpoint(client, parent_endpoint=self)
-        )
-        self.systemslots = self._register_child_endpoint(ComputersIdSystemslotsEndpoint(client, parent_endpoint=self))
         self.commandhistory = self._register_child_endpoint(
             ComputersIdCommandhistoryEndpoint(client, parent_endpoint=self)
         )
-        self.monitoralertsuspensions = self._register_child_endpoint(
-            ComputersIdMonitoralertsuspensionsEndpoint(client, parent_endpoint=self)
-        )
         self.commandexecute = self._register_child_endpoint(
             ComputersIdCommandexecuteEndpoint(client, parent_endpoint=self)
         )
-        self.processors = self._register_child_endpoint(ComputersIdProcessorsEndpoint(client, parent_endpoint=self))
-        self.microsoftupdates = self._register_child_endpoint(
-            ComputersIdMicrosoftupdatesEndpoint(client, parent_endpoint=self)
+        self.monitoralertsuspensions = self._register_child_endpoint(
+            ComputersIdMonitoralertsuspensionsEndpoint(client, parent_endpoint=self)
         )
-        self.computerpatchingpolicies = self._register_child_endpoint(
-            ComputersIdComputerpatchingpoliciesEndpoint(client, parent_endpoint=self)
+        self.operatingsystem = self._register_child_endpoint(
+            ComputersIdOperatingsystemEndpoint(client, parent_endpoint=self)
         )
+        self.software = self._register_child_endpoint(ComputersIdSoftwareEndpoint(client, parent_endpoint=self))
         self.devices = self._register_child_endpoint(ComputersIdDevicesEndpoint(client, parent_endpoint=self))
-        self.patchingstats = self._register_child_endpoint(
-            ComputersIdPatchingstatsEndpoint(client, parent_endpoint=self)
-        )
-        self.sensors = self._register_child_endpoint(ComputersIdSensorsEndpoint(client, parent_endpoint=self))
-        self.patchjobs = self._register_child_endpoint(ComputersIdPatchjobsEndpoint(client, parent_endpoint=self))
-        self.services = self._register_child_endpoint(ComputersIdServicesEndpoint(client, parent_endpoint=self))
-        self.alerts = self._register_child_endpoint(ComputersIdAlertsEndpoint(client, parent_endpoint=self))
-        self.effectivepatchingpolicy = self._register_child_endpoint(
-            ComputersIdEffectivepatchingpolicyEndpoint(client, parent_endpoint=self)
-        )
-        self.ups = self._register_child_endpoint(ComputersIdUpsEndpoint(client, parent_endpoint=self))
-        self.runningscripts = self._register_child_endpoint(
-            ComputersIdRunningscriptsEndpoint(client, parent_endpoint=self)
+        self.computerpatchingpolicies = self._register_child_endpoint(
+            ComputersIdComputerpatchingpoliciesEndpoint(client, parent_endpoint=self)
         )
-        self.scheduledtasks = self._register_child_endpoint(
-            ComputersIdScheduledtasksEndpoint(client, parent_endpoint=self)
+        self.scheduledscripts = self._register_child_endpoint(
+            ComputersIdScheduledscriptsEndpoint(client, parent_endpoint=self)
         )
-        self.drivers = self._register_child_endpoint(ComputersIdDriversEndpoint(client, parent_endpoint=self))
+        self.processors = self._register_child_endpoint(ComputersIdProcessorsEndpoint(client, parent_endpoint=self))
+        self.bios = self._register_child_endpoint(ComputersIdBiosEndpoint(client, parent_endpoint=self))
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Computer]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechComputer]:
         """
         Performs a GET request against the /Computers/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -109,19 +110,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Computer]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputer]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Computer,
+            LabTechComputer,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Computer:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechComputer:
         """
         Performs a GET request against the /Computers/{id} endpoint.
 
@@ -129,6 +130,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Computer: The parsed response data.
+            LabTechComputer: The parsed response data.
         """
-        return self._parse_one(Computer, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechComputer, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdMicrosoftupdatesEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdMicrosoftupdatesEndpoint.py
index 9f2417069..9246920e7 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdMicrosoftupdatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdMicrosoftupdatesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdMonitoralertsuspensionsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdMonitoralertsuspensionsEndpoint.py
index d19e61ad8..ae6bc009b 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdMonitoralertsuspensionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdMonitoralertsuspensionsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.Alerting import MonitorAlertSuspension
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechMonitorAlertSuspension
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class ComputersIdMonitoralertsuspensionsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Monitoralertsuspensions", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MonitorAlertSuspension:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechMonitorAlertSuspension:
         """
         Performs a POST request against the /Computers/{id}/Monitoralertsuspensions endpoint.
 
@@ -18,6 +17,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            MonitorAlertSuspension: The parsed response data.
+            LabTechMonitorAlertSuspension: The parsed response data.
         """
-        return self._parse_one(MonitorAlertSuspension, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            LabTechMonitorAlertSuspension, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdMonitorsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdMonitorsEndpoint.py
index 6cbd6aaaf..28ef65061 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdMonitorsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdMonitorsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdOperatingsystemEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdOperatingsystemEndpoint.py
index a44933d5f..4f7f71484 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdOperatingsystemEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdOperatingsystemEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerOperatingSystem
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerOperatingSystem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerOperatingSystem]:
+    ) -> PaginatedResponse[LabTechComputerOperatingSystem]:
         """
         Performs a GET request against the /Computers/{id}/Operatingsystem endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerOperatingSystem]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerOperatingSystem]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerOperatingSystem,
+            LabTechComputerOperatingSystem,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ComputerOperatingSystem:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechComputerOperatingSystem:
         """
         Performs a GET request against the /Computers/{id}/Operatingsystem endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ComputerOperatingSystem: The parsed response data.
+            LabTechComputerOperatingSystem: The parsed response data.
         """
-        return self._parse_one(ComputerOperatingSystem, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(
+            LabTechComputerOperatingSystem, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdPatchingstatsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdPatchingstatsEndpoint.py
index 4028419c8..9b01ac2c8 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdPatchingstatsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdPatchingstatsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Patching import ComputerPatchingStats
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateComputerPatchingStats
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerPatchingStats]:
+    ) -> PaginatedResponse[AutomateComputerPatchingStats]:
         """
         Performs a GET request against the /Computers/{id}/Patchingstats endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerPatchingStats]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateComputerPatchingStats]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerPatchingStats,
+            AutomateComputerPatchingStats,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ComputerPatchingStats:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateComputerPatchingStats:
         """
         Performs a GET request against the /Computers/{id}/Patchingstats endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ComputerPatchingStats: The parsed response data.
+            AutomateComputerPatchingStats: The parsed response data.
         """
-        return self._parse_one(ComputerPatchingStats, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(
+            AutomateComputerPatchingStats, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdPatchjobsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdPatchjobsEndpoint.py
index f3831abea..278cd8c98 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdPatchjobsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdPatchjobsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdPrintersEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdPrintersEndpoint.py
index 8d0127d40..897654c3e 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdPrintersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdPrintersEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerPrinter
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerPrinter
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerPrinter]:
+    ) -> PaginatedResponse[LabTechComputerPrinter]:
         """
         Performs a GET request against the /Computers/{id}/Printers endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerPrinter]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerPrinter]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerPrinter,
+            LabTechComputerPrinter,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerPrinter]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerPrinter]:
         """
         Performs a GET request against the /Computers/{id}/Printers endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerPrinter]: The parsed response data.
+            list[LabTechComputerPrinter]: The parsed response data.
         """
-        return self._parse_many(ComputerPrinter, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerPrinter, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdProcessorsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdProcessorsEndpoint.py
index e2df48920..7716e7760 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdProcessorsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdProcessorsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerProcessor
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerProcessor
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerProcessor]:
+    ) -> PaginatedResponse[LabTechComputerProcessor]:
         """
         Performs a GET request against the /Computers/{id}/Processors endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerProcessor]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerProcessor]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerProcessor,
+            LabTechComputerProcessor,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerProcessor]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerProcessor]:
         """
         Performs a GET request against the /Computers/{id}/Processors endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerProcessor]: The parsed response data.
+            list[LabTechComputerProcessor]: The parsed response data.
         """
-        return self._parse_many(ComputerProcessor, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerProcessor, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdRunningscriptsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdRunningscriptsEndpoint.py
index 12daeeff7..8701c5de5 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdRunningscriptsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdRunningscriptsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerRunningScript
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerRunningScript
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerRunningScript]:
+    ) -> PaginatedResponse[LabTechComputerRunningScript]:
         """
         Performs a GET request against the /Computers/{id}/Runningscripts endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerRunningScript]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerRunningScript]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerRunningScript,
+            LabTechComputerRunningScript,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerRunningScript]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerRunningScript]:
         """
         Performs a GET request against the /Computers/{id}/Runningscripts endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerRunningScript]: The parsed response data.
+            list[LabTechComputerRunningScript]: The parsed response data.
         """
-        return self._parse_many(ComputerRunningScript, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            LabTechComputerRunningScript, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdScheduledscriptsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdScheduledscriptsEndpoint.py
index 6131557b6..8f7186ff5 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdScheduledscriptsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdScheduledscriptsEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.ComputersIdScheduledscriptsIdEndpoint import ComputersIdScheduledscriptsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ScheduledScript
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechScheduledScript
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -26,7 +25,7 @@ def id(self, id: int) -> ComputersIdScheduledscriptsIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ScheduledScript]:
+    ) -> PaginatedResponse[LabTechScheduledScript]:
         """
         Performs a GET request against the /Computers/{id}/Scheduledscripts endpoint and returns an initialized PaginatedResponse object.
 
@@ -35,19 +34,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ScheduledScript]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechScheduledScript]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ScheduledScript,
+            LabTechScheduledScript,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ScheduledScript]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechScheduledScript]:
         """
         Performs a GET request against the /Computers/{id}/Scheduledscripts endpoint.
 
@@ -55,11 +54,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ScheduledScript]: The parsed response data.
+            list[LabTechScheduledScript]: The parsed response data.
         """
-        return self._parse_many(ScheduledScript, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechScheduledScript, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScheduledScript:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechScheduledScript:
         """
         Performs a POST request against the /Computers/{id}/Scheduledscripts endpoint.
 
@@ -67,6 +66,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ScheduledScript: The parsed response data.
+            LabTechScheduledScript: The parsed response data.
         """
-        return self._parse_one(ScheduledScript, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechScheduledScript, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdScheduledscriptsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdScheduledscriptsIdEndpoint.py
index 5adf88046..7e2882061 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdScheduledscriptsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdScheduledscriptsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ScheduledScript
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechScheduledScript
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ScheduledScript]:
+    ) -> PaginatedResponse[LabTechScheduledScript]:
         """
         Performs a GET request against the /Computers/{id}/Scheduledscripts/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ScheduledScript]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechScheduledScript]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ScheduledScript,
+            LabTechScheduledScript,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScheduledScript:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechScheduledScript:
         """
         Performs a GET request against the /Computers/{id}/Scheduledscripts/{id} endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ScheduledScript: The parsed response data.
+            LabTechScheduledScript: The parsed response data.
         """
-        return self._parse_one(ScheduledScript, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechScheduledScript, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdScheduledtasksEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdScheduledtasksEndpoint.py
index 755a182ca..910d96cdd 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdScheduledtasksEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdScheduledtasksEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class ComputersIdScheduledtasksEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Scheduledtasks", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Computers/{id}/Scheduledtasks endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdScripthistoryEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdScripthistoryEndpoint.py
index 1a5431ec3..26a1f85d4 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdScripthistoryEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdScripthistoryEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerScriptHistory
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerScriptHistory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerScriptHistory]:
+    ) -> PaginatedResponse[LabTechComputerScriptHistory]:
         """
         Performs a GET request against the /Computers/{id}/Scripthistory endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerScriptHistory]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerScriptHistory]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerScriptHistory,
+            LabTechComputerScriptHistory,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerScriptHistory]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerScriptHistory]:
         """
         Performs a GET request against the /Computers/{id}/Scripthistory endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerScriptHistory]: The parsed response data.
+            list[LabTechComputerScriptHistory]: The parsed response data.
         """
-        return self._parse_many(ComputerScriptHistory, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            LabTechComputerScriptHistory, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdSensorsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdSensorsEndpoint.py
index a93ee64ab..579a65c28 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdSensorsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdSensorsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerSensor
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerSensor
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerSensor]:
+    ) -> PaginatedResponse[LabTechComputerSensor]:
         """
         Performs a GET request against the /Computers/{id}/Sensors endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerSensor]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerSensor]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerSensor,
+            LabTechComputerSensor,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerSensor]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerSensor]:
         """
         Performs a GET request against the /Computers/{id}/Sensors endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerSensor]: The parsed response data.
+            list[LabTechComputerSensor]: The parsed response data.
         """
-        return self._parse_many(ComputerSensor, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerSensor, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdServicesEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdServicesEndpoint.py
index 4cc414d87..b9a820325 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdServicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdServicesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerService
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerService
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerService]:
+    ) -> PaginatedResponse[LabTechComputerService]:
         """
         Performs a GET request against the /Computers/{id}/Services endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerService]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerService]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerService,
+            LabTechComputerService,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerService]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerService]:
         """
         Performs a GET request against the /Computers/{id}/Services endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerService]: The parsed response data.
+            list[LabTechComputerService]: The parsed response data.
         """
-        return self._parse_many(ComputerService, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerService, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareEndpoint.py
index 978a7bca9..37ec3921b 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.ComputersIdSoftwareIdEndpoint import ComputersIdSoftwareIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerSoftware
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerSoftware
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -26,7 +25,7 @@ def id(self, id: int) -> ComputersIdSoftwareIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerSoftware]:
+    ) -> PaginatedResponse[LabTechComputerSoftware]:
         """
         Performs a GET request against the /Computers/{id}/Software endpoint and returns an initialized PaginatedResponse object.
 
@@ -35,19 +34,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerSoftware]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerSoftware]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerSoftware,
+            LabTechComputerSoftware,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerSoftware]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerSoftware]:
         """
         Performs a GET request against the /Computers/{id}/Software endpoint.
 
@@ -55,6 +54,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerSoftware]: The parsed response data.
+            list[LabTechComputerSoftware]: The parsed response data.
         """
-        return self._parse_many(ComputerSoftware, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerSoftware, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareIdEndpoint.py
index 5cfacd98b..b44e9ab0a 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.automate.ComputersIdSoftwareIdUninstallEndpoint import \
     ComputersIdSoftwareIdUninstallEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareIdUninstallEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareIdUninstallEndpoint.py
index 18e2c95ff..5e60fb1e0 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareIdUninstallEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdSoftwareIdUninstallEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class ComputersIdSoftwareIdUninstallEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Uninstall", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Computers/{id}/Software/{id}/Uninstall endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdSystemslotsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdSystemslotsEndpoint.py
index d7e22e3f9..3b5b60292 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdSystemslotsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdSystemslotsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerSystemSlot
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerSystemSlot
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerSystemSlot]:
+    ) -> PaginatedResponse[LabTechComputerSystemSlot]:
         """
         Performs a GET request against the /Computers/{id}/Systemslots endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerSystemSlot]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerSystemSlot]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerSystemSlot,
+            LabTechComputerSystemSlot,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerSystemSlot]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerSystemSlot]:
         """
         Performs a GET request against the /Computers/{id}/Systemslots endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerSystemSlot]: The parsed response data.
+            list[LabTechComputerSystemSlot]: The parsed response data.
         """
-        return self._parse_many(ComputerSystemSlot, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            LabTechComputerSystemSlot, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdThirdpartypatchesEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdThirdpartypatchesEndpoint.py
index 04093758a..87d7614f1 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdThirdpartypatchesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdThirdpartypatchesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdUpsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdUpsEndpoint.py
index d8cfe2615..ef251d846 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdUpsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdUpsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerUps
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerUps
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class ComputersIdUpsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Ups", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[ComputerUps]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechComputerUps]:
         """
         Performs a GET request against the /Computers/{id}/Ups endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerUps]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerUps]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerUps,
+            LabTechComputerUps,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerUps]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerUps]:
         """
         Performs a GET request against the /Computers/{id}/Ups endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerUps]: The parsed response data.
+            list[LabTechComputerUps]: The parsed response data.
         """
-        return self._parse_many(ComputerUps, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerUps, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersIdVideocardsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersIdVideocardsEndpoint.py
index 9e1273e16..d6f2f23dd 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersIdVideocardsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersIdVideocardsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerVideoCard
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerVideoCard
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerVideoCard]:
+    ) -> PaginatedResponse[LabTechComputerVideoCard]:
         """
         Performs a GET request against the /Computers/{id}/Videocards endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerVideoCard]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerVideoCard]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerVideoCard,
+            LabTechComputerVideoCard,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerVideoCard]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerVideoCard]:
         """
         Performs a GET request against the /Computers/{id}/Videocards endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerVideoCard]: The parsed response data.
+            list[LabTechComputerVideoCard]: The parsed response data.
         """
-        return self._parse_many(ComputerVideoCard, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerVideoCard, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersMaintenancemodesEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersMaintenancemodesEndpoint.py
index a3f255e78..fa77ecbb3 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersMaintenancemodesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersMaintenancemodesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import MaintenanceMode
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechMaintenanceMode
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[MaintenanceMode]:
+    ) -> PaginatedResponse[LabTechMaintenanceMode]:
         """
         Performs a GET request against the /Computers/Maintenancemodes endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[MaintenanceMode]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechMaintenanceMode]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            MaintenanceMode,
+            LabTechMaintenanceMode,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[MaintenanceMode]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechMaintenanceMode]:
         """
         Performs a GET request against the /Computers/Maintenancemodes endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[MaintenanceMode]: The parsed response data.
+            list[LabTechMaintenanceMode]: The parsed response data.
         """
-        return self._parse_many(MaintenanceMode, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechMaintenanceMode, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ComputersMemoryslotsEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersMemoryslotsEndpoint.py
index ef140f2a7..54d6369b3 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersMemoryslotsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersMemoryslotsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerMemorySlot
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerMemorySlot
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerMemorySlot]:
+    ) -> PaginatedResponse[LabTechComputerMemorySlot]:
         """
         Performs a GET request against the /Computers/Memoryslots endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerMemorySlot]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerMemorySlot]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerMemorySlot,
+            LabTechComputerMemorySlot,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerMemorySlot]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerMemorySlot]:
         """
         Performs a GET request against the /Computers/Memoryslots endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerMemorySlot]: The parsed response data.
+            list[LabTechComputerMemorySlot]: The parsed response data.
         """
-        return self._parse_many(ComputerMemorySlot, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            LabTechComputerMemorySlot, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ComputersSoftwareEndpoint.py b/src/pyconnectwise/endpoints/automate/ComputersSoftwareEndpoint.py
index 48f43461a..39e0ece0c 100644
--- a/src/pyconnectwise/endpoints/automate/ComputersSoftwareEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ComputersSoftwareEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ComputerSoftware
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechComputerSoftware
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ComputerSoftware]:
+    ) -> PaginatedResponse[LabTechComputerSoftware]:
         """
         Performs a GET request against the /Computers/Software endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ComputerSoftware]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechComputerSoftware]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ComputerSoftware,
+            LabTechComputerSoftware,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ComputerSoftware]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechComputerSoftware]:
         """
         Performs a GET request against the /Computers/Software endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ComputerSoftware]: The parsed response data.
+            list[LabTechComputerSoftware]: The parsed response data.
         """
-        return self._parse_many(ComputerSoftware, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechComputerSoftware, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ContactsEndpoint.py b/src/pyconnectwise/endpoints/automate/ContactsEndpoint.py
index bedc651a4..65ab22c41 100644
--- a/src/pyconnectwise/endpoints/automate/ContactsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ContactsEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.ContactsIdEndpoint import ContactsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Clients import Contact
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -24,7 +23,9 @@ def id(self, id: int) -> ContactsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Contact]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AutomateContact]:
         """
         Performs a GET request against the /Contacts endpoint and returns an initialized PaginatedResponse object.
 
@@ -33,19 +34,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Contact]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateContact]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Contact,
+            AutomateContact,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Contact]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AutomateContact]:
         """
         Performs a GET request against the /Contacts endpoint.
 
@@ -53,11 +54,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Contact]: The parsed response data.
+            list[AutomateContact]: The parsed response data.
         """
-        return self._parse_many(Contact, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(AutomateContact, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Contact:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateContact:
         """
         Performs a POST request against the /Contacts endpoint.
 
@@ -65,6 +66,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Contact: The parsed response data.
+            AutomateContact: The parsed response data.
         """
-        return self._parse_one(Contact, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(AutomateContact, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ContactsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ContactsIdEndpoint.py
index d1cdf438e..a0f39660f 100644
--- a/src/pyconnectwise/endpoints/automate/ContactsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ContactsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Clients import Contact
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class ContactsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Contact]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AutomateContact]:
         """
         Performs a GET request against the /Contacts/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Contact]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateContact]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Contact,
+            AutomateContact,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Contact:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateContact:
         """
         Performs a GET request against the /Contacts/{id} endpoint.
 
@@ -39,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Contact: The parsed response data.
+            AutomateContact: The parsed response data.
         """
-        return self._parse_one(Contact, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(AutomateContact, super()._make_request("GET", data=data, params=params).json())
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Contact:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateContact:
         """
         Performs a PUT request against the /Contacts/{id} endpoint.
 
@@ -51,18 +52,16 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Contact: The parsed response data.
+            AutomateContact: The parsed response data.
         """
-        return self._parse_one(Contact, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(AutomateContact, super()._make_request("PUT", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Contacts/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/DatabaseservertimeEndpoint.py b/src/pyconnectwise/endpoints/automate/DatabaseservertimeEndpoint.py
index 203d9705b..9480b49c2 100644
--- a/src/pyconnectwise/endpoints/automate/DatabaseservertimeEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DatabaseservertimeEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/DataviewfoldersEndpoint.py b/src/pyconnectwise/endpoints/automate/DataviewfoldersEndpoint.py
index cc511436b..e16890290 100644
--- a/src/pyconnectwise/endpoints/automate/DataviewfoldersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DataviewfoldersEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.DataviewfoldersIdEndpoint import DataviewfoldersIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import DataViewFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDataViewFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -26,7 +25,7 @@ def id(self, id: int) -> DataviewfoldersIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[DataViewFolder]:
+    ) -> PaginatedResponse[LabTechDataViewFolder]:
         """
         Performs a GET request against the /Dataviewfolders endpoint and returns an initialized PaginatedResponse object.
 
@@ -35,19 +34,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[DataViewFolder]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDataViewFolder]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            DataViewFolder,
+            LabTechDataViewFolder,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[DataViewFolder]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechDataViewFolder]:
         """
         Performs a GET request against the /Dataviewfolders endpoint.
 
@@ -55,6 +54,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[DataViewFolder]: The parsed response data.
+            list[LabTechDataViewFolder]: The parsed response data.
         """
-        return self._parse_many(DataViewFolder, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechDataViewFolder, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/DataviewfoldersIdEndpoint.py b/src/pyconnectwise/endpoints/automate/DataviewfoldersIdEndpoint.py
index 1b53e680a..69acaacb0 100644
--- a/src/pyconnectwise/endpoints/automate/DataviewfoldersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DataviewfoldersIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import DataViewFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDataViewFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[DataViewFolder]:
+    ) -> PaginatedResponse[LabTechDataViewFolder]:
         """
         Performs a GET request against the /Dataviewfolders/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[DataViewFolder]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDataViewFolder]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            DataViewFolder,
+            LabTechDataViewFolder,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> DataViewFolder:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechDataViewFolder:
         """
         Performs a GET request against the /Dataviewfolders/{id} endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> D
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            DataViewFolder: The parsed response data.
+            LabTechDataViewFolder: The parsed response data.
         """
-        return self._parse_one(DataViewFolder, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechDataViewFolder, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/DataviewsEndpoint.py b/src/pyconnectwise/endpoints/automate/DataviewsEndpoint.py
index 11fed0168..642f778bf 100644
--- a/src/pyconnectwise/endpoints/automate/DataviewsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DataviewsEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.DataviewsIdEndpoint import DataviewsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import DataView
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDataView
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -24,7 +23,9 @@ def id(self, id: int) -> DataviewsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[DataView]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechDataView]:
         """
         Performs a GET request against the /Dataviews endpoint and returns an initialized PaginatedResponse object.
 
@@ -33,19 +34,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[DataView]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDataView]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            DataView,
+            LabTechDataView,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[DataView]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechDataView]:
         """
         Performs a GET request against the /Dataviews endpoint.
 
@@ -53,6 +54,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[DataView]: The parsed response data.
+            list[LabTechDataView]: The parsed response data.
         """
-        return self._parse_many(DataView, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechDataView, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/DataviewsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/DataviewsIdEndpoint.py
index 6ba44f1ad..803f896d0 100644
--- a/src/pyconnectwise/endpoints/automate/DataviewsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DataviewsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import DataView
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDataView
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class DataviewsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[DataView]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechDataView]:
         """
         Performs a GET request against the /Dataviews/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[DataView]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDataView]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            DataView,
+            LabTechDataView,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> DataView:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechDataView:
         """
         Performs a GET request against the /Dataviews/{id} endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> D
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            DataView: The parsed response data.
+            LabTechDataView: The parsed response data.
         """
-        return self._parse_one(DataView, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechDataView, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/DrivesEndpoint.py b/src/pyconnectwise/endpoints/automate/DrivesEndpoint.py
index 517f2c67a..9892766b1 100644
--- a/src/pyconnectwise/endpoints/automate/DrivesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DrivesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.DrivesIdEndpoint import DrivesIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsDailyEndpoint.py b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsDailyEndpoint.py
index 89572179f..e528b0338 100644
--- a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsDailyEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsDailyEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import DriveStats
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDriveStats
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class DrivesIdDrivestatsDailyEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Daily", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[DriveStats]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechDriveStats]:
         """
         Performs a GET request against the /Drives/{id}/Drivestats/Daily endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[DriveStats]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDriveStats]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            DriveStats,
+            LabTechDriveStats,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[DriveStats]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechDriveStats]:
         """
         Performs a GET request against the /Drives/{id}/Drivestats/Daily endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[DriveStats]: The parsed response data.
+            list[LabTechDriveStats]: The parsed response data.
         """
-        return self._parse_many(DriveStats, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechDriveStats, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsEndpoint.py b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsEndpoint.py
index 02c2ec484..e510f4cbc 100644
--- a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.automate.DrivesIdDrivestatsWeeklyEndpoint import DrivesIdDrivestatsWeeklyEndpoint
 from pyconnectwise.endpoints.automate.DrivesIdDrivestatsYearlyEndpoint import DrivesIdDrivestatsYearlyEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -14,6 +13,6 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Drivestats", parent_endpoint=parent_endpoint)
 
         self.yearly = self._register_child_endpoint(DrivesIdDrivestatsYearlyEndpoint(client, parent_endpoint=self))
-        self.monthly = self._register_child_endpoint(DrivesIdDrivestatsMonthlyEndpoint(client, parent_endpoint=self))
         self.daily = self._register_child_endpoint(DrivesIdDrivestatsDailyEndpoint(client, parent_endpoint=self))
+        self.monthly = self._register_child_endpoint(DrivesIdDrivestatsMonthlyEndpoint(client, parent_endpoint=self))
         self.weekly = self._register_child_endpoint(DrivesIdDrivestatsWeeklyEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsMonthlyEndpoint.py b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsMonthlyEndpoint.py
index 7da03dec5..7ea6c533e 100644
--- a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsMonthlyEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsMonthlyEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import DriveStats
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDriveStats
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class DrivesIdDrivestatsMonthlyEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Monthly", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[DriveStats]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechDriveStats]:
         """
         Performs a GET request against the /Drives/{id}/Drivestats/Monthly endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[DriveStats]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDriveStats]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            DriveStats,
+            LabTechDriveStats,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[DriveStats]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechDriveStats]:
         """
         Performs a GET request against the /Drives/{id}/Drivestats/Monthly endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[DriveStats]: The parsed response data.
+            list[LabTechDriveStats]: The parsed response data.
         """
-        return self._parse_many(DriveStats, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechDriveStats, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsWeeklyEndpoint.py b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsWeeklyEndpoint.py
index 6489dc303..860c43fe7 100644
--- a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsWeeklyEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsWeeklyEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import DriveStats
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDriveStats
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class DrivesIdDrivestatsWeeklyEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Weekly", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[DriveStats]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechDriveStats]:
         """
         Performs a GET request against the /Drives/{id}/Drivestats/Weekly endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[DriveStats]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDriveStats]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            DriveStats,
+            LabTechDriveStats,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[DriveStats]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechDriveStats]:
         """
         Performs a GET request against the /Drives/{id}/Drivestats/Weekly endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[DriveStats]: The parsed response data.
+            list[LabTechDriveStats]: The parsed response data.
         """
-        return self._parse_many(DriveStats, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechDriveStats, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsYearlyEndpoint.py b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsYearlyEndpoint.py
index d6241775c..b0aa8af6b 100644
--- a/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsYearlyEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DrivesIdDrivestatsYearlyEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import DriveStats
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDriveStats
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class DrivesIdDrivestatsYearlyEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Yearly", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[DriveStats]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechDriveStats]:
         """
         Performs a GET request against the /Drives/{id}/Drivestats/Yearly endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[DriveStats]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechDriveStats]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            DriveStats,
+            LabTechDriveStats,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[DriveStats]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechDriveStats]:
         """
         Performs a GET request against the /Drives/{id}/Drivestats/Yearly endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[DriveStats]: The parsed response data.
+            list[LabTechDriveStats]: The parsed response data.
         """
-        return self._parse_many(DriveStats, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechDriveStats, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/DrivesIdEndpoint.py b/src/pyconnectwise/endpoints/automate/DrivesIdEndpoint.py
index c3e5fdda2..1015f2e03 100644
--- a/src/pyconnectwise/endpoints/automate/DrivesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/DrivesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.DrivesIdDrivestatsEndpoint import DrivesIdDrivestatsEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/EventlogsEndpoint.py b/src/pyconnectwise/endpoints/automate/EventlogsEndpoint.py
index 4c000abd3..f77ecbeac 100644
--- a/src/pyconnectwise/endpoints/automate/EventlogsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/EventlogsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import EventLog
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechEventLog
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class EventlogsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Eventlogs", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[EventLog]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechEventLog]:
         """
         Performs a GET request against the /Eventlogs endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[EventLog]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechEventLog]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            EventLog,
+            LabTechEventLog,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[EventLog]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechEventLog]:
         """
         Performs a GET request against the /Eventlogs endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[EventLog]: The parsed response data.
+            list[LabTechEventLog]: The parsed response data.
         """
-        return self._parse_many(EventLog, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechEventLog, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsClientsEndpoint.py b/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsClientsEndpoint.py
index 6ecac8495..22cd4656c 100644
--- a/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsClientsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsClientsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.automate.ExternalsystemcredentialsClientsIdEndpoint import \
     ExternalsystemcredentialsClientsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsClientsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsClientsIdEndpoint.py
index 108b1d7a4..aa37adad8 100644
--- a/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsClientsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsClientsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ExternalSystemCredentials
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechExternalSystemCredentials
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ExternalSystemCredentials]:
+    ) -> PaginatedResponse[LabTechExternalSystemCredentials]:
         """
         Performs a GET request against the /Externalsystemcredentials/Clients/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ExternalSystemCredentials]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechExternalSystemCredentials]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ExternalSystemCredentials,
+            LabTechExternalSystemCredentials,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ExternalSystemCredentials]:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[LabTechExternalSystemCredentials]:
         """
         Performs a GET request against the /Externalsystemcredentials/Clients/{id} endpoint.
 
@@ -41,8 +42,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ExternalSystemCredentials]: The parsed response data.
+            list[LabTechExternalSystemCredentials]: The parsed response data.
         """
         return self._parse_many(
-            ExternalSystemCredentials, super()._make_request("GET", data=data, params=params).json()
+            LabTechExternalSystemCredentials, super()._make_request("GET", data=data, params=params).json()
         )
diff --git a/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsEndpoint.py b/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsEndpoint.py
index 89a1ca147..0ed68aa0c 100644
--- a/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ExternalsystemcredentialsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.automate.ExternalsystemcredentialsClientsEndpoint import \
     ExternalsystemcredentialsClientsEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/FeatureflagsEndpoint.py b/src/pyconnectwise/endpoints/automate/FeatureflagsEndpoint.py
index a24677512..cda6e208c 100644
--- a/src/pyconnectwise/endpoints/automate/FeatureflagsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/FeatureflagsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import FeatureFlag
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechFeatureFlag
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class FeatureflagsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Featureflags", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> FeatureFlag:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechFeatureFlag:
         """
         Performs a POST request against the /Featureflags endpoint.
 
@@ -18,6 +17,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            FeatureFlag: The parsed response data.
+            LabTechFeatureFlag: The parsed response data.
         """
-        return self._parse_one(FeatureFlag, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechFeatureFlag, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/GrouppatchingpoliciesEndpoint.py b/src/pyconnectwise/endpoints/automate/GrouppatchingpoliciesEndpoint.py
index de9e0722c..b2379c9d5 100644
--- a/src/pyconnectwise/endpoints/automate/GrouppatchingpoliciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/GrouppatchingpoliciesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Patching import GroupPatchingPolicy
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateGroupPatchingPolicy
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[GroupPatchingPolicy]:
+    ) -> PaginatedResponse[AutomateGroupPatchingPolicy]:
         """
         Performs a GET request against the /Grouppatchingpolicies endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[GroupPatchingPolicy]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateGroupPatchingPolicy]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            GroupPatchingPolicy,
+            AutomateGroupPatchingPolicy,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[GroupPatchingPolicy]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AutomateGroupPatchingPolicy]:
         """
         Performs a GET request against the /Grouppatchingpolicies endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[GroupPatchingPolicy]: The parsed response data.
+            list[AutomateGroupPatchingPolicy]: The parsed response data.
         """
-        return self._parse_many(GroupPatchingPolicy, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            AutomateGroupPatchingPolicy, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/GroupsEndpoint.py b/src/pyconnectwise/endpoints/automate/GroupsEndpoint.py
index 90af1d0e6..d61bd84b6 100644
--- a/src/pyconnectwise/endpoints/automate/GroupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/GroupsEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.GroupsIdEndpoint import GroupsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Group
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechGroup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -24,7 +23,9 @@ def id(self, id: int) -> GroupsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Group]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechGroup]:
         """
         Performs a GET request against the /Groups endpoint and returns an initialized PaginatedResponse object.
 
@@ -33,19 +34,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Group]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechGroup]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Group,
+            LabTechGroup,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Group]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechGroup]:
         """
         Performs a GET request against the /Groups endpoint.
 
@@ -53,11 +54,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Group]: The parsed response data.
+            list[LabTechGroup]: The parsed response data.
         """
-        return self._parse_many(Group, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechGroup, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Group:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechGroup:
         """
         Performs a POST request against the /Groups endpoint.
 
@@ -65,6 +66,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Group: The parsed response data.
+            LabTechGroup: The parsed response data.
         """
-        return self._parse_one(Group, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechGroup, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/GroupsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/GroupsIdEndpoint.py
index 74a51113c..554611e91 100644
--- a/src/pyconnectwise/endpoints/automate/GroupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/GroupsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Group
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechGroup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class GroupsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Group]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechGroup]:
         """
         Performs a GET request against the /Groups/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Group]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechGroup]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Group,
+            LabTechGroup,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Group:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechGroup:
         """
         Performs a GET request against the /Groups/{id} endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> G
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Group: The parsed response data.
+            LabTechGroup: The parsed response data.
         """
-        return self._parse_one(Group, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechGroup, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/InternalmonitorresultsEndpoint.py b/src/pyconnectwise/endpoints/automate/InternalmonitorresultsEndpoint.py
index 973d37eec..b77a4c9a2 100644
--- a/src/pyconnectwise/endpoints/automate/InternalmonitorresultsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/InternalmonitorresultsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/LicensedproductsEndpoint.py b/src/pyconnectwise/endpoints/automate/LicensedproductsEndpoint.py
index 8adcb6798..6cc39c2ed 100644
--- a/src/pyconnectwise/endpoints/automate/LicensedproductsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LicensedproductsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import LicensedProduct
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechLicensedProduct
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[LicensedProduct]:
+    ) -> PaginatedResponse[LabTechLicensedProduct]:
         """
         Performs a GET request against the /Licensedproducts endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[LicensedProduct]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechLicensedProduct]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            LicensedProduct,
+            LabTechLicensedProduct,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LicensedProduct]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechLicensedProduct]:
         """
         Performs a GET request against the /Licensedproducts endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[LicensedProduct]: The parsed response data.
+            list[LabTechLicensedProduct]: The parsed response data.
         """
-        return self._parse_many(LicensedProduct, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechLicensedProduct, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/LinksEndpoint.py b/src/pyconnectwise/endpoints/automate/LinksEndpoint.py
index eef437b08..156ca0f81 100644
--- a/src/pyconnectwise/endpoints/automate/LinksEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LinksEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Link
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechLink
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class LinksEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Links", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Link]:
+    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[LabTechLink]:
         """
         Performs a GET request against the /Links endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +18,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Link]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechLink]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Link,
+            LabTechLink,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Link]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechLink]:
         """
         Performs a GET request against the /Links endpoint.
 
@@ -39,6 +38,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Link]: The parsed response data.
+            list[LabTechLink]: The parsed response data.
         """
-        return self._parse_many(Link, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechLink, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/LocationsEndpoint.py b/src/pyconnectwise/endpoints/automate/LocationsEndpoint.py
index 5e4bb4a12..c789f2c3b 100644
--- a/src/pyconnectwise/endpoints/automate/LocationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LocationsEndpoint.py
@@ -2,9 +2,7 @@
 
 from pyconnectwise.endpoints.automate.LocationsIdEndpoint import LocationsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Clients import Location
-from pyconnectwise.models.automate.LabTech.Models import Location
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateLocation, LabTechLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -25,7 +23,9 @@ def id(self, id: int) -> LocationsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Location]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AutomateLocation]:
         """
         Performs a GET request against the /Locations endpoint and returns an initialized PaginatedResponse object.
 
@@ -34,19 +34,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Location]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateLocation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Location,
+            AutomateLocation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Location]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AutomateLocation]:
         """
         Performs a GET request against the /Locations endpoint.
 
@@ -54,11 +54,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Location]: The parsed response data.
+            list[AutomateLocation]: The parsed response data.
         """
-        return self._parse_many(Location, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(AutomateLocation, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Location:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechLocation:
         """
         Performs a POST request against the /Locations endpoint.
 
@@ -66,6 +66,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Location: The parsed response data.
+            LabTechLocation: The parsed response data.
         """
-        return self._parse_one(Location, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechLocation, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/LocationsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/LocationsIdEndpoint.py
index 32a0e5217..fb1a26f94 100644
--- a/src/pyconnectwise/endpoints/automate/LocationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LocationsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.automate.LocationsIdProbeconfigurationEndpoint import LocationsIdProbeconfigurationEndpoint
 from pyconnectwise.endpoints.automate.LocationsIdUpgradeprobeEndpoint import LocationsIdUpgradeprobeEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -11,7 +10,7 @@ class LocationsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.upgradeprobe = self._register_child_endpoint(LocationsIdUpgradeprobeEndpoint(client, parent_endpoint=self))
         self.probeconfiguration = self._register_child_endpoint(
             LocationsIdProbeconfigurationEndpoint(client, parent_endpoint=self)
         )
-        self.upgradeprobe = self._register_child_endpoint(LocationsIdUpgradeprobeEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/automate/LocationsIdProbeconfigurationEndpoint.py b/src/pyconnectwise/endpoints/automate/LocationsIdProbeconfigurationEndpoint.py
index 0346eb051..87bdb4363 100644
--- a/src/pyconnectwise/endpoints/automate/LocationsIdProbeconfigurationEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LocationsIdProbeconfigurationEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.NetworkProbe import ProbeConfiguration
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechProbeConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ProbeConfiguration]:
+    ) -> PaginatedResponse[LabTechProbeConfiguration]:
         """
         Performs a GET request against the /Locations/{id}/Probeconfiguration endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ProbeConfiguration]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechProbeConfiguration]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ProbeConfiguration,
+            LabTechProbeConfiguration,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProbeConfiguration:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechProbeConfiguration:
         """
         Performs a GET request against the /Locations/{id}/Probeconfiguration endpoint.
 
@@ -41,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ProbeConfiguration: The parsed response data.
+            LabTechProbeConfiguration: The parsed response data.
         """
-        return self._parse_one(ProbeConfiguration, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechProbeConfiguration, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProbeConfiguration:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechProbeConfiguration:
         """
         Performs a POST request against the /Locations/{id}/Probeconfiguration endpoint.
 
@@ -53,23 +52,23 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ProbeConfiguration: The parsed response data.
+            LabTechProbeConfiguration: The parsed response data.
         """
-        return self._parse_one(ProbeConfiguration, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            LabTechProbeConfiguration, super()._make_request("POST", data=data, params=params).json()
+        )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Locations/{id}/Probeconfiguration endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProbeConfiguration:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechProbeConfiguration:
         """
         Performs a PATCH request against the /Locations/{id}/Probeconfiguration endpoint.
 
@@ -77,6 +76,8 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ProbeConfiguration: The parsed response data.
+            LabTechProbeConfiguration: The parsed response data.
         """
-        return self._parse_one(ProbeConfiguration, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(
+            LabTechProbeConfiguration, super()._make_request("PATCH", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/LocationsIdUpgradeprobeEndpoint.py b/src/pyconnectwise/endpoints/automate/LocationsIdUpgradeprobeEndpoint.py
index 8d75a02da..16d0f99e1 100644
--- a/src/pyconnectwise/endpoints/automate/LocationsIdUpgradeprobeEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LocationsIdUpgradeprobeEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class LocationsIdUpgradeprobeEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Upgradeprobe", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Locations/{id}/Upgradeprobe endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/LookupsEndpoint.py b/src/pyconnectwise/endpoints/automate/LookupsEndpoint.py
index c003db107..cbf29c802 100644
--- a/src/pyconnectwise/endpoints/automate/LookupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LookupsEndpoint.py
@@ -7,7 +7,6 @@
 from pyconnectwise.endpoints.automate.LookupsStatusscannetworkportoptionsEndpoint import \
     LookupsStatusscannetworkportoptionsEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -15,18 +14,18 @@ class LookupsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Lookups", parent_endpoint=parent_endpoint)
 
-        self.probeeventlevels = self._register_child_endpoint(
-            LookupsProbeeventlevelsEndpoint(client, parent_endpoint=self)
-        )
         self.scanfrequencies = self._register_child_endpoint(
             LookupsScanfrequenciesEndpoint(client, parent_endpoint=self)
         )
-        self.statusscannetworkportoptions = self._register_child_endpoint(
-            LookupsStatusscannetworkportoptionsEndpoint(client, parent_endpoint=self)
+        self.probeeventlevels = self._register_child_endpoint(
+            LookupsProbeeventlevelsEndpoint(client, parent_endpoint=self)
+        )
+        self.snmpencryptionmethods = self._register_child_endpoint(
+            LookupsSnmpencryptionmethodsEndpoint(client, parent_endpoint=self)
         )
         self.snmphashmethods = self._register_child_endpoint(
             LookupsSnmphashmethodsEndpoint(client, parent_endpoint=self)
         )
-        self.snmpencryptionmethods = self._register_child_endpoint(
-            LookupsSnmpencryptionmethodsEndpoint(client, parent_endpoint=self)
+        self.statusscannetworkportoptions = self._register_child_endpoint(
+            LookupsStatusscannetworkportoptionsEndpoint(client, parent_endpoint=self)
         )
diff --git a/src/pyconnectwise/endpoints/automate/LookupsProbeeventlevelsEndpoint.py b/src/pyconnectwise/endpoints/automate/LookupsProbeeventlevelsEndpoint.py
index 79e686e75..21c2a9258 100644
--- a/src/pyconnectwise/endpoints/automate/LookupsProbeeventlevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LookupsProbeeventlevelsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import ProbeEventLevel
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechProbeEventLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ProbeEventLevel]:
+    ) -> PaginatedResponse[LabTechProbeEventLevel]:
         """
         Performs a GET request against the /Lookups/Probeeventlevels endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ProbeEventLevel]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechProbeEventLevel]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ProbeEventLevel,
+            LabTechProbeEventLevel,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ProbeEventLevel]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechProbeEventLevel]:
         """
         Performs a GET request against the /Lookups/Probeeventlevels endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ProbeEventLevel]: The parsed response data.
+            list[LabTechProbeEventLevel]: The parsed response data.
         """
-        return self._parse_many(ProbeEventLevel, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechProbeEventLevel, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/LookupsScanfrequenciesEndpoint.py b/src/pyconnectwise/endpoints/automate/LookupsScanfrequenciesEndpoint.py
index 81b4b7cbc..3275a0984 100644
--- a/src/pyconnectwise/endpoints/automate/LookupsScanfrequenciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LookupsScanfrequenciesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.NetworkProbe import ScanFrequency
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechScanFrequency
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ScanFrequency]:
+    ) -> PaginatedResponse[LabTechScanFrequency]:
         """
         Performs a GET request against the /Lookups/Scanfrequencies endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ScanFrequency]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechScanFrequency]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ScanFrequency,
+            LabTechScanFrequency,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ScanFrequency]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechScanFrequency]:
         """
         Performs a GET request against the /Lookups/Scanfrequencies endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ScanFrequency]: The parsed response data.
+            list[LabTechScanFrequency]: The parsed response data.
         """
-        return self._parse_many(ScanFrequency, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechScanFrequency, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/LookupsSnmpencryptionmethodsEndpoint.py b/src/pyconnectwise/endpoints/automate/LookupsSnmpencryptionmethodsEndpoint.py
index df88dc18c..6b56c0f15 100644
--- a/src/pyconnectwise/endpoints/automate/LookupsSnmpencryptionmethodsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LookupsSnmpencryptionmethodsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.NetworkProbe import EncryptionMethod
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechEncryptionMethod
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[EncryptionMethod]:
+    ) -> PaginatedResponse[LabTechEncryptionMethod]:
         """
         Performs a GET request against the /Lookups/Snmpencryptionmethods endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[EncryptionMethod]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechEncryptionMethod]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            EncryptionMethod,
+            LabTechEncryptionMethod,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[EncryptionMethod]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechEncryptionMethod]:
         """
         Performs a GET request against the /Lookups/Snmpencryptionmethods endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[EncryptionMethod]: The parsed response data.
+            list[LabTechEncryptionMethod]: The parsed response data.
         """
-        return self._parse_many(EncryptionMethod, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechEncryptionMethod, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/LookupsSnmphashmethodsEndpoint.py b/src/pyconnectwise/endpoints/automate/LookupsSnmphashmethodsEndpoint.py
index 2cd2f13b2..8670cf473 100644
--- a/src/pyconnectwise/endpoints/automate/LookupsSnmphashmethodsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LookupsSnmphashmethodsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.NetworkProbe import HashMethod
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechHashMethod
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class LookupsSnmphashmethodsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Snmphashmethods", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[HashMethod]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechHashMethod]:
         """
         Performs a GET request against the /Lookups/Snmphashmethods endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[HashMethod]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechHashMethod]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            HashMethod,
+            LabTechHashMethod,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[HashMethod]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechHashMethod]:
         """
         Performs a GET request against the /Lookups/Snmphashmethods endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[HashMethod]: The parsed response data.
+            list[LabTechHashMethod]: The parsed response data.
         """
-        return self._parse_many(HashMethod, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechHashMethod, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/LookupsStatusscannetworkportoptionsEndpoint.py b/src/pyconnectwise/endpoints/automate/LookupsStatusscannetworkportoptionsEndpoint.py
index 1db5b3d6f..aa7ba1d4a 100644
--- a/src/pyconnectwise/endpoints/automate/LookupsStatusscannetworkportoptionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/LookupsStatusscannetworkportoptionsEndpoint.py
@@ -1,9 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.NetworkProbe import \
-    StatusScanNetworkPortOption
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechStatusScanNetworkPortOption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -13,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[StatusScanNetworkPortOption]:
+    ) -> PaginatedResponse[LabTechStatusScanNetworkPortOption]:
         """
         Performs a GET request against the /Lookups/Statusscannetworkportoptions endpoint and returns an initialized PaginatedResponse object.
 
@@ -22,19 +20,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[StatusScanNetworkPortOption]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechStatusScanNetworkPortOption]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            StatusScanNetworkPortOption,
+            LabTechStatusScanNetworkPortOption,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[StatusScanNetworkPortOption]:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[LabTechStatusScanNetworkPortOption]:
         """
         Performs a GET request against the /Lookups/Statusscannetworkportoptions endpoint.
 
@@ -42,8 +42,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[StatusScanNetworkPortOption]: The parsed response data.
+            list[LabTechStatusScanNetworkPortOption]: The parsed response data.
         """
         return self._parse_many(
-            StatusScanNetworkPortOption, super()._make_request("GET", data=data, params=params).json()
+            LabTechStatusScanNetworkPortOption, super()._make_request("GET", data=data, params=params).json()
         )
diff --git a/src/pyconnectwise/endpoints/automate/MaintenancewindowdefinitionsEndpoint.py b/src/pyconnectwise/endpoints/automate/MaintenancewindowdefinitionsEndpoint.py
index 21a8e8c6f..3ff7f339a 100644
--- a/src/pyconnectwise/endpoints/automate/MaintenancewindowdefinitionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MaintenancewindowdefinitionsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Maintenance import MaintenanceWindowDefinition
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateMaintenanceWindowDefinition
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[MaintenanceWindowDefinition]:
+    ) -> PaginatedResponse[AutomateMaintenanceWindowDefinition]:
         """
         Performs a GET request against the /Maintenancewindowdefinitions endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[MaintenanceWindowDefinition]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateMaintenanceWindowDefinition]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            MaintenanceWindowDefinition,
+            AutomateMaintenanceWindowDefinition,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[MaintenanceWindowDefinition]:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[AutomateMaintenanceWindowDefinition]:
         """
         Performs a GET request against the /Maintenancewindowdefinitions endpoint.
 
@@ -41,8 +42,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[MaintenanceWindowDefinition]: The parsed response data.
+            list[AutomateMaintenanceWindowDefinition]: The parsed response data.
         """
         return self._parse_many(
-            MaintenanceWindowDefinition, super()._make_request("GET", data=data, params=params).json()
+            AutomateMaintenanceWindowDefinition, super()._make_request("GET", data=data, params=params).json()
         )
diff --git a/src/pyconnectwise/endpoints/automate/MicrosoftupdatepoliciesEndpoint.py b/src/pyconnectwise/endpoints/automate/MicrosoftupdatepoliciesEndpoint.py
index 2c39379aa..468386c35 100644
--- a/src/pyconnectwise/endpoints/automate/MicrosoftupdatepoliciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MicrosoftupdatepoliciesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/MonitorhistoryEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorhistoryEndpoint.py
index ebecb7754..31b66bcaf 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorhistoryEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorhistoryEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/MonitorsEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorsEndpoint.py
index fda040f39..88f54d79a 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.MonitorsIdEndpoint import MonitorsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataDailyaveragesEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataDailyaveragesEndpoint.py
index dbc7f2f48..fd52a6887 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataDailyaveragesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataDailyaveragesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataEndpoint.py
index 5fdb139be..445db3438 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataEndpoint.py
@@ -9,7 +9,6 @@
 from pyconnectwise.endpoints.automate.MonitorsIdCollecteddataYearlyaveragesEndpoint import \
     MonitorsIdCollecteddataYearlyaveragesEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -20,12 +19,12 @@ def __init__(self, client, parent_endpoint=None):
         self.dailyaverages = self._register_child_endpoint(
             MonitorsIdCollecteddataDailyaveragesEndpoint(client, parent_endpoint=self)
         )
-        self.yearlyaverages = self._register_child_endpoint(
-            MonitorsIdCollecteddataYearlyaveragesEndpoint(client, parent_endpoint=self)
-        )
         self.monthlyaverages = self._register_child_endpoint(
             MonitorsIdCollecteddataMonthlyaveragesEndpoint(client, parent_endpoint=self)
         )
         self.weeklyaverages = self._register_child_endpoint(
             MonitorsIdCollecteddataWeeklyaveragesEndpoint(client, parent_endpoint=self)
         )
+        self.yearlyaverages = self._register_child_endpoint(
+            MonitorsIdCollecteddataYearlyaveragesEndpoint(client, parent_endpoint=self)
+        )
diff --git a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataMonthlyaveragesEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataMonthlyaveragesEndpoint.py
index 05d70faf0..ccf6748cf 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataMonthlyaveragesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataMonthlyaveragesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataWeeklyaveragesEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataWeeklyaveragesEndpoint.py
index fe6a846d0..af20e49d0 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataWeeklyaveragesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataWeeklyaveragesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataYearlyaveragesEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataYearlyaveragesEndpoint.py
index 1398dc438..ed99957fe 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataYearlyaveragesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorsIdCollecteddataYearlyaveragesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/MonitorsIdDatacollectionsettingsEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorsIdDatacollectionsettingsEndpoint.py
index 44b45b884..49d301bfb 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorsIdDatacollectionsettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorsIdDatacollectionsettingsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import MonitorDataCollectionSettings
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechMonitorDataCollectionSettings
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[MonitorDataCollectionSettings]:
+    ) -> PaginatedResponse[LabTechMonitorDataCollectionSettings]:
         """
         Performs a GET request against the /Monitors/{id}/Datacollectionsettings endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[MonitorDataCollectionSettings]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechMonitorDataCollectionSettings]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            MonitorDataCollectionSettings,
+            LabTechMonitorDataCollectionSettings,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MonitorDataCollectionSettings:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechMonitorDataCollectionSettings:
         """
         Performs a GET request against the /Monitors/{id}/Datacollectionsettings endpoint.
 
@@ -41,8 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            MonitorDataCollectionSettings: The parsed response data.
+            LabTechMonitorDataCollectionSettings: The parsed response data.
         """
         return self._parse_one(
-            MonitorDataCollectionSettings, super()._make_request("GET", data=data, params=params).json()
+            LabTechMonitorDataCollectionSettings, super()._make_request("GET", data=data, params=params).json()
         )
diff --git a/src/pyconnectwise/endpoints/automate/MonitorsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorsIdEndpoint.py
index 8d58cb2fc..f2245c966 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorsIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.automate.MonitorsIdDatacollectionsettingsEndpoint import \
     MonitorsIdDatacollectionsettingsEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,9 +11,9 @@ class MonitorsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.datacollectionsettings = self._register_child_endpoint(
-            MonitorsIdDatacollectionsettingsEndpoint(client, parent_endpoint=self)
-        )
         self.collecteddata = self._register_child_endpoint(
             MonitorsIdCollecteddataEndpoint(client, parent_endpoint=self)
         )
+        self.datacollectionsettings = self._register_child_endpoint(
+            MonitorsIdDatacollectionsettingsEndpoint(client, parent_endpoint=self)
+        )
diff --git a/src/pyconnectwise/endpoints/automate/MonitorstatisticsEndpoint.py b/src/pyconnectwise/endpoints/automate/MonitorstatisticsEndpoint.py
index 098906ca2..1692ab95f 100644
--- a/src/pyconnectwise/endpoints/automate/MonitorstatisticsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/MonitorstatisticsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/NetworkdevicesEndpoint.py b/src/pyconnectwise/endpoints/automate/NetworkdevicesEndpoint.py
index 8bfa22bbb..5601b6e5f 100644
--- a/src/pyconnectwise/endpoints/automate/NetworkdevicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/NetworkdevicesEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.NetworkdevicesIdEndpoint import NetworkdevicesIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import NetworkDevice
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechNetworkDevice
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -26,7 +25,7 @@ def id(self, id: int) -> NetworkdevicesIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[NetworkDevice]:
+    ) -> PaginatedResponse[LabTechNetworkDevice]:
         """
         Performs a GET request against the /Networkdevices endpoint and returns an initialized PaginatedResponse object.
 
@@ -35,19 +34,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[NetworkDevice]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechNetworkDevice]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            NetworkDevice,
+            LabTechNetworkDevice,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[NetworkDevice]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechNetworkDevice]:
         """
         Performs a GET request against the /Networkdevices endpoint.
 
@@ -55,11 +54,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[NetworkDevice]: The parsed response data.
+            list[LabTechNetworkDevice]: The parsed response data.
         """
-        return self._parse_many(NetworkDevice, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechNetworkDevice, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> NetworkDevice:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechNetworkDevice:
         """
         Performs a POST request against the /Networkdevices endpoint.
 
@@ -67,6 +66,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            NetworkDevice: The parsed response data.
+            LabTechNetworkDevice: The parsed response data.
         """
-        return self._parse_one(NetworkDevice, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechNetworkDevice, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/NetworkdevicesIdEndpoint.py b/src/pyconnectwise/endpoints/automate/NetworkdevicesIdEndpoint.py
index 820cd8dc5..730c37c8e 100644
--- a/src/pyconnectwise/endpoints/automate/NetworkdevicesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/NetworkdevicesIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import NetworkDevice
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechNetworkDevice
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[NetworkDevice]:
+    ) -> PaginatedResponse[LabTechNetworkDevice]:
         """
         Performs a GET request against the /Networkdevices/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[NetworkDevice]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechNetworkDevice]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            NetworkDevice,
+            LabTechNetworkDevice,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> NetworkDevice:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechNetworkDevice:
         """
         Performs a GET request against the /Networkdevices/{id} endpoint.
 
@@ -41,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> N
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            NetworkDevice: The parsed response data.
+            LabTechNetworkDevice: The parsed response data.
         """
-        return self._parse_one(NetworkDevice, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechNetworkDevice, super()._make_request("GET", data=data, params=params).json())
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> NetworkDevice:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechNetworkDevice:
         """
         Performs a PATCH request against the /Networkdevices/{id} endpoint.
 
@@ -53,6 +52,6 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            NetworkDevice: The parsed response data.
+            LabTechNetworkDevice: The parsed response data.
         """
-        return self._parse_one(NetworkDevice, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(LabTechNetworkDevice, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/PatchactionsDeployallapprovedEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchactionsDeployallapprovedEndpoint.py
index 4e4fab68f..7f2cbf35b 100644
--- a/src/pyconnectwise/endpoints/automate/PatchactionsDeployallapprovedEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchactionsDeployallapprovedEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class PatchactionsDeployallapprovedEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Deployallapproved", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Patchactions/Deployallapproved endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/PatchactionsDeployallsecurityEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchactionsDeployallsecurityEndpoint.py
index 827fbb03d..d8199a844 100644
--- a/src/pyconnectwise/endpoints/automate/PatchactionsDeployallsecurityEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchactionsDeployallsecurityEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class PatchactionsDeployallsecurityEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Deployallsecurity", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Patchactions/Deployallsecurity endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/PatchactionsEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchactionsEndpoint.py
index ee5a5ffa2..cd0496ac9 100644
--- a/src/pyconnectwise/endpoints/automate/PatchactionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchactionsEndpoint.py
@@ -8,7 +8,6 @@
     PatchactionsSettoproductionstageEndpoint
 from pyconnectwise.endpoints.automate.PatchactionsSettoteststageEndpoint import PatchactionsSettoteststageEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -19,6 +18,9 @@ def __init__(self, client, parent_endpoint=None):
         self.deployallapproved = self._register_child_endpoint(
             PatchactionsDeployallapprovedEndpoint(client, parent_endpoint=self)
         )
+        self.settoteststage = self._register_child_endpoint(
+            PatchactionsSettoteststageEndpoint(client, parent_endpoint=self)
+        )
         self.settoproductionstage = self._register_child_endpoint(
             PatchactionsSettoproductionstageEndpoint(client, parent_endpoint=self)
         )
@@ -28,9 +30,6 @@ def __init__(self, client, parent_endpoint=None):
         self.settopilotstage = self._register_child_endpoint(
             PatchactionsSettopilotstageEndpoint(client, parent_endpoint=self)
         )
-        self.settoteststage = self._register_child_endpoint(
-            PatchactionsSettoteststageEndpoint(client, parent_endpoint=self)
-        )
         self.reattemptfailed = self._register_child_endpoint(
             PatchactionsReattemptfailedEndpoint(client, parent_endpoint=self)
         )
diff --git a/src/pyconnectwise/endpoints/automate/PatchactionsReattemptfailedEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchactionsReattemptfailedEndpoint.py
index c7881660a..222408232 100644
--- a/src/pyconnectwise/endpoints/automate/PatchactionsReattemptfailedEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchactionsReattemptfailedEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class PatchactionsReattemptfailedEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Reattemptfailed", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Patchactions/Reattemptfailed endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/PatchactionsSettopilotstageEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchactionsSettopilotstageEndpoint.py
index 3d8010e35..2b64d15ef 100644
--- a/src/pyconnectwise/endpoints/automate/PatchactionsSettopilotstageEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchactionsSettopilotstageEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class PatchactionsSettopilotstageEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Settopilotstage", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Patchactions/Settopilotstage endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/PatchactionsSettoproductionstageEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchactionsSettoproductionstageEndpoint.py
index 50df14609..b42c67aef 100644
--- a/src/pyconnectwise/endpoints/automate/PatchactionsSettoproductionstageEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchactionsSettoproductionstageEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class PatchactionsSettoproductionstageEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Settoproductionstage", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Patchactions/Settoproductionstage endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/PatchactionsSettoteststageEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchactionsSettoteststageEndpoint.py
index 5eab118b4..77a7efd41 100644
--- a/src/pyconnectwise/endpoints/automate/PatchactionsSettoteststageEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchactionsSettoteststageEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class PatchactionsSettoteststageEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Settoteststage", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Patchactions/Settoteststage endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/PatchhistoryEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchhistoryEndpoint.py
index da46b0535..6ba50bc6d 100644
--- a/src/pyconnectwise/endpoints/automate/PatchhistoryEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchhistoryEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/PatchinformationEndpoint.py b/src/pyconnectwise/endpoints/automate/PatchinformationEndpoint.py
index f4f1aa619..caaa1b54c 100644
--- a/src/pyconnectwise/endpoints/automate/PatchinformationEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PatchinformationEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import PatchInformation
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechPatchInformation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[PatchInformation]:
+    ) -> PaginatedResponse[LabTechPatchInformation]:
         """
         Performs a GET request against the /Patchinformation endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[PatchInformation]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechPatchInformation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            PatchInformation,
+            LabTechPatchInformation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PatchInformation:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechPatchInformation:
         """
         Performs a GET request against the /Patchinformation endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PatchInformation: The parsed response data.
+            LabTechPatchInformation: The parsed response data.
         """
-        return self._parse_one(PatchInformation, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechPatchInformation, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/PermissionsClientsEndpoint.py b/src/pyconnectwise/endpoints/automate/PermissionsClientsEndpoint.py
index 05d2d6f29..b1255a08c 100644
--- a/src/pyconnectwise/endpoints/automate/PermissionsClientsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PermissionsClientsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.PermissionsClientsIdEndpoint import PermissionsClientsIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/PermissionsClientsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/PermissionsClientsIdEndpoint.py
index e0f598e29..f74fdc5bc 100644
--- a/src/pyconnectwise/endpoints/automate/PermissionsClientsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PermissionsClientsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/PermissionsEndpoint.py b/src/pyconnectwise/endpoints/automate/PermissionsEndpoint.py
index c790c44c0..cb1529525 100644
--- a/src/pyconnectwise/endpoints/automate/PermissionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PermissionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.automate.PermissionsClientsEndpoint import PermissionsClientsEndpoint
 from pyconnectwise.endpoints.automate.PermissionsUsersEndpoint import PermissionsUsersEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -11,5 +10,5 @@ class PermissionsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Permissions", parent_endpoint=parent_endpoint)
 
-        self.clients = self._register_child_endpoint(PermissionsClientsEndpoint(client, parent_endpoint=self))
         self.users = self._register_child_endpoint(PermissionsUsersEndpoint(client, parent_endpoint=self))
+        self.clients = self._register_child_endpoint(PermissionsClientsEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/automate/PermissionsUsersEndpoint.py b/src/pyconnectwise/endpoints/automate/PermissionsUsersEndpoint.py
index 73c452388..cb8893cd6 100644
--- a/src/pyconnectwise/endpoints/automate/PermissionsUsersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PermissionsUsersEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/PluginsEndpoint.py b/src/pyconnectwise/endpoints/automate/PluginsEndpoint.py
index 84331897f..c2bfe05f2 100644
--- a/src/pyconnectwise/endpoints/automate/PluginsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/PluginsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ProbeconfigurationEnableprobeEndpoint.py b/src/pyconnectwise/endpoints/automate/ProbeconfigurationEnableprobeEndpoint.py
index 6803b68f0..5f826f849 100644
--- a/src/pyconnectwise/endpoints/automate/ProbeconfigurationEnableprobeEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ProbeconfigurationEnableprobeEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.automate.ProbeconfigurationEnableprobeIdEndpoint import \
     ProbeconfigurationEnableprobeIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ProbeconfigurationEnableprobeIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ProbeconfigurationEnableprobeIdEndpoint.py
index 085f5bcd2..fdf61eae3 100644
--- a/src/pyconnectwise/endpoints/automate/ProbeconfigurationEnableprobeIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ProbeconfigurationEnableprobeIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.NetworkProbe import ProbeConfiguration
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechProbeConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class ProbeconfigurationEnableprobeIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProbeConfiguration:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechProbeConfiguration:
         """
         Performs a POST request against the /Probeconfiguration/Enableprobe/{id} endpoint.
 
@@ -18,6 +17,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ProbeConfiguration: The parsed response data.
+            LabTechProbeConfiguration: The parsed response data.
         """
-        return self._parse_one(ProbeConfiguration, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            LabTechProbeConfiguration, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ProbeconfigurationEndpoint.py b/src/pyconnectwise/endpoints/automate/ProbeconfigurationEndpoint.py
index 0e49ff260..a2326eafd 100644
--- a/src/pyconnectwise/endpoints/automate/ProbeconfigurationEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ProbeconfigurationEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.automate.ProbeconfigurationEnableprobeEndpoint import ProbeconfigurationEnableprobeEndpoint
 from pyconnectwise.endpoints.automate.ProbeconfigurationIdEndpoint import ProbeconfigurationIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdAgentpushcredentialsEndpoint.py b/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdAgentpushcredentialsEndpoint.py
index 3f841047e..802ece222 100644
--- a/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdAgentpushcredentialsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdAgentpushcredentialsEndpoint.py
@@ -1,9 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.NetworkProbe import \
-    ProbeConfigurationCredentials
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechProbeConfigurationCredentials
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -13,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ProbeConfigurationCredentials]:
+    ) -> PaginatedResponse[LabTechProbeConfigurationCredentials]:
         """
         Performs a GET request against the /Probeconfiguration/{id}/Agentpushcredentials endpoint and returns an initialized PaginatedResponse object.
 
@@ -22,19 +20,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ProbeConfigurationCredentials]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechProbeConfigurationCredentials]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ProbeConfigurationCredentials,
+            LabTechProbeConfigurationCredentials,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ProbeConfigurationCredentials]:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[LabTechProbeConfigurationCredentials]:
         """
         Performs a GET request against the /Probeconfiguration/{id}/Agentpushcredentials endpoint.
 
@@ -42,13 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ProbeConfigurationCredentials]: The parsed response data.
+            list[LabTechProbeConfigurationCredentials]: The parsed response data.
         """
         return self._parse_many(
-            ProbeConfigurationCredentials, super()._make_request("GET", data=data, params=params).json()
+            LabTechProbeConfigurationCredentials, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ProbeConfigurationCredentials]:
+    def put(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[LabTechProbeConfigurationCredentials]:
         """
         Performs a PUT request against the /Probeconfiguration/{id}/Agentpushcredentials endpoint.
 
@@ -56,20 +58,18 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ProbeConfigurationCredentials]: The parsed response data.
+            list[LabTechProbeConfigurationCredentials]: The parsed response data.
         """
         return self._parse_many(
-            ProbeConfigurationCredentials, super()._make_request("PUT", data=data, params=params).json()
+            LabTechProbeConfigurationCredentials, super()._make_request("PUT", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Probeconfiguration/{id}/Agentpushcredentials endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdEndpoint.py
index 7f950bd98..c75adc3eb 100644
--- a/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.automate.ProbeconfigurationIdSnmpconfigurationEndpoint import \
     ProbeconfigurationIdSnmpconfigurationEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -13,9 +12,9 @@ class ProbeconfigurationIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.snmpconfiguration = self._register_child_endpoint(
-            ProbeconfigurationIdSnmpconfigurationEndpoint(client, parent_endpoint=self)
-        )
         self.agentpushcredentials = self._register_child_endpoint(
             ProbeconfigurationIdAgentpushcredentialsEndpoint(client, parent_endpoint=self)
         )
+        self.snmpconfiguration = self._register_child_endpoint(
+            ProbeconfigurationIdSnmpconfigurationEndpoint(client, parent_endpoint=self)
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdSnmpconfigurationEndpoint.py b/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdSnmpconfigurationEndpoint.py
index 2019317fb..4f71d949e 100644
--- a/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdSnmpconfigurationEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ProbeconfigurationIdSnmpconfigurationEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.NetworkProbe import ProbeSnmpConfiguration
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechProbeSnmpConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ProbeSnmpConfiguration]:
+    ) -> PaginatedResponse[LabTechProbeSnmpConfiguration]:
         """
         Performs a GET request against the /Probeconfiguration/{id}/Snmpconfiguration endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ProbeSnmpConfiguration]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechProbeSnmpConfiguration]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ProbeSnmpConfiguration,
+            LabTechProbeSnmpConfiguration,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProbeSnmpConfiguration:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechProbeSnmpConfiguration:
         """
         Performs a GET request against the /Probeconfiguration/{id}/Snmpconfiguration endpoint.
 
@@ -41,11 +40,13 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ProbeSnmpConfiguration: The parsed response data.
+            LabTechProbeSnmpConfiguration: The parsed response data.
         """
-        return self._parse_one(ProbeSnmpConfiguration, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(
+            LabTechProbeSnmpConfiguration, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProbeSnmpConfiguration:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechProbeSnmpConfiguration:
         """
         Performs a PATCH request against the /Probeconfiguration/{id}/Snmpconfiguration endpoint.
 
@@ -53,6 +54,8 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ProbeSnmpConfiguration: The parsed response data.
+            LabTechProbeSnmpConfiguration: The parsed response data.
         """
-        return self._parse_one(ProbeSnmpConfiguration, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(
+            LabTechProbeSnmpConfiguration, super()._make_request("PATCH", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ProbeeventsEndpoint.py b/src/pyconnectwise/endpoints/automate/ProbeeventsEndpoint.py
index 683f8c1ca..6890c9634 100644
--- a/src/pyconnectwise/endpoints/automate/ProbeeventsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ProbeeventsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import ProbeEvent
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechProbeEvent
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class ProbeeventsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Probeevents", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[ProbeEvent]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechProbeEvent]:
         """
         Performs a GET request against the /Probeevents endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ProbeEvent]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechProbeEvent]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ProbeEvent,
+            LabTechProbeEvent,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ProbeEvent]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechProbeEvent]:
         """
         Performs a GET request against the /Probeevents endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ProbeEvent]: The parsed response data.
+            list[LabTechProbeEvent]: The parsed response data.
         """
-        return self._parse_many(ProbeEvent, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechProbeEvent, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/RebootpoliciesEndpoint.py b/src/pyconnectwise/endpoints/automate/RebootpoliciesEndpoint.py
index d9f995400..58adea2e8 100644
--- a/src/pyconnectwise/endpoints/automate/RebootpoliciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/RebootpoliciesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/RemoteagentschedulesEndpoint.py b/src/pyconnectwise/endpoints/automate/RemoteagentschedulesEndpoint.py
index ad8bf25a9..841acf67e 100644
--- a/src/pyconnectwise/endpoints/automate/RemoteagentschedulesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/RemoteagentschedulesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import RemoteAgentSchedule
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechRemoteAgentSchedule
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[RemoteAgentSchedule]:
+    ) -> PaginatedResponse[LabTechRemoteAgentSchedule]:
         """
         Performs a GET request against the /Remoteagentschedules endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[RemoteAgentSchedule]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechRemoteAgentSchedule]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            RemoteAgentSchedule,
+            LabTechRemoteAgentSchedule,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[RemoteAgentSchedule]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechRemoteAgentSchedule]:
         """
         Performs a GET request against the /Remoteagentschedules endpoint.
 
@@ -41,11 +40,13 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[RemoteAgentSchedule]: The parsed response data.
+            list[LabTechRemoteAgentSchedule]: The parsed response data.
         """
-        return self._parse_many(RemoteAgentSchedule, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            LabTechRemoteAgentSchedule, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> RemoteAgentSchedule:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechRemoteAgentSchedule:
         """
         Performs a POST request against the /Remoteagentschedules endpoint.
 
@@ -53,6 +54,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            RemoteAgentSchedule: The parsed response data.
+            LabTechRemoteAgentSchedule: The parsed response data.
         """
-        return self._parse_one(RemoteAgentSchedule, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            LabTechRemoteAgentSchedule, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/RemoteagenttemplatesEndpoint.py b/src/pyconnectwise/endpoints/automate/RemoteagenttemplatesEndpoint.py
index 71ccc6b9f..9ae5462bc 100644
--- a/src/pyconnectwise/endpoints/automate/RemoteagenttemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/RemoteagenttemplatesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import RemoteAgentTemplate
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechRemoteAgentTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[RemoteAgentTemplate]:
+    ) -> PaginatedResponse[LabTechRemoteAgentTemplate]:
         """
         Performs a GET request against the /Remoteagenttemplates endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[RemoteAgentTemplate]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechRemoteAgentTemplate]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            RemoteAgentTemplate,
+            LabTechRemoteAgentTemplate,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[RemoteAgentTemplate]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechRemoteAgentTemplate]:
         """
         Performs a GET request against the /Remoteagenttemplates endpoint.
 
@@ -41,11 +40,13 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[RemoteAgentTemplate]: The parsed response data.
+            list[LabTechRemoteAgentTemplate]: The parsed response data.
         """
-        return self._parse_many(RemoteAgentTemplate, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            LabTechRemoteAgentTemplate, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> RemoteAgentTemplate:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechRemoteAgentTemplate:
         """
         Performs a POST request against the /Remoteagenttemplates endpoint.
 
@@ -53,6 +54,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            RemoteAgentTemplate: The parsed response data.
+            LabTechRemoteAgentTemplate: The parsed response data.
         """
-        return self._parse_one(RemoteAgentTemplate, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            LabTechRemoteAgentTemplate, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/RetiredassetsEndpoint.py b/src/pyconnectwise/endpoints/automate/RetiredassetsEndpoint.py
index 80d5cc3bb..28bf21b7f 100644
--- a/src/pyconnectwise/endpoints/automate/RetiredassetsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/RetiredassetsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import RetiredAsset
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechRetiredAsset
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[RetiredAsset]:
+    ) -> PaginatedResponse[LabTechRetiredAsset]:
         """
         Performs a GET request against the /Retiredassets endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[RetiredAsset]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechRetiredAsset]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            RetiredAsset,
+            LabTechRetiredAsset,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[RetiredAsset]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechRetiredAsset]:
         """
         Performs a GET request against the /Retiredassets endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[RetiredAsset]: The parsed response data.
+            list[LabTechRetiredAsset]: The parsed response data.
         """
-        return self._parse_many(RetiredAsset, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechRetiredAsset, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/RoutersEndpoint.py b/src/pyconnectwise/endpoints/automate/RoutersEndpoint.py
index 6ec23e250..60af4d9e8 100644
--- a/src/pyconnectwise/endpoints/automate/RoutersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/RoutersEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Router
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechRouter
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class RoutersEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Routers", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Router]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechRouter]:
         """
         Performs a GET request against the /Routers endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Router]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechRouter]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Router,
+            LabTechRouter,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Router]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechRouter]:
         """
         Performs a GET request against the /Routers endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Router]: The parsed response data.
+            list[LabTechRouter]: The parsed response data.
         """
-        return self._parse_many(Router, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechRouter, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ScriptfoldersEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptfoldersEndpoint.py
index f0b93f4cf..4e68c9987 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptfoldersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptfoldersEndpoint.py
@@ -3,8 +3,7 @@
 from pyconnectwise.endpoints.automate.ScriptfoldersHierarchyEndpoint import ScriptfoldersHierarchyEndpoint
 from pyconnectwise.endpoints.automate.ScriptfoldersIdEndpoint import ScriptfoldersIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ScriptFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechScriptFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -29,7 +28,7 @@ def id(self, id: int) -> ScriptfoldersIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ScriptFolder]:
+    ) -> PaginatedResponse[LabTechScriptFolder]:
         """
         Performs a GET request against the /Scriptfolders endpoint and returns an initialized PaginatedResponse object.
 
@@ -38,19 +37,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ScriptFolder]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechScriptFolder]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ScriptFolder,
+            LabTechScriptFolder,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ScriptFolder]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechScriptFolder]:
         """
         Performs a GET request against the /Scriptfolders endpoint.
 
@@ -58,11 +57,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ScriptFolder]: The parsed response data.
+            list[LabTechScriptFolder]: The parsed response data.
         """
-        return self._parse_many(ScriptFolder, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechScriptFolder, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScriptFolder:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechScriptFolder:
         """
         Performs a POST request against the /Scriptfolders endpoint.
 
@@ -70,6 +69,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ScriptFolder: The parsed response data.
+            LabTechScriptFolder: The parsed response data.
         """
-        return self._parse_one(ScriptFolder, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechScriptFolder, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ScriptfoldersHierarchyEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptfoldersHierarchyEndpoint.py
index d81abd6e8..b35443c2c 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptfoldersHierarchyEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptfoldersHierarchyEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ScriptFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechScriptFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class ScriptfoldersHierarchyEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Hierarchy", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ScriptFolder]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechScriptFolder]:
         """
         Performs a GET request against the /Scriptfolders/Hierarchy endpoint.
 
@@ -18,6 +17,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ScriptFolder]: The parsed response data.
+            list[LabTechScriptFolder]: The parsed response data.
         """
-        return self._parse_many(ScriptFolder, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechScriptFolder, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ScriptfoldersIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptfoldersIdEndpoint.py
index 294215e51..001f14f4c 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptfoldersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptfoldersIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import ScriptFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechScriptFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ScriptFolder]:
+    ) -> PaginatedResponse[LabTechScriptFolder]:
         """
         Performs a GET request against the /Scriptfolders/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ScriptFolder]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechScriptFolder]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ScriptFolder,
+            LabTechScriptFolder,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScriptFolder:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechScriptFolder:
         """
         Performs a GET request against the /Scriptfolders/{id} endpoint.
 
@@ -41,23 +40,21 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ScriptFolder: The parsed response data.
+            LabTechScriptFolder: The parsed response data.
         """
-        return self._parse_one(ScriptFolder, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechScriptFolder, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Scriptfolders/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScriptFolder:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechScriptFolder:
         """
         Performs a PATCH request against the /Scriptfolders/{id} endpoint.
 
@@ -65,6 +62,6 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ScriptFolder: The parsed response data.
+            LabTechScriptFolder: The parsed response data.
         """
-        return self._parse_one(ScriptFolder, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(LabTechScriptFolder, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ScriptingEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptingEndpoint.py
index af0156adf..c34c59798 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptingEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptingEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.automate.ScriptingRunningscriptsEndpoint import ScriptingRunningscriptsEndpoint
 from pyconnectwise.endpoints.automate.ScriptingScriptschedulesEndpoint import ScriptingScriptschedulesEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ScriptingRunningscriptsEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptingRunningscriptsEndpoint.py
index e70b01d10..750b7c430 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptingRunningscriptsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptingRunningscriptsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Scripts.RunningScripts import RunningScript
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateRunningScript
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[RunningScript]:
+    ) -> PaginatedResponse[AutomateRunningScript]:
         """
         Performs a GET request against the /Scripting/Runningscripts endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[RunningScript]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateRunningScript]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            RunningScript,
+            AutomateRunningScript,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[RunningScript]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AutomateRunningScript]:
         """
         Performs a GET request against the /Scripting/Runningscripts endpoint.
 
@@ -41,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[RunningScript]: The parsed response data.
+            list[AutomateRunningScript]: The parsed response data.
         """
-        return self._parse_many(RunningScript, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(AutomateRunningScript, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ScriptingScriptschedulesEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptingScriptschedulesEndpoint.py
index 03f04b715..fd69fdba9 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptingScriptschedulesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptingScriptschedulesEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.ScriptingScriptschedulesIdEndpoint import ScriptingScriptschedulesIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Scripts import ScheduledScript
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateScheduledScript
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -26,7 +25,7 @@ def id(self, id: int) -> ScriptingScriptschedulesIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ScheduledScript]:
+    ) -> PaginatedResponse[AutomateScheduledScript]:
         """
         Performs a GET request against the /Scripting/Scriptschedules endpoint and returns an initialized PaginatedResponse object.
 
@@ -35,19 +34,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ScheduledScript]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateScheduledScript]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ScheduledScript,
+            AutomateScheduledScript,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ScheduledScript]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AutomateScheduledScript]:
         """
         Performs a GET request against the /Scripting/Scriptschedules endpoint.
 
@@ -55,6 +54,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ScheduledScript]: The parsed response data.
+            list[AutomateScheduledScript]: The parsed response data.
         """
-        return self._parse_many(ScheduledScript, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(AutomateScheduledScript, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ScriptingScriptschedulesIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptingScriptschedulesIdEndpoint.py
index c207067b6..5fe2cdbd2 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptingScriptschedulesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptingScriptschedulesIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Scripts import ScheduledScript
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateScheduledScript
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,19 +9,17 @@ class ScriptingScriptschedulesIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Scripting/Scriptschedules/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScheduledScript:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateScheduledScript:
         """
         Performs a PATCH request against the /Scripting/Scriptschedules/{id} endpoint.
 
@@ -30,6 +27,6 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ScheduledScript: The parsed response data.
+            AutomateScheduledScript: The parsed response data.
         """
-        return self._parse_one(ScheduledScript, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(AutomateScheduledScript, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ScriptsEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptsEndpoint.py
index da2e857ea..a0a0d2a75 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptsEndpoint.py
@@ -3,8 +3,7 @@
 from pyconnectwise.endpoints.automate.ScriptsIdEndpoint import ScriptsIdEndpoint
 from pyconnectwise.endpoints.automate.ScriptsScriptfoldersEndpoint import ScriptsScriptfoldersEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Scripts import Script
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateScript
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -27,7 +26,7 @@ def id(self, id: int) -> ScriptsIdEndpoint:
         child._id = id
         return child
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Script:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateScript:
         """
         Performs a POST request against the /Scripts endpoint.
 
@@ -35,6 +34,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Script: The parsed response data.
+            AutomateScript: The parsed response data.
         """
-        return self._parse_one(Script, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(AutomateScript, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ScriptsIdCopyEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptsIdCopyEndpoint.py
index 1e191fce9..516715476 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptsIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptsIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ScriptsIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptsIdEndpoint.py
index 5d603cc79..758646779 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptsIdEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.ScriptsIdCopyEndpoint import ScriptsIdCopyEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Scripts import Script
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateScript
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -13,7 +12,7 @@ def __init__(self, client, parent_endpoint=None):
 
         self.copy = self._register_child_endpoint(ScriptsIdCopyEndpoint(client, parent_endpoint=self))
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Script:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateScript:
         """
         Performs a GET request against the /Scripts/{id} endpoint.
 
@@ -21,11 +20,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Script: The parsed response data.
+            AutomateScript: The parsed response data.
         """
-        return self._parse_one(Script, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(AutomateScript, super()._make_request("GET", data=data, params=params).json())
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Script:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateScript:
         """
         Performs a PUT request against the /Scripts/{id} endpoint.
 
@@ -33,18 +32,16 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Script: The parsed response data.
+            AutomateScript: The parsed response data.
         """
-        return self._parse_one(Script, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(AutomateScript, super()._make_request("PUT", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Scripts/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/ScriptsScriptfoldersEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptsScriptfoldersEndpoint.py
index c9cbd95af..9c465c4d5 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptsScriptfoldersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptsScriptfoldersEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.ScriptsScriptfoldersIdEndpoint import ScriptsScriptfoldersIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Scripts import SubmittableScriptFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateSubmittableScriptFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -24,7 +23,7 @@ def id(self, id: int) -> ScriptsScriptfoldersIdEndpoint:
         child._id = id
         return child
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SubmittableScriptFolder:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateSubmittableScriptFolder:
         """
         Performs a POST request against the /Scripts/Scriptfolders endpoint.
 
@@ -32,6 +31,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            SubmittableScriptFolder: The parsed response data.
+            AutomateSubmittableScriptFolder: The parsed response data.
         """
-        return self._parse_one(SubmittableScriptFolder, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            AutomateSubmittableScriptFolder, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/ScriptsScriptfoldersIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ScriptsScriptfoldersIdEndpoint.py
index 0781f45d2..8ee8f5d13 100644
--- a/src/pyconnectwise/endpoints/automate/ScriptsScriptfoldersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ScriptsScriptfoldersIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Scripts import SubmittableScriptFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateSubmittableScriptFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class ScriptsScriptfoldersIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SubmittableScriptFolder:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateSubmittableScriptFolder:
         """
         Performs a POST request against the /Scripts/Scriptfolders/{id} endpoint.
 
@@ -18,6 +17,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            SubmittableScriptFolder: The parsed response data.
+            AutomateSubmittableScriptFolder: The parsed response data.
         """
-        return self._parse_one(SubmittableScriptFolder, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            AutomateSubmittableScriptFolder, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/SearchesEndpoint.py b/src/pyconnectwise/endpoints/automate/SearchesEndpoint.py
index ebb74bed9..826650cf1 100644
--- a/src/pyconnectwise/endpoints/automate/SearchesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/SearchesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Search
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechSearch
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class SearchesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Searches", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Search]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechSearch]:
         """
         Performs a GET request against the /Searches endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Search]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechSearch]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Search,
+            LabTechSearch,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Search]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechSearch]:
         """
         Performs a GET request against the /Searches endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Search]: The parsed response data.
+            list[LabTechSearch]: The parsed response data.
         """
-        return self._parse_many(Search, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechSearch, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/SearchfoldersEndpoint.py b/src/pyconnectwise/endpoints/automate/SearchfoldersEndpoint.py
index 0c441f7fa..82399448d 100644
--- a/src/pyconnectwise/endpoints/automate/SearchfoldersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/SearchfoldersEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import SearchFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechSearchFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[SearchFolder]:
+    ) -> PaginatedResponse[LabTechSearchFolder]:
         """
         Performs a GET request against the /Searchfolders endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[SearchFolder]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechSearchFolder]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            SearchFolder,
+            LabTechSearchFolder,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[SearchFolder]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechSearchFolder]:
         """
         Performs a GET request against the /Searchfolders endpoint.
 
@@ -41,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[SearchFolder]: The parsed response data.
+            list[LabTechSearchFolder]: The parsed response data.
         """
-        return self._parse_many(SearchFolder, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechSearchFolder, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SearchFolder:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechSearchFolder:
         """
         Performs a POST request against the /Searchfolders endpoint.
 
@@ -53,6 +52,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            SearchFolder: The parsed response data.
+            LabTechSearchFolder: The parsed response data.
         """
-        return self._parse_one(SearchFolder, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechSearchFolder, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/SensorchecksEndpoint.py b/src/pyconnectwise/endpoints/automate/SensorchecksEndpoint.py
index 19801110f..4c3e5fa3a 100644
--- a/src/pyconnectwise/endpoints/automate/SensorchecksEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/SensorchecksEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import SensorCheck
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechSensorCheck
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class SensorchecksEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Sensorchecks", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[SensorCheck]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechSensorCheck]:
         """
         Performs a GET request against the /Sensorchecks endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[SensorCheck]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechSensorCheck]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            SensorCheck,
+            LabTechSensorCheck,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[SensorCheck]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechSensorCheck]:
         """
         Performs a GET request against the /Sensorchecks endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[SensorCheck]: The parsed response data.
+            list[LabTechSensorCheck]: The parsed response data.
         """
-        return self._parse_many(SensorCheck, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechSensorCheck, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ServicesEndpoint.py b/src/pyconnectwise/endpoints/automate/ServicesEndpoint.py
index 6b7b25dd7..660fd5dd7 100644
--- a/src/pyconnectwise/endpoints/automate/ServicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ServicesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.ServicesIdEndpoint import ServicesIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/ServicesIdClassifyEndpoint.py b/src/pyconnectwise/endpoints/automate/ServicesIdClassifyEndpoint.py
index 67f56d910..d49e7e37e 100644
--- a/src/pyconnectwise/endpoints/automate/ServicesIdClassifyEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ServicesIdClassifyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class ServicesIdClassifyEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Classify", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Services/{id}/Classify endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/ServicesIdEndpoint.py b/src/pyconnectwise/endpoints/automate/ServicesIdEndpoint.py
index 11086e9fd..bf32000bd 100644
--- a/src/pyconnectwise/endpoints/automate/ServicesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ServicesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.ServicesIdClassifyEndpoint import ServicesIdClassifyEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/StatisticsDrivesEndpoint.py b/src/pyconnectwise/endpoints/automate/StatisticsDrivesEndpoint.py
index 7ca2c0b50..0440963c9 100644
--- a/src/pyconnectwise/endpoints/automate/StatisticsDrivesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/StatisticsDrivesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models import DriveStatistics
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechDriveStatistics
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class StatisticsDrivesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Drives", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[DriveStatistics]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechDriveStatistics]:
         """
         Performs a GET request against the /Statistics/Drives endpoint.
 
@@ -18,6 +17,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[DriveStatistics]: The parsed response data.
+            list[LabTechDriveStatistics]: The parsed response data.
         """
-        return self._parse_many(DriveStatistics, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechDriveStatistics, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/StatisticsEndpoint.py b/src/pyconnectwise/endpoints/automate/StatisticsEndpoint.py
index aa72cb5f7..dfa2ae422 100644
--- a/src/pyconnectwise/endpoints/automate/StatisticsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/StatisticsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.StatisticsDrivesEndpoint import StatisticsDrivesEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/SystemEndpoint.py b/src/pyconnectwise/endpoints/automate/SystemEndpoint.py
index 384dbab34..0fd08b8cb 100644
--- a/src/pyconnectwise/endpoints/automate/SystemEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/SystemEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.automate.SystemServerinformationEndpoint import SystemServerinformationEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/SystemServerinformationEndpoint.py b/src/pyconnectwise/endpoints/automate/SystemServerinformationEndpoint.py
index 58b14e6e8..72b0f6f0b 100644
--- a/src/pyconnectwise/endpoints/automate/SystemServerinformationEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/SystemServerinformationEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.System import ServerInformation
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateServerInformation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ServerInformation]:
+    ) -> PaginatedResponse[AutomateServerInformation]:
         """
         Performs a GET request against the /System/Serverinformation endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ServerInformation]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateServerInformation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ServerInformation,
+            AutomateServerInformation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ServerInformation]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AutomateServerInformation]:
         """
         Performs a GET request against the /System/Serverinformation endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ServerInformation]: The parsed response data.
+            list[AutomateServerInformation]: The parsed response data.
         """
-        return self._parse_many(ServerInformation, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            AutomateServerInformation, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/SystemcontactsEndpoint.py b/src/pyconnectwise/endpoints/automate/SystemcontactsEndpoint.py
index d45eaa8b7..927fde4c7 100644
--- a/src/pyconnectwise/endpoints/automate/SystemcontactsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/SystemcontactsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import Contact
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class SystemcontactsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Systemcontacts", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Contact]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechContact]:
         """
         Performs a GET request against the /Systemcontacts endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Contact]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechContact]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Contact,
+            LabTechContact,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Contact]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechContact]:
         """
         Performs a GET request against the /Systemcontacts endpoint.
 
@@ -39,6 +40,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Contact]: The parsed response data.
+            list[LabTechContact]: The parsed response data.
         """
-        return self._parse_many(Contact, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechContact, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/TemplateavailablepropertiesEndpoint.py b/src/pyconnectwise/endpoints/automate/TemplateavailablepropertiesEndpoint.py
index e7a9caa12..d51f548ec 100644
--- a/src/pyconnectwise/endpoints/automate/TemplateavailablepropertiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/TemplateavailablepropertiesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import TemplateAvailableProperty
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechTemplateAvailableProperty
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[TemplateAvailableProperty]:
+    ) -> PaginatedResponse[LabTechTemplateAvailableProperty]:
         """
         Performs a GET request against the /Templateavailableproperties endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[TemplateAvailableProperty]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechTemplateAvailableProperty]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            TemplateAvailableProperty,
+            LabTechTemplateAvailableProperty,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[TemplateAvailableProperty]:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[LabTechTemplateAvailableProperty]:
         """
         Performs a GET request against the /Templateavailableproperties endpoint.
 
@@ -41,13 +42,13 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[TemplateAvailableProperty]: The parsed response data.
+            list[LabTechTemplateAvailableProperty]: The parsed response data.
         """
         return self._parse_many(
-            TemplateAvailableProperty, super()._make_request("GET", data=data, params=params).json()
+            LabTechTemplateAvailableProperty, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TemplateAvailableProperty:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechTemplateAvailableProperty:
         """
         Performs a POST request against the /Templateavailableproperties endpoint.
 
@@ -55,8 +56,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            TemplateAvailableProperty: The parsed response data.
+            LabTechTemplateAvailableProperty: The parsed response data.
         """
         return self._parse_one(
-            TemplateAvailableProperty, super()._make_request("POST", data=data, params=params).json()
+            LabTechTemplateAvailableProperty, super()._make_request("POST", data=data, params=params).json()
         )
diff --git a/src/pyconnectwise/endpoints/automate/TemplatepropertiesEndpoint.py b/src/pyconnectwise/endpoints/automate/TemplatepropertiesEndpoint.py
index 77b76c395..c43a24b06 100644
--- a/src/pyconnectwise/endpoints/automate/TemplatepropertiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/TemplatepropertiesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import TemplateProperty
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechTemplateProperty
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[TemplateProperty]:
+    ) -> PaginatedResponse[LabTechTemplateProperty]:
         """
         Performs a GET request against the /Templateproperties endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[TemplateProperty]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechTemplateProperty]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            TemplateProperty,
+            LabTechTemplateProperty,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[TemplateProperty]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechTemplateProperty]:
         """
         Performs a GET request against the /Templateproperties endpoint.
 
@@ -41,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[TemplateProperty]: The parsed response data.
+            list[LabTechTemplateProperty]: The parsed response data.
         """
-        return self._parse_many(TemplateProperty, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechTemplateProperty, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TemplateProperty:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechTemplateProperty:
         """
         Performs a POST request against the /Templateproperties endpoint.
 
@@ -53,6 +52,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            TemplateProperty: The parsed response data.
+            LabTechTemplateProperty: The parsed response data.
         """
-        return self._parse_one(TemplateProperty, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechTemplateProperty, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/ThirdpartyupdatepoliciesEndpoint.py b/src/pyconnectwise/endpoints/automate/ThirdpartyupdatepoliciesEndpoint.py
index e7d8fbb99..ef8d26e79 100644
--- a/src/pyconnectwise/endpoints/automate/ThirdpartyupdatepoliciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/ThirdpartyupdatepoliciesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/TicketsEndpoint.py b/src/pyconnectwise/endpoints/automate/TicketsEndpoint.py
index d78b7afe7..c4bdc944e 100644
--- a/src/pyconnectwise/endpoints/automate/TicketsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/TicketsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/automate/UserauditsEndpoint.py b/src/pyconnectwise/endpoints/automate/UserauditsEndpoint.py
index 86e5e6327..aa33c448f 100644
--- a/src/pyconnectwise/endpoints/automate/UserauditsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UserauditsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import UserAudit
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechUserAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class UserauditsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Useraudits", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[UserAudit]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[LabTechUserAudit]:
         """
         Performs a GET request against the /Useraudits endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[UserAudit]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechUserAudit]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            UserAudit,
+            LabTechUserAudit,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[UserAudit]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechUserAudit]:
         """
         Performs a GET request against the /Useraudits endpoint.
 
@@ -39,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[UserAudit]: The parsed response data.
+            list[LabTechUserAudit]: The parsed response data.
         """
-        return self._parse_many(UserAudit, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechUserAudit, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserAudit:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechUserAudit:
         """
         Performs a POST request against the /Useraudits endpoint.
 
@@ -51,6 +52,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserAudit: The parsed response data.
+            LabTechUserAudit: The parsed response data.
         """
-        return self._parse_one(UserAudit, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechUserAudit, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UserclassesEndpoint.py b/src/pyconnectwise/endpoints/automate/UserclassesEndpoint.py
index 82367e39f..2026770c5 100644
--- a/src/pyconnectwise/endpoints/automate/UserclassesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UserclassesEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.UserclassesIdEndpoint import UserclassesIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Users import UserClass
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateUserClass
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -24,7 +23,9 @@ def id(self, id: int) -> UserclassesIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[UserClass]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AutomateUserClass]:
         """
         Performs a GET request against the /Userclasses endpoint and returns an initialized PaginatedResponse object.
 
@@ -33,19 +34,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[UserClass]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateUserClass]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            UserClass,
+            AutomateUserClass,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[UserClass]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AutomateUserClass]:
         """
         Performs a GET request against the /Userclasses endpoint.
 
@@ -53,6 +54,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[UserClass]: The parsed response data.
+            list[AutomateUserClass]: The parsed response data.
         """
-        return self._parse_many(UserClass, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(AutomateUserClass, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UserclassesIdEndpoint.py b/src/pyconnectwise/endpoints/automate/UserclassesIdEndpoint.py
index 31c1cb1ea..729f3e75e 100644
--- a/src/pyconnectwise/endpoints/automate/UserclassesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UserclassesIdEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.UserclassesIdWebextensionsEndpoint import UserclassesIdWebextensionsEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Users import UserClass
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateUserClass
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -15,7 +14,9 @@ def __init__(self, client, parent_endpoint=None):
             UserclassesIdWebextensionsEndpoint(client, parent_endpoint=self)
         )
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[UserClass]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AutomateUserClass]:
         """
         Performs a GET request against the /Userclasses/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -24,19 +25,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[UserClass]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateUserClass]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            UserClass,
+            AutomateUserClass,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserClass:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateUserClass:
         """
         Performs a GET request against the /Userclasses/{id} endpoint.
 
@@ -44,6 +45,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> U
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserClass: The parsed response data.
+            AutomateUserClass: The parsed response data.
         """
-        return self._parse_one(UserClass, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(AutomateUserClass, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UserclassesIdWebextensionsEndpoint.py b/src/pyconnectwise/endpoints/automate/UserclassesIdWebextensionsEndpoint.py
index 90632e906..b184c47a0 100644
--- a/src/pyconnectwise/endpoints/automate/UserclassesIdWebextensionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UserclassesIdWebextensionsEndpoint.py
@@ -1,9 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.PresentationLayer.WebExtensions import \
-    UserClassWebExtensionViewModel
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateUserClassWebExtensionViewModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -11,7 +9,9 @@ class UserclassesIdWebextensionsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Webextensions", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[UserClassWebExtensionViewModel]:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[AutomateUserClassWebExtensionViewModel]:
         """
         Performs a GET request against the /Userclasses/{id}/Webextensions endpoint.
 
@@ -19,13 +19,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[UserClassWebExtensionViewModel]: The parsed response data.
+            list[AutomateUserClassWebExtensionViewModel]: The parsed response data.
         """
         return self._parse_many(
-            UserClassWebExtensionViewModel, super()._make_request("GET", data=data, params=params).json()
+            AutomateUserClassWebExtensionViewModel, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[UserClassWebExtensionViewModel]:
+    def put(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[AutomateUserClassWebExtensionViewModel]:
         """
         Performs a PUT request against the /Userclasses/{id}/Webextensions endpoint.
 
@@ -33,8 +35,8 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[UserClassWebExtensionViewModel]: The parsed response data.
+            list[AutomateUserClassWebExtensionViewModel]: The parsed response data.
         """
         return self._parse_many(
-            UserClassWebExtensionViewModel, super()._make_request("PUT", data=data, params=params).json()
+            AutomateUserClassWebExtensionViewModel, super()._make_request("PUT", data=data, params=params).json()
         )
diff --git a/src/pyconnectwise/endpoints/automate/UserprofilesEndpoint.py b/src/pyconnectwise/endpoints/automate/UserprofilesEndpoint.py
index 91c0cde7b..cab5d324a 100644
--- a/src/pyconnectwise/endpoints/automate/UserprofilesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UserprofilesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Repositories.MySQL.Domain.Models.PresentationLayer import UserProfile
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechUserProfile
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class UserprofilesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Userprofiles", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserProfile:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechUserProfile:
         """
         Performs a GET request against the /Userprofiles endpoint.
 
@@ -18,6 +17,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> U
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserProfile: The parsed response data.
+            LabTechUserProfile: The parsed response data.
         """
-        return self._parse_one(UserProfile, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(LabTechUserProfile, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UsersEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersEndpoint.py
index 420963457..d0452c608 100644
--- a/src/pyconnectwise/endpoints/automate/UsersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersEndpoint.py
@@ -3,8 +3,7 @@
 from pyconnectwise.endpoints.automate.UsersFoldersEndpoint import UsersFoldersEndpoint
 from pyconnectwise.endpoints.automate.UsersIdEndpoint import UsersIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Users import User
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateUser
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -27,7 +26,7 @@ def id(self, id: int) -> UsersIdEndpoint:
         child._id = id
         return child
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> User:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateUser:
         """
         Performs a POST request against the /Users endpoint.
 
@@ -35,6 +34,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            User: The parsed response data.
+            AutomateUser: The parsed response data.
         """
-        return self._parse_one(User, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(AutomateUser, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UsersFoldersEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersFoldersEndpoint.py
index 846f6d26e..fc031d3f7 100644
--- a/src/pyconnectwise/endpoints/automate/UsersFoldersEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersFoldersEndpoint.py
@@ -2,8 +2,7 @@
 
 from pyconnectwise.endpoints.automate.UsersFoldersIdEndpoint import UsersFoldersIdEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Users import UserFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateUserFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -24,7 +23,7 @@ def id(self, id: int) -> UsersFoldersIdEndpoint:
         child._id = id
         return child
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserFolder:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateUserFolder:
         """
         Performs a POST request against the /Users/Folders endpoint.
 
@@ -32,6 +31,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserFolder: The parsed response data.
+            AutomateUserFolder: The parsed response data.
         """
-        return self._parse_one(UserFolder, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(AutomateUserFolder, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UsersFoldersIdEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersFoldersIdEndpoint.py
index 846dccbfa..173f64dfa 100644
--- a/src/pyconnectwise/endpoints/automate/UsersFoldersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersFoldersIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Users import UserFolder
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateUserFolder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class UsersFoldersIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[UserFolder]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AutomateUserFolder]:
         """
         Performs a GET request against the /Users/Folders/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[UserFolder]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateUserFolder]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            UserFolder,
+            AutomateUserFolder,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserFolder:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateUserFolder:
         """
         Performs a GET request against the /Users/Folders/{id} endpoint.
 
@@ -39,23 +40,21 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> U
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserFolder: The parsed response data.
+            AutomateUserFolder: The parsed response data.
         """
-        return self._parse_one(UserFolder, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(AutomateUserFolder, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Users/Folders/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserFolder:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateUserFolder:
         """
         Performs a PATCH request against the /Users/Folders/{id} endpoint.
 
@@ -63,6 +62,6 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserFolder: The parsed response data.
+            AutomateUserFolder: The parsed response data.
         """
-        return self._parse_one(UserFolder, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(AutomateUserFolder, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UsersIdAuthlinkEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersIdAuthlinkEndpoint.py
index 6711f79be..b1c6992fa 100644
--- a/src/pyconnectwise/endpoints/automate/UsersIdAuthlinkEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersIdAuthlinkEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.RESTApi.Security import AuthServiceCredentials
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechAuthServiceCredentials
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class UsersIdAuthlinkEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Authlink", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AuthServiceCredentials:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechAuthServiceCredentials:
         """
         Performs a POST request against the /Users/{id}/Authlink endpoint.
 
@@ -18,6 +17,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            AuthServiceCredentials: The parsed response data.
+            LabTechAuthServiceCredentials: The parsed response data.
         """
-        return self._parse_one(AuthServiceCredentials, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            LabTechAuthServiceCredentials, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/automate/UsersIdChangepasswordEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersIdChangepasswordEndpoint.py
index 9721ee7e9..d9e212866 100644
--- a/src/pyconnectwise/endpoints/automate/UsersIdChangepasswordEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersIdChangepasswordEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class UsersIdChangepasswordEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Changepassword", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /Users/{id}/Changepassword endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/automate/UsersIdEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersIdEndpoint.py
index b6020ad0f..d09de8558 100644
--- a/src/pyconnectwise/endpoints/automate/UsersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersIdEndpoint.py
@@ -6,8 +6,7 @@
 from pyconnectwise.endpoints.automate.UsersIdSettingsEndpoint import UsersIdSettingsEndpoint
 from pyconnectwise.endpoints.automate.UsersIdUseraccessEndpoint import UsersIdUseraccessEndpoint
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Users import User
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateUser
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -16,12 +15,14 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
         self.settings = self._register_child_endpoint(UsersIdSettingsEndpoint(client, parent_endpoint=self))
-        self.favorites = self._register_child_endpoint(UsersIdFavoritesEndpoint(client, parent_endpoint=self))
-        self.authlink = self._register_child_endpoint(UsersIdAuthlinkEndpoint(client, parent_endpoint=self))
         self.useraccess = self._register_child_endpoint(UsersIdUseraccessEndpoint(client, parent_endpoint=self))
+        self.authlink = self._register_child_endpoint(UsersIdAuthlinkEndpoint(client, parent_endpoint=self))
+        self.favorites = self._register_child_endpoint(UsersIdFavoritesEndpoint(client, parent_endpoint=self))
         self.changepassword = self._register_child_endpoint(UsersIdChangepasswordEndpoint(client, parent_endpoint=self))
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[User]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AutomateUser]:
         """
         Performs a GET request against the /Users/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -30,19 +31,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[User]: The initialized PaginatedResponse object.
+            PaginatedResponse[AutomateUser]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            User,
+            AutomateUser,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> User:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateUser:
         """
         Performs a GET request against the /Users/{id} endpoint.
 
@@ -50,23 +51,21 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> U
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            User: The parsed response data.
+            AutomateUser: The parsed response data.
         """
-        return self._parse_one(User, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(AutomateUser, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /Users/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> User:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateUser:
         """
         Performs a PATCH request against the /Users/{id} endpoint.
 
@@ -74,6 +73,6 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            User: The parsed response data.
+            AutomateUser: The parsed response data.
         """
-        return self._parse_one(User, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(AutomateUser, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UsersIdFavoritesEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersIdFavoritesEndpoint.py
index ab3716918..4d3739fa5 100644
--- a/src/pyconnectwise/endpoints/automate/UsersIdFavoritesEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersIdFavoritesEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import UserFavorite
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechUserFavorite
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class UsersIdFavoritesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Favorites", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserFavorite:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechUserFavorite:
         """
         Performs a POST request against the /Users/{id}/Favorites endpoint.
 
@@ -18,6 +17,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserFavorite: The parsed response data.
+            LabTechUserFavorite: The parsed response data.
         """
-        return self._parse_one(UserFavorite, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechUserFavorite, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UsersIdSettingsEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersIdSettingsEndpoint.py
index 0224c9ae6..ef6ba84c4 100644
--- a/src/pyconnectwise/endpoints/automate/UsersIdSettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersIdSettingsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import UserSetting
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechUserSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class UsersIdSettingsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Settings", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserSetting:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechUserSetting:
         """
         Performs a POST request against the /Users/{id}/Settings endpoint.
 
@@ -18,6 +17,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserSetting: The parsed response data.
+            LabTechUserSetting: The parsed response data.
         """
-        return self._parse_one(UserSetting, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechUserSetting, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/UsersIdUseraccessEndpoint.py b/src/pyconnectwise/endpoints/automate/UsersIdUseraccessEndpoint.py
index 1f38fc0f5..fa489b20f 100644
--- a/src/pyconnectwise/endpoints/automate/UsersIdUseraccessEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/UsersIdUseraccessEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.Automate.Api.Domain.Contracts.Users import UserAccess
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import AutomateUserAccess
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class UsersIdUseraccessEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "Useraccess", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserAccess:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutomateUserAccess:
         """
         Performs a GET request against the /Users/{id}/Useraccess endpoint.
 
@@ -18,6 +17,6 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> U
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            UserAccess: The parsed response data.
+            AutomateUserAccess: The parsed response data.
         """
-        return self._parse_one(UserAccess, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(AutomateUserAccess, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/automate/VirusscannerdefsEndpoint.py b/src/pyconnectwise/endpoints/automate/VirusscannerdefsEndpoint.py
index 045038de9..4235e7050 100644
--- a/src/pyconnectwise/endpoints/automate/VirusscannerdefsEndpoint.py
+++ b/src/pyconnectwise/endpoints/automate/VirusscannerdefsEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.automate.LabTech.Models import VirusScannerDef
-from pyconnectwise.models.base.message_model import GenericMessageModel
+from pyconnectwise.models.automate import LabTechVirusScannerDef
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[VirusScannerDef]:
+    ) -> PaginatedResponse[LabTechVirusScannerDef]:
         """
         Performs a GET request against the /Virusscannerdefs endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[VirusScannerDef]: The initialized PaginatedResponse object.
+            PaginatedResponse[LabTechVirusScannerDef]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            VirusScannerDef,
+            LabTechVirusScannerDef,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[VirusScannerDef]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[LabTechVirusScannerDef]:
         """
         Performs a GET request against the /Virusscannerdefs endpoint.
 
@@ -41,11 +40,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[VirusScannerDef]: The parsed response data.
+            list[LabTechVirusScannerDef]: The parsed response data.
         """
-        return self._parse_many(VirusScannerDef, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(LabTechVirusScannerDef, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> VirusScannerDef:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LabTechVirusScannerDef:
         """
         Performs a POST request against the /Virusscannerdefs endpoint.
 
@@ -53,6 +52,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            VirusScannerDef: The parsed response data.
+            LabTechVirusScannerDef: The parsed response data.
         """
-        return self._parse_one(VirusScannerDef, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(LabTechVirusScannerDef, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/base/connectwise_endpoint.py b/src/pyconnectwise/endpoints/base/connectwise_endpoint.py
index bc6c3bdd9..f58b65591 100644
--- a/src/pyconnectwise/endpoints/base/connectwise_endpoint.py
+++ b/src/pyconnectwise/endpoints/base/connectwise_endpoint.py
@@ -3,6 +3,7 @@
 from requests import Response
 from typing import Any
 from typing import TypeVar, Type
+from pydantic import BaseModel
 
 TChildEndpoint = TypeVar("TChildEndpoint", bound="ConnectWiseEndpoint")
 TSelf = TypeVar("TSelf", bound="ConnectWiseEndpoint")
@@ -174,13 +175,3 @@ def _parse_many(self, model_type: Type[T], data: list[dict[str, Any]]) -> list[T
 
     def _parse_one(self, model_type: Type[T], data: dict[str, Any]) -> T:
         return model_type.model_validate(data)
-
-    def id(self: TSelf, id: int) -> TSelf:
-        """
-        Set the ID for the current endpoint.
-
-        Args:
-            id (int): The ID to set.
-        """
-        self._id = id
-        return self
diff --git a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsCountEndpoint.py
index 9d509a00d..55cfe543e 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsEndpoint.py
index 715dc9b9f..54d63e3a0 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyAddressformatsCountEndpoint import CompanyAddressformatsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyAddressformatsIdEndpoint import CompanyAddressformatsIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyAddressformatsInfoEndpoint import CompanyAddressformatsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AddressFormat
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsIdEndpoint.py
index 50f4738ae..70b217111 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyAddressformatsIdInfoEndpoint import CompanyAddressformatsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AddressFormat
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AddressFormat, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/addressFormats/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AddressFormat:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsIdInfoEndpoint.py
index 8719cb4db..0b8036e7b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AddressFormatInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsInfoCountEndpoint.py
index 50e2ca484..db3326af0 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsInfoEndpoint.py
index 2ff183559..e30d53d22 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyAddressformatsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyAddressformatsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyAddressformatsInfoCountEndpoint import CompanyAddressformatsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AddressFormatInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsEndpoint.py
index 2ff456cb9..2d3aaf200 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyBillingsetupsInfoEndpoint import CompanyBillingsetupsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsInfoCountEndpoint.py
index 4b5ed44f1..cffd2e49c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsInfoEndpoint.py
index 47f5828a1..0a9ce496c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyBillingsetupsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyBillingsetupsInfoCountEndpoint import CompanyBillingsetupsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesCountEndpoint.py
index 0cd3dc92a..ca6d663ae 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesEndpoint.py
index aac23124b..5631e5f98 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyCommunicationtypesCountEndpoint import CompanyCommunicationtypesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCommunicationtypesIdEndpoint import CompanyCommunicationtypesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyCommunicationtypesInfoEndpoint import CompanyCommunicationtypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CommunicationType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdEndpoint.py
index 28992def9..2539dbe3d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdEndpoint.py
@@ -5,7 +5,6 @@
     CompanyCommunicationtypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.CompanyCommunicationtypesIdUsagesEndpoint import \
     CompanyCommunicationtypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CommunicationType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -54,17 +53,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CommunicationType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/communicationTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CommunicationType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdInfoEndpoint.py
index 47d6da1bf..1eb84c501 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CommunicationTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdUsagesEndpoint.py
index 8a3394043..6367a2411 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCommunicationtypesIdUsagesListEndpoint import \
     CompanyCommunicationtypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdUsagesListEndpoint.py
index 31f103983..61eb978df 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesInfoCountEndpoint.py
index 6eaf915e4..62349d589 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesInfoEndpoint.py
index 8277a3abd..1e00a35a5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCommunicationtypesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCommunicationtypesInfoCountEndpoint import \
     CompanyCommunicationtypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CommunicationTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesCountEndpoint.py
index db180aac7..7509b9bc7 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesDefaultEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesDefaultEndpoint.py
index 2138e74a2..a46739a79 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesDefaultEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesDefaultEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Company
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesEndpoint.py
index d6e68a26f..c3529a481 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesEndpoint.py
@@ -7,7 +7,6 @@
 from pyconnectwise.endpoints.manage.CompanyCompaniesInfoEndpoint import CompanyCompaniesInfoEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesStatusesEndpoint import CompanyCompaniesStatusesEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesTypesEndpoint import CompanyCompaniesTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Company
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -16,11 +15,11 @@ class CompanyCompaniesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "companies", parent_endpoint=parent_endpoint)
 
-        self.default = self._register_child_endpoint(CompanyCompaniesDefaultEndpoint(client, parent_endpoint=self))
         self.info = self._register_child_endpoint(CompanyCompaniesInfoEndpoint(client, parent_endpoint=self))
         self.types = self._register_child_endpoint(CompanyCompaniesTypesEndpoint(client, parent_endpoint=self))
-        self.statuses = self._register_child_endpoint(CompanyCompaniesStatusesEndpoint(client, parent_endpoint=self))
         self.count = self._register_child_endpoint(CompanyCompaniesCountEndpoint(client, parent_endpoint=self))
+        self.default = self._register_child_endpoint(CompanyCompaniesDefaultEndpoint(client, parent_endpoint=self))
+        self.statuses = self._register_child_endpoint(CompanyCompaniesStatusesEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> CompanyCompaniesIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesCountEndpoint.py
index 15f3c34a0..b5b66f739 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesEndpoint.py
index 23a2bd99b..cbd221b4a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesEndpoint.py
@@ -5,7 +5,6 @@
     CompanyCompaniesIdCustomstatusnotesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdCustomstatusnotesIdEndpoint import \
     CompanyCompaniesIdCustomstatusnotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyCustomNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesIdEndpoint.py
index b3bb66e88..c20dec874 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdCustomstatusnotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyCustomNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyCustomNote, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/customStatusNotes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCustomNote:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdEndpoint.py
index 0cd0d5a01..0e51615f5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdEndpoint.py
@@ -19,7 +19,6 @@
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdTypeassociationsEndpoint import \
     CompanyCompaniesIdTypeassociationsEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdUsagesEndpoint import CompanyCompaniesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Company
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -28,29 +27,29 @@ class CompanyCompaniesIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.management_report_setup = self._register_child_endpoint(
-            CompanyCompaniesIdManagementreportsetupEndpoint(client, parent_endpoint=self)
+        self.management_report_notifications = self._register_child_endpoint(
+            CompanyCompaniesIdManagementreportnotificationsEndpoint(client, parent_endpoint=self)
         )
-        self.notes = self._register_child_endpoint(CompanyCompaniesIdNotesEndpoint(client, parent_endpoint=self))
+        self.groups = self._register_child_endpoint(CompanyCompaniesIdGroupsEndpoint(client, parent_endpoint=self))
         self.custom_status_notes = self._register_child_endpoint(
             CompanyCompaniesIdCustomstatusnotesEndpoint(client, parent_endpoint=self)
         )
-        self.tracks = self._register_child_endpoint(CompanyCompaniesIdTracksEndpoint(client, parent_endpoint=self))
-        self.management_summary_reports = self._register_child_endpoint(
-            CompanyCompaniesIdManagementsummaryreportsEndpoint(client, parent_endpoint=self)
-        )
-        self.groups = self._register_child_endpoint(CompanyCompaniesIdGroupsEndpoint(client, parent_endpoint=self))
-        self.merge = self._register_child_endpoint(CompanyCompaniesIdMergeEndpoint(client, parent_endpoint=self))
-        self.sites = self._register_child_endpoint(CompanyCompaniesIdSitesEndpoint(client, parent_endpoint=self))
         self.surveys = self._register_child_endpoint(CompanyCompaniesIdSurveysEndpoint(client, parent_endpoint=self))
-        self.usages = self._register_child_endpoint(CompanyCompaniesIdUsagesEndpoint(client, parent_endpoint=self))
         self.teams = self._register_child_endpoint(CompanyCompaniesIdTeamsEndpoint(client, parent_endpoint=self))
         self.type_associations = self._register_child_endpoint(
             CompanyCompaniesIdTypeassociationsEndpoint(client, parent_endpoint=self)
         )
-        self.management_report_notifications = self._register_child_endpoint(
-            CompanyCompaniesIdManagementreportnotificationsEndpoint(client, parent_endpoint=self)
+        self.merge = self._register_child_endpoint(CompanyCompaniesIdMergeEndpoint(client, parent_endpoint=self))
+        self.management_report_setup = self._register_child_endpoint(
+            CompanyCompaniesIdManagementreportsetupEndpoint(client, parent_endpoint=self)
         )
+        self.notes = self._register_child_endpoint(CompanyCompaniesIdNotesEndpoint(client, parent_endpoint=self))
+        self.usages = self._register_child_endpoint(CompanyCompaniesIdUsagesEndpoint(client, parent_endpoint=self))
+        self.management_summary_reports = self._register_child_endpoint(
+            CompanyCompaniesIdManagementsummaryreportsEndpoint(client, parent_endpoint=self)
+        )
+        self.sites = self._register_child_endpoint(CompanyCompaniesIdSitesEndpoint(client, parent_endpoint=self))
+        self.tracks = self._register_child_endpoint(CompanyCompaniesIdTracksEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Company]:
         """
@@ -85,17 +84,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Company, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsCountEndpoint.py
index 0b446e0b6..e9a91014b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsEndpoint.py
index 181002f50..6d6d4229c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdGroupsCountEndpoint import CompanyCompaniesIdGroupsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdGroupsIdEndpoint import CompanyCompaniesIdGroupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyGroup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsIdEndpoint.py
index 79ab25e0b..a9225db2b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdGroupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyGroup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyGroup, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/groups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyGroup:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsCountEndpoint.py
index a6929b95a..c7cb373f6 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsEndpoint.py
index 6117ee321..b205dd775 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyCompaniesIdManagementreportnotificationsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdManagementreportnotificationsIdEndpoint import \
     CompanyCompaniesIdManagementreportnotificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementReportNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsIdEndpoint.py
index 39f349c14..30fecfbc6 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportnotificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementReportNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -47,17 +46,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
             ManagementReportNotification, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/managementReportNotifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ManagementReportNotification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportsetupEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportsetupEndpoint.py
index 59f3fde12..d8f370039 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportsetupEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportsetupEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdManagementreportsetupIdEndpoint import \
     CompanyCompaniesIdManagementreportsetupIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementReportSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportsetupIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportsetupIdEndpoint.py
index 1fbc6696a..a818c7e09 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportsetupIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementreportsetupIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementReportSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsCountEndpoint.py
index 80ada512a..8e94dceb3 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsEndpoint.py
index 8c0998ed9..5038c49f4 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyCompaniesIdManagementsummaryreportsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdManagementsummaryreportsIdEndpoint import \
     CompanyCompaniesIdManagementsummaryreportsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyManagementSummary
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsIdEndpoint.py
index 8db8b90ac..a1328a66e 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdManagementsummaryreportsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyManagementSummary
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyManagementSummary, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/managementSummaryReports/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyManagementSummary:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdMergeEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdMergeEndpoint.py
index d4e8abfea..fafa432e1 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdMergeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdMergeEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesCountEndpoint.py
index c60708331..6fe7faada 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesEndpoint.py
index 8f2954713..7450a7ea2 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdNotesCountEndpoint import CompanyCompaniesIdNotesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdNotesIdEndpoint import CompanyCompaniesIdNotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesIdEndpoint.py
index beba0b3c0..c2c71b53b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdNotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyNote, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/notes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyNote:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesCountEndpoint.py
index bd4e8ee98..ef125480d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesEndpoint.py
index c801a1609..243d5a2f8 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdSitesCountEndpoint import CompanyCompaniesIdSitesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdSitesIdEndpoint import CompanyCompaniesIdSitesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanySite
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdEndpoint.py
index b8667bf4e..d557fb9f9 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdSitesIdUsagesEndpoint import \
     CompanyCompaniesIdSitesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanySite
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -49,17 +48,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanySite, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/sites/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanySite:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdUsagesEndpoint.py
index 426c141a6..5c4321833 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdSitesIdUsagesListEndpoint import \
     CompanyCompaniesIdSitesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdUsagesListEndpoint.py
index d0336dbc8..32ff42b1c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSitesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSurveysCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSurveysCountEndpoint.py
index 3e0fc42c6..27d15b9a0 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSurveysCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSurveysCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSurveysEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSurveysEndpoint.py
index 6ecbb41e5..78658bbee 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSurveysEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdSurveysEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdSurveysCountEndpoint import CompanyCompaniesIdSurveysCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsCountEndpoint.py
index ba354e9e6..aeb5403c5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsEndpoint.py
index 0634c8149..64a8449a1 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdTeamsCountEndpoint import CompanyCompaniesIdTeamsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdTeamsIdEndpoint import CompanyCompaniesIdTeamsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsIdEndpoint.py
index c1e637947..8b923ce2d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTeamsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyTeam, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/teams/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyTeam:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksCountEndpoint.py
index d093bc44c..46eca8045 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksEndpoint.py
index bc52019de..b6acbecb1 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdTracksCountEndpoint import CompanyCompaniesIdTracksCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdTracksIdEndpoint import CompanyCompaniesIdTracksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactTrack
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksIdEndpoint.py
index 53e851b50..65f700c39 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTracksIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactTrack
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ContactTrack, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/tracks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsCountEndpoint.py
index fe512b205..c1b4a81a2 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsEndpoint.py
index bfa6eacdc..6f684b339 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsEndpoint.py
@@ -5,8 +5,7 @@
     CompanyCompaniesIdTypeassociationsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdTypeassociationsIdEndpoint import \
     CompanyCompaniesIdTypeassociationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import CompanyCompanyTypeAssociation
+from pyconnectwise.models.manage import CompanyCompanyTypeAssociationCompanyTypeAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -33,7 +32,7 @@ def id(self, id: int) -> CompanyCompaniesIdTypeassociationsIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[CompanyCompanyTypeAssociation]:
+    ) -> PaginatedResponse[CompanyCompanyTypeAssociationCompanyTypeAssociation]:
         """
         Performs a GET request against the /company/companies/{id}/typeAssociations endpoint and returns an initialized PaginatedResponse object.
 
@@ -42,19 +41,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[CompanyCompanyTypeAssociation]: The initialized PaginatedResponse object.
+            PaginatedResponse[CompanyCompanyTypeAssociationCompanyTypeAssociation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            CompanyCompanyTypeAssociation,
+            CompanyCompanyTypeAssociationCompanyTypeAssociation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CompanyCompanyTypeAssociation]:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[CompanyCompanyTypeAssociationCompanyTypeAssociation]:
         """
         Performs a GET request against the /company/companies/{id}/typeAssociations endpoint.
 
@@ -62,13 +63,16 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[CompanyCompanyTypeAssociation]: The parsed response data.
+            list[CompanyCompanyTypeAssociationCompanyTypeAssociation]: The parsed response data.
         """
         return self._parse_many(
-            CompanyCompanyTypeAssociation, super()._make_request("GET", data=data, params=params).json()
+            CompanyCompanyTypeAssociationCompanyTypeAssociation,
+            super()._make_request("GET", data=data, params=params).json(),
         )
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCompanyTypeAssociation:
+    def post(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> CompanyCompanyTypeAssociationCompanyTypeAssociation:
         """
         Performs a POST request against the /company/companies/{id}/typeAssociations endpoint.
 
@@ -76,8 +80,9 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CompanyCompanyTypeAssociation: The parsed response data.
+            CompanyCompanyTypeAssociationCompanyTypeAssociation: The parsed response data.
         """
         return self._parse_one(
-            CompanyCompanyTypeAssociation, super()._make_request("POST", data=data, params=params).json()
+            CompanyCompanyTypeAssociationCompanyTypeAssociation,
+            super()._make_request("POST", data=data, params=params).json(),
         )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsIdEndpoint.py
index ab2afc9c4..465c65331 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdTypeassociationsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import CompanyCompanyTypeAssociation
+from pyconnectwise.models.manage import CompanyCompanyTypeAssociationCompanyTypeAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[CompanyCompanyTypeAssociation]:
+    ) -> PaginatedResponse[CompanyCompanyTypeAssociationCompanyTypeAssociation]:
         """
         Performs a GET request against the /company/companies/{id}/typeAssociations/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[CompanyCompanyTypeAssociation]: The initialized PaginatedResponse object.
+            PaginatedResponse[CompanyCompanyTypeAssociationCompanyTypeAssociation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            CompanyCompanyTypeAssociation,
+            CompanyCompanyTypeAssociationCompanyTypeAssociation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCompanyTypeAssociation:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> CompanyCompanyTypeAssociationCompanyTypeAssociation:
         """
         Performs a GET request against the /company/companies/{id}/typeAssociations/{id} endpoint.
 
@@ -41,25 +42,26 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CompanyCompanyTypeAssociation: The parsed response data.
+            CompanyCompanyTypeAssociationCompanyTypeAssociation: The parsed response data.
         """
         return self._parse_one(
-            CompanyCompanyTypeAssociation, super()._make_request("GET", data=data, params=params).json()
+            CompanyCompanyTypeAssociationCompanyTypeAssociation,
+            super()._make_request("GET", data=data, params=params).json(),
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/{id}/typeAssociations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCompanyTypeAssociation:
+    def put(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> CompanyCompanyTypeAssociationCompanyTypeAssociation:
         """
         Performs a PUT request against the /company/companies/{id}/typeAssociations/{id} endpoint.
 
@@ -67,13 +69,16 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CompanyCompanyTypeAssociation: The parsed response data.
+            CompanyCompanyTypeAssociationCompanyTypeAssociation: The parsed response data.
         """
         return self._parse_one(
-            CompanyCompanyTypeAssociation, super()._make_request("PUT", data=data, params=params).json()
+            CompanyCompanyTypeAssociationCompanyTypeAssociation,
+            super()._make_request("PUT", data=data, params=params).json(),
         )
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCompanyTypeAssociation:
+    def patch(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> CompanyCompanyTypeAssociationCompanyTypeAssociation:
         """
         Performs a PATCH request against the /company/companies/{id}/typeAssociations/{id} endpoint.
 
@@ -81,8 +86,9 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CompanyCompanyTypeAssociation: The parsed response data.
+            CompanyCompanyTypeAssociationCompanyTypeAssociation: The parsed response data.
         """
         return self._parse_one(
-            CompanyCompanyTypeAssociation, super()._make_request("PATCH", data=data, params=params).json()
+            CompanyCompanyTypeAssociationCompanyTypeAssociation,
+            super()._make_request("PATCH", data=data, params=params).json(),
         )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdUsagesEndpoint.py
index 25f15496f..31c92b749 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesIdUsagesListEndpoint import CompanyCompaniesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdUsagesListEndpoint.py
index 3721ac7e1..478774b80 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoEndpoint.py
index 8304718dc..c1eb6f3ce 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesInfoTypesEndpoint import CompanyCompaniesInfoTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesCountEndpoint.py
index 2b3ca6bd6..bc1687102 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesEndpoint.py
index b860ba252..3a5bda0e5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesInfoTypesCountEndpoint import CompanyCompaniesInfoTypesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesInfoTypesIdEndpoint import CompanyCompaniesInfoTypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesIdEndpoint.py
index 68343f7bf..8d087cce8 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesInfoTypesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesCountEndpoint.py
index a87402167..5ec33033b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesEndpoint.py
index 32eadc435..9497db4cf 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesStatusesCountEndpoint import CompanyCompaniesStatusesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesStatusesIdEndpoint import CompanyCompaniesStatusesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdEndpoint.py
index d91fe78c3..d04ae4330 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesStatusesIdUsagesEndpoint import \
     CompanyCompaniesStatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdUsagesEndpoint.py
index b5b2e5cd6..9c852a327 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesStatusesIdUsagesListEndpoint import \
     CompanyCompaniesStatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdUsagesListEndpoint.py
index 849f38b59..9e7569571 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesStatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesCountEndpoint.py
index e1328ae8e..d23cd95b3 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesEndpoint.py
index d7ae9cac4..82ad626fa 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesTypesCountEndpoint import CompanyCompaniesTypesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesTypesIdEndpoint import CompanyCompaniesTypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdEndpoint.py
index 5311b86f2..01dba735c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesTypesIdUsagesEndpoint import CompanyCompaniesTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companies/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdUsagesEndpoint.py
index 39b15e918..30a98b07a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompaniesTypesIdUsagesListEndpoint import \
     CompanyCompaniesTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdUsagesListEndpoint.py
index bf17fbfc5..698b561ba 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompaniesTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanyfinanceEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanyfinanceEndpoint.py
index 939d5440e..88bb9bbfc 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanyfinanceEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanyfinanceEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompanyfinanceIdEndpoint import CompanyCompanyfinanceIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanyfinanceIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanyfinanceIdEndpoint.py
index f848a237d..bcafbcbd1 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanyfinanceIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanyfinanceIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyFinance
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsClearEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsClearEndpoint.py
index 35541cbe5..b267387ef 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsClearEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsClearEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ClearPickerRequest
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsCountEndpoint.py
index 736ec4ac1..0856594cf 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsEndpoint.py
index e124e0cb4..35f4be152 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyCompanypickeritemsClearEndpoint import CompanyCompanypickeritemsClearEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompanypickeritemsCountEndpoint import CompanyCompanypickeritemsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompanypickeritemsIdEndpoint import CompanyCompanypickeritemsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyPickerItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -13,8 +12,8 @@ class CompanyCompanypickeritemsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "companyPickerItems", parent_endpoint=parent_endpoint)
 
-        self.count = self._register_child_endpoint(CompanyCompanypickeritemsCountEndpoint(client, parent_endpoint=self))
         self.clear = self._register_child_endpoint(CompanyCompanypickeritemsClearEndpoint(client, parent_endpoint=self))
+        self.count = self._register_child_endpoint(CompanyCompanypickeritemsCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> CompanyCompanypickeritemsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsIdEndpoint.py
index 89777ed9d..c98da215b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanypickeritemsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyPickerItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyPickerItem, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companyPickerItems/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsCountEndpoint.py
index c924fd8ff..155889dac 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsEndpoint.py
index 3f70b1675..1ae05fc6c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsEndpoint.py
@@ -5,8 +5,7 @@
     CompanyCompanytypeassociationsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCompanytypeassociationsIdEndpoint import \
     CompanyCompanytypeassociationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Company
+from pyconnectwise.models.manage import CompanyCompanyTypeAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -31,7 +30,9 @@ def id(self, id: int) -> CompanyCompanytypeassociationsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Company]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[CompanyCompanyTypeAssociation]:
         """
         Performs a GET request against the /company/companyTypeAssociations endpoint and returns an initialized PaginatedResponse object.
 
@@ -40,19 +41,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Company]: The initialized PaginatedResponse object.
+            PaginatedResponse[CompanyCompanyTypeAssociation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Company,
+            CompanyCompanyTypeAssociation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Company]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CompanyCompanyTypeAssociation]:
         """
         Performs a GET request against the /company/companyTypeAssociations endpoint.
 
@@ -60,11 +61,13 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Company]: The parsed response data.
+            list[CompanyCompanyTypeAssociation]: The parsed response data.
         """
-        return self._parse_many(Company, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            CompanyCompanyTypeAssociation, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCompanyTypeAssociation:
         """
         Performs a POST request against the /company/companyTypeAssociations endpoint.
 
@@ -72,6 +75,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyCompanyTypeAssociation: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            CompanyCompanyTypeAssociation, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsIdEndpoint.py
index 042261d7e..5fd484d72 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCompanytypeassociationsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Company
+from pyconnectwise.models.manage import CompanyCompanyTypeAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class CompanyCompanytypeassociationsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Company]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[CompanyCompanyTypeAssociation]:
         """
         Performs a GET request against the /company/companyTypeAssociations/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Company]: The initialized PaginatedResponse object.
+            PaginatedResponse[CompanyCompanyTypeAssociation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Company,
+            CompanyCompanyTypeAssociation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCompanyTypeAssociation:
         """
         Performs a GET request against the /company/companyTypeAssociations/{id} endpoint.
 
@@ -39,23 +40,23 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyCompanyTypeAssociation: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(
+            CompanyCompanyTypeAssociation, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/companyTypeAssociations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCompanyTypeAssociation:
         """
         Performs a PUT request against the /company/companyTypeAssociations/{id} endpoint.
 
@@ -63,11 +64,13 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyCompanyTypeAssociation: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(
+            CompanyCompanyTypeAssociation, super()._make_request("PUT", data=data, params=params).json()
+        )
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyCompanyTypeAssociation:
         """
         Performs a PATCH request against the /company/companyTypeAssociations/{id} endpoint.
 
@@ -75,6 +78,8 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyCompanyTypeAssociation: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(
+            CompanyCompanyTypeAssociation, super()._make_request("PATCH", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsBulkEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsBulkEndpoint.py
index a166f2132..5bd2d388b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsBulkEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsBulkEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import BulkResult, Company
+from pyconnectwise.models.manage import BulkResult, CompanyConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class CompanyConfigurationsBulkEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "bulk", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyConfiguration:
         """
         Performs a POST request against the /company/configurations/bulk endpoint.
 
@@ -18,9 +17,9 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyConfiguration: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(CompanyConfiguration, super()._make_request("POST", data=data, params=params).json())
 
     def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BulkResult:
         """
@@ -34,7 +33,7 @@ def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -
         """
         return self._parse_one(BulkResult, super()._make_request("DELETE", data=data, params=params).json())
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyConfiguration:
         """
         Performs a PUT request against the /company/configurations/bulk endpoint.
 
@@ -42,6 +41,6 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyConfiguration: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(CompanyConfiguration, super()._make_request("PUT", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsCountEndpoint.py
index 46b4fbc1e..5af2e6bc5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsEndpoint.py
index 2136204e1..659efc601 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsEndpoint.py
@@ -6,8 +6,7 @@
 from pyconnectwise.endpoints.manage.CompanyConfigurationsIdEndpoint import CompanyConfigurationsIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsStatusesEndpoint import CompanyConfigurationsStatusesEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesEndpoint import CompanyConfigurationsTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Company
+from pyconnectwise.models.manage import CompanyConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -17,10 +16,10 @@ def __init__(self, client, parent_endpoint=None):
 
         self.bulk = self._register_child_endpoint(CompanyConfigurationsBulkEndpoint(client, parent_endpoint=self))
         self.types = self._register_child_endpoint(CompanyConfigurationsTypesEndpoint(client, parent_endpoint=self))
+        self.count = self._register_child_endpoint(CompanyConfigurationsCountEndpoint(client, parent_endpoint=self))
         self.statuses = self._register_child_endpoint(
             CompanyConfigurationsStatusesEndpoint(client, parent_endpoint=self)
         )
-        self.count = self._register_child_endpoint(CompanyConfigurationsCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> CompanyConfigurationsIdEndpoint:
         """
@@ -35,7 +34,9 @@ def id(self, id: int) -> CompanyConfigurationsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Company]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[CompanyConfiguration]:
         """
         Performs a GET request against the /company/configurations endpoint and returns an initialized PaginatedResponse object.
 
@@ -44,19 +45,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Company]: The initialized PaginatedResponse object.
+            PaginatedResponse[CompanyConfiguration]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Company,
+            CompanyConfiguration,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Company]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CompanyConfiguration]:
         """
         Performs a GET request against the /company/configurations endpoint.
 
@@ -64,11 +65,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Company]: The parsed response data.
+            list[CompanyConfiguration]: The parsed response data.
         """
-        return self._parse_many(Company, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(CompanyConfiguration, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyConfiguration:
         """
         Performs a POST request against the /company/configurations endpoint.
 
@@ -76,6 +77,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyConfiguration: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(CompanyConfiguration, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsIdChangetypeEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsIdChangetypeEndpoint.py
index e28fc4404..39568b08c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsIdChangetypeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsIdChangetypeEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Company
+from pyconnectwise.models.manage import CompanyConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,7 @@ class CompanyConfigurationsIdChangetypeEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "changeType", parent_endpoint=parent_endpoint)
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyConfiguration:
         """
         Performs a PATCH request against the /company/configurations/{id}/changeType endpoint.
 
@@ -18,6 +17,6 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyConfiguration: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(CompanyConfiguration, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsIdEndpoint.py
index 3cf64aea5..b7c2ea49a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsIdEndpoint.py
@@ -3,8 +3,7 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsIdChangetypeEndpoint import \
     CompanyConfigurationsIdChangetypeEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Company
+from pyconnectwise.models.manage import CompanyConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -16,7 +15,9 @@ def __init__(self, client, parent_endpoint=None):
             CompanyConfigurationsIdChangetypeEndpoint(client, parent_endpoint=self)
         )
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Company]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[CompanyConfiguration]:
         """
         Performs a GET request against the /company/configurations/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -25,19 +26,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Company]: The initialized PaginatedResponse object.
+            PaginatedResponse[CompanyConfiguration]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Company,
+            CompanyConfiguration,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyConfiguration:
         """
         Performs a GET request against the /company/configurations/{id} endpoint.
 
@@ -45,23 +46,21 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyConfiguration: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(CompanyConfiguration, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/configurations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyConfiguration:
         """
         Performs a PUT request against the /company/configurations/{id} endpoint.
 
@@ -69,11 +68,11 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyConfiguration: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(CompanyConfiguration, super()._make_request("PUT", data=data, params=params).json())
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyConfiguration:
         """
         Performs a PATCH request against the /company/configurations/{id} endpoint.
 
@@ -81,6 +80,6 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyConfiguration: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(CompanyConfiguration, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesCountEndpoint.py
index 147b94173..870376709 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesEndpoint.py
index 65a67e326..b3c608734 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesEndpoint.py
@@ -7,7 +7,6 @@
     CompanyConfigurationsStatusesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsStatusesInfoEndpoint import \
     CompanyConfigurationsStatusesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdEndpoint.py
index 6e22ec4e5..68da67966 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdEndpoint.py
@@ -5,7 +5,6 @@
     CompanyConfigurationsStatusesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsStatusesIdUsagesEndpoint import \
     CompanyConfigurationsStatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ConfigurationStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/configurations/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ConfigurationStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdInfoEndpoint.py
index 552e83016..2dbbbd827 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdUsagesEndpoint.py
index 993bcdea6..a4b9c8156 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsStatusesIdUsagesListEndpoint import \
     CompanyConfigurationsStatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdUsagesListEndpoint.py
index 9cb13921d..5f944d33d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesInfoCountEndpoint.py
index 061c3c459..fb27c2291 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesInfoEndpoint.py
index 5d94f5793..002333c9c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsStatusesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsStatusesInfoCountEndpoint import \
     CompanyConfigurationsStatusesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesCopyEndpoint.py
index b514e6c3a..cd5f953ca 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesCountEndpoint.py
index 7bf129b41..dfc2850cc 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesEndpoint.py
index da8191015..47794e08d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesCountEndpoint import \
     CompanyConfigurationsTypesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesIdEndpoint import CompanyConfigurationsTypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdEndpoint.py
index 945dd1260..e040e8377 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdEndpoint.py
@@ -7,7 +7,6 @@
     CompanyConfigurationsTypesIdQuestionsEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesIdUsagesEndpoint import \
     CompanyConfigurationsTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -61,17 +60,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ConfigurationType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/configurations/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ConfigurationType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdInfoEndpoint.py
index 3f7e9695d..b77d96627 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsCountEndpoint.py
index d99c91858..dc7ed53cb 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsEndpoint.py
index 436437419..7805961f3 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyConfigurationsTypesIdQuestionsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesIdQuestionsIdEndpoint import \
     CompanyConfigurationsTypesIdQuestionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeQuestion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdEndpoint.py
index fcee4ef39..f21958387 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesIdQuestionsIdValuesEndpoint import \
     CompanyConfigurationsTypesIdQuestionsIdValuesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeQuestion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ConfigurationTypeQuestion, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/configurations/types/{id}/questions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ConfigurationTypeQuestion:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesCountEndpoint.py
index 6150ddb67..0d9bf6e66 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesEndpoint.py
index 9a56b37da..4f452e817 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesEndpoint.py
@@ -5,7 +5,6 @@
     CompanyConfigurationsTypesIdQuestionsIdValuesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesIdQuestionsIdValuesIdEndpoint import \
     CompanyConfigurationsTypesIdQuestionsIdValuesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeQuestionValue
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdEndpoint.py
index ef153df17..a279de19a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesEndpoint import \
     CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeQuestionValue
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -53,17 +52,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             ConfigurationTypeQuestionValue, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/configurations/types/{id}/questions/{id}/values/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ConfigurationTypeQuestionValue:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesEndpoint.py
index 6ab9f2802..e3ac53de3 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesListEndpoint import \
     CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesListEndpoint.py
index 41f628c87..929fa0ba4 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdQuestionsIdValuesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdUsagesEndpoint.py
index 6c2fdc1de..e404edd70 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyConfigurationsTypesIdUsagesListEndpoint import \
     CompanyConfigurationsTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdUsagesListEndpoint.py
index 456f2b169..1272892ef 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyConfigurationsTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactEndpoint.py
index e23406488..456e7dc21 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactTypesEndpoint import CompanyContactTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactTypesEndpoint.py
index e30003bcb..8add39da3 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactTypesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactTypesIdEndpoint import CompanyContactTypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdEndpoint.py
index c1a7a3b58..aa57bf6ad 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactTypesIdUsagesEndpoint import CompanyContactTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdUsagesEndpoint.py
index 9efac2d78..beefdb281 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactTypesIdUsagesListEndpoint import \
     CompanyContactTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdUsagesListEndpoint.py
index 07188172a..f978f3025 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsCountEndpoint.py
index 2df38ab09..db57cfe25 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDefaultEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDefaultEndpoint.py
index d8ad7a3df..6e612d379 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDefaultEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDefaultEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Contact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsCountEndpoint.py
index 976514304..7df5e7c41 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsEndpoint.py
index 06e1adccd..20608dbec 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyContactsDepartmentsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsDepartmentsIdEndpoint import CompanyContactsDepartmentsIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsDepartmentsInfoEndpoint import CompanyContactsDepartmentsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactDepartment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdEndpoint.py
index 0884ae978..a7e5f0654 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdEndpoint.py
@@ -5,7 +5,6 @@
     CompanyContactsDepartmentsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsDepartmentsIdUsagesEndpoint import \
     CompanyContactsDepartmentsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactDepartment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ContactDepartment, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/departments/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactDepartment:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdInfoEndpoint.py
index 1b86146bb..3ae8929e3 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactDepartmentInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdUsagesEndpoint.py
index b6ec3ebc8..f181c7a44 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsDepartmentsIdUsagesListEndpoint import \
     CompanyContactsDepartmentsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdUsagesListEndpoint.py
index 08204faf2..009b4dc42 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsInfoCountEndpoint.py
index b6e2b85df..88881688d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsInfoEndpoint.py
index f60d6c713..bdb410cdc 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsDepartmentsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsDepartmentsInfoCountEndpoint import \
     CompanyContactsDepartmentsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactDepartmentInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsEndpoint.py
index 1f883bac0..4969ff055 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsEndpoint.py
@@ -10,7 +10,6 @@
 from pyconnectwise.endpoints.manage.CompanyContactsTypesEndpoint import CompanyContactsTypesEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsValidateportalcredentialsEndpoint import \
     CompanyContactsValidateportalcredentialsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Contact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -19,7 +18,6 @@ class CompanyContactsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "contacts", parent_endpoint=parent_endpoint)
 
-        self.default = self._register_child_endpoint(CompanyContactsDefaultEndpoint(client, parent_endpoint=self))
         self.request_password = self._register_child_endpoint(
             CompanyContactsRequestpasswordEndpoint(client, parent_endpoint=self)
         )
@@ -27,13 +25,14 @@ def __init__(self, client, parent_endpoint=None):
             CompanyContactsRelationshipsEndpoint(client, parent_endpoint=self)
         )
         self.types = self._register_child_endpoint(CompanyContactsTypesEndpoint(client, parent_endpoint=self))
-        self.validate_portal_credentials = self._register_child_endpoint(
-            CompanyContactsValidateportalcredentialsEndpoint(client, parent_endpoint=self)
-        )
+        self.count = self._register_child_endpoint(CompanyContactsCountEndpoint(client, parent_endpoint=self))
         self.departments = self._register_child_endpoint(
             CompanyContactsDepartmentsEndpoint(client, parent_endpoint=self)
         )
-        self.count = self._register_child_endpoint(CompanyContactsCountEndpoint(client, parent_endpoint=self))
+        self.validate_portal_credentials = self._register_child_endpoint(
+            CompanyContactsValidateportalcredentialsEndpoint(client, parent_endpoint=self)
+        )
+        self.default = self._register_child_endpoint(CompanyContactsDefaultEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> CompanyContactsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsCountEndpoint.py
index 690030925..1a8dd165d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsEndpoint.py
index 615c71c77..8fe8ecd3f 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyContactsIdCommunicationsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdCommunicationsIdEndpoint import \
     CompanyContactsIdCommunicationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactCommunication
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsIdEndpoint.py
index f804fd5a0..1679d1b2f 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdCommunicationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactCommunication
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ContactCommunication, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/{id}/communications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactCommunication:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdEndpoint.py
index 1fb2207a0..5ea32a4e5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdEndpoint.py
@@ -12,7 +12,6 @@
 from pyconnectwise.endpoints.manage.CompanyContactsIdTypeassociationsEndpoint import \
     CompanyContactsIdTypeassociationsEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdUsagesEndpoint import CompanyContactsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Contact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -21,20 +20,20 @@ class CompanyContactsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.notes = self._register_child_endpoint(CompanyContactsIdNotesEndpoint(client, parent_endpoint=self))
-        self.tracks = self._register_child_endpoint(CompanyContactsIdTracksEndpoint(client, parent_endpoint=self))
         self.communications = self._register_child_endpoint(
             CompanyContactsIdCommunicationsEndpoint(client, parent_endpoint=self)
         )
-        self.groups = self._register_child_endpoint(CompanyContactsIdGroupsEndpoint(client, parent_endpoint=self))
         self.portal_security = self._register_child_endpoint(
             CompanyContactsIdPortalsecurityEndpoint(client, parent_endpoint=self)
         )
+        self.groups = self._register_child_endpoint(CompanyContactsIdGroupsEndpoint(client, parent_endpoint=self))
         self.image = self._register_child_endpoint(CompanyContactsIdImageEndpoint(client, parent_endpoint=self))
-        self.usages = self._register_child_endpoint(CompanyContactsIdUsagesEndpoint(client, parent_endpoint=self))
         self.type_associations = self._register_child_endpoint(
             CompanyContactsIdTypeassociationsEndpoint(client, parent_endpoint=self)
         )
+        self.notes = self._register_child_endpoint(CompanyContactsIdNotesEndpoint(client, parent_endpoint=self))
+        self.usages = self._register_child_endpoint(CompanyContactsIdUsagesEndpoint(client, parent_endpoint=self))
+        self.tracks = self._register_child_endpoint(CompanyContactsIdTracksEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Contact]:
         """
@@ -69,17 +68,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Contact, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Contact:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsCountEndpoint.py
index eb41307cb..de51fbf15 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsEndpoint.py
index 5183648ea..4965555bb 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdGroupsCountEndpoint import CompanyContactsIdGroupsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdGroupsIdEndpoint import CompanyContactsIdGroupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactGroup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsIdEndpoint.py
index b8a34b13b..a394e8a53 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdGroupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactGroup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ContactGroup, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/{id}/groups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactGroup:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdImageEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdImageEndpoint.py
index 9a6ea5166..a8fc99368 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdImageEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdImageEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class CompanyContactsIdImageEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "image", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a GET request against the /company/contacts/{id}/image endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("GET", data=data, params=params).json())
+        super()._make_request("GET", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesCountEndpoint.py
index 88800be52..4ef978431 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesEndpoint.py
index 38ed4ee28..d30430977 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdNotesCountEndpoint import CompanyContactsIdNotesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdNotesIdEndpoint import CompanyContactsIdNotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesIdEndpoint.py
index dd81beddb..f2db4b786 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdNotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ContactNote, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/{id}/notes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactNote:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdPortalsecurityEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdPortalsecurityEndpoint.py
index ed29b8a63..0faa4cd8a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdPortalsecurityEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdPortalsecurityEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalSecurity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksCountEndpoint.py
index afcfe7cb4..5816bbe67 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksEndpoint.py
index 86df882ad..595338ad4 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdTracksCountEndpoint import CompanyContactsIdTracksCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdTracksIdEndpoint import CompanyContactsIdTracksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactTrack
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksIdEndpoint.py
index 7a7bdacbb..c83b56be9 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTracksIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactTrack
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ContactTrack, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/{id}/tracks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsCountEndpoint.py
index 5a3766843..6eb5b0c30 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsEndpoint.py
index 00b2e7230..133535419 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsEndpoint.py
@@ -5,8 +5,7 @@
     CompanyContactsIdTypeassociationsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdTypeassociationsIdEndpoint import \
     CompanyContactsIdTypeassociationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import ContactContactTypeAssociation
+from pyconnectwise.models.manage import ContactContactTypeAssociationContactTypeAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -33,7 +32,7 @@ def id(self, id: int) -> CompanyContactsIdTypeassociationsIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ContactContactTypeAssociation]:
+    ) -> PaginatedResponse[ContactContactTypeAssociationContactTypeAssociation]:
         """
         Performs a GET request against the /company/contacts/{id}/typeAssociations endpoint and returns an initialized PaginatedResponse object.
 
@@ -42,19 +41,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ContactContactTypeAssociation]: The initialized PaginatedResponse object.
+            PaginatedResponse[ContactContactTypeAssociationContactTypeAssociation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ContactContactTypeAssociation,
+            ContactContactTypeAssociationContactTypeAssociation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ContactContactTypeAssociation]:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> list[ContactContactTypeAssociationContactTypeAssociation]:
         """
         Performs a GET request against the /company/contacts/{id}/typeAssociations endpoint.
 
@@ -62,13 +63,16 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[ContactContactTypeAssociation]: The parsed response data.
+            list[ContactContactTypeAssociationContactTypeAssociation]: The parsed response data.
         """
         return self._parse_many(
-            ContactContactTypeAssociation, super()._make_request("GET", data=data, params=params).json()
+            ContactContactTypeAssociationContactTypeAssociation,
+            super()._make_request("GET", data=data, params=params).json(),
         )
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactContactTypeAssociation:
+    def post(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> ContactContactTypeAssociationContactTypeAssociation:
         """
         Performs a POST request against the /company/contacts/{id}/typeAssociations endpoint.
 
@@ -76,8 +80,9 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ContactContactTypeAssociation: The parsed response data.
+            ContactContactTypeAssociationContactTypeAssociation: The parsed response data.
         """
         return self._parse_one(
-            ContactContactTypeAssociation, super()._make_request("POST", data=data, params=params).json()
+            ContactContactTypeAssociationContactTypeAssociation,
+            super()._make_request("POST", data=data, params=params).json(),
         )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsIdEndpoint.py
index 77bbf726b..c28191ee7 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdTypeassociationsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import ContactContactTypeAssociation
+from pyconnectwise.models.manage import ContactContactTypeAssociationContactTypeAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[ContactContactTypeAssociation]:
+    ) -> PaginatedResponse[ContactContactTypeAssociationContactTypeAssociation]:
         """
         Performs a GET request against the /company/contacts/{id}/typeAssociations/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,21 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[ContactContactTypeAssociation]: The initialized PaginatedResponse object.
+            PaginatedResponse[ContactContactTypeAssociationContactTypeAssociation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            ContactContactTypeAssociation,
+            ContactContactTypeAssociationContactTypeAssociation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactContactTypeAssociation:
+    def get(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> ContactContactTypeAssociationContactTypeAssociation:
         """
         Performs a GET request against the /company/contacts/{id}/typeAssociations/{id} endpoint.
 
@@ -41,25 +42,26 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ContactContactTypeAssociation: The parsed response data.
+            ContactContactTypeAssociationContactTypeAssociation: The parsed response data.
         """
         return self._parse_one(
-            ContactContactTypeAssociation, super()._make_request("GET", data=data, params=params).json()
+            ContactContactTypeAssociationContactTypeAssociation,
+            super()._make_request("GET", data=data, params=params).json(),
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/{id}/typeAssociations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactContactTypeAssociation:
+    def put(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> ContactContactTypeAssociationContactTypeAssociation:
         """
         Performs a PUT request against the /company/contacts/{id}/typeAssociations/{id} endpoint.
 
@@ -67,13 +69,16 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ContactContactTypeAssociation: The parsed response data.
+            ContactContactTypeAssociationContactTypeAssociation: The parsed response data.
         """
         return self._parse_one(
-            ContactContactTypeAssociation, super()._make_request("PUT", data=data, params=params).json()
+            ContactContactTypeAssociationContactTypeAssociation,
+            super()._make_request("PUT", data=data, params=params).json(),
         )
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactContactTypeAssociation:
+    def patch(
+        self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}
+    ) -> ContactContactTypeAssociationContactTypeAssociation:
         """
         Performs a PATCH request against the /company/contacts/{id}/typeAssociations/{id} endpoint.
 
@@ -81,8 +86,9 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            ContactContactTypeAssociation: The parsed response data.
+            ContactContactTypeAssociationContactTypeAssociation: The parsed response data.
         """
         return self._parse_one(
-            ContactContactTypeAssociation, super()._make_request("PATCH", data=data, params=params).json()
+            ContactContactTypeAssociationContactTypeAssociation,
+            super()._make_request("PATCH", data=data, params=params).json(),
         )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdUsagesEndpoint.py
index e234dfcb3..7f18afe76 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsIdUsagesListEndpoint import CompanyContactsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsIdUsagesListEndpoint.py
index cb6007a44..985f77660 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsCountEndpoint.py
index e5a925fc7..451a55fa1 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsEndpoint.py
index 3696541dc..e745e6241 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyContactsRelationshipsCountEndpoint import \
     CompanyContactsRelationshipsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsRelationshipsIdEndpoint import CompanyContactsRelationshipsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactRelationship
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsIdEndpoint.py
index d9d1d3d89..171cc964d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsRelationshipsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactRelationship
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ContactRelationship, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/relationships/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactRelationship:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsRequestpasswordEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsRequestpasswordEndpoint.py
index 6f4acfc42..babede5a4 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsRequestpasswordEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsRequestpasswordEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class CompanyContactsRequestpasswordEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "requestPassword", parent_endpoint=parent_endpoint)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /company/contacts/requestPassword endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesCountEndpoint.py
index 53be40eb4..23c37514f 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesCountEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsTypesCountInfoEndpoint import CompanyContactsTypesCountInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesCountInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesCountInfoEndpoint.py
index bc7e05cca..ee7302a9c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesCountInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesCountInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesEndpoint.py
index a56ca5d14..04acfff52 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyContactsTypesCountEndpoint import CompanyContactsTypesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsTypesIdEndpoint import CompanyContactsTypesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsTypesInfoEndpoint import CompanyContactsTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesIdEndpoint.py
index b840bb7d7..7c608b07b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsTypesIdInfoEndpoint import CompanyContactsTypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ContactType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contacts/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ContactType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesIdInfoEndpoint.py
index b086a57d8..39a1bc3bb 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesInfoEndpoint.py
index c2e13d3c1..bc92a46fd 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsTypesInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ContactTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsValidateportalcredentialsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsValidateportalcredentialsEndpoint.py
index 6a9963e3d..34aaeaa40 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsValidateportalcredentialsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsValidateportalcredentialsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ValidatePortalResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyCountEndpoint.py
index 73083f985..bbe979cea 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyEndpoint.py
index 37f94c0bf..0bdef302d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsyncCompanyCountEndpoint import CompanyContactsyncCompanyCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsyncCompanyIdEndpoint import CompanyContactsyncCompanyIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncCompany
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -62,14 +61,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
         """
         return self._parse_many(M365ContactSyncCompany, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contactsync/company endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyIdEndpoint.py
index e56a8f066..ee9786240 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanyIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncCompany
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanysyncEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanysyncEndpoint.py
index 7e57b34e3..755fd425a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanysyncEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanysyncEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsyncCompanysyncIdEndpoint import \
     CompanyContactsyncCompanysyncIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanysyncIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanysyncIdEndpoint.py
index ceb03c267..877a9ad4d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanysyncIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsyncCompanysyncIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncCompany
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContactsyncEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContactsyncEndpoint.py
index 21c6d950a..c4f8c7f95 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContactsyncEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContactsyncEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsyncCompanyEndpoint import CompanyContactsyncCompanyEndpoint
 from pyconnectwise.endpoints.manage.CompanyContactsyncCompanysyncEndpoint import CompanyContactsyncCompanysyncEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -11,7 +10,7 @@ class CompanyContactsyncEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "contactsync", parent_endpoint=parent_endpoint)
 
-        self.company = self._register_child_endpoint(CompanyContactsyncCompanyEndpoint(client, parent_endpoint=self))
         self.companysync = self._register_child_endpoint(
             CompanyContactsyncCompanysyncEndpoint(client, parent_endpoint=self)
         )
+        self.company = self._register_child_endpoint(CompanyContactsyncCompanyEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsCountEndpoint.py
index f2cf375d8..4e975754f 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsEndpoint.py
index fcbef4534..fdbbb6a9c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsEndpoint.py
@@ -5,8 +5,7 @@
     CompanyContacttypeassociationsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyContacttypeassociationsIdEndpoint import \
     CompanyContacttypeassociationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Company
+from pyconnectwise.models.manage import CompanyContactTypeAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -31,7 +30,9 @@ def id(self, id: int) -> CompanyContacttypeassociationsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Company]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[CompanyContactTypeAssociation]:
         """
         Performs a GET request against the /company/contactTypeAssociations endpoint and returns an initialized PaginatedResponse object.
 
@@ -40,19 +41,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Company]: The initialized PaginatedResponse object.
+            PaginatedResponse[CompanyContactTypeAssociation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Company,
+            CompanyContactTypeAssociation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Company]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CompanyContactTypeAssociation]:
         """
         Performs a GET request against the /company/contactTypeAssociations endpoint.
 
@@ -60,11 +61,13 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Company]: The parsed response data.
+            list[CompanyContactTypeAssociation]: The parsed response data.
         """
-        return self._parse_many(Company, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            CompanyContactTypeAssociation, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyContactTypeAssociation:
         """
         Performs a POST request against the /company/contactTypeAssociations endpoint.
 
@@ -72,6 +75,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyContactTypeAssociation: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            CompanyContactTypeAssociation, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsIdEndpoint.py
index e4e0ecbce..fd2fff7fd 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyContacttypeassociationsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Company
+from pyconnectwise.models.manage import CompanyContactTypeAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class CompanyContacttypeassociationsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Company]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[CompanyContactTypeAssociation]:
         """
         Performs a GET request against the /company/contactTypeAssociations/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Company]: The initialized PaginatedResponse object.
+            PaginatedResponse[CompanyContactTypeAssociation]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Company,
+            CompanyContactTypeAssociation,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyContactTypeAssociation:
         """
         Performs a GET request against the /company/contactTypeAssociations/{id} endpoint.
 
@@ -39,23 +40,23 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyContactTypeAssociation: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(
+            CompanyContactTypeAssociation, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/contactTypeAssociations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyContactTypeAssociation:
         """
         Performs a PUT request against the /company/contactTypeAssociations/{id} endpoint.
 
@@ -63,11 +64,13 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyContactTypeAssociation: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(
+            CompanyContactTypeAssociation, super()._make_request("PUT", data=data, params=params).json()
+        )
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Company:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyContactTypeAssociation:
         """
         Performs a PATCH request against the /company/contactTypeAssociations/{id} endpoint.
 
@@ -75,6 +78,8 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Company: The parsed response data.
+            CompanyContactTypeAssociation: The parsed response data.
         """
-        return self._parse_one(Company, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(
+            CompanyContactTypeAssociation, super()._make_request("PATCH", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCountriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCountriesCountEndpoint.py
index efcb80300..06d535fc0 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCountriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCountriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCountriesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCountriesEndpoint.py
index 5caa2ddbb..6e779698b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCountriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCountriesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyCountriesCountEndpoint import CompanyCountriesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyCountriesIdEndpoint import CompanyCountriesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyCountriesInfoEndpoint import CompanyCountriesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Country
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCountriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCountriesIdEndpoint.py
index 054d4e099..0e15d4a51 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCountriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCountriesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCountriesIdInfoEndpoint import CompanyCountriesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Country
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Country, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/countries/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Country:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCountriesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCountriesIdInfoEndpoint.py
index 37cbf7cd2..12ab3ca83 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCountriesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCountriesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CountryInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCountriesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCountriesInfoCountEndpoint.py
index 8ec118979..38b4fa414 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCountriesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCountriesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyCountriesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyCountriesInfoEndpoint.py
index cc4fcb201..d452496ac 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyCountriesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyCountriesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyCountriesInfoCountEndpoint import CompanyCountriesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CountryInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyEndpoint.py
index e073c0a69..b160bc3ad 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyEndpoint.py
@@ -33,7 +33,6 @@
 from pyconnectwise.endpoints.manage.CompanyStatesEndpoint import CompanyStatesEndpoint
 from pyconnectwise.endpoints.manage.CompanyTeamrolesEndpoint import CompanyTeamrolesEndpoint
 from pyconnectwise.endpoints.manage.CompanyTracksEndpoint import CompanyTracksEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -44,61 +43,62 @@ def __init__(self, client, parent_endpoint=None):
         self.portal_configurations = self._register_child_endpoint(
             CompanyPortalconfigurationsEndpoint(client, parent_endpoint=self)
         )
-        self.expense_types = self._register_child_endpoint(CompanyExpensetypesEndpoint(client, parent_endpoint=self))
-        self.management = self._register_child_endpoint(CompanyManagementEndpoint(client, parent_endpoint=self))
-        self.management_backups = self._register_child_endpoint(
-            CompanyManagementbackupsEndpoint(client, parent_endpoint=self)
-        )
-        self.m365contactsync = self._register_child_endpoint(
-            CompanyM365contactsyncEndpoint(client, parent_endpoint=self)
+        self.managed_devices_integrations = self._register_child_endpoint(
+            CompanyManageddevicesintegrationsEndpoint(client, parent_endpoint=self)
         )
-        self.entity_types = self._register_child_endpoint(CompanyEntitytypesEndpoint(client, parent_endpoint=self))
+        self.team_roles = self._register_child_endpoint(CompanyTeamrolesEndpoint(client, parent_endpoint=self))
+        self.billing_setups = self._register_child_endpoint(CompanyBillingsetupsEndpoint(client, parent_endpoint=self))
         self.note_types = self._register_child_endpoint(CompanyNotetypesEndpoint(client, parent_endpoint=self))
+        self.contactsync = self._register_child_endpoint(CompanyContactsyncEndpoint(client, parent_endpoint=self))
+        self.entity_types = self._register_child_endpoint(CompanyEntitytypesEndpoint(client, parent_endpoint=self))
+        self.management_it_solutions = self._register_child_endpoint(
+            CompanyManagementitsolutionsEndpoint(client, parent_endpoint=self)
+        )
+        self.expense_types = self._register_child_endpoint(CompanyExpensetypesEndpoint(client, parent_endpoint=self))
+        self.contacts = self._register_child_endpoint(CompanyContactsEndpoint(client, parent_endpoint=self))
         self.portal_security_levels = self._register_child_endpoint(
             CompanyPortalsecuritylevelsEndpoint(client, parent_endpoint=self)
         )
-        self.market_descriptions = self._register_child_endpoint(
-            CompanyMarketdescriptionsEndpoint(client, parent_endpoint=self)
-        )
-        self.team_roles = self._register_child_endpoint(CompanyTeamrolesEndpoint(client, parent_endpoint=self))
-        self.address_formats = self._register_child_endpoint(
-            CompanyAddressformatsEndpoint(client, parent_endpoint=self)
+        self.company_picker_items = self._register_child_endpoint(
+            CompanyCompanypickeritemsEndpoint(client, parent_endpoint=self)
         )
-        self.companies = self._register_child_endpoint(CompanyCompaniesEndpoint(client, parent_endpoint=self))
-        self.portal_security_settings = self._register_child_endpoint(
-            CompanyPortalsecuritysettingsEndpoint(client, parent_endpoint=self)
+        self.tracks = self._register_child_endpoint(CompanyTracksEndpoint(client, parent_endpoint=self))
+        self.company_finance = self._register_child_endpoint(
+            CompanyCompanyfinanceEndpoint(client, parent_endpoint=self)
         )
-        self.contactsync = self._register_child_endpoint(CompanyContactsyncEndpoint(client, parent_endpoint=self))
-        self.billing_setups = self._register_child_endpoint(CompanyBillingsetupsEndpoint(client, parent_endpoint=self))
         self.company_type_associations = self._register_child_endpoint(
             CompanyCompanytypeassociationsEndpoint(client, parent_endpoint=self)
         )
         self.contact_type_associations = self._register_child_endpoint(
             CompanyContacttypeassociationsEndpoint(client, parent_endpoint=self)
         )
+        self.states = self._register_child_endpoint(CompanyStatesEndpoint(client, parent_endpoint=self))
+        self.companies = self._register_child_endpoint(CompanyCompaniesEndpoint(client, parent_endpoint=self))
+        self.payment_types = self._register_child_endpoint(CompanyPaymenttypesEndpoint(client, parent_endpoint=self))
+        self.management_backups = self._register_child_endpoint(
+            CompanyManagementbackupsEndpoint(client, parent_endpoint=self)
+        )
         self.ownership_types = self._register_child_endpoint(
             CompanyOwnershiptypesEndpoint(client, parent_endpoint=self)
         )
-        self.countries = self._register_child_endpoint(CompanyCountriesEndpoint(client, parent_endpoint=self))
-        self.management_it_solutions = self._register_child_endpoint(
-            CompanyManagementitsolutionsEndpoint(client, parent_endpoint=self)
+        self.entitytypes = self._register_child_endpoint(CompanyEntitytypesEndpoint(client, parent_endpoint=self))
+        self.market_descriptions = self._register_child_endpoint(
+            CompanyMarketdescriptionsEndpoint(client, parent_endpoint=self)
         )
-        self.contact = self._register_child_endpoint(CompanyContactEndpoint(client, parent_endpoint=self))
-        self.managed_devices_integrations = self._register_child_endpoint(
-            CompanyManageddevicesintegrationsEndpoint(client, parent_endpoint=self)
+        self.portal_security_settings = self._register_child_endpoint(
+            CompanyPortalsecuritysettingsEndpoint(client, parent_endpoint=self)
         )
-        self.contacts = self._register_child_endpoint(CompanyContactsEndpoint(client, parent_endpoint=self))
-        self.states = self._register_child_endpoint(CompanyStatesEndpoint(client, parent_endpoint=self))
-        self.tracks = self._register_child_endpoint(CompanyTracksEndpoint(client, parent_endpoint=self))
         self.configurations = self._register_child_endpoint(CompanyConfigurationsEndpoint(client, parent_endpoint=self))
-        self.company_finance = self._register_child_endpoint(
-            CompanyCompanyfinanceEndpoint(client, parent_endpoint=self)
-        )
-        self.payment_types = self._register_child_endpoint(CompanyPaymenttypesEndpoint(client, parent_endpoint=self))
-        self.m365contact = self._register_child_endpoint(CompanyM365contactEndpoint(client, parent_endpoint=self))
-        self.company_picker_items = self._register_child_endpoint(
-            CompanyCompanypickeritemsEndpoint(client, parent_endpoint=self)
+        self.address_formats = self._register_child_endpoint(
+            CompanyAddressformatsEndpoint(client, parent_endpoint=self)
         )
         self.communication_types = self._register_child_endpoint(
             CompanyCommunicationtypesEndpoint(client, parent_endpoint=self)
         )
+        self.contact = self._register_child_endpoint(CompanyContactEndpoint(client, parent_endpoint=self))
+        self.countries = self._register_child_endpoint(CompanyCountriesEndpoint(client, parent_endpoint=self))
+        self.m365contact = self._register_child_endpoint(CompanyM365contactEndpoint(client, parent_endpoint=self))
+        self.management = self._register_child_endpoint(CompanyManagementEndpoint(client, parent_endpoint=self))
+        self.m365contactsync = self._register_child_endpoint(
+            CompanyM365contactsyncEndpoint(client, parent_endpoint=self)
+        )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesCountEndpoint.py
index 3ab45a3f5..723f4175a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesEndpoint.py
index c9122f03e..3770ccf04 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesEndpoint.py
@@ -1,20 +1,16 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.endpoints.manage.CompanyEntitytypesCountEndpoint import CompanyEntitytypesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyEntitytypesIdEndpoint import CompanyEntitytypesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyEntitytypesInfoEndpoint import CompanyEntitytypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import EntityType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
 class CompanyEntitytypesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
-        super().__init__(client, "entityTypes", parent_endpoint=parent_endpoint)
+        super().__init__(client, "entitytypes", parent_endpoint=parent_endpoint)
 
         self.info = self._register_child_endpoint(CompanyEntitytypesInfoEndpoint(client, parent_endpoint=self))
-        self.count = self._register_child_endpoint(CompanyEntitytypesCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> CompanyEntitytypesIdEndpoint:
         """
@@ -28,36 +24,3 @@ def id(self, id: int) -> CompanyEntitytypesIdEndpoint:
         child = CompanyEntitytypesIdEndpoint(self.client, parent_endpoint=self)
         child._id = id
         return child
-
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[EntityType]:
-        """
-        Performs a GET request against the /company/entityTypes endpoint and returns an initialized PaginatedResponse object.
-
-        Parameters:
-            page (int): The page number to request.
-            page_size (int): The number of results to return per page.
-            params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            PaginatedResponse[EntityType]: The initialized PaginatedResponse object.
-        """
-        params["page"] = page
-        params["pageSize"] = page_size
-        return PaginatedResponse(
-            super()._make_request("GET", params=params),
-            EntityType,
-            self,
-            page,
-            page_size,
-        )
-
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[EntityType]:
-        """
-        Performs a GET request against the /company/entityTypes endpoint.
-
-        Parameters:
-            data (dict[str, Any]): The data to send in the request body.
-            params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            list[EntityType]: The parsed response data.
-        """
-        return self._parse_many(EntityType, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesIdEndpoint.py
index 7525dabc9..5f1ce4d26 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesIdEndpoint.py
@@ -2,8 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyEntitytypesIdInfoEndpoint import CompanyEntitytypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import EntityType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,36 +10,3 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
         self.info = self._register_child_endpoint(CompanyEntitytypesIdInfoEndpoint(client, parent_endpoint=self))
-
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[EntityType]:
-        """
-        Performs a GET request against the /company/entityTypes/{id} endpoint and returns an initialized PaginatedResponse object.
-
-        Parameters:
-            page (int): The page number to request.
-            page_size (int): The number of results to return per page.
-            params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            PaginatedResponse[EntityType]: The initialized PaginatedResponse object.
-        """
-        params["page"] = page
-        params["pageSize"] = page_size
-        return PaginatedResponse(
-            super()._make_request("GET", params=params),
-            EntityType,
-            self,
-            page,
-            page_size,
-        )
-
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> EntityType:
-        """
-        Performs a GET request against the /company/entityTypes/{id} endpoint.
-
-        Parameters:
-            data (dict[str, Any]): The data to send in the request body.
-            params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            EntityType: The parsed response data.
-        """
-        return self._parse_one(EntityType, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesIdInfoEndpoint.py
index c6aa19222..c4a0516f5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EntityTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -14,7 +13,7 @@ def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
     ) -> PaginatedResponse[EntityTypeInfo]:
         """
-        Performs a GET request against the /company/entityTypes/{id}/info endpoint and returns an initialized PaginatedResponse object.
+        Performs a GET request against the /company/entitytypes/{id}/info endpoint and returns an initialized PaginatedResponse object.
 
         Parameters:
             page (int): The page number to request.
@@ -35,7 +34,7 @@ def paginated(
 
     def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> EntityTypeInfo:
         """
-        Performs a GET request against the /company/entityTypes/{id}/info endpoint.
+        Performs a GET request against the /company/entitytypes/{id}/info endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
diff --git a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesInfoCountEndpoint.py
index 03e3f2ccb..fa92f5ba1 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesInfoEndpoint.py
index 8bf51a706..81f0ed1ee 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyEntitytypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyEntitytypesInfoEndpoint.py
@@ -2,8 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyEntitytypesInfoCountEndpoint import CompanyEntitytypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import EntityTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,38 +10,3 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "info", parent_endpoint=parent_endpoint)
 
         self.count = self._register_child_endpoint(CompanyEntitytypesInfoCountEndpoint(client, parent_endpoint=self))
-
-    def paginated(
-        self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[EntityTypeInfo]:
-        """
-        Performs a GET request against the /company/entityTypes/info endpoint and returns an initialized PaginatedResponse object.
-
-        Parameters:
-            page (int): The page number to request.
-            page_size (int): The number of results to return per page.
-            params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            PaginatedResponse[EntityTypeInfo]: The initialized PaginatedResponse object.
-        """
-        params["page"] = page
-        params["pageSize"] = page_size
-        return PaginatedResponse(
-            super()._make_request("GET", params=params),
-            EntityTypeInfo,
-            self,
-            page,
-            page_size,
-        )
-
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[EntityTypeInfo]:
-        """
-        Performs a GET request against the /company/entityTypes/info endpoint.
-
-        Parameters:
-            data (dict[str, Any]): The data to send in the request body.
-            params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            list[EntityTypeInfo]: The parsed response data.
-        """
-        return self._parse_many(EntityTypeInfo, super()._make_request("GET", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/CompanyExpensetypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyExpensetypesEndpoint.py
index d392638dd..5f569e4bb 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyExpensetypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyExpensetypesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyExpensetypesInfoEndpoint import CompanyExpensetypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyExpensetypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyExpensetypesInfoCountEndpoint.py
index a770f910d..abc71ee47 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyExpensetypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyExpensetypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyExpensetypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyExpensetypesInfoEndpoint.py
index ed1338322..b3e7aa122 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyExpensetypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyExpensetypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyExpensetypesInfoCountEndpoint import CompanyExpensetypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactCountEndpoint.py
index c6a3ca871..510ac14f8 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactEndpoint.py
index b156e93fa..a2302c11c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyM365contactCountEndpoint import CompanyM365contactCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyM365contactIdEndpoint import CompanyM365contactIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365Contact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactIdEndpoint.py
index ce7aa7491..e8d87bf31 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365Contact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncEndpoint.py
index f8cc92790..db244a118 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyM365contactsyncIdEndpoint import CompanyM365contactsyncIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyM365contactsyncPropertyEndpoint import CompanyM365contactsyncPropertyEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncIdEndpoint.py
index 7c57ef416..241e54794 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyM365contactsyncIdPropertyEndpoint import \
     CompanyM365contactsyncIdPropertyEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncIdPropertyEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncIdPropertyEndpoint.py
index a726c3c4d..18f11b2c2 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncIdPropertyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncIdPropertyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncProperty
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyCountEndpoint.py
index 1860ba81f..8b45592b5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyEndpoint.py
index c96d1af8b..a50fd06a2 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyEndpoint.py
@@ -7,7 +7,6 @@
     CompanyM365contactsyncPropertyExcludedEndpoint
 from pyconnectwise.endpoints.manage.CompanyM365contactsyncPropertyIncludedEndpoint import \
     CompanyM365contactsyncPropertyIncludedEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncProperty
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -16,14 +15,14 @@ class CompanyM365contactsyncPropertyEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "property", parent_endpoint=parent_endpoint)
 
-        self.included = self._register_child_endpoint(
-            CompanyM365contactsyncPropertyIncludedEndpoint(client, parent_endpoint=self)
+        self.excluded = self._register_child_endpoint(
+            CompanyM365contactsyncPropertyExcludedEndpoint(client, parent_endpoint=self)
         )
         self.count = self._register_child_endpoint(
             CompanyM365contactsyncPropertyCountEndpoint(client, parent_endpoint=self)
         )
-        self.excluded = self._register_child_endpoint(
-            CompanyM365contactsyncPropertyExcludedEndpoint(client, parent_endpoint=self)
+        self.included = self._register_child_endpoint(
+            CompanyM365contactsyncPropertyIncludedEndpoint(client, parent_endpoint=self)
         )
 
     def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M365ContactSyncProperty:
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyExcludedEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyExcludedEndpoint.py
index 222b3f581..ec7d6749d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyExcludedEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyExcludedEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncProperty
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyIncludedEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyIncludedEndpoint.py
index 3851e074e..0692204bd 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyIncludedEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyM365contactsyncPropertyIncludedEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncProperty
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsCountEndpoint.py
index 61e3566cd..d62f792ad 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsEndpoint.py
index fee4b9f06..6d14129f6 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsEndpoint.py
@@ -7,7 +7,6 @@
     CompanyManageddevicesintegrationsIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyManageddevicesintegrationsInfoEndpoint import \
     CompanyManageddevicesintegrationsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesCountEndpoint.py
index e7f68f524..6bbc1c546 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesEndpoint.py
index 4a432e891..cefe320a0 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesEndpoint.py
@@ -5,7 +5,6 @@
     CompanyManageddevicesintegrationsIdCrossreferencesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyManageddevicesintegrationsIdCrossreferencesIdEndpoint import \
     CompanyManageddevicesintegrationsIdCrossreferencesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegrationCrossReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesIdEndpoint.py
index c76966b33..dd1e0ee1a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdCrossreferencesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegrationCrossReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdEndpoint.py
index 30746c787..510091f58 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdEndpoint.py
@@ -11,7 +11,6 @@
     CompanyManageddevicesintegrationsIdNotificationsEndpoint
 from pyconnectwise.endpoints.manage.CompanyManageddevicesintegrationsIdUsagesEndpoint import \
     CompanyManageddevicesintegrationsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -20,11 +19,8 @@ class CompanyManageddevicesintegrationsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.notifications = self._register_child_endpoint(
-            CompanyManageddevicesintegrationsIdNotificationsEndpoint(client, parent_endpoint=self)
-        )
-        self.usages = self._register_child_endpoint(
-            CompanyManageddevicesintegrationsIdUsagesEndpoint(client, parent_endpoint=self)
+        self.logins = self._register_child_endpoint(
+            CompanyManageddevicesintegrationsIdLoginsEndpoint(client, parent_endpoint=self)
         )
         self.info = self._register_child_endpoint(
             CompanyManageddevicesintegrationsIdInfoEndpoint(client, parent_endpoint=self)
@@ -32,8 +28,11 @@ def __init__(self, client, parent_endpoint=None):
         self.cross_references = self._register_child_endpoint(
             CompanyManageddevicesintegrationsIdCrossreferencesEndpoint(client, parent_endpoint=self)
         )
-        self.logins = self._register_child_endpoint(
-            CompanyManageddevicesintegrationsIdLoginsEndpoint(client, parent_endpoint=self)
+        self.notifications = self._register_child_endpoint(
+            CompanyManageddevicesintegrationsIdNotificationsEndpoint(client, parent_endpoint=self)
+        )
+        self.usages = self._register_child_endpoint(
+            CompanyManageddevicesintegrationsIdUsagesEndpoint(client, parent_endpoint=self)
         )
 
     def paginated(
@@ -71,17 +70,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(ManagedDevicesIntegration, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/managedDevicesIntegrations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ManagedDevicesIntegration:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdInfoEndpoint.py
index e2f9065bd..37f3967e0 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegrationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsCountEndpoint.py
index 7d2c89511..9be5852fa 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsEndpoint.py
index 5dca18b00..4e778d078 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyManageddevicesintegrationsIdLoginsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyManageddevicesintegrationsIdLoginsIdEndpoint import \
     CompanyManageddevicesintegrationsIdLoginsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegrationLogin
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsIdEndpoint.py
index 7bea8f9b3..b871b68ab 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdLoginsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegrationLogin
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsCountEndpoint.py
index 25e239b8c..2b7afbce2 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsEndpoint.py
index 9b8db37ad..adbc442e6 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyManageddevicesintegrationsIdNotificationsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyManageddevicesintegrationsIdNotificationsIdEndpoint import \
     CompanyManageddevicesintegrationsIdNotificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegrationNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsIdEndpoint.py
index c96314557..57415aad4 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdNotificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegrationNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdUsagesEndpoint.py
index 54e6d8adc..8105ba543 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyManageddevicesintegrationsIdUsagesListEndpoint import \
     CompanyManageddevicesintegrationsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdUsagesListEndpoint.py
index 15cebba50..add8c9885 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsInfoCountEndpoint.py
index 39131b6cf..38cda52af 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsInfoEndpoint.py
index b630ec9d7..223f118b0 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManageddevicesintegrationsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyManageddevicesintegrationsInfoCountEndpoint import \
     CompanyManageddevicesintegrationsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDevicesIntegrationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementCountEndpoint.py
index 54870920c..c1bbaefb7 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementEndpoint.py
index 9d8fc6335..f58feabe4 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementCountEndpoint import CompanyManagementCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementIdEndpoint import CompanyManagementIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Management
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementIdEndpoint.py
index 32af05c82..21c956dbf 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementIdEndpoint.py
@@ -7,7 +7,6 @@
 from pyconnectwise.endpoints.manage.CompanyManagementIdLogsEndpoint import CompanyManagementIdLogsEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementIdManagementreportnotificationsEndpoint import \
     CompanyManagementIdManagementreportnotificationsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Management
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -16,14 +15,14 @@ class CompanyManagementIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.logs = self._register_child_endpoint(CompanyManagementIdLogsEndpoint(client, parent_endpoint=self))
+        self.log = self._register_child_endpoint(CompanyManagementIdLogEndpoint(client, parent_endpoint=self))
         self.management_report_notifications = self._register_child_endpoint(
             CompanyManagementIdManagementreportnotificationsEndpoint(client, parent_endpoint=self)
         )
+        self.logs = self._register_child_endpoint(CompanyManagementIdLogsEndpoint(client, parent_endpoint=self))
         self.execute_managed_it_sync = self._register_child_endpoint(
             CompanyManagementIdExecutemanageditsyncEndpoint(client, parent_endpoint=self)
         )
-        self.log = self._register_child_endpoint(CompanyManagementIdLogEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Management]:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementIdExecutemanageditsyncEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementIdExecutemanageditsyncEndpoint.py
index 238b37bf2..0693063a3 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementIdExecutemanageditsyncEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementIdExecutemanageditsyncEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogDownloadEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogDownloadEndpoint.py
index 35d978cf0..337323e53 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogDownloadEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogDownloadEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class CompanyManagementIdLogDownloadEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "download", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a GET request against the /company/management/{id}/log/download endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("GET", data=data, params=params).json())
+        super()._make_request("GET", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogEndpoint.py
index 037fcdf16..ef92a211f 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementIdLogDownloadEndpoint import CompanyManagementIdLogDownloadEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogsEndpoint.py
index bb7e6d2c2..59ce353de 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementIdLogsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementLogDocumentInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsCountEndpoint.py
index e755ced98..9f89d6801 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsEndpoint.py
index c1070ab53..1e616151c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyManagementIdManagementreportnotificationsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementIdManagementreportnotificationsIdEndpoint import \
     CompanyManagementIdManagementreportnotificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementReportNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsIdEndpoint.py
index 06ac3b211..0d0ced6b2 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementIdManagementreportnotificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementReportNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -47,17 +46,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
             ManagementReportNotification, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/management/{id}/managementReportNotifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ManagementReportNotification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsCountEndpoint.py
index 47018bfa6..2b9cf08c2 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsEndpoint.py
index 20d132120..f8a84c513 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementbackupsCountEndpoint import CompanyManagementbackupsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementbackupsIdEndpoint import CompanyManagementbackupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementBackup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsIdEndpoint.py
index 32589ab2a..a1a351859 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementbackupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementBackup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(ManagementBackup, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/managementBackups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ManagementBackup:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsCountEndpoint.py
index bd52b9607..adf77ae23 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsEndpoint.py
index c670f6370..97110fbae 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyManagementitsolutionsCountEndpoint import \
     CompanyManagementitsolutionsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementitsolutionsIdEndpoint import CompanyManagementitsolutionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementItSolution
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdEndpoint.py
index 2d019c473..a6190e9b5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdEndpoint.py
@@ -5,7 +5,6 @@
     CompanyManagementitsolutionsIdManagementproductsEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementitsolutionsIdUsagesEndpoint import \
     CompanyManagementitsolutionsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementItSolution
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(ManagementItSolution, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/managementItSolutions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ManagementItSolution:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsCountEndpoint.py
index 273771802..cd84aa904 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsEndpoint.py
index 3ae265e35..e15a506b9 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyManagementitsolutionsIdManagementproductsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementitsolutionsIdManagementproductsIdEndpoint import \
     CompanyManagementitsolutionsIdManagementproductsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementItSolutionAgreementInterfaceParameter
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsIdEndpoint.py
index 8030a0cd5..19ad70120 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdManagementproductsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementItSolutionAgreementInterfaceParameter
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdUsagesEndpoint.py
index 3af5c7377..15c90dcde 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyManagementitsolutionsIdUsagesListEndpoint import \
     CompanyManagementitsolutionsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdUsagesListEndpoint.py
index 1a396e29f..e38a31c5c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyManagementitsolutionsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsCountEndpoint.py
index 8636544ff..0ed738ec1 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsEndpoint.py
index f3197940d..889225784 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyMarketdescriptionsCountEndpoint import CompanyMarketdescriptionsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyMarketdescriptionsIdEndpoint import CompanyMarketdescriptionsIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyMarketdescriptionsInfoEndpoint import CompanyMarketdescriptionsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketDescription
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdEndpoint.py
index ee7f16967..87a60af29 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdEndpoint.py
@@ -5,7 +5,6 @@
     CompanyMarketdescriptionsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.CompanyMarketdescriptionsIdUsagesEndpoint import \
     CompanyMarketdescriptionsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketDescription
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -54,17 +53,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MarketDescription, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/marketDescriptions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MarketDescription:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdInfoEndpoint.py
index 159824457..7ebe4be23 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketDescriptionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdUsagesEndpoint.py
index c96e267d7..50de464b4 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyMarketdescriptionsIdUsagesListEndpoint import \
     CompanyMarketdescriptionsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdUsagesListEndpoint.py
index 6e3a1ffd5..90ffd3e53 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsInfoCountEndpoint.py
index 735e5156e..cd2758867 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsInfoEndpoint.py
index e1b556d3a..e63303232 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyMarketdescriptionsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyMarketdescriptionsInfoCountEndpoint import \
     CompanyMarketdescriptionsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketDescriptionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyNotetypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyNotetypesCountEndpoint.py
index 01a99561a..3ec78d9cf 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyNotetypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyNotetypesCountEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyNotetypesCountInfoEndpoint import CompanyNotetypesCountInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyNotetypesCountInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyNotetypesCountInfoEndpoint.py
index 56324965b..fa27b9f1d 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyNotetypesCountInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyNotetypesCountInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyNotetypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyNotetypesEndpoint.py
index f85454ae4..89a38b6b5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyNotetypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyNotetypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyNotetypesCountEndpoint import CompanyNotetypesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyNotetypesIdEndpoint import CompanyNotetypesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyNotetypesInfoEndpoint import CompanyNotetypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyNoteType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyNotetypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyNotetypesIdEndpoint.py
index a65a28a81..dd9a672f6 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyNotetypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyNotetypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyNotetypesIdInfoEndpoint import CompanyNotetypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyNoteType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CompanyNoteType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/noteTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CompanyNoteType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyNotetypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyNotetypesIdInfoEndpoint.py
index 35a8e2d3c..16169207e 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyNotetypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyNotetypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyNoteTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyNotetypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyNotetypesInfoEndpoint.py
index f32cff09c..d104776cd 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyNotetypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyNotetypesInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyNoteTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesCountEndpoint.py
index ca1035e42..b544b780a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesEndpoint.py
index 74e52c594..d586c4d7a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyOwnershiptypesCountEndpoint import CompanyOwnershiptypesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyOwnershiptypesIdEndpoint import CompanyOwnershiptypesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyOwnershiptypesInfoEndpoint import CompanyOwnershiptypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OwnershipType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesIdEndpoint.py
index 3e75d4dfb..f9f90e15a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyOwnershiptypesIdInfoEndpoint import CompanyOwnershiptypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OwnershipType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OwnershipType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/ownershipTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OwnershipType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesIdInfoEndpoint.py
index 2306eba96..f4fd618f5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OwnershipTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesInfoCountEndpoint.py
index f6cae4e24..39da64f32 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesInfoEndpoint.py
index 6c9337f08..91b61b03b 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyOwnershiptypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyOwnershiptypesInfoCountEndpoint import CompanyOwnershiptypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OwnershipTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesEndpoint.py
index d37a8a665..49c2a27cb 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyPaymenttypesInfoEndpoint import CompanyPaymenttypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesInfoCountEndpoint.py
index b0e645d8f..7269715ba 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesInfoEndpoint.py
index 38b1dfa16..f066b23bf 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPaymenttypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyPaymenttypesInfoCountEndpoint import CompanyPaymenttypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsCopyEndpoint.py
index 981380728..51eaa7941 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsCountEndpoint.py
index 27d809435..a1a0ed315 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsEndpoint.py
index 8245c63b4..c2597f5d3 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsEndpoint.py
@@ -8,7 +8,6 @@
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsIdEndpoint import CompanyPortalconfigurationsIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsInvoicesetupEndpoint import \
     CompanyPortalconfigurationsInvoicesetupEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -17,10 +16,10 @@ class CompanyPortalconfigurationsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "portalConfigurations", parent_endpoint=parent_endpoint)
 
+        self.copy = self._register_child_endpoint(CompanyPortalconfigurationsCopyEndpoint(client, parent_endpoint=self))
         self.invoice_setup = self._register_child_endpoint(
             CompanyPortalconfigurationsInvoicesetupEndpoint(client, parent_endpoint=self)
         )
-        self.copy = self._register_child_endpoint(CompanyPortalconfigurationsCopyEndpoint(client, parent_endpoint=self))
         self.count = self._register_child_endpoint(
             CompanyPortalconfigurationsCountEndpoint(client, parent_endpoint=self)
         )
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdEndpoint.py
index aa5b73128..ff65a4b44 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdEndpoint.py
@@ -11,7 +11,6 @@
     CompanyPortalconfigurationsIdProjectsetupsEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsIdServicesetupsEndpoint import \
     CompanyPortalconfigurationsIdServicesetupsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -26,14 +25,14 @@ def __init__(self, client, parent_endpoint=None):
         self.project_setups = self._register_child_endpoint(
             CompanyPortalconfigurationsIdProjectsetupsEndpoint(client, parent_endpoint=self)
         )
-        self.service_setups = self._register_child_endpoint(
-            CompanyPortalconfigurationsIdServicesetupsEndpoint(client, parent_endpoint=self)
+        self.password_email_setups = self._register_child_endpoint(
+            CompanyPortalconfigurationsIdPasswordemailsetupsEndpoint(client, parent_endpoint=self)
         )
         self.opportunity_setups = self._register_child_endpoint(
             CompanyPortalconfigurationsIdOpportunitysetupsEndpoint(client, parent_endpoint=self)
         )
-        self.password_email_setups = self._register_child_endpoint(
-            CompanyPortalconfigurationsIdPasswordemailsetupsEndpoint(client, parent_endpoint=self)
+        self.service_setups = self._register_child_endpoint(
+            CompanyPortalconfigurationsIdServicesetupsEndpoint(client, parent_endpoint=self)
         )
 
     def paginated(
@@ -71,17 +70,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PortalConfiguration, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/portalConfigurations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PortalConfiguration:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsCountEndpoint.py
index 274ab1207..e25577157 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsEndpoint.py
index 9b72fc610..7f9cf0f3e 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyPortalconfigurationsIdInvoicesetupsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsIdInvoicesetupsIdEndpoint import \
     CompanyPortalconfigurationsIdInvoicesetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationInvoiceSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsIdEndpoint.py
index f2356284b..46a548f2e 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsIdInvoicesetupsIdTesttransactionEndpoint import \
     CompanyPortalconfigurationsIdInvoicesetupsIdTesttransactionEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationInvoiceSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsIdTesttransactionEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsIdTesttransactionEndpoint.py
index 715b185ff..cb42a06fa 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsIdTesttransactionEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdInvoicesetupsIdTesttransactionEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdOpportunitysetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdOpportunitysetupsEndpoint.py
index e6d92b3de..940111d27 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdOpportunitysetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdOpportunitysetupsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsIdOpportunitysetupsIdEndpoint import \
     CompanyPortalconfigurationsIdOpportunitysetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationOpportunitySetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdOpportunitysetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdOpportunitysetupsIdEndpoint.py
index a3567a6dc..c3d229a1e 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdOpportunitysetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdOpportunitysetupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationOpportunitySetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdPasswordemailsetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdPasswordemailsetupsEndpoint.py
index 778372f0b..0d27958bf 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdPasswordemailsetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdPasswordemailsetupsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsIdPasswordemailsetupsIdEndpoint import \
     CompanyPortalconfigurationsIdPasswordemailsetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationPasswordEmailSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdPasswordemailsetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdPasswordemailsetupsIdEndpoint.py
index 002dc2d35..eac92a8c5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdPasswordemailsetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdPasswordemailsetupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationPasswordEmailSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsCountEndpoint.py
index 897fdfcd5..dd26774da 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsEndpoint.py
index b13bc964d..57bacf006 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyPortalconfigurationsIdProjectsetupsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsIdProjectsetupsIdEndpoint import \
     CompanyPortalconfigurationsIdProjectsetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationProjectSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsIdEndpoint.py
index a30ae87b3..62c6431d5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdProjectsetupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationProjectSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsCountEndpoint.py
index 65a7ecad9..33b015a75 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsEndpoint.py
index 541b1fb81..71ca4570a 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyPortalconfigurationsIdServicesetupsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsIdServicesetupsIdEndpoint import \
     CompanyPortalconfigurationsIdServicesetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationServiceSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsIdEndpoint.py
index efd0dd884..17ff3a322 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsIdServicesetupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationServiceSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupEndpoint.py
index 8724cfdef..168204e10 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsInvoicesetupPaymentprocessorsEndpoint import \
     CompanyPortalconfigurationsInvoicesetupPaymentprocessorsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsCountEndpoint.py
index 08da3fd88..0ba5c8792 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsEndpoint.py
index f6ad67c03..9b858e087 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyPortalconfigurationsInvoicesetupPaymentprocessorsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalconfigurationsInvoicesetupPaymentprocessorsIdEndpoint import \
     CompanyPortalconfigurationsInvoicesetupPaymentprocessorsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationPaymentProcessor
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsIdEndpoint.py
index da8008b9b..18b6246cf 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalconfigurationsInvoicesetupPaymentprocessorsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalConfigurationPaymentProcessor
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsCountEndpoint.py
index 7f417ecfe..2545f1698 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsEndpoint.py
index 1a71a8d05..1518ab634 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyPortalsecuritylevelsCountEndpoint import \
     CompanyPortalsecuritylevelsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalsecuritylevelsIdEndpoint import CompanyPortalsecuritylevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalSecurityLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsIdEndpoint.py
index b0e5df131..59df6d35c 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritylevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalSecurityLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsCountEndpoint.py
index ea79dfa28..4f55c0d38 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsEndpoint.py
index 423aa9d71..50149719f 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsEndpoint.py
@@ -5,7 +5,6 @@
     CompanyPortalsecuritysettingsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyPortalsecuritysettingsIdEndpoint import \
     CompanyPortalsecuritysettingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalSecuritySetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsIdEndpoint.py
index 95b27372b..da484c393 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyPortalsecuritysettingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalSecuritySetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyStatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyStatesCountEndpoint.py
index 0caa568db..8baea4b70 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyStatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyStatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyStatesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyStatesEndpoint.py
index d43f3c7ec..ce0c18ad0 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyStatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyStatesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyStatesCountEndpoint import CompanyStatesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyStatesIdEndpoint import CompanyStatesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyStatesInfoEndpoint import CompanyStatesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import State
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyStatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyStatesIdEndpoint.py
index 219d04707..993bd8299 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyStatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyStatesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyStatesIdInfoEndpoint import CompanyStatesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.CompanyStatesIdUsagesEndpoint import CompanyStatesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import State
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -72,14 +71,12 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
         """
         return self._parse_one(State, super()._make_request("PATCH", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/states/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyStatesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyStatesIdInfoEndpoint.py
index a4fd8683e..91b879308 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyStatesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyStatesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import StateInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyStatesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyStatesIdUsagesEndpoint.py
index 71dfb1f15..835c8ce31 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyStatesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyStatesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyStatesIdUsagesListEndpoint import CompanyStatesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyStatesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyStatesIdUsagesListEndpoint.py
index 17fcdc364..a506be8ce 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyStatesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyStatesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyStatesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyStatesInfoCountEndpoint.py
index 8e8d7f1dc..a94312ea1 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyStatesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyStatesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyStatesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyStatesInfoEndpoint.py
index b6a1421e4..65f7dd8ef 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyStatesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyStatesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyStatesInfoCountEndpoint import CompanyStatesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import StateInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesCountEndpoint.py
index 38c9aac4c..aa6a1d411 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesEndpoint.py
index 0fd9dc686..440c4a655 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.CompanyTeamrolesCountEndpoint import CompanyTeamrolesCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyTeamrolesIdEndpoint import CompanyTeamrolesIdEndpoint
 from pyconnectwise.endpoints.manage.CompanyTeamrolesInfoEndpoint import CompanyTeamrolesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TeamRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdEndpoint.py
index 50ecbb0bf..ee2ca7bf8 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyTeamrolesIdInfoEndpoint import CompanyTeamrolesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.CompanyTeamrolesIdUsagesEndpoint import CompanyTeamrolesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TeamRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TeamRole, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/teamRoles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TeamRole:
         """
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdInfoEndpoint.py
index ab2ea4186..fd2c17e44 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TeamRoleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdUsagesEndpoint.py
index 7cebdfef2..184fa4449 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyTeamrolesIdUsagesListEndpoint import CompanyTeamrolesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdUsagesListEndpoint.py
index 6163245d5..66c6f2d67 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesInfoCountEndpoint.py
index 08c0dbc87..1cacd7ce9 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesInfoEndpoint.py
index 78dbfdd1e..731246dd7 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTeamrolesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTeamrolesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyTeamrolesInfoCountEndpoint import CompanyTeamrolesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TeamRoleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTracksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTracksCountEndpoint.py
index 24c5d4ab0..8e6792723 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTracksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTracksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTracksEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTracksEndpoint.py
index 2df85e346..b1985ea60 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTracksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTracksEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyTracksCountEndpoint import CompanyTracksCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyTracksIdEndpoint import CompanyTracksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Track
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsCountEndpoint.py
index 3eff19a9f..fe440cd42 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsEndpoint.py
index d9c4c5495..55d604137 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyTracksIdActionsCountEndpoint import CompanyTracksIdActionsCountEndpoint
 from pyconnectwise.endpoints.manage.CompanyTracksIdActionsIdEndpoint import CompanyTracksIdActionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TrackAction
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsIdEndpoint.py
index f78022f8d..e958cd5b5 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTracksIdActionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TrackAction
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -67,14 +66,12 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
         """
         return self._parse_one(TrackAction, super()._make_request("PATCH", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/tracks/{id}/actions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/CompanyTracksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/CompanyTracksIdEndpoint.py
index 11826489a..fc5f1d58f 100644
--- a/src/pyconnectwise/endpoints/manage/CompanyTracksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/CompanyTracksIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.CompanyTracksIdActionsEndpoint import CompanyTracksIdActionsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Track
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(Track, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /company/tracks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Track:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsEndpoint.py
index 152b43e2e..2c3237085 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesEndpoint import ConfigurationsTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesEndpoint.py
index 6702d303e..47f031d02 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesIdEndpoint import ConfigurationsTypesIdEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesInfoEndpoint import ConfigurationsTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdEndpoint.py
index 0c7934a94..10b27a497 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesIdQuestionsEndpoint import ConfigurationsTypesIdQuestionsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsEndpoint.py
index 6022fa7c2..0b794efc6 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsEndpoint.py
@@ -5,7 +5,6 @@
     ConfigurationsTypesIdQuestionsIdEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesIdQuestionsInfoEndpoint import \
     ConfigurationsTypesIdQuestionsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdEndpoint.py
index 673473ddf..2bae500fa 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdEndpoint.py
@@ -5,7 +5,6 @@
     ConfigurationsTypesIdQuestionsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesIdQuestionsIdValuesEndpoint import \
     ConfigurationsTypesIdQuestionsIdValuesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -13,9 +12,9 @@ class ConfigurationsTypesIdQuestionsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.values = self._register_child_endpoint(
-            ConfigurationsTypesIdQuestionsIdValuesEndpoint(client, parent_endpoint=self)
-        )
         self.info = self._register_child_endpoint(
             ConfigurationsTypesIdQuestionsIdInfoEndpoint(client, parent_endpoint=self)
         )
+        self.values = self._register_child_endpoint(
+            ConfigurationsTypesIdQuestionsIdValuesEndpoint(client, parent_endpoint=self)
+        )
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdInfoEndpoint.py
index b5f85876f..2b623f120 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeQuestionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesEndpoint.py
index a92112513..5bba1e381 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesEndpoint.py
@@ -5,7 +5,6 @@
     ConfigurationsTypesIdQuestionsIdValuesIdEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesIdQuestionsIdValuesInfoEndpoint import \
     ConfigurationsTypesIdQuestionsIdValuesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesIdEndpoint.py
index 20f0ac654..b902a2a45 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesIdQuestionsIdValuesIdInfoEndpoint import \
     ConfigurationsTypesIdQuestionsIdValuesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesIdInfoEndpoint.py
index 2246e30e1..1bf15311e 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeQuestionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesInfoCountEndpoint.py
index 9b7b32a5a..80133e53a 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesInfoEndpoint.py
index 3ee5769fd..8af1d25f2 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsIdValuesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesIdQuestionsIdValuesInfoCountEndpoint import \
     ConfigurationsTypesIdQuestionsIdValuesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeQuestionValueInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsInfoCountEndpoint.py
index f9e9e24aa..0f088b403 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsInfoEndpoint.py
index 9b537485f..15997693b 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesIdQuestionsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesIdQuestionsInfoCountEndpoint import \
     ConfigurationsTypesIdQuestionsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeQuestionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesInfoCountEndpoint.py
index 8ef10f845..6b14db582 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesInfoEndpoint.py
index b06b86587..04b577f12 100644
--- a/src/pyconnectwise/endpoints/manage/ConfigurationsTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ConfigurationsTypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ConfigurationsTypesInfoCountEndpoint import ConfigurationsTypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseClassificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseClassificationsCountEndpoint.py
index 87d930283..cf720d81a 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseClassificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseClassificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseClassificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseClassificationsEndpoint.py
index c7c6e20ca..2c8fda350 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseClassificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseClassificationsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseClassificationsCountEndpoint import ExpenseClassificationsCountEndpoint
 from pyconnectwise.endpoints.manage.ExpenseClassificationsIdEndpoint import ExpenseClassificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Classification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseClassificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseClassificationsIdEndpoint.py
index d600b3eff..82d844f98 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseClassificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseClassificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Classification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseEndpoint.py
index 927a14240..85fbb577f 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseEndpoint.py
@@ -7,7 +7,6 @@
 from pyconnectwise.endpoints.manage.ExpensePaymenttypesEndpoint import ExpensePaymenttypesEndpoint
 from pyconnectwise.endpoints.manage.ExpenseReportsEndpoint import ExpenseReportsEndpoint
 from pyconnectwise.endpoints.manage.ExpenseTypesEndpoint import ExpenseTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -15,11 +14,11 @@ class ExpenseEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "expense", parent_endpoint=parent_endpoint)
 
-        self.entries = self._register_child_endpoint(ExpenseEntriesEndpoint(client, parent_endpoint=self))
-        self.reports = self._register_child_endpoint(ExpenseReportsEndpoint(client, parent_endpoint=self))
         self.info = self._register_child_endpoint(ExpenseInfoEndpoint(client, parent_endpoint=self))
-        self.types = self._register_child_endpoint(ExpenseTypesEndpoint(client, parent_endpoint=self))
         self.classifications = self._register_child_endpoint(
             ExpenseClassificationsEndpoint(client, parent_endpoint=self)
         )
         self.payment_types = self._register_child_endpoint(ExpensePaymenttypesEndpoint(client, parent_endpoint=self))
+        self.types = self._register_child_endpoint(ExpenseTypesEndpoint(client, parent_endpoint=self))
+        self.entries = self._register_child_endpoint(ExpenseEntriesEndpoint(client, parent_endpoint=self))
+        self.reports = self._register_child_endpoint(ExpenseReportsEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseEntriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseEntriesCountEndpoint.py
index 67799c834..960cca502 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseEntriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseEntriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseEntriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseEntriesEndpoint.py
index 0a2458901..8436238dd 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseEntriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseEntriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseEntriesCountEndpoint import ExpenseEntriesCountEndpoint
 from pyconnectwise.endpoints.manage.ExpenseEntriesIdEndpoint import ExpenseEntriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsCountEndpoint.py
index 8b1e2b133..259e47116 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsEndpoint.py
index baf055d1f..0ed7fc4c5 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseEntriesIdAuditsCountEndpoint import ExpenseEntriesIdAuditsCountEndpoint
 from pyconnectwise.endpoints.manage.ExpenseEntriesIdAuditsIdEndpoint import ExpenseEntriesIdAuditsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseEntryAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsIdEndpoint.py
index 34ce9950c..4ae18a0d6 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdAuditsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseEntryAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdEndpoint.py
index 4fccadce6..772b3721c 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseEntriesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseEntriesIdAuditsEndpoint import ExpenseEntriesIdAuditsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
         """
         return self._parse_one(ExpenseEntry, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /expense/entries/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ExpenseEntry:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseInfoEndpoint.py
index f5157f7c6..b811d1d60 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseInfoTaxtypesEndpoint import ExpenseInfoTaxtypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesCountEndpoint.py
index 0743fedc5..dde91c9f7 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesEndpoint.py
index 7023118cb..819f887e8 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseInfoTaxtypesCountEndpoint import ExpenseInfoTaxtypesCountEndpoint
 from pyconnectwise.endpoints.manage.ExpenseInfoTaxtypesIdEndpoint import ExpenseInfoTaxtypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseTaxTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesIdEndpoint.py
index f5eb0d610..26d2f3a6d 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseInfoTaxtypesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseTaxTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesCountEndpoint.py
index 656281f46..41ae3026c 100644
--- a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesEndpoint.py
index f11cd472b..564b30511 100644
--- a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ExpensePaymenttypesCountEndpoint import ExpensePaymenttypesCountEndpoint
 from pyconnectwise.endpoints.manage.ExpensePaymenttypesIdEndpoint import ExpensePaymenttypesIdEndpoint
 from pyconnectwise.endpoints.manage.ExpensePaymenttypesInfoEndpoint import ExpensePaymenttypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PaymentType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesIdEndpoint.py
index ca4b0e350..f72ff7fb1 100644
--- a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpensePaymenttypesIdInfoEndpoint import ExpensePaymenttypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PaymentType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PaymentType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /expense/paymentTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PaymentType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesIdInfoEndpoint.py
index ab335e345..f8d1d3b0f 100644
--- a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PaymentTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesInfoEndpoint.py
index 0db6f415f..049c3e5e5 100644
--- a/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpensePaymenttypesInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PaymentTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsCountEndpoint.py
index 63b7ae63c..92d085dcd 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsEndpoint.py
index 85e98d950..28cfe5cb0 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseReportsCountEndpoint import ExpenseReportsCountEndpoint
 from pyconnectwise.endpoints.manage.ExpenseReportsIdEndpoint import ExpenseReportsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseReport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdApproveEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdApproveEndpoint.py
index 3bff0fad9..65b3b6fda 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdApproveEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdApproveEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsCountEndpoint.py
index 433c2ebb6..3f5d36b08 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsEndpoint.py
index bae55bdba..c19c387a0 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseReportsIdAuditsCountEndpoint import ExpenseReportsIdAuditsCountEndpoint
 from pyconnectwise.endpoints.manage.ExpenseReportsIdAuditsIdEndpoint import ExpenseReportsIdAuditsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseReportAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsIdEndpoint.py
index 192428338..71b30c4e2 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdAuditsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseReportAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdEndpoint.py
index 0cd0e2355..d4830f92d 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.ExpenseReportsIdRejectEndpoint import ExpenseReportsIdRejectEndpoint
 from pyconnectwise.endpoints.manage.ExpenseReportsIdReverseEndpoint import ExpenseReportsIdReverseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseReportsIdSubmitEndpoint import ExpenseReportsIdSubmitEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseReport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -17,9 +16,9 @@ def __init__(self, client, parent_endpoint=None):
 
         self.reverse = self._register_child_endpoint(ExpenseReportsIdReverseEndpoint(client, parent_endpoint=self))
         self.submit = self._register_child_endpoint(ExpenseReportsIdSubmitEndpoint(client, parent_endpoint=self))
-        self.approve = self._register_child_endpoint(ExpenseReportsIdApproveEndpoint(client, parent_endpoint=self))
         self.reject = self._register_child_endpoint(ExpenseReportsIdRejectEndpoint(client, parent_endpoint=self))
         self.audits = self._register_child_endpoint(ExpenseReportsIdAuditsEndpoint(client, parent_endpoint=self))
+        self.approve = self._register_child_endpoint(ExpenseReportsIdApproveEndpoint(client, parent_endpoint=self))
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdRejectEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdRejectEndpoint.py
index 88001ca88..30ff8c7f6 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdRejectEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdRejectEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdReverseEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdReverseEndpoint.py
index 118b0b794..69bf12d34 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdReverseEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdReverseEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdSubmitEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdSubmitEndpoint.py
index 37630d4b0..66cc6379c 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseReportsIdSubmitEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseReportsIdSubmitEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseTypesCountEndpoint.py
index faa506f47..f1d5c90be 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseTypesEndpoint.py
index 4e35a20b2..10755f0c0 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseTypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ExpenseTypesCountEndpoint import ExpenseTypesCountEndpoint
 from pyconnectwise.endpoints.manage.ExpenseTypesIdEndpoint import ExpenseTypesIdEndpoint
 from pyconnectwise.endpoints.manage.ExpenseTypesInfoEndpoint import ExpenseTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseTypesIdEndpoint.py
index 83d8f57ea..2e1217467 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseTypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ExpenseTypesIdInfoEndpoint import ExpenseTypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
         """
         return self._parse_one(ExpenseType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /expense/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ExpenseType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseTypesIdInfoEndpoint.py
index d3528b5ad..1eb9f7dc5 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ExpenseTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ExpenseTypesInfoEndpoint.py
index 0af170401..11381e176 100644
--- a/src/pyconnectwise/endpoints/manage/ExpenseTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ExpenseTypesInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesCountEndpoint.py
index 695ff5eb1..28e099659 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesEndpoint.py
index edbc776d2..373913623 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingBatchesCountEndpoint import FinanceAccountingBatchesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingBatchesIdEndpoint import FinanceAccountingBatchesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AccountingBatch, GLExport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEndpoint.py
index e7943dd2d..9d9e785fe 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingBatchesIdEntriesEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingBatchesIdExportEndpoint import \
     FinanceAccountingBatchesIdExportEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AccountingBatch
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -56,14 +55,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AccountingBatch, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/accounting/batches/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesCountEndpoint.py
index 6569fd35c..20ffc8c4a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesEndpoint.py
index 93f0e75e8..60f80d93e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingBatchesIdEntriesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingBatchesIdEntriesIdEndpoint import \
     FinanceAccountingBatchesIdEntriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BatchEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesIdEndpoint.py
index cd86b9d4c..f7fd272bf 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdEntriesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BatchEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdExportEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdExportEndpoint.py
index d3c030023..cd88ea07d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdExportEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingBatchesIdExportEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GLExport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingEndpoint.py
index 38f19c540..36caf2641 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingEndpoint.py
@@ -9,7 +9,6 @@
     FinanceAccountingUnpostedinvoicesEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedprocurementEndpoint import \
     FinanceAccountingUnpostedprocurementEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -17,14 +16,14 @@ class FinanceAccountingEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "accounting", parent_endpoint=parent_endpoint)
 
+        self.unpostedexpenses = self._register_child_endpoint(
+            FinanceAccountingUnpostedexpensesEndpoint(client, parent_endpoint=self)
+        )
         self.unpostedinvoices = self._register_child_endpoint(
             FinanceAccountingUnpostedinvoicesEndpoint(client, parent_endpoint=self)
         )
-        self.export = self._register_child_endpoint(FinanceAccountingExportEndpoint(client, parent_endpoint=self))
+        self.batches = self._register_child_endpoint(FinanceAccountingBatchesEndpoint(client, parent_endpoint=self))
         self.unpostedprocurement = self._register_child_endpoint(
             FinanceAccountingUnpostedprocurementEndpoint(client, parent_endpoint=self)
         )
-        self.batches = self._register_child_endpoint(FinanceAccountingBatchesEndpoint(client, parent_endpoint=self))
-        self.unpostedexpenses = self._register_child_endpoint(
-            FinanceAccountingUnpostedexpensesEndpoint(client, parent_endpoint=self)
-        )
+        self.export = self._register_child_endpoint(FinanceAccountingExportEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingExportEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingExportEndpoint.py
index 0aae1d772..67517015d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingExportEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingExportEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GLExport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesCountEndpoint.py
index b34fa3411..a233fae2f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesEndpoint.py
index e06a821bc..cfe848d10 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingUnpostedexpensesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedexpensesIdEndpoint import \
     FinanceAccountingUnpostedexpensesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedExpense
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdEndpoint.py
index 77039ce7d..cc0a2ba1a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedexpensesIdTaxablelevelsEndpoint import \
     FinanceAccountingUnpostedexpensesIdTaxablelevelsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedExpense
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsCountEndpoint.py
index bc8b44f3d..bb79424c4 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsEndpoint.py
index d090549e4..7f090ac3e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingUnpostedexpensesIdTaxablelevelsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedexpensesIdTaxablelevelsIdEndpoint import \
     FinanceAccountingUnpostedexpensesIdTaxablelevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedExpenseTaxableLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsIdEndpoint.py
index 00c17893e..681467347 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedexpensesIdTaxablelevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedExpenseTaxableLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesCountEndpoint.py
index 0cfdee4f7..ea56efd2d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesEndpoint.py
index dd4769f7c..0ac2afc25 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingUnpostedinvoicesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedinvoicesIdEndpoint import \
     FinanceAccountingUnpostedinvoicesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedInvoice
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdEndpoint.py
index 1be1c5fda..739152d20 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedinvoicesIdTaxablelevelsEndpoint import \
     FinanceAccountingUnpostedinvoicesIdTaxablelevelsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedInvoice
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsCountEndpoint.py
index b778d1a80..332b51b3c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsEndpoint.py
index f4ebbed2d..45cdda3ee 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingUnpostedinvoicesIdTaxablelevelsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedinvoicesIdTaxablelevelsIdEndpoint import \
     FinanceAccountingUnpostedinvoicesIdTaxablelevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedInvoiceTaxableLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsIdEndpoint.py
index 9e2415645..47a8ee75b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedinvoicesIdTaxablelevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedInvoiceTaxableLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementCountEndpoint.py
index e3bf96be7..079971498 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementEndpoint.py
index 43ba50b0f..1c2bd1aff 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingUnpostedprocurementCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedprocurementIdEndpoint import \
     FinanceAccountingUnpostedprocurementIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedProcurement
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdEndpoint.py
index df54ed933..5af9b566a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedprocurementIdTaxablelevelsEndpoint import \
     FinanceAccountingUnpostedprocurementIdTaxablelevelsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedProcurement
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsCountEndpoint.py
index 5ade43f39..ae90d50f9 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsEndpoint.py
index 9c50410e9..2adff0f57 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingUnpostedprocurementIdTaxablelevelsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingUnpostedprocurementIdTaxablelevelsIdEndpoint import \
     FinanceAccountingUnpostedprocurementIdTaxablelevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedProcurementTaxableLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsIdEndpoint.py
index 374abfe5f..16adbca76 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingUnpostedprocurementIdTaxablelevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnpostedProcurementTaxableLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesCountEndpoint.py
index 4b8357bba..7d8b05deb 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesEndpoint.py
index 6f76c5f5d..3821dbc95 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingpackagesCountEndpoint import FinanceAccountingpackagesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingpackagesIdEndpoint import FinanceAccountingpackagesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AccountingPackage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesIdEndpoint.py
index 259f1f3aa..4e33eab61 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AccountingPackage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupCountEndpoint.py
index 234d5340f..a505236da 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupEndpoint.py
index 47863f831..b3efef2a0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAccountingpackagesetupCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAccountingpackagesetupIdEndpoint import \
     FinanceAccountingpackagesetupIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AccountingPackageSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupIdEndpoint.py
index f9ec4d663..caa5692ae 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAccountingpackagesetupIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AccountingPackageSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementrecapEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementrecapEndpoint.py
index de927e547..30a0050e5 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementrecapEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementrecapEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementrecapIdEndpoint import FinanceAgreementrecapIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementrecapIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementrecapIdEndpoint.py
index 065854bbe..48d0652f7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementrecapIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementrecapIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementRecap
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsCountEndpoint.py
index 78187f22a..b74dc9f08 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsEndpoint.py
index fc5950c9d..22d959b49 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceAgreementsCountEndpoint import FinanceAgreementsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdEndpoint import FinanceAgreementsIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesEndpoint import FinanceAgreementsTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Agreement
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsCountEndpoint.py
index c9c217261..6cd49effc 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsEndpoint.py
index c78082ff1..5b98d542e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdAdditionsCountEndpoint import \
     FinanceAgreementsIdAdditionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdAdditionsIdEndpoint import FinanceAgreementsIdAdditionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Addition
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsIdEndpoint.py
index 31d1adc05..c27ec9e04 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdditionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Addition
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(Addition, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/additions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Addition:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsCountEndpoint.py
index a930c09d7..733186e7d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsEndpoint.py
index 968b84538..29537650a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsEndpoint.py
@@ -5,8 +5,7 @@
     FinanceAgreementsIdAdjustmentsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdAdjustmentsIdEndpoint import \
     FinanceAgreementsIdAdjustmentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Agreement
+from pyconnectwise.models.manage import AgreementAdjustment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -31,7 +30,9 @@ def id(self, id: int) -> FinanceAgreementsIdAdjustmentsIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Agreement]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AgreementAdjustment]:
         """
         Performs a GET request against the /finance/agreements/{id}/adjustments endpoint and returns an initialized PaginatedResponse object.
 
@@ -40,19 +41,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Agreement]: The initialized PaginatedResponse object.
+            PaginatedResponse[AgreementAdjustment]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Agreement,
+            AgreementAdjustment,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Agreement]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[AgreementAdjustment]:
         """
         Performs a GET request against the /finance/agreements/{id}/adjustments endpoint.
 
@@ -60,11 +61,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Agreement]: The parsed response data.
+            list[AgreementAdjustment]: The parsed response data.
         """
-        return self._parse_many(Agreement, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(AgreementAdjustment, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Agreement:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementAdjustment:
         """
         Performs a POST request against the /finance/agreements/{id}/adjustments endpoint.
 
@@ -72,6 +73,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Agreement: The parsed response data.
+            AgreementAdjustment: The parsed response data.
         """
-        return self._parse_one(Agreement, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(AgreementAdjustment, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsIdEndpoint.py
index 1fb6aabbb..6a6d1aca3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdAdjustmentsIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Agreement
+from pyconnectwise.models.manage import AgreementAdjustment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -10,7 +9,9 @@ class FinanceAgreementsIdAdjustmentsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Agreement]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[AgreementAdjustment]:
         """
         Performs a GET request against the /finance/agreements/{id}/adjustments/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -19,19 +20,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Agreement]: The initialized PaginatedResponse object.
+            PaginatedResponse[AgreementAdjustment]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Agreement,
+            AgreementAdjustment,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Agreement:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementAdjustment:
         """
         Performs a GET request against the /finance/agreements/{id}/adjustments/{id} endpoint.
 
@@ -39,23 +40,21 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Agreement: The parsed response data.
+            AgreementAdjustment: The parsed response data.
         """
-        return self._parse_one(Agreement, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(AgreementAdjustment, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/adjustments/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Agreement:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementAdjustment:
         """
         Performs a PUT request against the /finance/agreements/{id}/adjustments/{id} endpoint.
 
@@ -63,11 +62,11 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Agreement: The parsed response data.
+            AgreementAdjustment: The parsed response data.
         """
-        return self._parse_one(Agreement, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(AgreementAdjustment, super()._make_request("PUT", data=data, params=params).json())
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Agreement:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementAdjustment:
         """
         Performs a PATCH request against the /finance/agreements/{id}/adjustments/{id} endpoint.
 
@@ -75,6 +74,6 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Agreement: The parsed response data.
+            AgreementAdjustment: The parsed response data.
         """
-        return self._parse_one(Agreement, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(AgreementAdjustment, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdApplicationparametersEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdApplicationparametersEndpoint.py
index d97cb6061..7ccde23b7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdApplicationparametersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdApplicationparametersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdApplicationparametersIdEndpoint import \
     FinanceAgreementsIdApplicationparametersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdApplicationparametersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdApplicationparametersIdEndpoint.py
index b7284a871..b660cf92a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdApplicationparametersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdApplicationparametersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementApplicationParameters
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsCountEndpoint.py
index 7c6bacbd0..14cbe0714 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsEndpoint.py
index 55d7f82cd..14a7ce03a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementsIdBoarddefaultsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdBoarddefaultsIdEndpoint import \
     FinanceAgreementsIdBoarddefaultsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardDefault
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsIdEndpoint.py
index 487ce9f94..8ad503967 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdBoarddefaultsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardDefault
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardDefault, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/boardDefaults/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardDefault:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsCountEndpoint.py
index 721a1a4e9..4dde854c5 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsEndpoint.py
index 964b17d8d..c1b601c48 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementsIdConfigurationsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdConfigurationsIdEndpoint import \
     FinanceAgreementsIdConfigurationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsIdEndpoint.py
index 10c01dd25..70a83a117 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdConfigurationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ConfigurationReference, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/configurations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdCopyEndpoint.py
index c05cc2132..3c51fe7f7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Agreement
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdEndpoint.py
index 1a8bf9ff6..6a599d5d7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdEndpoint.py
@@ -20,7 +20,6 @@
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdWorktypeexclusionsEndpoint import \
     FinanceAgreementsIdWorktypeexclusionsEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdWorktypesEndpoint import FinanceAgreementsIdWorktypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Agreement
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -29,38 +28,38 @@ class FinanceAgreementsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.work_type_exclusions = self._register_child_endpoint(
-            FinanceAgreementsIdWorktypeexclusionsEndpoint(client, parent_endpoint=self)
+        self.additions = self._register_child_endpoint(
+            FinanceAgreementsIdAdditionsEndpoint(client, parent_endpoint=self)
         )
         self.recurring_parameters = self._register_child_endpoint(
             FinanceAgreementsIdRecurringparametersEndpoint(client, parent_endpoint=self)
         )
-        self.adjustments = self._register_child_endpoint(
-            FinanceAgreementsIdAdjustmentsEndpoint(client, parent_endpoint=self)
-        )
-        self.configurations = self._register_child_endpoint(
-            FinanceAgreementsIdConfigurationsEndpoint(client, parent_endpoint=self)
+        self.workroles = self._register_child_endpoint(
+            FinanceAgreementsIdWorkrolesEndpoint(client, parent_endpoint=self)
         )
-        self.invoice = self._register_child_endpoint(FinanceAgreementsIdInvoiceEndpoint(client, parent_endpoint=self))
         self.application_parameters = self._register_child_endpoint(
             FinanceAgreementsIdApplicationparametersEndpoint(client, parent_endpoint=self)
         )
+        self.copy = self._register_child_endpoint(FinanceAgreementsIdCopyEndpoint(client, parent_endpoint=self))
         self.board_defaults = self._register_child_endpoint(
             FinanceAgreementsIdBoarddefaultsEndpoint(client, parent_endpoint=self)
         )
+        self.work_type_exclusions = self._register_child_endpoint(
+            FinanceAgreementsIdWorktypeexclusionsEndpoint(client, parent_endpoint=self)
+        )
+        self.invoice = self._register_child_endpoint(FinanceAgreementsIdInvoiceEndpoint(client, parent_endpoint=self))
+        self.worktypes = self._register_child_endpoint(
+            FinanceAgreementsIdWorktypesEndpoint(client, parent_endpoint=self)
+        )
+        self.adjustments = self._register_child_endpoint(
+            FinanceAgreementsIdAdjustmentsEndpoint(client, parent_endpoint=self)
+        )
         self.sites = self._register_child_endpoint(FinanceAgreementsIdSitesEndpoint(client, parent_endpoint=self))
         self.work_role_exclusions = self._register_child_endpoint(
             FinanceAgreementsIdWorkroleexclusionsEndpoint(client, parent_endpoint=self)
         )
-        self.copy = self._register_child_endpoint(FinanceAgreementsIdCopyEndpoint(client, parent_endpoint=self))
-        self.workroles = self._register_child_endpoint(
-            FinanceAgreementsIdWorkrolesEndpoint(client, parent_endpoint=self)
-        )
-        self.additions = self._register_child_endpoint(
-            FinanceAgreementsIdAdditionsEndpoint(client, parent_endpoint=self)
-        )
-        self.worktypes = self._register_child_endpoint(
-            FinanceAgreementsIdWorktypesEndpoint(client, parent_endpoint=self)
+        self.configurations = self._register_child_endpoint(
+            FinanceAgreementsIdConfigurationsEndpoint(client, parent_endpoint=self)
         )
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Agreement]:
@@ -96,17 +95,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(Agreement, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Agreement:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdInvoiceEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdInvoiceEndpoint.py
index 239e35f45..8dd2cbe22 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdInvoiceEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdInvoiceEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdRecurringparametersEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdRecurringparametersEndpoint.py
index d4470c05e..43199f8be 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdRecurringparametersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdRecurringparametersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdRecurringparametersIdEndpoint import \
     FinanceAgreementsIdRecurringparametersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdRecurringparametersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdRecurringparametersIdEndpoint.py
index b61f7603f..3112c93af 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdRecurringparametersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdRecurringparametersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementRecurringParameters
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesCountEndpoint.py
index cba5c6089..090ec3e1a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesEndpoint.py
index cbfbda4bd..8dd22baa9 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdSitesCountEndpoint import FinanceAgreementsIdSitesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdSitesIdEndpoint import FinanceAgreementsIdSitesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementSite
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesIdEndpoint.py
index b8bfe399b..4e0276f34 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdSitesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementSite
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AgreementSite, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/sites/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementSite:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsCountEndpoint.py
index 5cea3aec9..db5c6cefb 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsEndpoint.py
index 2aadc065b..8efd15972 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementsIdWorkroleexclusionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdWorkroleexclusionsIdEndpoint import \
     FinanceAgreementsIdWorkroleexclusionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementWorkRoleExclusion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsIdEndpoint.py
index 292dd64e1..38334279f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkroleexclusionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class FinanceAgreementsIdWorkroleexclusionsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/workRoleExclusions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesCountEndpoint.py
index 2f09c980c..ba6aeb5a7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesEndpoint.py
index 0daafaa94..1232fdb00 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdWorkrolesCountEndpoint import \
     FinanceAgreementsIdWorkrolesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdWorkrolesIdEndpoint import FinanceAgreementsIdWorkrolesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementWorkRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesIdEndpoint.py
index 1597810e9..e0ebac078 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorkrolesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementWorkRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AgreementWorkRole, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/workroles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementWorkRole:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsCountEndpoint.py
index 2ad72c956..aebe20c9f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsEndpoint.py
index 1c0c5d640..6d0fb7cc1 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementsIdWorktypeexclusionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdWorktypeexclusionsIdEndpoint import \
     FinanceAgreementsIdWorktypeexclusionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementWorkTypeExclusion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsIdEndpoint.py
index ff73cc457..ef0159c82 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypeexclusionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class FinanceAgreementsIdWorktypeexclusionsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/workTypeExclusions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesCountEndpoint.py
index 9bf7f9a59..182db1375 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesEndpoint.py
index 8904f3491..284990c0e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdWorktypesCountEndpoint import \
     FinanceAgreementsIdWorktypesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsIdWorktypesIdEndpoint import FinanceAgreementsIdWorktypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementWorkType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesIdEndpoint.py
index 81656c994..161bf08ff 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsIdWorktypesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementWorkType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AgreementWorkType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/{id}/worktypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementWorkType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesCountEndpoint.py
index e1fdb93ab..a4555a63f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesEndpoint.py
index 17d2589b5..6b823531f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesCountEndpoint import FinanceAgreementsTypesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesIdEndpoint import FinanceAgreementsTypesIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesInfoEndpoint import FinanceAgreementsTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdCopyEndpoint.py
index eb345e4f7..492417316 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdEndpoint.py
index 83506b34b..b4671ba9d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesIdCopyEndpoint import FinanceAgreementsTypesIdCopyEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesIdInfoEndpoint import FinanceAgreementsTypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesIdUsagesEndpoint import FinanceAgreementsTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -54,17 +53,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AgreementType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreements/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdInfoEndpoint.py
index 740e0a615..07cda09c6 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdUsagesEndpoint.py
index 9f58f88c1..6dff37848 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesIdUsagesListEndpoint import \
     FinanceAgreementsTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdUsagesListEndpoint.py
index fc669a29b..cf606c443 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesInfoCountEndpoint.py
index 726fee77f..41eb92181 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesInfoEndpoint.py
index 7bc50c358..70297e761 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementsTypesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementsTypesInfoCountEndpoint import \
     FinanceAgreementsTypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesEndpoint.py
index a73a97ffc..a005d1ffd 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementtypesIdEndpoint import FinanceAgreementtypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsCountEndpoint.py
index 5faeac249..29442413f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsEndpoint.py
index 150c2c940..139197bb2 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementtypesIdBoarddefaultsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementtypesIdBoarddefaultsIdEndpoint import \
     FinanceAgreementtypesIdBoarddefaultsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeBoardDefault
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsIdEndpoint.py
index 912067ad2..1ba78bdad 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdBoarddefaultsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeBoardDefault
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AgreementTypeBoardDefault, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreementTypes/{id}/boardDefaults/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementTypeBoardDefault:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdEndpoint.py
index 48bfbf4bf..37aa302bc 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdEndpoint.py
@@ -11,7 +11,6 @@
     FinanceAgreementtypesIdWorktypeexclusionsEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementtypesIdWorktypesEndpoint import \
     FinanceAgreementtypesIdWorktypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -19,18 +18,18 @@ class FinanceAgreementtypesIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.work_type_exclusions = self._register_child_endpoint(
-            FinanceAgreementtypesIdWorktypeexclusionsEndpoint(client, parent_endpoint=self)
+        self.workroles = self._register_child_endpoint(
+            FinanceAgreementtypesIdWorkrolesEndpoint(client, parent_endpoint=self)
         )
         self.board_defaults = self._register_child_endpoint(
             FinanceAgreementtypesIdBoarddefaultsEndpoint(client, parent_endpoint=self)
         )
+        self.work_type_exclusions = self._register_child_endpoint(
+            FinanceAgreementtypesIdWorktypeexclusionsEndpoint(client, parent_endpoint=self)
+        )
         self.work_role_exclusions = self._register_child_endpoint(
             FinanceAgreementtypesIdWorkroleexclusionsEndpoint(client, parent_endpoint=self)
         )
-        self.workroles = self._register_child_endpoint(
-            FinanceAgreementtypesIdWorkrolesEndpoint(client, parent_endpoint=self)
-        )
         self.worktypes = self._register_child_endpoint(
             FinanceAgreementtypesIdWorktypesEndpoint(client, parent_endpoint=self)
         )
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsCountEndpoint.py
index dfbffea8f..454c36aef 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsEndpoint.py
index 0ed44b149..73cc2aeb0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementtypesIdWorkroleexclusionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementtypesIdWorkroleexclusionsIdEndpoint import \
     FinanceAgreementtypesIdWorkroleexclusionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkRoleExclusion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsIdEndpoint.py
index e8bb76bb8..56430e33c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkroleexclusionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkRoleExclusion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -47,14 +46,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
             AgreementTypeWorkRoleExclusion, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreementTypes/{id}/workRoleExclusions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesCountEndpoint.py
index ad10f0d35..bc061edbf 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesEndpoint.py
index 04f64c821..ec60460a0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesEndpoint.py
@@ -7,7 +7,6 @@
     FinanceAgreementtypesIdWorkrolesIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementtypesIdWorkrolesInfoEndpoint import \
     FinanceAgreementtypesIdWorkrolesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesIdEndpoint.py
index 810faa7bb..de9a0b884 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AgreementTypeWorkRole, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreementTypes/{id}/workroles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementTypeWorkRole:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoCountEndpoint.py
index ff0cc3251..b939f6483 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoEndpoint.py
index 101a5e60f..f8c38192c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementtypesIdWorkrolesInfoCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementtypesIdWorkrolesInfoIdEndpoint import \
     FinanceAgreementtypesIdWorkrolesInfoIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkRoleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoIdEndpoint.py
index fc4f4c425..33339ecdb 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorkrolesInfoIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkRoleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsCountEndpoint.py
index db01456dd..398163d79 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsEndpoint.py
index ac67fd864..e2b79a76d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementtypesIdWorktypeexclusionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementtypesIdWorktypeexclusionsIdEndpoint import \
     FinanceAgreementtypesIdWorktypeexclusionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkTypeExclusion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsIdEndpoint.py
index 0ad817f3b..4251a91c5 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypeexclusionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkTypeExclusion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -47,14 +46,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
             AgreementTypeWorkTypeExclusion, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreementTypes/{id}/workTypeExclusions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesCountEndpoint.py
index 9ecc34e57..337443de0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesEndpoint.py
index 7dbe95437..680499172 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesEndpoint.py
@@ -5,7 +5,6 @@
     FinanceAgreementtypesIdWorktypesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceAgreementtypesIdWorktypesIdEndpoint import \
     FinanceAgreementtypesIdWorktypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesIdEndpoint.py
index d873f74a8..5aafe220e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceAgreementtypesIdWorktypesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementTypeWorkType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AgreementTypeWorkType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/agreementTypes/{id}/worktypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AgreementTypeWorkType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsCountEndpoint.py
index 5152181a3..0dc7dbd36 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsEndpoint.py
index 42fa4586c..474054d5a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBatchsetupsCountEndpoint import FinanceBatchsetupsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceBatchsetupsIdEndpoint import FinanceBatchsetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementBatchSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsIdEndpoint.py
index a7b83f9a6..889ae908e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBatchsetupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AgreementBatchSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesCountEndpoint.py
index 59084c9c8..263a59dbc 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesEndpoint.py
index 56c2be28f..c0b1a7d1d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceBillingcyclesCountEndpoint import FinanceBillingcyclesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingcyclesIdEndpoint import FinanceBillingcyclesIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingcyclesInfoEndpoint import FinanceBillingcyclesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingCycle
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdEndpoint.py
index 1dac272ce..44e18aa19 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingcyclesIdInfoEndpoint import FinanceBillingcyclesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingcyclesIdUsagesEndpoint import FinanceBillingcyclesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingCycle
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BillingCycle, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/billingCycles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BillingCycle:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdInfoEndpoint.py
index f01fb443a..f5b40c113 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingCycleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdUsagesEndpoint.py
index de9c377b8..9a35c888b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingcyclesIdUsagesListEndpoint import \
     FinanceBillingcyclesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdUsagesListEndpoint.py
index 0423495b9..d85923e2a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesInfoCountEndpoint.py
index 7564c4030..0d5c37f32 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesInfoEndpoint.py
index d29a2fd32..3942bc108 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingcyclesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingcyclesInfoCountEndpoint import FinanceBillingcyclesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingCycleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsCountEndpoint.py
index 5c45a497e..838285cc3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsEndpoint.py
index 052467f1a..141056af0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceBillingsetupsCountEndpoint import FinanceBillingsetupsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingsetupsIdEndpoint import FinanceBillingsetupsIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingsetupsInfoEndpoint import FinanceBillingsetupsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdEndpoint.py
index d70f73eed..1ab7ee62c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingsetupsIdInfoEndpoint import FinanceBillingsetupsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingsetupsIdRoutingsEndpoint import FinanceBillingsetupsIdRoutingsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -52,17 +51,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BillingSetup, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/billingSetups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BillingSetup:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdInfoEndpoint.py
index 10b671ad0..e8baf0963 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingSetupInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsCountEndpoint.py
index 55e52c96d..0e0996982 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsEndpoint.py
index 51f6d22fc..cb5d3bc8b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceBillingsetupsIdRoutingsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingsetupsIdRoutingsIdEndpoint import \
     FinanceBillingsetupsIdRoutingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingSetupRouting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsIdEndpoint.py
index 7803c957e..33c22bb6c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsIdRoutingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingSetupRouting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BillingSetupRouting, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/billingSetups/{id}/routings/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BillingSetupRouting:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsInfoEndpoint.py
index 4bfcb04d7..165011f1a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingsetupsInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingSetupInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesCountEndpoint.py
index ac3130c06..0564c895c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesEndpoint.py
index a864be4ca..c3047112f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceBillingstatusesCountEndpoint import FinanceBillingstatusesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingstatusesIdEndpoint import FinanceBillingstatusesIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingstatusesInfoEndpoint import FinanceBillingstatusesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdEndpoint.py
index 6b19b56b1..d644aa5a0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingstatusesIdInfoEndpoint import FinanceBillingstatusesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingstatusesIdUsagesEndpoint import FinanceBillingstatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -52,17 +51,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BillingStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/billingStatuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BillingStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdInfoEndpoint.py
index 8154fd3c1..867077e78 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdUsagesEndpoint.py
index b14c8bcae..7e4353626 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingstatusesIdUsagesListEndpoint import \
     FinanceBillingstatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdUsagesListEndpoint.py
index 1f7fed5b6..98a283196 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesInfoCountEndpoint.py
index 2da708b46..b7be7b471 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesInfoEndpoint.py
index 441c314a6..ba9ad78a9 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingstatusesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingstatusesInfoCountEndpoint import \
     FinanceBillingstatusesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsCountEndpoint.py
index a048349c8..346d40b99 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsEndpoint.py
index 8422ccab7..33ca16c9b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceBillingtermsCountEndpoint import FinanceBillingtermsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingtermsIdEndpoint import FinanceBillingtermsIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingtermsInfoEndpoint import FinanceBillingtermsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingTerm
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdEndpoint.py
index 21151499d..5c058e0fe 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingtermsIdInfoEndpoint import FinanceBillingtermsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingtermsIdUsagesEndpoint import FinanceBillingtermsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingTerm
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BillingTerm, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/billingTerms/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BillingTerm:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdInfoEndpoint.py
index 25485ff8e..71d540ebb 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingTermInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdUsagesEndpoint.py
index acadc0819..5cbe1b87b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingtermsIdUsagesListEndpoint import \
     FinanceBillingtermsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdUsagesListEndpoint.py
index 1da4ef8a0..82c14a909 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsInfoCountEndpoint.py
index 77a23e479..b9103ddd5 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsInfoEndpoint.py
index 8566d1c38..fcb8e26c0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceBillingtermsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceBillingtermsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceBillingtermsInfoCountEndpoint import FinanceBillingtermsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BillingTermInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceClosedinvoicesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceClosedinvoicesEndpoint.py
index cb95d2577..08baa79e4 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceClosedinvoicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceClosedinvoicesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceClosedinvoicesIdEndpoint import FinanceClosedinvoicesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceClosedinvoicesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceClosedinvoicesIdEndpoint.py
index 0829f1f69..336d30715 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceClosedinvoicesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceClosedinvoicesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ClosedInvoice
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceCountEndpoint.py
index 97fce646d..924de23a8 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceEndpoint.py
index dc304a94a..d2b559002 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceCompanyfinanceCountEndpoint import FinanceCompanyfinanceCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceCompanyfinanceIdEndpoint import FinanceCompanyfinanceIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceIdEndpoint.py
index b366617e9..c230a6c2b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCompanyfinanceIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CompanyFinance
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesCountEndpoint.py
index c8a2f8e41..983b78bd9 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesEndpoint.py
index 6b36c18da..a50ed6b94 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesEndpoint.py
@@ -4,8 +4,7 @@
 from pyconnectwise.endpoints.manage.FinanceCurrenciesCountEndpoint import FinanceCurrenciesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceCurrenciesIdEndpoint import FinanceCurrenciesIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceCurrenciesInfoEndpoint import FinanceCurrenciesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Finance
+from pyconnectwise.models.manage import FinanceCurrency
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -29,7 +28,9 @@ def id(self, id: int) -> FinanceCurrenciesIdEndpoint:
         child._id = id
         return child
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Finance]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[FinanceCurrency]:
         """
         Performs a GET request against the /finance/currencies endpoint and returns an initialized PaginatedResponse object.
 
@@ -38,19 +39,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Finance]: The initialized PaginatedResponse object.
+            PaginatedResponse[FinanceCurrency]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Finance,
+            FinanceCurrency,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[Finance]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[FinanceCurrency]:
         """
         Performs a GET request against the /finance/currencies endpoint.
 
@@ -58,11 +59,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[Finance]: The parsed response data.
+            list[FinanceCurrency]: The parsed response data.
         """
-        return self._parse_many(Finance, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(FinanceCurrency, super()._make_request("GET", data=data, params=params).json())
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Finance:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> FinanceCurrency:
         """
         Performs a POST request against the /finance/currencies endpoint.
 
@@ -70,6 +71,6 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Finance: The parsed response data.
+            FinanceCurrency: The parsed response data.
         """
-        return self._parse_one(Finance, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(FinanceCurrency, super()._make_request("POST", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdEndpoint.py
index 925e1c1ac..e7af28c01 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdEndpoint.py
@@ -3,8 +3,7 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceCurrenciesIdInfoEndpoint import FinanceCurrenciesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.FinanceCurrenciesIdUsagesEndpoint import FinanceCurrenciesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage import Finance
+from pyconnectwise.models.manage import FinanceCurrency
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -15,7 +14,9 @@ def __init__(self, client, parent_endpoint=None):
         self.usages = self._register_child_endpoint(FinanceCurrenciesIdUsagesEndpoint(client, parent_endpoint=self))
         self.info = self._register_child_endpoint(FinanceCurrenciesIdInfoEndpoint(client, parent_endpoint=self))
 
-    def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Finance]:
+    def paginated(
+        self, page: int, page_size: int, params: dict[str, int | str] = {}
+    ) -> PaginatedResponse[FinanceCurrency]:
         """
         Performs a GET request against the /finance/currencies/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -24,19 +25,19 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[Finance]: The initialized PaginatedResponse object.
+            PaginatedResponse[FinanceCurrency]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            Finance,
+            FinanceCurrency,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Finance:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> FinanceCurrency:
         """
         Performs a GET request against the /finance/currencies/{id} endpoint.
 
@@ -44,11 +45,11 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> F
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Finance: The parsed response data.
+            FinanceCurrency: The parsed response data.
         """
-        return self._parse_one(Finance, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(FinanceCurrency, super()._make_request("GET", data=data, params=params).json())
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Finance:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> FinanceCurrency:
         """
         Performs a PUT request against the /finance/currencies/{id} endpoint.
 
@@ -56,11 +57,11 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> F
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Finance: The parsed response data.
+            FinanceCurrency: The parsed response data.
         """
-        return self._parse_one(Finance, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(FinanceCurrency, super()._make_request("PUT", data=data, params=params).json())
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Finance:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> FinanceCurrency:
         """
         Performs a PATCH request against the /finance/currencies/{id} endpoint.
 
@@ -68,18 +69,16 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            Finance: The parsed response data.
+            FinanceCurrency: The parsed response data.
         """
-        return self._parse_one(Finance, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(FinanceCurrency, super()._make_request("PATCH", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/currencies/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdInfoEndpoint.py
index 71357e5a5..ade3b56d1 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CurrencyInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdUsagesEndpoint.py
index c7a5a5883..8be1fd3ae 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceCurrenciesIdUsagesListEndpoint import FinanceCurrenciesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdUsagesListEndpoint.py
index bed169606..f542f5065 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesInfoCountEndpoint.py
index cf3b6e705..56b42ba34 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesInfoEndpoint.py
index d6348e6bf..6259ddbe3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceCurrenciesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceCurrenciesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceCurrenciesInfoCountEndpoint import FinanceCurrenciesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CurrencyInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsCountEndpoint.py
index cef199516..6333e4141 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsEndpoint.py
index 97a3529d2..eb2f909fc 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceDeliverymethodsCountEndpoint import FinanceDeliverymethodsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceDeliverymethodsIdEndpoint import FinanceDeliverymethodsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DeliveryMethod
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsIdEndpoint.py
index 72ea0a51e..32f5cc20e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceDeliverymethodsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DeliveryMethod
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> D
         """
         return self._parse_one(DeliveryMethod, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/deliveryMethods/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> DeliveryMethod:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceEndpoint.py
index 0872631f9..4ea687208 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceEndpoint.py
@@ -26,7 +26,6 @@
 from pyconnectwise.endpoints.manage.FinanceInvoicetemplatesetupsEndpoint import FinanceInvoicetemplatesetupsEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesEndpoint import FinanceTaxcodesEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxintegrationsEndpoint import FinanceTaxintegrationsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -34,50 +33,50 @@ class FinanceEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "finance", parent_endpoint=parent_endpoint)
 
+        self.billing_terms = self._register_child_endpoint(FinanceBillingtermsEndpoint(client, parent_endpoint=self))
         self.closed_invoices = self._register_child_endpoint(
             FinanceClosedinvoicesEndpoint(client, parent_endpoint=self)
         )
-        self.billing_cycles = self._register_child_endpoint(FinanceBillingcyclesEndpoint(client, parent_endpoint=self))
+        self.gl_captions = self._register_child_endpoint(FinanceGlcaptionsEndpoint(client, parent_endpoint=self))
+        self.tax_integrations = self._register_child_endpoint(
+            FinanceTaxintegrationsEndpoint(client, parent_endpoint=self)
+        )
+        self.currencies = self._register_child_endpoint(FinanceCurrenciesEndpoint(client, parent_endpoint=self))
+        self.billing_setups = self._register_child_endpoint(FinanceBillingsetupsEndpoint(client, parent_endpoint=self))
         self.gl_accounts = self._register_child_endpoint(FinanceGlaccountsEndpoint(client, parent_endpoint=self))
+        self.batch_setups = self._register_child_endpoint(FinanceBatchsetupsEndpoint(client, parent_endpoint=self))
         self.accounting_package_setup = self._register_child_endpoint(
             FinanceAccountingpackagesetupEndpoint(client, parent_endpoint=self)
         )
-        self.accounting = self._register_child_endpoint(FinanceAccountingEndpoint(client, parent_endpoint=self))
-        self.tax_codes = self._register_child_endpoint(FinanceTaxcodesEndpoint(client, parent_endpoint=self))
-        self.invoices = self._register_child_endpoint(FinanceInvoicesEndpoint(client, parent_endpoint=self))
-        self.currencies = self._register_child_endpoint(FinanceCurrenciesEndpoint(client, parent_endpoint=self))
-        self.delivery_methods = self._register_child_endpoint(
-            FinanceDeliverymethodsEndpoint(client, parent_endpoint=self)
-        )
         self.invoice_email_templates = self._register_child_endpoint(
             FinanceInvoiceemailtemplatesEndpoint(client, parent_endpoint=self)
         )
-        self.agreements = self._register_child_endpoint(FinanceAgreementsEndpoint(client, parent_endpoint=self))
         self.invoice_templates = self._register_child_endpoint(
             FinanceInvoicetemplatesEndpoint(client, parent_endpoint=self)
         )
-        self.billing_setups = self._register_child_endpoint(FinanceBillingsetupsEndpoint(client, parent_endpoint=self))
-        self.invoice_template_setups = self._register_child_endpoint(
-            FinanceInvoicetemplatesetupsEndpoint(client, parent_endpoint=self)
+        self.delivery_methods = self._register_child_endpoint(
+            FinanceDeliverymethodsEndpoint(client, parent_endpoint=self)
         )
-        self.agreementrecap = self._register_child_endpoint(FinanceAgreementrecapEndpoint(client, parent_endpoint=self))
-        self.billing_terms = self._register_child_endpoint(FinanceBillingtermsEndpoint(client, parent_endpoint=self))
-        self.tax_integrations = self._register_child_endpoint(
-            FinanceTaxintegrationsEndpoint(client, parent_endpoint=self)
+        self.tax_codes = self._register_child_endpoint(FinanceTaxcodesEndpoint(client, parent_endpoint=self))
+        self.billing_cycles = self._register_child_endpoint(FinanceBillingcyclesEndpoint(client, parent_endpoint=self))
+        self.company_finance = self._register_child_endpoint(
+            FinanceCompanyfinanceEndpoint(client, parent_endpoint=self)
         )
-        self.glpaths = self._register_child_endpoint(FinanceGlpathsEndpoint(client, parent_endpoint=self))
+        self.invoices = self._register_child_endpoint(FinanceInvoicesEndpoint(client, parent_endpoint=self))
+        self.accounting = self._register_child_endpoint(FinanceAccountingEndpoint(client, parent_endpoint=self))
         self.agreement_types = self._register_child_endpoint(
             FinanceAgreementtypesEndpoint(client, parent_endpoint=self)
         )
+        self.agreements = self._register_child_endpoint(FinanceAgreementsEndpoint(client, parent_endpoint=self))
         self.info = self._register_child_endpoint(FinanceInfoEndpoint(client, parent_endpoint=self))
-        self.company_finance = self._register_child_endpoint(
-            FinanceCompanyfinanceEndpoint(client, parent_endpoint=self)
+        self.agreementrecap = self._register_child_endpoint(FinanceAgreementrecapEndpoint(client, parent_endpoint=self))
+        self.accounting_packages = self._register_child_endpoint(
+            FinanceAccountingpackagesEndpoint(client, parent_endpoint=self)
+        )
+        self.invoice_template_setups = self._register_child_endpoint(
+            FinanceInvoicetemplatesetupsEndpoint(client, parent_endpoint=self)
         )
-        self.gl_captions = self._register_child_endpoint(FinanceGlcaptionsEndpoint(client, parent_endpoint=self))
         self.billing_statuses = self._register_child_endpoint(
             FinanceBillingstatusesEndpoint(client, parent_endpoint=self)
         )
-        self.batch_setups = self._register_child_endpoint(FinanceBatchsetupsEndpoint(client, parent_endpoint=self))
-        self.accounting_packages = self._register_child_endpoint(
-            FinanceAccountingpackagesEndpoint(client, parent_endpoint=self)
-        )
+        self.glpaths = self._register_child_endpoint(FinanceGlpathsEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsCountEndpoint.py
index dee19ae63..8323ac304 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsEndpoint.py
index 53fea2fc7..2c9151d0d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceGlaccountsCountEndpoint import FinanceGlaccountsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceGlaccountsIdEndpoint import FinanceGlaccountsIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceGlaccountsMappedtypesEndpoint import FinanceGlaccountsMappedtypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GLAccount
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -13,10 +12,10 @@ class FinanceGlaccountsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "glAccounts", parent_endpoint=parent_endpoint)
 
-        self.count = self._register_child_endpoint(FinanceGlaccountsCountEndpoint(client, parent_endpoint=self))
         self.mapped_types = self._register_child_endpoint(
             FinanceGlaccountsMappedtypesEndpoint(client, parent_endpoint=self)
         )
+        self.count = self._register_child_endpoint(FinanceGlaccountsCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> FinanceGlaccountsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsIdEndpoint.py
index 6c9070f6f..ee1681067 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GLAccount
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -67,14 +66,12 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
         """
         return self._parse_one(GLAccount, super()._make_request("PATCH", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/glAccounts/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsMappedtypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsMappedtypesCountEndpoint.py
index a67f49ace..683f6a34c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsMappedtypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsMappedtypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsMappedtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsMappedtypesEndpoint.py
index d766fd6ce..71da48d8b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlaccountsMappedtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlaccountsMappedtypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceGlaccountsMappedtypesCountEndpoint import \
     FinanceGlaccountsMappedtypesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MappedType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsCountEndpoint.py
index ad2e1bece..3028b5d1a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsEndpoint.py
index 0c1935717..6a113586a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceGlcaptionsCountEndpoint import FinanceGlcaptionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceGlcaptionsIdEndpoint import FinanceGlcaptionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GLCaption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsIdEndpoint.py
index 5ebffb9cc..d7394179a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlcaptionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GLCaption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlpathsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlpathsCountEndpoint.py
index c72b083df..d037adf13 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlpathsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlpathsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlpathsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlpathsEndpoint.py
index 3f0aa555e..21f7ea7a5 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlpathsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlpathsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceGlpathsCountEndpoint import FinanceGlpathsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceGlpathsIdEndpoint import FinanceGlpathsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GLPath
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceGlpathsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceGlpathsIdEndpoint.py
index 4c37a9924..c10adda15 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceGlpathsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceGlpathsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GLPath
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> G
         """
         return self._parse_one(GLPath, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/glpaths/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GLPath:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesCountEndpoint.py
index c75bb47a5..69dc42e35 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesEndpoint.py
index c1a013e86..45b66b4a9 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInfoCurrencycodesCountEndpoint import FinanceInfoCurrencycodesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceInfoCurrencycodesIdEndpoint import FinanceInfoCurrencycodesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CurrencyCode
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesIdEndpoint.py
index 35e4610c5..c69b2855d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoCurrencycodesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CurrencyCode
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoEndpoint.py
index a34c4bb1b..656a384e3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceInfoCurrencycodesEndpoint import FinanceInfoCurrencycodesEndpoint
 from pyconnectwise.endpoints.manage.FinanceInfoInvoiceEndpoint import FinanceInfoInvoiceEndpoint
 from pyconnectwise.endpoints.manage.FinanceInfoTaxintegrationsEndpoint import FinanceInfoTaxintegrationsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,10 +11,10 @@ class FinanceInfoEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "info", parent_endpoint=parent_endpoint)
 
-        self.invoice = self._register_child_endpoint(FinanceInfoInvoiceEndpoint(client, parent_endpoint=self))
         self.currency_codes = self._register_child_endpoint(
             FinanceInfoCurrencycodesEndpoint(client, parent_endpoint=self)
         )
+        self.invoice = self._register_child_endpoint(FinanceInfoInvoiceEndpoint(client, parent_endpoint=self))
         self.tax_integrations = self._register_child_endpoint(
             FinanceInfoTaxintegrationsEndpoint(client, parent_endpoint=self)
         )
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoInvoiceEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoInvoiceEndpoint.py
index 9caefc505..6ecc0d4f3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoInvoiceEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoInvoiceEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInfoInvoiceIdEndpoint import FinanceInfoInvoiceIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoInvoiceIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoInvoiceIdEndpoint.py
index 8a2ad0693..67d2b7ad0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoInvoiceIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoInvoiceIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsCountEndpoint.py
index 5586cb46d..5d6d481af 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsEndpoint.py
index c9456cd42..ab3d6f25c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceInfoTaxintegrationsCountEndpoint import \
     FinanceInfoTaxintegrationsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceInfoTaxintegrationsIdEndpoint import FinanceInfoTaxintegrationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxIntegrationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsIdEndpoint.py
index 3a663bbe9..56f5a6ffe 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInfoTaxintegrationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxIntegrationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesCountEndpoint.py
index 211a0b3c0..20009b75a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesEndpoint.py
index 12fa93b30..62b50207e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.FinanceInvoiceemailtemplatesIdEndpoint import FinanceInvoiceemailtemplatesIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoiceemailtemplatesInfoEndpoint import \
     FinanceInvoiceemailtemplatesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceEmailTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdEndpoint.py
index 85f0a02c4..7fa1e2a14 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdEndpoint.py
@@ -5,7 +5,6 @@
     FinanceInvoiceemailtemplatesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoiceemailtemplatesIdUsagesEndpoint import \
     FinanceInvoiceemailtemplatesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceEmailTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(InvoiceEmailTemplate, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/invoiceEmailTemplates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> InvoiceEmailTemplate:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdInfoEndpoint.py
index 719eb6a1d..5e86b7d48 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceEmailTemplateInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdUsagesEndpoint.py
index ad2c684a0..1fadbc69f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoiceemailtemplatesIdUsagesListEndpoint import \
     FinanceInvoiceemailtemplatesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdUsagesListEndpoint.py
index 061fbbfbf..34a9c7789 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesInfoCountEndpoint.py
index 930e83b24..262660fbc 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesInfoEndpoint.py
index 68699eeb5..cc60c3ce5 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoiceemailtemplatesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoiceemailtemplatesInfoCountEndpoint import \
     FinanceInvoiceemailtemplatesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceEmailTemplateInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicesCountEndpoint.py
index 9986d4e06..a423c57b3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicesEndpoint.py
index e606a42cd..5fb5994a0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicesCountEndpoint import FinanceInvoicesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicesIdEndpoint import FinanceInvoicesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Invoice
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdEndpoint.py
index 961aab052..94cf27c4f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicesIdPaymentsEndpoint import FinanceInvoicesIdPaymentsEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicesIdPdfEndpoint import FinanceInvoicesIdPdfEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Invoice
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(Invoice, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/invoices/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Invoice:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPaymentsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPaymentsEndpoint.py
index 36d066ce9..d4636ddfd 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPaymentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPaymentsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicesIdPaymentsIdEndpoint import FinanceInvoicesIdPaymentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoicePayment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPaymentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPaymentsIdEndpoint.py
index 746a2691e..85049ade8 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPaymentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPaymentsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoicePayment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -69,14 +68,12 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(InvoicePayment, super()._make_request("PUT", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/invoices/{id}/payments/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPdfEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPdfEndpoint.py
index 4c51f19fb..8edcc19c3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPdfEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicesIdPdfEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class FinanceInvoicesIdPdfEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "pdf", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a GET request against the /finance/invoices/{id}/pdf endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("GET", data=data, params=params).json())
+        super()._make_request("GET", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesCountEndpoint.py
index a4b7a2080..411504148 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesEndpoint.py
index c70733686..3248880ee 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicetemplatesCountEndpoint import FinanceInvoicetemplatesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicetemplatesIdEndpoint import FinanceInvoicetemplatesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdEndpoint.py
index 9210d3ec5..94303a6b0 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicetemplatesIdUsagesEndpoint import \
     FinanceInvoicetemplatesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -75,14 +74,12 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(InvoiceTemplate, super()._make_request("PUT", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/invoiceTemplates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdUsagesEndpoint.py
index 06b1559d0..2675f4d8e 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicetemplatesIdUsagesListEndpoint import \
     FinanceInvoicetemplatesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdUsagesListEndpoint.py
index a59085d9d..dc7eefa26 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsCountEndpoint.py
index 17d88c0f6..b0df648b3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsEndpoint.py
index b1154be37..029abed98 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceInvoicetemplatesetupsCountEndpoint import \
     FinanceInvoicetemplatesetupsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceInvoicetemplatesetupsIdEndpoint import FinanceInvoicetemplatesetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceTemplateSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsIdEndpoint.py
index e9f1f8d7f..a8b3089a5 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceInvoicetemplatesetupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InvoiceTemplateSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesCountEndpoint.py
index 572468184..d8a353c5b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesEndpoint.py
index 5c84bf184..d212bdd27 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.FinanceTaxcodesCountEndpoint import FinanceTaxcodesCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdEndpoint import FinanceTaxcodesIdEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesInfoEndpoint import FinanceTaxcodesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCode
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdCopyEndpoint.py
index bf7c1f936..eeab5bb07 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCode
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdEndpoint.py
index b08ac5c70..c9c946c0c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdEndpoint.py
@@ -12,7 +12,6 @@
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdUsagesEndpoint import FinanceTaxcodesIdUsagesEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdWorkroleexemptionsEndpoint import \
     FinanceTaxcodesIdWorkroleexemptionsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCode
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -22,6 +21,9 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
         self.info = self._register_child_endpoint(FinanceTaxcodesIdInfoEndpoint(client, parent_endpoint=self))
+        self.product_type_exemptions = self._register_child_endpoint(
+            FinanceTaxcodesIdProducttypeexemptionsEndpoint(client, parent_endpoint=self)
+        )
         self.work_role_exemptions = self._register_child_endpoint(
             FinanceTaxcodesIdWorkroleexemptionsEndpoint(client, parent_endpoint=self)
         )
@@ -29,16 +31,13 @@ def __init__(self, client, parent_endpoint=None):
             FinanceTaxcodesIdTaxcodelevelsEndpoint(client, parent_endpoint=self)
         )
         self.copy = self._register_child_endpoint(FinanceTaxcodesIdCopyEndpoint(client, parent_endpoint=self))
-        self.product_type_exemptions = self._register_child_endpoint(
-            FinanceTaxcodesIdProducttypeexemptionsEndpoint(client, parent_endpoint=self)
+        self.expense_type_exemptions = self._register_child_endpoint(
+            FinanceTaxcodesIdExpensetypeexemptionsEndpoint(client, parent_endpoint=self)
         )
-        self.usages = self._register_child_endpoint(FinanceTaxcodesIdUsagesEndpoint(client, parent_endpoint=self))
         self.tax_code_x_refs = self._register_child_endpoint(
             FinanceTaxcodesIdTaxcodexrefsEndpoint(client, parent_endpoint=self)
         )
-        self.expense_type_exemptions = self._register_child_endpoint(
-            FinanceTaxcodesIdExpensetypeexemptionsEndpoint(client, parent_endpoint=self)
-        )
+        self.usages = self._register_child_endpoint(FinanceTaxcodesIdUsagesEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[TaxCode]:
         """
@@ -73,17 +72,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TaxCode, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TaxCode:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsCountEndpoint.py
index 4d0489750..41889657a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsEndpoint.py
index 3cbfb3f9d..2746427ff 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdExpensetypeexemptionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdExpensetypeexemptionsIdEndpoint import \
     FinanceTaxcodesIdExpensetypeexemptionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseTypeExemption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdEndpoint.py
index 09a7e58e0..752c845ca 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsEndpoint import \
     FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ExpenseTypeExemption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
         """
         return self._parse_one(ExpenseTypeExemption, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/expenseTypeExemptions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ExpenseTypeExemption:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsCountEndpoint.py
index 206b6ba8f..a74a0a5b7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsEndpoint.py
index 2653b6fcc..5d53d99d7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsIdEndpoint import \
     FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxableExpenseTypeLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsIdEndpoint.py
index 624b35dec..653004509 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdExpensetypeexemptionsIdTaxableexpensetypelevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxableExpenseTypeLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TaxableExpenseTypeLevel, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/expenseTypeExemptions/{id}/taxableExpenseTypeLevels/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TaxableExpenseTypeLevel:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdInfoEndpoint.py
index 3d14ccfe9..c4a63db7a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCodeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsCountEndpoint.py
index ea337bd20..01ffb4fbd 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsEndpoint.py
index 0a9a23b8e..92a1e9d1d 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdProducttypeexemptionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdProducttypeexemptionsIdEndpoint import \
     FinanceTaxcodesIdProducttypeexemptionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductTypeExemption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdEndpoint.py
index cecd28e07..7fe2fa550 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsEndpoint import \
     FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductTypeExemption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProductTypeExemption, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/productTypeExemptions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProductTypeExemption:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsCountEndpoint.py
index 8b003d732..a2f5cbb2a 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsEndpoint.py
index c0173668a..d2291323b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsIdEndpoint import \
     FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxableProductTypeLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsIdEndpoint.py
index 525aea9b9..6f7c9d53f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdProducttypeexemptionsIdTaxableproducttypelevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxableProductTypeLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TaxableProductTypeLevel, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/productTypeExemptions/{id}/taxableProductTypeLevels/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TaxableProductTypeLevel:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsCountEndpoint.py
index 02810732c..e9dc3f1d2 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsEndpoint.py
index 127f9b9ab..e95890c9b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdTaxcodelevelsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdTaxcodelevelsIdEndpoint import \
     FinanceTaxcodesIdTaxcodelevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCodeLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsIdEndpoint.py
index 4dc33834f..4f52f0a48 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodelevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCodeLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TaxCodeLevel, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/taxCodeLevels/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TaxCodeLevel:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsCountEndpoint.py
index e745dfec1..5bce0612f 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsEndpoint.py
index f6a36884a..9f3eab3f8 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdTaxcodexrefsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdTaxcodexrefsIdEndpoint import \
     FinanceTaxcodesIdTaxcodexrefsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCodeXRef
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdEndpoint.py
index b6100891c..cd6efaf3b 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsEndpoint import \
     FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCodeXRef
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -49,17 +48,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TaxCodeXRef, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/taxCodeXRefs/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TaxCodeXRef:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsCountEndpoint.py
index 7888b4e7b..9ab424a11 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsEndpoint.py
index 50a018aa9..1338144bf 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsIdEndpoint import \
     FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxableXRefLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsIdEndpoint.py
index d65ff92ff..f69e176b7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdTaxcodexrefsIdTaxablexreflevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxableXRefLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TaxableXRefLevel, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/taxCodeXRefs/{id}/taxableXRefLevels/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TaxableXRefLevel:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdUsagesEndpoint.py
index 9a6d86714..019cf6fb9 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdUsagesListEndpoint import FinanceTaxcodesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdUsagesListEndpoint.py
index cd82fbcca..b2c3d0a43 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsCountEndpoint.py
index 7ab2fea2d..1d07cea41 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsEndpoint.py
index d42d2df23..11fef3ee2 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdWorkroleexemptionsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdWorkroleexemptionsIdEndpoint import \
     FinanceTaxcodesIdWorkroleexemptionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkRoleExemption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdEndpoint.py
index c83aa1aa1..242b458ab 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsEndpoint import \
     FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkRoleExemption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(WorkRoleExemption, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/workRoleExemptions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> WorkRoleExemption:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsCountEndpoint.py
index cde0a9f48..29e2399e3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsEndpoint.py
index 0d2d90fa7..ca33eace7 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsEndpoint.py
@@ -5,7 +5,6 @@
     FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsIdEndpoint import \
     FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxableWorkRoleLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsIdEndpoint.py
index 3c4debe60..0b94fc0a3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesIdWorkroleexemptionsIdTaxableworkrolelevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxableWorkRoleLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TaxableWorkRoleLevel, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /finance/taxCodes/{id}/workRoleExemptions/{id}/taxableWorkRoleLevels/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TaxableWorkRoleLevel:
         """
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesInfoCountEndpoint.py
index c84d8412e..1f926c391 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesInfoEndpoint.py
index ca98d9e14..b0d01c0c3 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxcodesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxcodesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxcodesInfoCountEndpoint import FinanceTaxcodesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxCodeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsCountEndpoint.py
index a0c403896..00fed1152 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsEndpoint.py
index 47a6552e4..b146e208c 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxintegrationsCountEndpoint import FinanceTaxintegrationsCountEndpoint
 from pyconnectwise.endpoints.manage.FinanceTaxintegrationsIdEndpoint import FinanceTaxintegrationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxIntegration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsIdEndpoint.py
index aa720960f..a002708b5 100644
--- a/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/FinanceTaxintegrationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TaxIntegration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsCountEndpoint.py
index 1cac78392..67449a23d 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsEndpoint.py
index 73016920f..8f6a8b357 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.MarketingCampaignsStatusesEndpoint import MarketingCampaignsStatusesEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsSubtypesEndpoint import MarketingCampaignsSubtypesEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsTypesEndpoint import MarketingCampaignsTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Campaign
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -15,10 +14,10 @@ class MarketingCampaignsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "campaigns", parent_endpoint=parent_endpoint)
 
-        self.sub_types = self._register_child_endpoint(MarketingCampaignsSubtypesEndpoint(client, parent_endpoint=self))
         self.types = self._register_child_endpoint(MarketingCampaignsTypesEndpoint(client, parent_endpoint=self))
-        self.statuses = self._register_child_endpoint(MarketingCampaignsStatusesEndpoint(client, parent_endpoint=self))
         self.count = self._register_child_endpoint(MarketingCampaignsCountEndpoint(client, parent_endpoint=self))
+        self.statuses = self._register_child_endpoint(MarketingCampaignsStatusesEndpoint(client, parent_endpoint=self))
+        self.sub_types = self._register_child_endpoint(MarketingCampaignsSubtypesEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> MarketingCampaignsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdActivitiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdActivitiesCountEndpoint.py
index 64f97d997..d9fe60ef1 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdActivitiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdActivitiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdActivitiesEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdActivitiesEndpoint.py
index 95ec4f0cf..ee4f3d908 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdActivitiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdActivitiesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsIdActivitiesCountEndpoint import \
     MarketingCampaignsIdActivitiesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsCountEndpoint.py
index 37a3238e9..2184f76b7 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsEndpoint.py
index 857d72059..197446efc 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.MarketingCampaignsIdAuditsCountEndpoint import \
     MarketingCampaignsIdAuditsCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsIdAuditsIdEndpoint import MarketingCampaignsIdAuditsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CampaignAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsIdEndpoint.py
index 7ab90bcde..be5de5da1 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdAuditsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CampaignAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CampaignAudit, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/campaigns/{id}/audits/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignAudit:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedCountEndpoint.py
index 5136a403e..87fb211fd 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedEndpoint.py
index 3351b252d..064f91a5c 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedEndpoint.py
@@ -5,7 +5,6 @@
     MarketingCampaignsIdEmailsopenedCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsIdEmailsopenedIdEndpoint import \
     MarketingCampaignsIdEmailsopenedIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailOpened
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedIdEndpoint.py
index 73b1ae137..ecdd8dde3 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEmailsopenedIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailOpened
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
         """
         return self._parse_one(EmailOpened, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/campaigns/{id}/emailsOpened/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> EmailOpened:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEndpoint.py
index a60736c61..95418be55 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdEndpoint.py
@@ -11,7 +11,6 @@
     MarketingCampaignsIdLinksclickedEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsIdOpportunitiesEndpoint import \
     MarketingCampaignsIdOpportunitiesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Campaign
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -23,18 +22,18 @@ def __init__(self, client, parent_endpoint=None):
         self.forms_submitted = self._register_child_endpoint(
             MarketingCampaignsIdFormssubmittedEndpoint(client, parent_endpoint=self)
         )
+        self.audits = self._register_child_endpoint(MarketingCampaignsIdAuditsEndpoint(client, parent_endpoint=self))
         self.emails_opened = self._register_child_endpoint(
             MarketingCampaignsIdEmailsopenedEndpoint(client, parent_endpoint=self)
         )
-        self.opportunities = self._register_child_endpoint(
-            MarketingCampaignsIdOpportunitiesEndpoint(client, parent_endpoint=self)
+        self.links_clicked = self._register_child_endpoint(
+            MarketingCampaignsIdLinksclickedEndpoint(client, parent_endpoint=self)
         )
         self.activities = self._register_child_endpoint(
             MarketingCampaignsIdActivitiesEndpoint(client, parent_endpoint=self)
         )
-        self.audits = self._register_child_endpoint(MarketingCampaignsIdAuditsEndpoint(client, parent_endpoint=self))
-        self.links_clicked = self._register_child_endpoint(
-            MarketingCampaignsIdLinksclickedEndpoint(client, parent_endpoint=self)
+        self.opportunities = self._register_child_endpoint(
+            MarketingCampaignsIdOpportunitiesEndpoint(client, parent_endpoint=self)
         )
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Campaign]:
@@ -70,17 +69,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Campaign, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/campaigns/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Campaign:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedCountEndpoint.py
index 555a63960..f67331baf 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedEndpoint.py
index dc340e2aa..a678e59e8 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedEndpoint.py
@@ -5,7 +5,6 @@
     MarketingCampaignsIdFormssubmittedCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsIdFormssubmittedIdEndpoint import \
     MarketingCampaignsIdFormssubmittedIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import FormSubmitted
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedIdEndpoint.py
index 98efd115a..6321e3d43 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdFormssubmittedIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import FormSubmitted
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> F
         """
         return self._parse_one(FormSubmitted, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/campaigns/{id}/formsSubmitted/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> FormSubmitted:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedCountEndpoint.py
index 584714a6b..235e0b70a 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedEndpoint.py
index ddf2e951b..27af9d97c 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedEndpoint.py
@@ -5,7 +5,6 @@
     MarketingCampaignsIdLinksclickedCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsIdLinksclickedIdEndpoint import \
     MarketingCampaignsIdLinksclickedIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LinkClicked
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedIdEndpoint.py
index 92e6deae3..6e262bc1a 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdLinksclickedIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LinkClicked
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> L
         """
         return self._parse_one(LinkClicked, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/campaigns/{id}/linksClicked/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LinkClicked:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdOpportunitiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdOpportunitiesCountEndpoint.py
index 387146647..810f1b9cc 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdOpportunitiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdOpportunitiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdOpportunitiesEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdOpportunitiesEndpoint.py
index 400ca849c..70815d0f5 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdOpportunitiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsIdOpportunitiesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsIdOpportunitiesCountEndpoint import \
     MarketingCampaignsIdOpportunitiesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesCountEndpoint.py
index b4a8f64eb..a5818a3c7 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesEndpoint.py
index 1b199eb7d..8c5c7548b 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.MarketingCampaignsStatusesCountEndpoint import \
     MarketingCampaignsStatusesCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsStatusesIdEndpoint import MarketingCampaignsStatusesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CampaignStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesIdEndpoint.py
index bf4fa223f..c9a16535a 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsStatusesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CampaignStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CampaignStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/campaigns/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesCountEndpoint.py
index 66dc82b90..f4399486f 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesEndpoint.py
index 19fbad081..00ed9e8a0 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesEndpoint.py
@@ -4,8 +4,7 @@
 from pyconnectwise.endpoints.manage.MarketingCampaignsSubtypesCountEndpoint import \
     MarketingCampaignsSubtypesCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsSubtypesIdEndpoint import MarketingCampaignsSubtypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage.Campaign.SubType import CampaignSubType
+from pyconnectwise.models.manage import CampaignSubTypeCampaignSubType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -32,7 +31,7 @@ def id(self, id: int) -> MarketingCampaignsSubtypesIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[CampaignSubType]:
+    ) -> PaginatedResponse[CampaignSubTypeCampaignSubType]:
         """
         Performs a GET request against the /marketing/campaigns/subTypes endpoint and returns an initialized PaginatedResponse object.
 
@@ -41,19 +40,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[CampaignSubType]: The initialized PaginatedResponse object.
+            PaginatedResponse[CampaignSubTypeCampaignSubType]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            CampaignSubType,
+            CampaignSubTypeCampaignSubType,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CampaignSubType]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CampaignSubTypeCampaignSubType]:
         """
         Performs a GET request against the /marketing/campaigns/subTypes endpoint.
 
@@ -61,11 +60,13 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[CampaignSubType]: The parsed response data.
+            list[CampaignSubTypeCampaignSubType]: The parsed response data.
         """
-        return self._parse_many(CampaignSubType, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            CampaignSubTypeCampaignSubType, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubType:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubTypeCampaignSubType:
         """
         Performs a POST request against the /marketing/campaigns/subTypes endpoint.
 
@@ -73,6 +74,8 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CampaignSubType: The parsed response data.
+            CampaignSubTypeCampaignSubType: The parsed response data.
         """
-        return self._parse_one(CampaignSubType, super()._make_request("POST", data=data, params=params).json())
+        return self._parse_one(
+            CampaignSubTypeCampaignSubType, super()._make_request("POST", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesIdEndpoint.py
index f70d5e092..795949537 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsSubtypesIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage.Campaign.SubType import CampaignSubType
+from pyconnectwise.models.manage import CampaignSubTypeCampaignSubType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[CampaignSubType]:
+    ) -> PaginatedResponse[CampaignSubTypeCampaignSubType]:
         """
         Performs a GET request against the /marketing/campaigns/subTypes/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[CampaignSubType]: The initialized PaginatedResponse object.
+            PaginatedResponse[CampaignSubTypeCampaignSubType]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            CampaignSubType,
+            CampaignSubTypeCampaignSubType,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubType:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubTypeCampaignSubType:
         """
         Performs a GET request against the /marketing/campaigns/subTypes/{id} endpoint.
 
@@ -41,23 +40,23 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CampaignSubType: The parsed response data.
+            CampaignSubTypeCampaignSubType: The parsed response data.
         """
-        return self._parse_one(CampaignSubType, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(
+            CampaignSubTypeCampaignSubType, super()._make_request("GET", data=data, params=params).json()
+        )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/campaigns/subTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
-    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubType:
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubTypeCampaignSubType:
         """
         Performs a PUT request against the /marketing/campaigns/subTypes/{id} endpoint.
 
@@ -65,11 +64,13 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CampaignSubType: The parsed response data.
+            CampaignSubTypeCampaignSubType: The parsed response data.
         """
-        return self._parse_one(CampaignSubType, super()._make_request("PUT", data=data, params=params).json())
+        return self._parse_one(
+            CampaignSubTypeCampaignSubType, super()._make_request("PUT", data=data, params=params).json()
+        )
 
-    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubType:
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubTypeCampaignSubType:
         """
         Performs a PATCH request against the /marketing/campaigns/subTypes/{id} endpoint.
 
@@ -77,6 +78,8 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CampaignSubType: The parsed response data.
+            CampaignSubTypeCampaignSubType: The parsed response data.
         """
-        return self._parse_one(CampaignSubType, super()._make_request("PATCH", data=data, params=params).json())
+        return self._parse_one(
+            CampaignSubTypeCampaignSubType, super()._make_request("PATCH", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesCountEndpoint.py
index 706374016..6ab8d9226 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesEndpoint.py
index fe2eb016d..a738b1639 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.MarketingCampaignsTypesCountEndpoint import MarketingCampaignsTypesCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsTypesIdEndpoint import MarketingCampaignsTypesIdEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsTypesInfoEndpoint import MarketingCampaignsTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CampaignType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdEndpoint.py
index d80557ac5..cc13f6477 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.MarketingCampaignsTypesIdInfoEndpoint import MarketingCampaignsTypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsTypesIdSubtypesEndpoint import \
     MarketingCampaignsTypesIdSubtypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CampaignType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -53,17 +52,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CampaignType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/campaigns/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdInfoEndpoint.py
index be5051f17..e192e0352 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CampaignTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesCountEndpoint.py
index 1bcd16ea1..808a08c2a 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesEndpoint.py
index 7f621f4c1..ba6a0ad72 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesEndpoint.py
@@ -5,8 +5,7 @@
     MarketingCampaignsTypesIdSubtypesCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsTypesIdSubtypesIdEndpoint import \
     MarketingCampaignsTypesIdSubtypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage.Type.SubType import CampaignSubType
+from pyconnectwise.models.manage import TypeSubTypeCampaignSubType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -33,7 +32,7 @@ def id(self, id: int) -> MarketingCampaignsTypesIdSubtypesIdEndpoint:
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[CampaignSubType]:
+    ) -> PaginatedResponse[TypeSubTypeCampaignSubType]:
         """
         Performs a GET request against the /marketing/campaigns/types/{id}/subTypes endpoint and returns an initialized PaginatedResponse object.
 
@@ -42,19 +41,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[CampaignSubType]: The initialized PaginatedResponse object.
+            PaginatedResponse[TypeSubTypeCampaignSubType]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            CampaignSubType,
+            TypeSubTypeCampaignSubType,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[CampaignSubType]:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[TypeSubTypeCampaignSubType]:
         """
         Performs a GET request against the /marketing/campaigns/types/{id}/subTypes endpoint.
 
@@ -62,6 +61,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            list[CampaignSubType]: The parsed response data.
+            list[TypeSubTypeCampaignSubType]: The parsed response data.
         """
-        return self._parse_many(CampaignSubType, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_many(
+            TypeSubTypeCampaignSubType, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesIdEndpoint.py
index d08010c52..f74fbed49 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesIdSubtypesIdEndpoint.py
@@ -1,8 +1,7 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.models.manage.Type.SubType import CampaignSubType
+from pyconnectwise.models.manage import TypeSubTypeCampaignSubType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,7 +11,7 @@ def __init__(self, client, parent_endpoint=None):
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
-    ) -> PaginatedResponse[CampaignSubType]:
+    ) -> PaginatedResponse[TypeSubTypeCampaignSubType]:
         """
         Performs a GET request against the /marketing/campaigns/types/{id}/subTypes/{id} endpoint and returns an initialized PaginatedResponse object.
 
@@ -21,19 +20,19 @@ def paginated(
             page_size (int): The number of results to return per page.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            PaginatedResponse[CampaignSubType]: The initialized PaginatedResponse object.
+            PaginatedResponse[TypeSubTypeCampaignSubType]: The initialized PaginatedResponse object.
         """
         params["page"] = page
         params["pageSize"] = page_size
         return PaginatedResponse(
             super()._make_request("GET", params=params),
-            CampaignSubType,
+            TypeSubTypeCampaignSubType,
             self,
             page,
             page_size,
         )
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CampaignSubType:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TypeSubTypeCampaignSubType:
         """
         Performs a GET request against the /marketing/campaigns/types/{id}/subTypes/{id} endpoint.
 
@@ -41,6 +40,8 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
         Returns:
-            CampaignSubType: The parsed response data.
+            TypeSubTypeCampaignSubType: The parsed response data.
         """
-        return self._parse_one(CampaignSubType, super()._make_request("GET", data=data, params=params).json())
+        return self._parse_one(
+            TypeSubTypeCampaignSubType, super()._make_request("GET", data=data, params=params).json()
+        )
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesInfoCountEndpoint.py
index 4e914a462..a6abc4052 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesInfoEndpoint.py
index d829e5d63..6b3af27fa 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingCampaignsTypesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsTypesInfoCountEndpoint import \
     MarketingCampaignsTypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CampaignTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingEndpoint.py
index be016486d..64df9fc88 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.MarketingCampaignsEndpoint import MarketingCampaignsEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsEndpoint import MarketingGroupsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsCountEndpoint.py
index a2cd4adff..8d2b5162e 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsEndpoint.py
index 8beb27934..7eefbb871 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.MarketingGroupsCountEndpoint import MarketingGroupsCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsIdEndpoint import MarketingGroupsIdEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsInfoEndpoint import MarketingGroupsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Group
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesCountEndpoint.py
index fd4268d19..c7182a5c6 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesEndpoint.py
index 079fd15e5..11451f9fe 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.MarketingGroupsIdCompaniesCountEndpoint import \
     MarketingGroupsIdCompaniesCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsIdCompaniesIdEndpoint import MarketingGroupsIdCompaniesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketingCompany
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesIdEndpoint.py
index 93bf80389..f31515439 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdCompaniesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketingCompany
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MarketingCompany, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/groups/{id}/companies/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MarketingCompany:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsCountEndpoint.py
index 897a104f5..560786f3b 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsEndpoint.py
index 5db85a424..687037c87 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsIdContactsCountEndpoint import MarketingGroupsIdContactsCountEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsIdContactsIdEndpoint import MarketingGroupsIdContactsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketingContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsIdEndpoint.py
index b4db72b02..d1e52e1e7 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdContactsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketingContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MarketingContact, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/groups/{id}/contacts/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MarketingContact:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdEndpoint.py
index 461a71fb7..bc22296e6 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.MarketingGroupsIdContactsEndpoint import MarketingGroupsIdContactsEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsIdInfoEndpoint import MarketingGroupsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsIdUsagesEndpoint import MarketingGroupsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Group
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -15,8 +14,8 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
         self.usages = self._register_child_endpoint(MarketingGroupsIdUsagesEndpoint(client, parent_endpoint=self))
-        self.info = self._register_child_endpoint(MarketingGroupsIdInfoEndpoint(client, parent_endpoint=self))
         self.companies = self._register_child_endpoint(MarketingGroupsIdCompaniesEndpoint(client, parent_endpoint=self))
+        self.info = self._register_child_endpoint(MarketingGroupsIdInfoEndpoint(client, parent_endpoint=self))
         self.contacts = self._register_child_endpoint(MarketingGroupsIdContactsEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Group]:
@@ -52,17 +51,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> G
         """
         return self._parse_one(Group, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /marketing/groups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Group:
         """
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdInfoEndpoint.py
index 6264e54b5..814abcc41 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GroupInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdUsagesEndpoint.py
index e503e477c..c22663daf 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsIdUsagesListEndpoint import MarketingGroupsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdUsagesListEndpoint.py
index 5150e035f..7ff25d6b6 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsInfoCountEndpoint.py
index 8138dd457..653f9d16e 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/MarketingGroupsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/MarketingGroupsInfoEndpoint.py
index adab9f33f..2313389fd 100644
--- a/src/pyconnectwise/endpoints/manage/MarketingGroupsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/MarketingGroupsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.MarketingGroupsInfoCountEndpoint import MarketingGroupsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GroupInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsCountEndpoint.py
index 80f24575e..ad0e7d190 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsEndpoint.py
index 21b7a16ff..c9cf6970d 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsCountEndpoint import ProcurementAdjustmentsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsIdEndpoint import ProcurementAdjustmentsIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsTypesEndpoint import ProcurementAdjustmentsTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProcurementAdjustment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsCountEndpoint.py
index 75419ecb9..16c28dc49 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsEndpoint.py
index c8fcf1148..2be53fcc8 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementAdjustmentsIdDetailsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsIdDetailsIdEndpoint import \
     ProcurementAdjustmentsIdDetailsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AdjustmentDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsIdEndpoint.py
index 40d1d6ed0..2aac22341 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdDetailsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AdjustmentDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AdjustmentDetail, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/adjustments/{id}/details/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdEndpoint.py
index 5d91c61f3..444f2abd2 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsIdDetailsEndpoint import \
     ProcurementAdjustmentsIdDetailsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProcurementAdjustment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProcurementAdjustment, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/adjustments/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProcurementAdjustment:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesCountEndpoint.py
index 88a865a2c..d7d110aa1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesEndpoint.py
index 124ab78d4..5d4992dac 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsTypesIdEndpoint import ProcurementAdjustmentsTypesIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsTypesInfoEndpoint import \
     ProcurementAdjustmentsTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AdjustmentType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdEndpoint.py
index 2add180a7..9a76e64df 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementAdjustmentsTypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsTypesIdUsagesEndpoint import \
     ProcurementAdjustmentsTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AdjustmentType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AdjustmentType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/adjustments/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AdjustmentType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdInfoEndpoint.py
index 34d21dec4..9910df7ce 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AdjustmentTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdUsagesEndpoint.py
index fa0b09fb9..ff9d74419 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsTypesIdUsagesListEndpoint import \
     ProcurementAdjustmentsTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdUsagesListEndpoint.py
index 3bdb72b3a..50e2adcf1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesInfoCountEndpoint.py
index 2888e06da..16bfa309e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesInfoEndpoint.py
index 713b6ab4f..4ce0f4e40 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementAdjustmentsTypesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementAdjustmentsTypesInfoCountEndpoint import \
     ProcurementAdjustmentsTypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AdjustmentTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogCountEndpoint.py
index 5c55483d9..41e9e0285 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogEndpoint.py
index 7f13dd056..b49de6205 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementCatalogCountEndpoint import ProcurementCatalogCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCatalogIdEndpoint import ProcurementCatalogIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCatalogInfoEndpoint import ProcurementCatalogInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsCountEndpoint.py
index 247d5cfd5..9f990af07 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsEndpoint.py
index 6a29d21a0..da3dc4e9c 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementCatalogIdComponentsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCatalogIdComponentsIdEndpoint import \
     ProcurementCatalogIdComponentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogComponent
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsIdEndpoint.py
index 9409fd9a3..d4aa3c81e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdComponentsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogComponent
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CatalogComponent, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/catalog/{id}/components/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CatalogComponent:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdEndpoint.py
index 1160b58e1..fe9d9ed74 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdEndpoint.py
@@ -9,7 +9,6 @@
 from pyconnectwise.endpoints.manage.ProcurementCatalogIdPricingEndpoint import ProcurementCatalogIdPricingEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCatalogIdQuantityonhandEndpoint import \
     ProcurementCatalogIdQuantityonhandEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -18,10 +17,11 @@ class ProcurementCatalogIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.info = self._register_child_endpoint(ProcurementCatalogIdInfoEndpoint(client, parent_endpoint=self))
         self.quantity_on_hand = self._register_child_endpoint(
             ProcurementCatalogIdQuantityonhandEndpoint(client, parent_endpoint=self)
         )
-        self.info = self._register_child_endpoint(ProcurementCatalogIdInfoEndpoint(client, parent_endpoint=self))
+        self.pricing = self._register_child_endpoint(ProcurementCatalogIdPricingEndpoint(client, parent_endpoint=self))
         self.components = self._register_child_endpoint(
             ProcurementCatalogIdComponentsEndpoint(client, parent_endpoint=self)
         )
@@ -31,7 +31,6 @@ def __init__(self, client, parent_endpoint=None):
         self.inventory = self._register_child_endpoint(
             ProcurementCatalogIdInventoryEndpoint(client, parent_endpoint=self)
         )
-        self.pricing = self._register_child_endpoint(ProcurementCatalogIdPricingEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[CatalogItem]:
         """
@@ -66,17 +65,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CatalogItem, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/catalog/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CatalogItem:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInfoEndpoint.py
index 1964af090..ed7a6a6f3 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogItemInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryCountEndpoint.py
index 1bed36e26..1fa9c4496 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryEndpoint.py
index 83a5c368b..1758dc774 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementCatalogIdInventoryCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCatalogIdInventoryIdEndpoint import \
     ProcurementCatalogIdInventoryIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogInventory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryIdEndpoint.py
index d8b468ac0..b9addff7e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdInventoryIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogInventory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseCountEndpoint.py
index cae2223dd..d0484594e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseEndpoint.py
index f8990d428..3fc53b7ad 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementCatalogIdMinimumstockbywarehouseCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCatalogIdMinimumstockbywarehouseIdEndpoint import \
     ProcurementCatalogIdMinimumstockbywarehouseIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MinimumStockByWarehouse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseIdEndpoint.py
index 8b88ead37..0c4c76ad5 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdMinimumstockbywarehouseIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MinimumStockByWarehouse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MinimumStockByWarehouse, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/catalog/{id}/minimumStockByWarehouse/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MinimumStockByWarehouse:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdPricingEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdPricingEndpoint.py
index 931c78041..f1ecc9f9a 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdPricingEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdPricingEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogPricing
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdQuantityonhandEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdQuantityonhandEndpoint.py
index 984f74329..09bf02f92 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdQuantityonhandEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogIdQuantityonhandEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogInfoCountEndpoint.py
index cb2b183c8..023b25033 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCatalogInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCatalogInfoEndpoint.py
index 2352ec55e..c9b17f609 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCatalogInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCatalogInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCatalogInfoCountEndpoint import ProcurementCatalogInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CatalogItemInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesCountEndpoint.py
index 23d0184f2..b5d148192 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesEndpoint.py
index d20184fe9..530114ced 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementCategoriesCountEndpoint import ProcurementCategoriesCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCategoriesIdEndpoint import ProcurementCategoriesIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCategoriesInfoEndpoint import ProcurementCategoriesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Category
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdEndpoint.py
index e160b7b4f..028a037ce 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementCategoriesIdInfoEndpoint import ProcurementCategoriesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCategoriesIdSubcategoriesEndpoint import \
     ProcurementCategoriesIdSubcategoriesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Category
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -13,10 +12,10 @@ class ProcurementCategoriesIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.info = self._register_child_endpoint(ProcurementCategoriesIdInfoEndpoint(client, parent_endpoint=self))
         self.subcategories = self._register_child_endpoint(
             ProcurementCategoriesIdSubcategoriesEndpoint(client, parent_endpoint=self)
         )
+        self.info = self._register_child_endpoint(ProcurementCategoriesIdInfoEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Category]:
         """
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Category, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/categories/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Category:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdInfoEndpoint.py
index 633009771..389452adb 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CategoryInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesCountEndpoint.py
index 6b2d8850f..554ef8b75 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesEndpoint.py
index ecaa30d29..ef4c009f1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesEndpoint.py
@@ -7,7 +7,6 @@
     ProcurementCategoriesIdSubcategoriesIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCategoriesIdSubcategoriesInfoEndpoint import \
     ProcurementCategoriesIdSubcategoriesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesIdEndpoint.py
index 83eddd9e6..d8d39672f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCategoriesIdSubcategoriesIdInfoEndpoint import \
     ProcurementCategoriesIdSubcategoriesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LegacySubCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> L
         """
         return self._parse_one(LegacySubCategory, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/categories/{id}/subcategories/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LegacySubCategory:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesIdInfoEndpoint.py
index e1fbf4d90..c41ec0440 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LegacySubCategoryInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesInfoCountEndpoint.py
index 8e0aef0ab..015eb5866 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesInfoEndpoint.py
index 4ae14d23d..f6431991f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesIdSubcategoriesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCategoriesIdSubcategoriesInfoCountEndpoint import \
     ProcurementCategoriesIdSubcategoriesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LegacySubCategoryInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesInfoCountEndpoint.py
index db1049d64..b4f72e9d1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesInfoEndpoint.py
index c5fa80bc2..9812457a0 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementCategoriesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementCategoriesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementCategoriesInfoCountEndpoint import ProcurementCategoriesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CategoryInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsCountEndpoint.py
index 2a166b80d..b2c8e6198 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsEndpoint.py
index a6055db21..5d1866700 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementDirectionalsyncsCountEndpoint import \
     ProcurementDirectionalsyncsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementDirectionalsyncsIdEndpoint import ProcurementDirectionalsyncsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DirectionalSync
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsIdEndpoint.py
index ccd186315..5ba9db31d 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementDirectionalsyncsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DirectionalSync
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> D
         """
         return self._parse_one(DirectionalSync, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/directionalSyncs/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> DirectionalSync:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementEndpoint.py
index c09c9c054..8294db17f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementEndpoint.py
@@ -24,7 +24,6 @@
 from pyconnectwise.endpoints.manage.ProcurementUnitofmeasuresEndpoint import ProcurementUnitofmeasuresEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousebinsEndpoint import ProcurementWarehousebinsEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousesEndpoint import ProcurementWarehousesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -32,49 +31,49 @@ class ProcurementEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "procurement", parent_endpoint=parent_endpoint)
 
-        self.r_m_a_dispositions = self._register_child_endpoint(
-            ProcurementRmadispositionsEndpoint(client, parent_endpoint=self)
-        )
-        self.rma_actions = self._register_child_endpoint(ProcurementRmaactionsEndpoint(client, parent_endpoint=self))
-        self.products = self._register_child_endpoint(ProcurementProductsEndpoint(client, parent_endpoint=self))
-        self.purchaseorderstatuses = self._register_child_endpoint(
-            ProcurementPurchaseorderstatusesEndpoint(client, parent_endpoint=self)
-        )
-        self.types = self._register_child_endpoint(ProcurementTypesEndpoint(client, parent_endpoint=self))
-        self.warehouses = self._register_child_endpoint(ProcurementWarehousesEndpoint(client, parent_endpoint=self))
-        self.catalog = self._register_child_endpoint(ProcurementCatalogEndpoint(client, parent_endpoint=self))
-        self.adjustments = self._register_child_endpoint(ProcurementAdjustmentsEndpoint(client, parent_endpoint=self))
         self.directional_syncs = self._register_child_endpoint(
             ProcurementDirectionalsyncsEndpoint(client, parent_endpoint=self)
         )
-        self.pricingschedules = self._register_child_endpoint(
-            ProcurementPricingschedulesEndpoint(client, parent_endpoint=self)
+        self.rma_tags = self._register_child_endpoint(ProcurementRmatagsEndpoint(client, parent_endpoint=self))
+        self.warehouses = self._register_child_endpoint(ProcurementWarehousesEndpoint(client, parent_endpoint=self))
+        self.rma_statuses = self._register_child_endpoint(ProcurementRmastatusesEndpoint(client, parent_endpoint=self))
+        self.unit_of_measures = self._register_child_endpoint(
+            ProcurementUnitofmeasuresEndpoint(client, parent_endpoint=self)
+        )
+        self.warehouse_bins = self._register_child_endpoint(
+            ProcurementWarehousebinsEndpoint(client, parent_endpoint=self)
         )
+        self.types = self._register_child_endpoint(ProcurementTypesEndpoint(client, parent_endpoint=self))
         self.subcategories = self._register_child_endpoint(
             ProcurementSubcategoriesEndpoint(client, parent_endpoint=self)
         )
-        self.rma_statuses = self._register_child_endpoint(ProcurementRmastatusesEndpoint(client, parent_endpoint=self))
-        self.settings = self._register_child_endpoint(ProcurementSettingsEndpoint(client, parent_endpoint=self))
-        self.purchasing_demands = self._register_child_endpoint(
-            ProcurementPurchasingdemandsEndpoint(client, parent_endpoint=self)
+        self.adjustments = self._register_child_endpoint(ProcurementAdjustmentsEndpoint(client, parent_endpoint=self))
+        self.r_m_a_dispositions = self._register_child_endpoint(
+            ProcurementRmadispositionsEndpoint(client, parent_endpoint=self)
         )
-        self.categories = self._register_child_endpoint(ProcurementCategoriesEndpoint(client, parent_endpoint=self))
-        self.manufacturers = self._register_child_endpoint(
-            ProcurementManufacturersEndpoint(client, parent_endpoint=self)
+        self.shipmentmethods = self._register_child_endpoint(
+            ProcurementShipmentmethodsEndpoint(client, parent_endpoint=self)
         )
         self.purchaseorders = self._register_child_endpoint(
             ProcurementPurchaseordersEndpoint(client, parent_endpoint=self)
         )
-        self.shipmentmethods = self._register_child_endpoint(
-            ProcurementShipmentmethodsEndpoint(client, parent_endpoint=self)
-        )
-        self.unit_of_measures = self._register_child_endpoint(
-            ProcurementUnitofmeasuresEndpoint(client, parent_endpoint=self)
+        self.purchasing_demands = self._register_child_endpoint(
+            ProcurementPurchasingdemandsEndpoint(client, parent_endpoint=self)
         )
+        self.settings = self._register_child_endpoint(ProcurementSettingsEndpoint(client, parent_endpoint=self))
         self.onhandserialnumbers = self._register_child_endpoint(
             ProcurementOnhandserialnumbersEndpoint(client, parent_endpoint=self)
         )
-        self.rma_tags = self._register_child_endpoint(ProcurementRmatagsEndpoint(client, parent_endpoint=self))
-        self.warehouse_bins = self._register_child_endpoint(
-            ProcurementWarehousebinsEndpoint(client, parent_endpoint=self)
+        self.pricingschedules = self._register_child_endpoint(
+            ProcurementPricingschedulesEndpoint(client, parent_endpoint=self)
+        )
+        self.categories = self._register_child_endpoint(ProcurementCategoriesEndpoint(client, parent_endpoint=self))
+        self.products = self._register_child_endpoint(ProcurementProductsEndpoint(client, parent_endpoint=self))
+        self.manufacturers = self._register_child_endpoint(
+            ProcurementManufacturersEndpoint(client, parent_endpoint=self)
         )
+        self.purchaseorderstatuses = self._register_child_endpoint(
+            ProcurementPurchaseorderstatusesEndpoint(client, parent_endpoint=self)
+        )
+        self.catalog = self._register_child_endpoint(ProcurementCatalogEndpoint(client, parent_endpoint=self))
+        self.rma_actions = self._register_child_endpoint(ProcurementRmaactionsEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersCountEndpoint.py
index a5c354873..b1dc36d09 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersCountEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementManufacturersCountInfoEndpoint import \
     ProcurementManufacturersCountInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersCountInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersCountInfoEndpoint.py
index 47359dfb3..a2f176adb 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersCountInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersCountInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersEndpoint.py
index 3e38f0c78..7f1737a1d 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementManufacturersCountEndpoint import ProcurementManufacturersCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementManufacturersIdEndpoint import ProcurementManufacturersIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementManufacturersInfoEndpoint import ProcurementManufacturersInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Manufacturer
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersIdEndpoint.py
index 98d281e2e..59a042a60 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementManufacturersIdInfoEndpoint import ProcurementManufacturersIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Manufacturer
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(Manufacturer, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/manufacturers/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Manufacturer:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersIdInfoEndpoint.py
index d7b2c3e46..11527a3d8 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManufacturerInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersInfoEndpoint.py
index ff4c6bfef..380bfc33e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementManufacturersInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementManufacturersInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManufacturerInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersCountEndpoint.py
index 2d1df2011..da05cedbe 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersEndpoint.py
index 6f66868a0..8429eb54f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementOnhandserialnumbersCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementOnhandserialnumbersIdEndpoint import \
     ProcurementOnhandserialnumbersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OnHandSerialNumber
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersIdEndpoint.py
index 284ce39a6..4569fa229 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementOnhandserialnumbersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OnHandSerialNumber
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesCountEndpoint.py
index 291140bcc..3fe6449b1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesEndpoint.py
index ab02db5e0..178c6ed12 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementPricingschedulesCountEndpoint import \
     ProcurementPricingschedulesCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPricingschedulesIdEndpoint import ProcurementPricingschedulesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PricingSchedule
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsCountEndpoint.py
index fff31afe5..2af5d8807 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsEndpoint.py
index 2f6d991a7..2abe10039 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementPricingschedulesIdDetailsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPricingschedulesIdDetailsIdEndpoint import \
     ProcurementPricingschedulesIdDetailsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PricingDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksCountEndpoint.py
index 9e5c33f35..7738db76c 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksEndpoint.py
index 278c57080..aef2574a4 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementPricingschedulesIdDetailsIdBreaksCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPricingschedulesIdDetailsIdBreaksIdEndpoint import \
     ProcurementPricingschedulesIdDetailsIdBreaksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PricingBreak
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksIdEndpoint.py
index cbbe118df..d07337270 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdBreaksIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PricingBreak
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PricingBreak, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/pricingschedules/{id}/details/{id}/breaks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PricingBreak:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdEndpoint.py
index 46edac482..e5ac8b2fc 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdDetailsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPricingschedulesIdDetailsIdBreaksEndpoint import \
     ProcurementPricingschedulesIdDetailsIdBreaksEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PricingDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PricingDetail, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/pricingschedules/{id}/details/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PricingDetail:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdEndpoint.py
index 65f68c3cc..23a88af70 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPricingschedulesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPricingschedulesIdDetailsEndpoint import \
     ProcurementPricingschedulesIdDetailsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PricingSchedule
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PricingSchedule, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/pricingschedules/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PricingSchedule:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsCountEndpoint.py
index 01862b4f1..7cdc73ea8 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsEndpoint.py
index 32263339a..ea9c15672 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementProductsCountEndpoint import ProcurementProductsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementProductsIdEndpoint import ProcurementProductsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsCountEndpoint.py
index adc45db75..a8589665e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsEndpoint.py
index ecb825722..2a8f81a9e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementProductsIdComponentsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementProductsIdComponentsIdEndpoint import \
     ProcurementProductsIdComponentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductComponent
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsIdEndpoint.py
index 28f9e6f30..6705f901d 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdComponentsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductComponent
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
         """
         return self._parse_many(ProductComponent, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/products/{id}/components/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ProductComponent]:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdDetachEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdDetachEndpoint.py
index 830666389..aa5732ee4 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdDetachEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdDetachEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductDetach
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdEndpoint.py
index 5ab4a52d0..f8eced8da 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.ProcurementProductsIdDetachEndpoint import ProcurementProductsIdDetachEndpoint
 from pyconnectwise.endpoints.manage.ProcurementProductsIdPickingshippingdetailsEndpoint import \
     ProcurementProductsIdPickingshippingdetailsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -15,13 +14,13 @@ class ProcurementProductsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.components = self._register_child_endpoint(
-            ProcurementProductsIdComponentsEndpoint(client, parent_endpoint=self)
-        )
-        self.detach = self._register_child_endpoint(ProcurementProductsIdDetachEndpoint(client, parent_endpoint=self))
         self.picking_shipping_details = self._register_child_endpoint(
             ProcurementProductsIdPickingshippingdetailsEndpoint(client, parent_endpoint=self)
         )
+        self.detach = self._register_child_endpoint(ProcurementProductsIdDetachEndpoint(client, parent_endpoint=self))
+        self.components = self._register_child_endpoint(
+            ProcurementProductsIdComponentsEndpoint(client, parent_endpoint=self)
+        )
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[ProductItem]:
         """
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProductItem, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/products/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProductItem:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsCountEndpoint.py
index 79a7d43eb..4acff857c 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsEndpoint.py
index 8a1167491..27fc3fb5e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementProductsIdPickingshippingdetailsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementProductsIdPickingshippingdetailsIdEndpoint import \
     ProcurementProductsIdPickingshippingdetailsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductPickingShippingDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsIdEndpoint.py
index 172329d73..a1684c801 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementProductsIdPickingshippingdetailsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductPickingShippingDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -47,17 +46,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> l
             ProductPickingShippingDetail, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/products/{id}/pickingShippingDetails/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> list[ProductPickingShippingDetail]:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersCountEndpoint.py
index 5977dc9e2..e6595fd21 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersEndpoint.py
index 47c8c95b7..e65ff8147 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseordersCountEndpoint import ProcurementPurchaseordersCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseordersIdEndpoint import ProcurementPurchaseordersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdEndpoint.py
index 250d9ad3b..ff1b3a667 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdEndpoint.py
@@ -7,7 +7,6 @@
     ProcurementPurchaseordersIdRebatchEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseordersIdUnbatchEndpoint import \
     ProcurementPurchaseordersIdUnbatchEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrder
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -19,12 +18,12 @@ def __init__(self, client, parent_endpoint=None):
         self.lineitems = self._register_child_endpoint(
             ProcurementPurchaseordersIdLineitemsEndpoint(client, parent_endpoint=self)
         )
-        self.rebatch = self._register_child_endpoint(
-            ProcurementPurchaseordersIdRebatchEndpoint(client, parent_endpoint=self)
-        )
         self.unbatch = self._register_child_endpoint(
             ProcurementPurchaseordersIdUnbatchEndpoint(client, parent_endpoint=self)
         )
+        self.rebatch = self._register_child_endpoint(
+            ProcurementPurchaseordersIdRebatchEndpoint(client, parent_endpoint=self)
+        )
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
@@ -61,17 +60,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PurchaseOrder, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/purchaseorders/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PurchaseOrder:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsBulkEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsBulkEndpoint.py
index aa42145ae..8461b6b3b 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsBulkEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsBulkEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BulkResult
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsCountEndpoint.py
index 23b59ab8b..0e124238d 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsEndpoint.py
index 0df3e7fb8..3d3b2ccb5 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsEndpoint.py
@@ -7,7 +7,6 @@
     ProcurementPurchaseordersIdLineitemsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseordersIdLineitemsIdEndpoint import \
     ProcurementPurchaseordersIdLineitemsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrderLineItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -16,12 +15,12 @@ class ProcurementPurchaseordersIdLineitemsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "lineitems", parent_endpoint=parent_endpoint)
 
-        self.count = self._register_child_endpoint(
-            ProcurementPurchaseordersIdLineitemsCountEndpoint(client, parent_endpoint=self)
-        )
         self.bulk = self._register_child_endpoint(
             ProcurementPurchaseordersIdLineitemsBulkEndpoint(client, parent_endpoint=self)
         )
+        self.count = self._register_child_endpoint(
+            ProcurementPurchaseordersIdLineitemsCountEndpoint(client, parent_endpoint=self)
+        )
 
     def id(self, id: int) -> ProcurementPurchaseordersIdLineitemsIdEndpoint:
         """
@@ -83,14 +82,12 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
         """
         return self._parse_one(PurchaseOrderLineItem, super()._make_request("POST", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/purchaseorders/{id}/lineitems endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsIdEndpoint.py
index c2be65e69..15bcffa91 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdLineitemsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrderLineItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdRebatchEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdRebatchEndpoint.py
index c96f252e1..25a3d43a1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdRebatchEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdRebatchEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdUnbatchEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdUnbatchEndpoint.py
index 5abaef05b..0d9baf053 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdUnbatchEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseordersIdUnbatchEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesCountEndpoint.py
index eaaff29ac..27097a062 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesEndpoint.py
index 4dfd10ddf..f57719f11 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementPurchaseorderstatusesCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseorderstatusesIdEndpoint import \
     ProcurementPurchaseorderstatusesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrderStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesCountEndpoint.py
index c67dd8c3d..ae17b4d86 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesEndpoint.py
index d1a26289a..b835f8cdf 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementPurchaseorderstatusesIdEmailtemplatesCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseorderstatusesIdEmailtemplatesIdEndpoint import \
     ProcurementPurchaseorderstatusesIdEmailtemplatesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesIdEndpoint.py
index 009c10e7a..a99834b04 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEmailtemplatesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrderStatusEmailTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -47,17 +46,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
             PurchaseOrderStatusEmailTemplate, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/purchaseorderstatuses/{id}/emailtemplates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PurchaseOrderStatusEmailTemplate:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEndpoint.py
index 6ed158950..d02471a4c 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdEndpoint.py
@@ -7,7 +7,6 @@
     ProcurementPurchaseorderstatusesIdNotificationsEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseorderstatusesIdUsagesEndpoint import \
     ProcurementPurchaseorderstatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrderStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -61,17 +60,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PurchaseOrderStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/purchaseorderstatuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PurchaseOrderStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsCountEndpoint.py
index 3c5b0dc7c..d5f580276 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsEndpoint.py
index ad757c4cf..09f547ab2 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementPurchaseorderstatusesIdNotificationsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseorderstatusesIdNotificationsIdEndpoint import \
     ProcurementPurchaseorderstatusesIdNotificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrderStatusNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsIdEndpoint.py
index 3cf8f357f..44e00ccc3 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdNotificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchaseOrderStatusNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -47,17 +46,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
             PurchaseOrderStatusNotification, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/purchaseorderstatuses/{id}/notifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PurchaseOrderStatusNotification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdUsagesEndpoint.py
index cf637adc3..005a6bd65 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementPurchaseorderstatusesIdUsagesListEndpoint import \
     ProcurementPurchaseorderstatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdUsagesListEndpoint.py
index 134c6fc86..d608da596 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchaseorderstatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementPurchasingdemandsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementPurchasingdemandsEndpoint.py
index 567d7e05e..eee968d33 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementPurchasingdemandsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementPurchasingdemandsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PurchasingDemand
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsCountEndpoint.py
index 67b9a74b0..01a296ccd 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsEndpoint.py
index 99bdbdc4b..a09e41320 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementRmaactionsCountEndpoint import ProcurementRmaactionsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmaactionsIdEndpoint import ProcurementRmaactionsIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmaactionsInfoEndpoint import ProcurementRmaactionsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaAction
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsIdEndpoint.py
index ee71cb5f2..6e10e5bfb 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmaactionsIdInfoEndpoint import ProcurementRmaactionsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaAction
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(RmaAction, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/rmaActions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> RmaAction:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsIdInfoEndpoint.py
index dd6fb7482..07989af68 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaActionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsInfoCountEndpoint.py
index e75961a2b..4e22c375e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsInfoEndpoint.py
index a14850f8e..221b48700 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmaactionsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmaactionsInfoCountEndpoint import ProcurementRmaactionsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaActionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsCountEndpoint.py
index bf53536d3..ae2fa50da 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsEndpoint.py
index b0c0a5b26..906ade30c 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementRmadispositionsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmadispositionsIdEndpoint import ProcurementRmadispositionsIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmadispositionsInfoEndpoint import ProcurementRmadispositionsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaDisposition
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsIdEndpoint.py
index a2067c168..8b0da7048 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmadispositionsIdInfoEndpoint import \
     ProcurementRmadispositionsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaDisposition
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(RmaDisposition, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/RMADispositions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> RmaDisposition:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsIdInfoEndpoint.py
index 811075e8c..7004d4dd2 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaDispositionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsInfoCountEndpoint.py
index a53f9c5cd..782a20ee0 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsInfoEndpoint.py
index 2c36ab836..e3d64ad3a 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmadispositionsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmadispositionsInfoCountEndpoint import \
     ProcurementRmadispositionsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaDispositionInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesCountEndpoint.py
index c878afb32..2d1e1b6b1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesEndpoint.py
index ff2411d98..2db8c2fab 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementRmastatusesCountEndpoint import ProcurementRmastatusesCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmastatusesIdEndpoint import ProcurementRmastatusesIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmastatusesInfoEndpoint import ProcurementRmastatusesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesCountEndpoint.py
index 4b66b2f29..431162910 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesEndpoint.py
index b3c7d0bfe..520641f2e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesIdEndpoint.py
index 33194ec38..8a2f654f3 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEmailtemplatesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaStatusEmailTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(RmaStatusEmailTemplate, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/rmaStatuses/{id}/emailtemplates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> RmaStatusEmailTemplate:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEndpoint.py
index edd2ea75a..f00b110da 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdEndpoint.py
@@ -7,7 +7,6 @@
 from pyconnectwise.endpoints.manage.ProcurementRmastatusesIdNotificationsEndpoint import \
     ProcurementRmastatusesIdNotificationsEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmastatusesIdUsagesEndpoint import ProcurementRmastatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -16,16 +15,16 @@ class ProcurementRmastatusesIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.notifications = self._register_child_endpoint(
-            ProcurementRmastatusesIdNotificationsEndpoint(client, parent_endpoint=self)
-        )
-        self.email_templates = self._register_child_endpoint(
+        self.emailtemplates = self._register_child_endpoint(
             ProcurementRmastatusesIdEmailtemplatesEndpoint(client, parent_endpoint=self)
         )
         self.info = self._register_child_endpoint(ProcurementRmastatusesIdInfoEndpoint(client, parent_endpoint=self))
-        self.emailtemplates = self._register_child_endpoint(
+        self.email_templates = self._register_child_endpoint(
             ProcurementRmastatusesIdEmailtemplatesEndpoint(client, parent_endpoint=self)
         )
+        self.notifications = self._register_child_endpoint(
+            ProcurementRmastatusesIdNotificationsEndpoint(client, parent_endpoint=self)
+        )
         self.usages = self._register_child_endpoint(
             ProcurementRmastatusesIdUsagesEndpoint(client, parent_endpoint=self)
         )
@@ -63,17 +62,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(RmaStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/rmaStatuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> RmaStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdInfoEndpoint.py
index d86ff49be..ede92e86f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsCountEndpoint.py
index d5986add4..04f12e2a6 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsEndpoint.py
index bba1778f5..30f7162a3 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementRmastatusesIdNotificationsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmastatusesIdNotificationsIdEndpoint import \
     ProcurementRmastatusesIdNotificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaStatusNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsIdEndpoint.py
index ebc84001f..7b49a4c24 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdNotificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaStatusNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(RmaStatusNotification, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/rmaStatuses/{id}/notifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> RmaStatusNotification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdUsagesEndpoint.py
index a13df350f..14e120e35 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmastatusesIdUsagesListEndpoint import \
     ProcurementRmastatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdUsagesListEndpoint.py
index 33cc8fdc6..fb6743a02 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesInfoCountEndpoint.py
index 5b5027ba2..841c2e15f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesInfoEndpoint.py
index 2f8a263b1..eb73a93b0 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmastatusesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmastatusesInfoCountEndpoint import \
     ProcurementRmastatusesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmatagsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmatagsCountEndpoint.py
index 9a50f25d4..095f8d2ae 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmatagsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmatagsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmatagsDefaultEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmatagsDefaultEndpoint.py
index fff281788..935d49087 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmatagsDefaultEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmatagsDefaultEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaTag
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmatagsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmatagsEndpoint.py
index 823ddc6e1..8aabc8650 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmatagsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmatagsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementRmatagsCountEndpoint import ProcurementRmatagsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmatagsDefaultEndpoint import ProcurementRmatagsDefaultEndpoint
 from pyconnectwise.endpoints.manage.ProcurementRmatagsIdEndpoint import ProcurementRmatagsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaTag
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementRmatagsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementRmatagsIdEndpoint.py
index ea18e2d30..60213aaed 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementRmatagsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementRmatagsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import RmaTag
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(RmaTag, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/rmaTags/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> RmaTag:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSettingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSettingsCountEndpoint.py
index fbd1c7769..9bd32157b 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSettingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSettingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSettingsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSettingsEndpoint.py
index 816f91617..5c2445c1f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSettingsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementSettingsCountEndpoint import ProcurementSettingsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementSettingsIdEndpoint import ProcurementSettingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProcurementSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSettingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSettingsIdEndpoint.py
index 7cb5f05bd..176f9ddcc 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSettingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSettingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProcurementSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsCountEndpoint.py
index 3d1ec7f74..e4b0dc874 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsEndpoint.py
index 4394f03d6..571b8ea6e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementShipmentmethodsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementShipmentmethodsIdEndpoint import ProcurementShipmentmethodsIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementShipmentmethodsInfoEndpoint import ProcurementShipmentmethodsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ShipmentMethod
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdEndpoint.py
index 5e371ccb5..c72d719c2 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementShipmentmethodsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProcurementShipmentmethodsIdUsagesEndpoint import \
     ProcurementShipmentmethodsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ShipmentMethod
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ShipmentMethod, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/shipmentmethods/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ShipmentMethod:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdInfoEndpoint.py
index e8cd40a71..d8c02af9e 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ShipmentMethodInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdUsagesEndpoint.py
index b7fecbc48..d22106f9c 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementShipmentmethodsIdUsagesListEndpoint import \
     ProcurementShipmentmethodsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdUsagesListEndpoint.py
index 284bfb6ca..a99efab6c 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsInfoCountEndpoint.py
index 582b5508f..d91939a93 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsInfoEndpoint.py
index 7522958a5..a3cf33e04 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementShipmentmethodsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementShipmentmethodsInfoCountEndpoint import \
     ProcurementShipmentmethodsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ShipmentMethodInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesCountEndpoint.py
index 69ca831f9..deb6ecffb 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesEndpoint.py
index 6247f85fd..234332f43 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementSubcategoriesCountEndpoint import ProcurementSubcategoriesCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementSubcategoriesIdEndpoint import ProcurementSubcategoriesIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementSubcategoriesInfoEndpoint import ProcurementSubcategoriesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdEndpoint.py
index a7783953e..5ba686cff 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementSubcategoriesIdInfoEndpoint import ProcurementSubcategoriesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProcurementSubcategoriesIdUsagesEndpoint import \
     ProcurementSubcategoriesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SubCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SubCategory, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/subcategories/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SubCategory:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdInfoEndpoint.py
index 24806bed4..950c7ae73 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SubCategoryInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdUsagesEndpoint.py
index 218edd398..41ea182ea 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementSubcategoriesIdUsagesListEndpoint import \
     ProcurementSubcategoriesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdUsagesListEndpoint.py
index f22bbc38c..357c1ece2 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesInfoCountEndpoint.py
index d96058d02..2798a96e1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesInfoEndpoint.py
index 5dd3938ea..b6861541a 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementSubcategoriesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementSubcategoriesInfoCountEndpoint import \
     ProcurementSubcategoriesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementTypesCountEndpoint.py
index 37b524cb5..8845ce678 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementTypesEndpoint.py
index 450a7ee08..d45b888a6 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementTypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementTypesCountEndpoint import ProcurementTypesCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementTypesIdEndpoint import ProcurementTypesIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementTypesInfoEndpoint import ProcurementTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementTypesIdEndpoint.py
index c1dfbd554..6f2324ba3 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementTypesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementTypesIdInfoEndpoint import ProcurementTypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProcurementTypesIdUsagesEndpoint import ProcurementTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProductType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProductType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementTypesIdInfoEndpoint.py
index 8d7563c1d..3807663a5 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementTypesIdUsagesEndpoint.py
index 2c0be8247..7b3c7b2d4 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementTypesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementTypesIdUsagesListEndpoint import ProcurementTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementTypesIdUsagesListEndpoint.py
index 467746f10..d6a5edafb 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementTypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementTypesInfoCountEndpoint.py
index 2d07f3d36..28096e480 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementTypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementTypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementTypesInfoEndpoint.py
index c61be7142..cb146b482 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementTypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementTypesInfoCountEndpoint import ProcurementTypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresCountEndpoint.py
index ed1ad204e..acdb77671 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresEndpoint.py
index c84e48515..752df0e88 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementUnitofmeasuresCountEndpoint import ProcurementUnitofmeasuresCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementUnitofmeasuresIdEndpoint import ProcurementUnitofmeasuresIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnitOfMeasure
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsCountEndpoint.py
index 7c460b9c9..22f4fd44a 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsEndpoint.py
index 63aee8d1b..b328d6bae 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementUnitofmeasuresIdConversionsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementUnitofmeasuresIdConversionsIdEndpoint import \
     ProcurementUnitofmeasuresIdConversionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Conversion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsIdEndpoint.py
index 5c268fd70..0fe160059 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdConversionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Conversion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Conversion, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/unitOfMeasures/{id}/conversions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Conversion:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdEndpoint.py
index ddafa5516..e347a3cc0 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementUnitofmeasuresIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementUnitofmeasuresIdConversionsEndpoint import \
     ProcurementUnitofmeasuresIdConversionsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UnitOfMeasure
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> U
         """
         return self._parse_one(UnitOfMeasure, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/unitOfMeasures/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UnitOfMeasure:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsCountEndpoint.py
index 2e13356b2..4a240863a 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsEndpoint.py
index ac06fab2d..7b641fcbb 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementWarehousebinsCountEndpoint import ProcurementWarehousebinsCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousebinsIdEndpoint import ProcurementWarehousebinsIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousebinsInfoEndpoint import ProcurementWarehousebinsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WarehouseBin
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdEndpoint.py
index 2c90329c1..81c23ece7 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementWarehousebinsIdInfoEndpoint import ProcurementWarehousebinsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousebinsIdInventoryonhandEndpoint import \
     ProcurementWarehousebinsIdInventoryonhandEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WarehouseBin
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -53,17 +52,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(WarehouseBin, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/warehouseBins/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> WarehouseBin:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInfoEndpoint.py
index 93ff252c3..60d10daf4 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WarehouseBinInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandCountEndpoint.py
index 9f08ae7e7..ce566ab43 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandEndpoint.py
index e697da5fd..d6b12945b 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandEndpoint.py
@@ -5,7 +5,6 @@
     ProcurementWarehousebinsIdInventoryonhandCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousebinsIdInventoryonhandIdEndpoint import \
     ProcurementWarehousebinsIdInventoryonhandIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InventoryOnHand
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandIdEndpoint.py
index 233096416..ba502888f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsIdInventoryonhandIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InventoryOnHand
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsInfoCountEndpoint.py
index 5220e71b4..7e819f233 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsInfoEndpoint.py
index a77378018..e9aac4b30 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousebinsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousebinsInfoCountEndpoint import \
     ProcurementWarehousebinsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WarehouseBinInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesCountEndpoint.py
index e738ffc46..67a2ea544 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesEndpoint.py
index 8b14f1f07..3c473a9db 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProcurementWarehousesCountEndpoint import ProcurementWarehousesCountEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousesIdEndpoint import ProcurementWarehousesIdEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousesInfoEndpoint import ProcurementWarehousesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Warehouse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesIdEndpoint.py
index eb215a373..f2a1590f3 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousesIdInfoEndpoint import ProcurementWarehousesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Warehouse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(Warehouse, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /procurement/warehouses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Warehouse:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesIdInfoEndpoint.py
index 50c5e657f..ec76e5b5f 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WarehouseInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesInfoCountEndpoint.py
index 71980d3d7..f7425d6f1 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesInfoEndpoint.py
index b7b4853d9..4301fea33 100644
--- a/src/pyconnectwise/endpoints/manage/ProcurementWarehousesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProcurementWarehousesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProcurementWarehousesInfoCountEndpoint import ProcurementWarehousesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WarehouseInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBillingratesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBillingratesEndpoint.py
index 660dad7ec..7ca7caaef 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBillingratesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBillingratesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectBillingratesIdEndpoint import ProjectBillingratesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdBillingratesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdBillingratesEndpoint.py
index 51a929d6c..cd9688b12 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdBillingratesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdBillingratesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectBillingratesIdBillingratesIdEndpoint import \
     ProjectBillingratesIdBillingratesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdBillingratesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdBillingratesIdEndpoint.py
index 41450ca28..6e8408f9e 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdBillingratesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdBillingratesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBillingRate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdEndpoint.py
index 30b405415..681214f1e 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBillingratesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectBillingratesIdBillingratesEndpoint import \
     ProjectBillingratesIdBillingratesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsEndpoint.py
index facd35b15..3563a269f 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectBoardsIdEndpoint import ProjectBoardsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdEndpoint.py
index cd0ca9efd..e0fc8ac70 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectBoardsIdTeamsEndpoint import ProjectBoardsIdTeamsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsCountEndpoint.py
index b95fcc28b..ab2a96297 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsEndpoint.py
index 684ced462..bc7ee583d 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProjectBoardsIdTeamsCountEndpoint import ProjectBoardsIdTeamsCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectBoardsIdTeamsIdEndpoint import ProjectBoardsIdTeamsIdEndpoint
 from pyconnectwise.endpoints.manage.ProjectBoardsIdTeamsInfoEndpoint import ProjectBoardsIdTeamsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBoardTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdEndpoint.py
index 702389e46..6c1dc15b4 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectBoardsIdTeamsIdInfoEndpoint import ProjectBoardsIdTeamsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProjectBoardsIdTeamsIdMembersEndpoint import ProjectBoardsIdTeamsIdMembersEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBoardTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -52,17 +51,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectBoardTeam, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/boards/{id}/teams/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectBoardTeam:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdInfoCountEndpoint.py
index 1e29ec92d..26f4f3055 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdInfoEndpoint.py
index 599af47a6..360ed74c2 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectBoardsIdTeamsIdInfoCountEndpoint import \
     ProjectBoardsIdTeamsIdInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBoardTeamInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdMembersEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdMembersEndpoint.py
index 7165d58c6..7251e0f7f 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdMembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdMembersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectBoardsIdTeamsIdMembersIdEndpoint import \
     ProjectBoardsIdTeamsIdMembersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBoardTeamMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdMembersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdMembersIdEndpoint.py
index 3c67ecea0..6a01b917c 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdMembersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsIdMembersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBoardTeamMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectBoardTeamMember, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/boards/{id}/teams/{id}/members/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectBoardTeamMember:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsInfoEndpoint.py
index 652e867f9..8bfd85e28 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectBoardsIdTeamsInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBoardTeamInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectEndpoint.py
index 2d5f3cfd0..8d5244faf 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectEndpoint.py
@@ -13,7 +13,6 @@
 from pyconnectwise.endpoints.manage.ProjectStatusindicatorsEndpoint import ProjectStatusindicatorsEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketnoteEndpoint import ProjectTicketnoteEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsEndpoint import ProjectTicketsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -23,19 +22,19 @@ def __init__(self, client, parent_endpoint=None):
 
         self.projects = self._register_child_endpoint(ProjectProjectsEndpoint(client, parent_endpoint=self))
         self.phase_statuses = self._register_child_endpoint(ProjectPhasestatusesEndpoint(client, parent_endpoint=self))
-        self.billing_rates = self._register_child_endpoint(ProjectBillingratesEndpoint(client, parent_endpoint=self))
-        self.project_templates = self._register_child_endpoint(
-            ProjectProjecttemplatesEndpoint(client, parent_endpoint=self)
-        )
-        self.ticket_note = self._register_child_endpoint(ProjectTicketnoteEndpoint(client, parent_endpoint=self))
+        self.security_roles = self._register_child_endpoint(ProjectSecurityrolesEndpoint(client, parent_endpoint=self))
         self.status_indicators = self._register_child_endpoint(
             ProjectStatusindicatorsEndpoint(client, parent_endpoint=self)
         )
-        self.tickets = self._register_child_endpoint(ProjectTicketsEndpoint(client, parent_endpoint=self))
-        self.security_roles = self._register_child_endpoint(ProjectSecurityrolesEndpoint(client, parent_endpoint=self))
-        self.statuses = self._register_child_endpoint(ProjectStatusesEndpoint(client, parent_endpoint=self))
+        self.ticket_note = self._register_child_endpoint(ProjectTicketnoteEndpoint(client, parent_endpoint=self))
+        self.billing_rates = self._register_child_endpoint(ProjectBillingratesEndpoint(client, parent_endpoint=self))
         self.project_types = self._register_child_endpoint(ProjectProjecttypesEndpoint(client, parent_endpoint=self))
+        self.tickets = self._register_child_endpoint(ProjectTicketsEndpoint(client, parent_endpoint=self))
         self.boards = self._register_child_endpoint(ProjectBoardsEndpoint(client, parent_endpoint=self))
+        self.statuses = self._register_child_endpoint(ProjectStatusesEndpoint(client, parent_endpoint=self))
+        self.project_templates = self._register_child_endpoint(
+            ProjectProjecttemplatesEndpoint(client, parent_endpoint=self)
+        )
 
     def id(self, id: int) -> ProjectIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesCountEndpoint.py
index e8911e6ca..0de302ea3 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesEndpoint.py
index 8338c08e8..b2f7bbfa4 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectIdBillingratesCountEndpoint import ProjectIdBillingratesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectIdBillingratesIdEndpoint import ProjectIdBillingratesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBillingRate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesIdEndpoint.py
index ed8320fa2..d9ef9a81e 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectIdBillingratesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectBillingRate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectBillingRate, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/{id}/billingRates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectBillingRate:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectIdEndpoint.py
index 62b3d1467..9297961ac 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectIdBillingratesEndpoint import ProjectIdBillingratesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesCountEndpoint.py
index 1930bbff3..dd9953811 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesEndpoint.py
index 284d37559..fbdd426bd 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectPhasestatusesCountEndpoint import ProjectPhasestatusesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectPhasestatusesIdEndpoint import ProjectPhasestatusesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PhaseStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdEndpoint.py
index 304394c63..3608bc819 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectPhasestatusesIdUsagesEndpoint import ProjectPhasestatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PhaseStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PhaseStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/phaseStatuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PhaseStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdUsagesEndpoint.py
index abcaf6080..b8de55536 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectPhasestatusesIdUsagesListEndpoint import \
     ProjectPhasestatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdUsagesListEndpoint.py
index 8b4d27f95..78f15f3cd 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectPhasestatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsCountEndpoint.py
index c1dffe8c0..53eae1e26 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsEndpoint.py
index 2c39ecf9f..30205a1da 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsCountEndpoint import ProjectProjectsCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdEndpoint import ProjectProjectsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Project
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdContactsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdContactsEndpoint.py
index 22af68f67..8686107d7 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdContactsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdContactsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdContactsIdEndpoint import ProjectProjectsIdContactsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdContactsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdContactsIdEndpoint.py
index f0ec14724..551628569 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdContactsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdContactsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectContact, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projects/{id}/contacts/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdEndpoint.py
index c31335059..ac7101164 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdEndpoint.py
@@ -7,7 +7,6 @@
 from pyconnectwise.endpoints.manage.ProjectProjectsIdProjectworkplanEndpoint import \
     ProjectProjectsIdProjectworkplanEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdTeammembersEndpoint import ProjectProjectsIdTeammembersEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Project
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -16,15 +15,15 @@ class ProjectProjectsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.phases = self._register_child_endpoint(ProjectProjectsIdPhasesEndpoint(client, parent_endpoint=self))
         self.team_members = self._register_child_endpoint(
             ProjectProjectsIdTeammembersEndpoint(client, parent_endpoint=self)
         )
         self.notes = self._register_child_endpoint(ProjectProjectsIdNotesEndpoint(client, parent_endpoint=self))
+        self.contacts = self._register_child_endpoint(ProjectProjectsIdContactsEndpoint(client, parent_endpoint=self))
         self.project_workplan = self._register_child_endpoint(
             ProjectProjectsIdProjectworkplanEndpoint(client, parent_endpoint=self)
         )
-        self.phases = self._register_child_endpoint(ProjectProjectsIdPhasesEndpoint(client, parent_endpoint=self))
-        self.contacts = self._register_child_endpoint(ProjectProjectsIdContactsEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Project]:
         """
@@ -59,17 +58,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(Project, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projects/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Project:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesCountEndpoint.py
index 2fea44985..3d9da3d41 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesEndpoint.py
index fca21a2be..1fdc4575c 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdNotesCountEndpoint import ProjectProjectsIdNotesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdNotesIdEndpoint import ProjectProjectsIdNotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesIdEndpoint.py
index 285cb16f1..01e5002f5 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdNotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectNote, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projects/{id}/notes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectNote:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesCountEndpoint.py
index ccbf2348f..e3eb2be9c 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesEndpoint.py
index 82cd10e11..e43a1d981 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdPhasesCountEndpoint import ProjectProjectsIdPhasesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdPhasesIdEndpoint import ProjectProjectsIdPhasesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectPhase
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesIdEndpoint.py
index 5bdd6ec32..de1054538 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdPhasesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectPhase
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectPhase, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projects/{id}/phases/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectPhase:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanCountEndpoint.py
index 98f2bf576..9d4e84ad2 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanEndpoint.py
index 8654d461e..5e441815a 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanEndpoint.py
@@ -5,7 +5,6 @@
     ProjectProjectsIdProjectworkplanCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdProjectworkplanIdEndpoint import \
     ProjectProjectsIdProjectworkplanIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectWorkplan
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanIdEndpoint.py
index 56274909b..c16e0e51a 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdProjectworkplanIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectWorkplan
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersCountEndpoint.py
index 45c530dcf..f9dee3500 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersEndpoint.py
index d8505d9c0..dd80910f2 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProjectProjectsIdTeammembersCountEndpoint import \
     ProjectProjectsIdTeammembersCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjectsIdTeammembersIdEndpoint import ProjectProjectsIdTeammembersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTeamMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersIdEndpoint.py
index a66c99b11..a13e9c514 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjectsIdTeammembersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTeamMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectTeamMember, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projects/{id}/teamMembers/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectTeamMember:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesCountEndpoint.py
index c05b63e44..c02bbbc02 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesEndpoint.py
index 827cffb55..cfa938421 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttemplatesCountEndpoint import ProjectProjecttemplatesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttemplatesIdEndpoint import ProjectProjecttemplatesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdEndpoint.py
index a21ff6e22..6d25c7cbe 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdEndpoint.py
@@ -5,7 +5,6 @@
     ProjectProjecttemplatesIdProjecttemplateticketsEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttemplatesIdWorkplanEndpoint import \
     ProjectProjecttemplatesIdWorkplanEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -14,12 +13,12 @@ class ProjectProjecttemplatesIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.workplan = self._register_child_endpoint(
-            ProjectProjecttemplatesIdWorkplanEndpoint(client, parent_endpoint=self)
-        )
         self.project_template_tickets = self._register_child_endpoint(
             ProjectProjecttemplatesIdProjecttemplateticketsEndpoint(client, parent_endpoint=self)
         )
+        self.workplan = self._register_child_endpoint(
+            ProjectProjecttemplatesIdWorkplanEndpoint(client, parent_endpoint=self)
+        )
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectTemplate, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projectTemplates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectTemplate:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsCountEndpoint.py
index d671e3fe1..1c33fb4cb 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsEndpoint.py
index 671faef6d..903c0a15d 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsEndpoint.py
@@ -5,7 +5,6 @@
     ProjectProjecttemplatesIdProjecttemplateticketsCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttemplatesIdProjecttemplateticketsIdEndpoint import \
     ProjectProjecttemplatesIdProjecttemplateticketsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTemplateTicket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdEndpoint.py
index c308b7c80..cfad37a25 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttemplatesIdProjecttemplateticketsIdTasksEndpoint import \
     ProjectProjecttemplatesIdProjecttemplateticketsIdTasksEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTemplateTicket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectTemplateTicket, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projectTemplates/{id}/projectTemplateTickets/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectTemplateTicket:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksCountEndpoint.py
index d83182b07..1ac796222 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksEndpoint.py
index fcd4fadf2..953784709 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksEndpoint.py
@@ -5,7 +5,6 @@
     ProjectProjecttemplatesIdProjecttemplateticketsIdTasksCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttemplatesIdProjecttemplateticketsIdTasksIdEndpoint import \
     ProjectProjecttemplatesIdProjecttemplateticketsIdTasksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTemplateTask
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksIdEndpoint.py
index f4a787636..4f3933211 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdProjecttemplateticketsIdTasksIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTemplateTask
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectTemplateTask, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projectTemplates/{id}/projectTemplateTickets/{id}/tasks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectTemplateTask:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdWorkplanEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdWorkplanEndpoint.py
index 6b5fdf262..6da22f40b 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdWorkplanEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttemplatesIdWorkplanEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTemplateWorkPlan
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesCountEndpoint.py
index f50717e41..cbff92254 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesEndpoint.py
index c4125b153..f327e9057 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProjectProjecttypesCountEndpoint import ProjectProjecttypesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttypesIdEndpoint import ProjectProjecttypesIdEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttypesInfoEndpoint import ProjectProjecttypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdEndpoint.py
index ef003abc4..7e294997f 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttypesIdInfoEndpoint import ProjectProjecttypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttypesIdUsagesEndpoint import ProjectProjecttypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/projectTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdInfoEndpoint.py
index 3ac37d805..699ae2702 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdUsagesEndpoint.py
index b4bfc3609..d0fe3411b 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttypesIdUsagesListEndpoint import \
     ProjectProjecttypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdUsagesListEndpoint.py
index 86dc5a3da..fe0f99058 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesInfoCountEndpoint.py
index 61a01686c..68b93d94a 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesInfoEndpoint.py
index e916d6c07..d692bf5d8 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectProjecttypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectProjecttypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectProjecttypesInfoCountEndpoint import ProjectProjecttypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesCountEndpoint.py
index 1d84843d4..0616978ad 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesEndpoint.py
index d73ea12f8..35dd378ff 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectSecurityrolesCountEndpoint import ProjectSecurityrolesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectSecurityrolesIdEndpoint import ProjectSecurityrolesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectSecurityRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdEndpoint.py
index b1d2ffa3b..6db466319 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectSecurityrolesIdSettingsEndpoint import ProjectSecurityrolesIdSettingsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectSecurityRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectSecurityRole, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/securityRoles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectSecurityRole:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsCountEndpoint.py
index c2aafb695..dd9ddd83a 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsEndpoint.py
index 8a449b1af..ebfde1c0c 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsEndpoint.py
@@ -5,7 +5,6 @@
     ProjectSecurityrolesIdSettingsCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectSecurityrolesIdSettingsIdEndpoint import \
     ProjectSecurityrolesIdSettingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectSecurityRoleSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsIdEndpoint.py
index d9bcba7cf..9a75beb86 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectSecurityrolesIdSettingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectSecurityRoleSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusesCountEndpoint.py
index f166478f9..2cc594f0a 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusesEndpoint.py
index 6b87d9169..e0eff1d1a 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProjectStatusesCountEndpoint import ProjectStatusesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectStatusesIdEndpoint import ProjectStatusesIdEndpoint
 from pyconnectwise.endpoints.manage.ProjectStatusesInfoEndpoint import ProjectStatusesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusesIdEndpoint.py
index 585d1a994..911c0b94a 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectStatusesIdInfoEndpoint import ProjectStatusesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ProjectStatusesIdUsagesEndpoint import ProjectStatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusesIdInfoEndpoint.py
index 085266be0..a7506bd2b 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusesIdUsagesEndpoint.py
index 7d8e835fa..f23a74042 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectStatusesIdUsagesListEndpoint import ProjectStatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusesIdUsagesListEndpoint.py
index de9e2ab04..2a4769bd0 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusesInfoCountEndpoint.py
index d3eb26efa..5f890b7bd 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusesInfoEndpoint.py
index d1b75c031..12d41ac8d 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectStatusesInfoCountEndpoint import ProjectStatusesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsCountEndpoint.py
index 8e3e1b98e..7bf2c226e 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsEndpoint.py
index e8d6102dd..3ff0576aa 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectStatusindicatorsCountEndpoint import ProjectStatusindicatorsCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectStatusindicatorsIdEndpoint import ProjectStatusindicatorsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import StatusIndicator
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsIdEndpoint.py
index 63cf0416d..e2c27a611 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectStatusindicatorsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import StatusIndicator
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketnoteEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketnoteEndpoint.py
index 3edf03966..e6c7d6127 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketnoteEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketnoteEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketnoteIdEndpoint import ProjectTicketnoteIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketnoteIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketnoteIdEndpoint.py
index 9899c5900..9e5f612b1 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketnoteIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketnoteIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketnoteIdMarkasEndpoint import ProjectTicketnoteIdMarkasEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketnoteIdMarkasEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketnoteIdMarkasEndpoint.py
index a31dfc38f..ae17a4cb5 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketnoteIdMarkasEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketnoteIdMarkasEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsCountEndpoint.py
index 7a68a3e18..86d083a96 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsEndpoint.py
index eefff9013..2dd1f1298 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ProjectTicketsCountEndpoint import ProjectTicketsCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdEndpoint import ProjectTicketsIdEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsSearchEndpoint import ProjectTicketsSearchEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTicket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdActivitiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdActivitiesCountEndpoint.py
index e9061cfa7..85bef08a9 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdActivitiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdActivitiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdActivitiesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdActivitiesEndpoint.py
index 67c41e4a6..b3e415730 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdActivitiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdActivitiesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdActivitiesCountEndpoint import \
     ProjectTicketsIdActivitiesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdAllnotesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdAllnotesEndpoint.py
index 89e21d48e..faf12a262 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdAllnotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdAllnotesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTicketNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsCountEndpoint.py
index 893f07aa9..9340041a5 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsEndpoint.py
index 89147e0ec..2142830ae 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsEndpoint.py
@@ -5,7 +5,6 @@
     ProjectTicketsIdConfigurationsCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdConfigurationsIdEndpoint import \
     ProjectTicketsIdConfigurationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsIdEndpoint.py
index 7a4de7b4e..a1072010c 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConfigurationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ConfigurationReference, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/tickets/{id}/configurations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConvertEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConvertEndpoint.py
index ba438f11c..334484299 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConvertEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdConvertEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdDocumentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdDocumentsCountEndpoint.py
index 1c48f8eb0..14a13cb01 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdDocumentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdDocumentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdDocumentsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdDocumentsEndpoint.py
index 90ee09f62..73ca18f58 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdDocumentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdDocumentsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdDocumentsCountEndpoint import ProjectTicketsIdDocumentsCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DocumentReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdEndpoint.py
index d742b5767..1ef2bbce2 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdEndpoint.py
@@ -12,7 +12,6 @@
     ProjectTicketsIdScheduleentriesEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdTasksEndpoint import ProjectTicketsIdTasksEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdTimeentriesEndpoint import ProjectTicketsIdTimeentriesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTicket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -21,24 +20,24 @@ class ProjectTicketsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.scheduleentries = self._register_child_endpoint(
+            ProjectTicketsIdScheduleentriesEndpoint(client, parent_endpoint=self)
+        )
+        self.tasks = self._register_child_endpoint(ProjectTicketsIdTasksEndpoint(client, parent_endpoint=self))
+        self.all_notes = self._register_child_endpoint(ProjectTicketsIdAllnotesEndpoint(client, parent_endpoint=self))
+        self.products = self._register_child_endpoint(ProjectTicketsIdProductsEndpoint(client, parent_endpoint=self))
         self.timeentries = self._register_child_endpoint(
             ProjectTicketsIdTimeentriesEndpoint(client, parent_endpoint=self)
         )
         self.convert = self._register_child_endpoint(ProjectTicketsIdConvertEndpoint(client, parent_endpoint=self))
-        self.scheduleentries = self._register_child_endpoint(
-            ProjectTicketsIdScheduleentriesEndpoint(client, parent_endpoint=self)
-        )
         self.notes = self._register_child_endpoint(ProjectTicketsIdNotesEndpoint(client, parent_endpoint=self))
-        self.configurations = self._register_child_endpoint(
-            ProjectTicketsIdConfigurationsEndpoint(client, parent_endpoint=self)
-        )
-        self.products = self._register_child_endpoint(ProjectTicketsIdProductsEndpoint(client, parent_endpoint=self))
         self.activities = self._register_child_endpoint(
             ProjectTicketsIdActivitiesEndpoint(client, parent_endpoint=self)
         )
-        self.all_notes = self._register_child_endpoint(ProjectTicketsIdAllnotesEndpoint(client, parent_endpoint=self))
-        self.tasks = self._register_child_endpoint(ProjectTicketsIdTasksEndpoint(client, parent_endpoint=self))
         self.documents = self._register_child_endpoint(ProjectTicketsIdDocumentsEndpoint(client, parent_endpoint=self))
+        self.configurations = self._register_child_endpoint(
+            ProjectTicketsIdConfigurationsEndpoint(client, parent_endpoint=self)
+        )
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
@@ -75,17 +74,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(ProjectTicket, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/tickets/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ProjectTicket:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesCountEndpoint.py
index 4bfc1e4d1..926a4dc26 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesEndpoint.py
index 59dedc272..b17b4e8cf 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdNotesCountEndpoint import ProjectTicketsIdNotesCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdNotesIdEndpoint import ProjectTicketsIdNotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesIdEndpoint.py
index b51b83c6f..4841f1c2f 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdNotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TicketNote, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/tickets/{id}/notes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TicketNote:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdProductsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdProductsCountEndpoint.py
index 76c0e2c47..deccd9bf4 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdProductsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdProductsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdProductsEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdProductsEndpoint.py
index 04f9d064a..8f5974628 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdProductsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdProductsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdProductsCountEndpoint import ProjectTicketsIdProductsCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdScheduleentriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdScheduleentriesCountEndpoint.py
index 532b5f14b..39469ee6e 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdScheduleentriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdScheduleentriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdScheduleentriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdScheduleentriesEndpoint.py
index 2764791e9..6febc8173 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdScheduleentriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdScheduleentriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdScheduleentriesCountEndpoint import \
     ProjectTicketsIdScheduleentriesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleEntryReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksCountEndpoint.py
index ccf1fffaf..87a8bc419 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksEndpoint.py
index b005bd8e9..5c4daff7b 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdTasksCountEndpoint import ProjectTicketsIdTasksCountEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdTasksIdEndpoint import ProjectTicketsIdTasksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketTask
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksIdEndpoint.py
index c374c3c66..b7a85742d 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTasksIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketTask
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TicketTask, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /project/tickets/{id}/tasks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TicketTask:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTimeentriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTimeentriesCountEndpoint.py
index 63f718b1c..ddf0cdcbd 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTimeentriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTimeentriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTimeentriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTimeentriesEndpoint.py
index 398d127b1..9d0cec95b 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTimeentriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsIdTimeentriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ProjectTicketsIdTimeentriesCountEndpoint import \
     ProjectTicketsIdTimeentriesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeEntryReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ProjectTicketsSearchEndpoint.py b/src/pyconnectwise/endpoints/manage/ProjectTicketsSearchEndpoint.py
index 802aa5093..c1c2ac208 100644
--- a/src/pyconnectwise/endpoints/manage/ProjectTicketsSearchEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ProjectTicketsSearchEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProjectTicket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesCountEndpoint.py
index cc29e33b5..8e60c748d 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesEndpoint.py
index cff772de8..a1f1f252b 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.SalesActivitiesIdEndpoint import SalesActivitiesIdEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesStatusesEndpoint import SalesActivitiesStatusesEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesTypesEndpoint import SalesActivitiesTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Activity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -15,8 +14,8 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "activities", parent_endpoint=parent_endpoint)
 
         self.types = self._register_child_endpoint(SalesActivitiesTypesEndpoint(client, parent_endpoint=self))
-        self.statuses = self._register_child_endpoint(SalesActivitiesStatusesEndpoint(client, parent_endpoint=self))
         self.count = self._register_child_endpoint(SalesActivitiesCountEndpoint(client, parent_endpoint=self))
+        self.statuses = self._register_child_endpoint(SalesActivitiesStatusesEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SalesActivitiesIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesIdEndpoint.py
index 292863c66..a9d16ccb1 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Activity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(Activity, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/activities/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Activity:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesCountEndpoint.py
index f7fbda917..0864cb4ba 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesEndpoint.py
index 540e8720c..6dd4642af 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesActivitiesStatusesCountEndpoint import SalesActivitiesStatusesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesStatusesIdEndpoint import SalesActivitiesStatusesIdEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesStatusesInfoEndpoint import SalesActivitiesStatusesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesIdEndpoint.py
index 0a2fb5c4b..8a26b9003 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesStatusesIdInfoEndpoint import SalesActivitiesStatusesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(ActivityStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/activities/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ActivityStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesIdInfoEndpoint.py
index 399a37fa2..91d50e3af 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesInfoCountEndpoint.py
index 3b829d2e5..5b4cf1be0 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesInfoEndpoint.py
index 64f296389..a176b754d 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesStatusesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesStatusesInfoCountEndpoint import \
     SalesActivitiesStatusesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesCountEndpoint.py
index 7f0efb3c4..62d372be1 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesEndpoint.py
index df926d7ac..222a1931d 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesTypesCountEndpoint import SalesActivitiesTypesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesTypesIdEndpoint import SalesActivitiesTypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdEndpoint.py
index e63fd33e0..aa5800d13 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesTypesIdUsagesEndpoint import SalesActivitiesTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(ActivityType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/activities/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ActivityType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdUsagesEndpoint.py
index c743dc950..4c0d4cf18 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesActivitiesTypesIdUsagesListEndpoint import \
     SalesActivitiesTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdUsagesListEndpoint.py
index feb94a4ab..4fd9668da 100644
--- a/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesActivitiesTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesCommissionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesCommissionsCountEndpoint.py
index 310f61fca..499b5bef2 100644
--- a/src/pyconnectwise/endpoints/manage/SalesCommissionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesCommissionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesCommissionsEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesCommissionsEndpoint.py
index b03a8cf0b..c550dd85c 100644
--- a/src/pyconnectwise/endpoints/manage/SalesCommissionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesCommissionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesCommissionsCountEndpoint import SalesCommissionsCountEndpoint
 from pyconnectwise.endpoints.manage.SalesCommissionsIdEndpoint import SalesCommissionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Commission
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesCommissionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesCommissionsIdEndpoint.py
index 3398938a8..504b435fb 100644
--- a/src/pyconnectwise/endpoints/manage/SalesCommissionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesCommissionsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesCommissionsIdUsagesEndpoint import SalesCommissionsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Commission
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Commission, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/commissions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Commission:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesCommissionsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesCommissionsIdUsagesEndpoint.py
index b9225f510..4d39076e2 100644
--- a/src/pyconnectwise/endpoints/manage/SalesCommissionsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesCommissionsIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesCommissionsIdUsagesListEndpoint import SalesCommissionsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesCommissionsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesCommissionsIdUsagesListEndpoint.py
index 26b4ecf2e..b728eaeaa 100644
--- a/src/pyconnectwise/endpoints/manage/SalesCommissionsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesCommissionsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesEndpoint.py
index a3f34eefd..e477ca83b 100644
--- a/src/pyconnectwise/endpoints/manage/SalesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesEndpoint.py
@@ -12,7 +12,6 @@
 from pyconnectwise.endpoints.manage.SalesScheduleEndpoint import SalesScheduleEndpoint
 from pyconnectwise.endpoints.manage.SalesServiceEndpoint import SalesServiceEndpoint
 from pyconnectwise.endpoints.manage.SalesStagesEndpoint import SalesStagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -20,14 +19,14 @@ class SalesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "sales", parent_endpoint=parent_endpoint)
 
+        self.sales_teams = self._register_child_endpoint(SalesSalesteamsEndpoint(client, parent_endpoint=self))
+        self.stages = self._register_child_endpoint(SalesStagesEndpoint(client, parent_endpoint=self))
+        self.service = self._register_child_endpoint(SalesServiceEndpoint(client, parent_endpoint=self))
         self.commissions = self._register_child_endpoint(SalesCommissionsEndpoint(client, parent_endpoint=self))
+        self.probabilities = self._register_child_endpoint(SalesProbabilitiesEndpoint(client, parent_endpoint=self))
         self.orders = self._register_child_endpoint(SalesOrdersEndpoint(client, parent_endpoint=self))
-        self.service = self._register_child_endpoint(SalesServiceEndpoint(client, parent_endpoint=self))
-        self.stages = self._register_child_endpoint(SalesStagesEndpoint(client, parent_endpoint=self))
-        self.opportunities = self._register_child_endpoint(SalesOpportunitiesEndpoint(client, parent_endpoint=self))
-        self.activities = self._register_child_endpoint(SalesActivitiesEndpoint(client, parent_endpoint=self))
-        self.quotas = self._register_child_endpoint(SalesQuotasEndpoint(client, parent_endpoint=self))
         self.roles = self._register_child_endpoint(SalesRolesEndpoint(client, parent_endpoint=self))
-        self.sales_teams = self._register_child_endpoint(SalesSalesteamsEndpoint(client, parent_endpoint=self))
         self.schedule = self._register_child_endpoint(SalesScheduleEndpoint(client, parent_endpoint=self))
-        self.probabilities = self._register_child_endpoint(SalesProbabilitiesEndpoint(client, parent_endpoint=self))
+        self.quotas = self._register_child_endpoint(SalesQuotasEndpoint(client, parent_endpoint=self))
+        self.opportunities = self._register_child_endpoint(SalesOpportunitiesEndpoint(client, parent_endpoint=self))
+        self.activities = self._register_child_endpoint(SalesActivitiesEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesCountEndpoint.py
index f248daefd..1a1e1baa8 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesDefaultEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesDefaultEndpoint.py
index ec85c0cd8..c7c46c011 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesDefaultEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesDefaultEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Opportunity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesEndpoint.py
index fa9539d48..2b6f3e74a 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesEndpoint.py
@@ -7,7 +7,6 @@
 from pyconnectwise.endpoints.manage.SalesOpportunitiesRatingsEndpoint import SalesOpportunitiesRatingsEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesStatusesEndpoint import SalesOpportunitiesStatusesEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesTypesEndpoint import SalesOpportunitiesTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Opportunity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -16,11 +15,11 @@ class SalesOpportunitiesEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "opportunities", parent_endpoint=parent_endpoint)
 
-        self.default = self._register_child_endpoint(SalesOpportunitiesDefaultEndpoint(client, parent_endpoint=self))
-        self.types = self._register_child_endpoint(SalesOpportunitiesTypesEndpoint(client, parent_endpoint=self))
         self.ratings = self._register_child_endpoint(SalesOpportunitiesRatingsEndpoint(client, parent_endpoint=self))
-        self.statuses = self._register_child_endpoint(SalesOpportunitiesStatusesEndpoint(client, parent_endpoint=self))
+        self.types = self._register_child_endpoint(SalesOpportunitiesTypesEndpoint(client, parent_endpoint=self))
         self.count = self._register_child_endpoint(SalesOpportunitiesCountEndpoint(client, parent_endpoint=self))
+        self.default = self._register_child_endpoint(SalesOpportunitiesDefaultEndpoint(client, parent_endpoint=self))
+        self.statuses = self._register_child_endpoint(SalesOpportunitiesStatusesEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SalesOpportunitiesIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsCountEndpoint.py
index ab6b761d2..f94e00df8 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsEndpoint.py
index 0636c8bd1..4036afc4b 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdContactsCountEndpoint import \
     SalesOpportunitiesIdContactsCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdContactsIdEndpoint import SalesOpportunitiesIdContactsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsIdEndpoint.py
index e924e26e3..1cd081da2 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdContactsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityContact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OpportunityContact, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/opportunities/{id}/contacts/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OpportunityContact:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoagreementEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoagreementEndpoint.py
index c12636076..4488e7932 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoagreementEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoagreementEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Agreement
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoprojectEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoprojectEndpoint.py
index 17eb5734a..c46215282 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoprojectEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoprojectEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Project
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttosalesorderEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttosalesorderEndpoint.py
index dc74c6ba8..b154adc63 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttosalesorderEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttosalesorderEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Order
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoserviceticketEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoserviceticketEndpoint.py
index 76b2ffe94..cb33acd69 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoserviceticketEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdConverttoserviceticketEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Ticket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdEndpoint.py
index 8f5366aad..b31ae91f1 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdEndpoint.py
@@ -13,7 +13,6 @@
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdForecastEndpoint import SalesOpportunitiesIdForecastEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdNotesEndpoint import SalesOpportunitiesIdNotesEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdTeamEndpoint import SalesOpportunitiesIdTeamEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Opportunity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -22,19 +21,19 @@ class SalesOpportunitiesIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.notes = self._register_child_endpoint(SalesOpportunitiesIdNotesEndpoint(client, parent_endpoint=self))
-        self.convert_to_project = self._register_child_endpoint(
-            SalesOpportunitiesIdConverttoprojectEndpoint(client, parent_endpoint=self)
-        )
-        self.convert_to_service_ticket = self._register_child_endpoint(
-            SalesOpportunitiesIdConverttoserviceticketEndpoint(client, parent_endpoint=self)
-        )
         self.forecast = self._register_child_endpoint(
             SalesOpportunitiesIdForecastEndpoint(client, parent_endpoint=self)
         )
         self.convert_to_sales_order = self._register_child_endpoint(
             SalesOpportunitiesIdConverttosalesorderEndpoint(client, parent_endpoint=self)
         )
+        self.notes = self._register_child_endpoint(SalesOpportunitiesIdNotesEndpoint(client, parent_endpoint=self))
+        self.convert_to_service_ticket = self._register_child_endpoint(
+            SalesOpportunitiesIdConverttoserviceticketEndpoint(client, parent_endpoint=self)
+        )
+        self.convert_to_project = self._register_child_endpoint(
+            SalesOpportunitiesIdConverttoprojectEndpoint(client, parent_endpoint=self)
+        )
         self.contacts = self._register_child_endpoint(
             SalesOpportunitiesIdContactsEndpoint(client, parent_endpoint=self)
         )
@@ -76,17 +75,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(Opportunity, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/opportunities/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Opportunity:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCopyEndpoint.py
index 30e33ed01..a46e2fe29 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCopyEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdForecastCopyIdEndpoint import \
     SalesOpportunitiesIdForecastCopyIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCopyIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCopyIdEndpoint.py
index a663797d6..ed26b1e1a 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCopyIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCopyIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCountEndpoint.py
index 314e1da21..8828b2bc8 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastEndpoint.py
index 9ba93db64..59117e545 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdForecastCountEndpoint import \
     SalesOpportunitiesIdForecastCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdForecastIdEndpoint import SalesOpportunitiesIdForecastIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Forecast
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastIdEndpoint.py
index e573898cf..99555b1e0 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdForecastIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ForecastItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -57,17 +56,15 @@ def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
         """
         return self._parse_one(ForecastItem, super()._make_request("POST", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/opportunities/{id}/forecast/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ForecastItem:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesCountEndpoint.py
index 1f50f2132..73b77b0cc 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesEndpoint.py
index dd6959b5c..b68ec6f1e 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdNotesCountEndpoint import SalesOpportunitiesIdNotesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdNotesIdEndpoint import SalesOpportunitiesIdNotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesIdEndpoint.py
index be496bfc1..ff43dbf5e 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdNotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OpportunityNote, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/opportunities/{id}/notes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OpportunityNote:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamCountEndpoint.py
index a681849f5..593e27c88 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamEndpoint.py
index edc62c4ac..8da405473 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdTeamCountEndpoint import SalesOpportunitiesIdTeamCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesIdTeamIdEndpoint import SalesOpportunitiesIdTeamIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Team
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamIdEndpoint.py
index 4e1075fbb..161f495a9 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesIdTeamIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Team
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(Team, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/opportunities/{id}/team/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Team:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsCountEndpoint.py
index a202e36ae..959cbe2fb 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsEndpoint.py
index 87772e74d..eb2a90c0c 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesOpportunitiesRatingsCountEndpoint import SalesOpportunitiesRatingsCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesRatingsIdEndpoint import SalesOpportunitiesRatingsIdEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesRatingsInfoEndpoint import SalesOpportunitiesRatingsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityRating
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsIdEndpoint.py
index a3121d89c..4e723304c 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesRatingsIdInfoEndpoint import \
     SalesOpportunitiesRatingsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityRating
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -49,17 +48,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OpportunityRating, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/opportunities/ratings/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OpportunityRating:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsIdInfoEndpoint.py
index 25e8cffa6..406788356 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityRatingInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsInfoCountEndpoint.py
index 0c2cce83c..53bf11f73 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsInfoEndpoint.py
index a45982282..430444c71 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesRatingsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesRatingsInfoCountEndpoint import \
     SalesOpportunitiesRatingsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityRatingInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesCountEndpoint.py
index 888fedebf..17024425c 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesEndpoint.py
index 0cfd38b7b..1c0da2969 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesEndpoint.py
@@ -5,7 +5,6 @@
     SalesOpportunitiesStatusesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesStatusesIdEndpoint import SalesOpportunitiesStatusesIdEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesStatusesInfoEndpoint import SalesOpportunitiesStatusesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdEndpoint.py
index 8cdb4b47e..7ced33677 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdEndpoint.py
@@ -5,7 +5,6 @@
     SalesOpportunitiesStatusesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesStatusesIdUsagesEndpoint import \
     SalesOpportunitiesStatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OpportunityStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/opportunities/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OpportunityStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdInfoEndpoint.py
index f62e0f4eb..3882e6b39 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdUsagesEndpoint.py
index 2592b4f73..c6087efcb 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesStatusesIdUsagesListEndpoint import \
     SalesOpportunitiesStatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdUsagesListEndpoint.py
index debbacfdc..1c5c76c0b 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesInfoCountEndpoint.py
index 712bd581c..95fb0d145 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesInfoEndpoint.py
index 3c89a5ca9..97607a900 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesStatusesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesStatusesInfoCountEndpoint import \
     SalesOpportunitiesStatusesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesCountEndpoint.py
index 96971c226..2ab206087 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesEndpoint.py
index 7d61b8a5b..d76a22891 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesOpportunitiesTypesCountEndpoint import SalesOpportunitiesTypesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesTypesIdEndpoint import SalesOpportunitiesTypesIdEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesTypesInfoEndpoint import SalesOpportunitiesTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdEndpoint.py
index 779a69e73..d105d7275 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesOpportunitiesTypesIdInfoEndpoint import SalesOpportunitiesTypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesTypesIdUsagesEndpoint import \
     SalesOpportunitiesTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -53,17 +52,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OpportunityType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/opportunities/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OpportunityType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdInfoEndpoint.py
index 9f6bf74b6..12124d531 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdUsagesEndpoint.py
index 2aec9f231..0a7ac29eb 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesTypesIdUsagesListEndpoint import \
     SalesOpportunitiesTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdUsagesListEndpoint.py
index 1ab552709..c5c13f300 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesInfoCountEndpoint.py
index 7279ab48a..522ad5c26 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesInfoEndpoint.py
index 1c44c2bd0..c6e6b167d 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOpportunitiesTypesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOpportunitiesTypesInfoCountEndpoint import \
     SalesOpportunitiesTypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersCountEndpoint.py
index 85b313225..fd1a2baa2 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersEndpoint.py
index aa22d97bf..25ee27a3b 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesOrdersCountEndpoint import SalesOrdersCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersIdEndpoint import SalesOrdersIdEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesEndpoint import SalesOrdersStatusesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Order
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -13,8 +12,8 @@ class SalesOrdersEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "orders", parent_endpoint=parent_endpoint)
 
-        self.statuses = self._register_child_endpoint(SalesOrdersStatusesEndpoint(client, parent_endpoint=self))
         self.count = self._register_child_endpoint(SalesOrdersCountEndpoint(client, parent_endpoint=self))
+        self.statuses = self._register_child_endpoint(SalesOrdersStatusesEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SalesOrdersIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersIdConverttoserviceticketEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersIdConverttoserviceticketEndpoint.py
index 4d028d23f..fbe4c9d16 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersIdConverttoserviceticketEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersIdConverttoserviceticketEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Ticket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersIdEndpoint.py
index 16df6c9e0..76759ff98 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersIdConverttoserviceticketEndpoint import \
     SalesOrdersIdConverttoserviceticketEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Order
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -49,17 +48,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(Order, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/orders/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Order:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesCountEndpoint.py
index e767c8f87..efc7391bc 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesEndpoint.py
index a0f45dfaa..11afb7c40 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesCountEndpoint import SalesOrdersStatusesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesIdEndpoint import SalesOrdersStatusesIdEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesInfoEndpoint import SalesOrdersStatusesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OrderStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesCountEndpoint.py
index 85e33074f..21c01e547 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesEndpoint.py
index 66b6f7111..7ee9c0af5 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesEndpoint.py
@@ -5,7 +5,6 @@
     SalesOrdersStatusesIdEmailtemplatesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesIdEmailtemplatesIdEndpoint import \
     SalesOrdersStatusesIdEmailtemplatesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesIdEndpoint.py
index 5c7d7cef6..17fa38255 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEmailtemplatesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OrderStatusEmailTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OrderStatusEmailTemplate, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/orders/statuses/{id}/emailtemplates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OrderStatusEmailTemplate:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEndpoint.py
index f891dcf0e..b221c5ae8 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdEndpoint.py
@@ -7,7 +7,6 @@
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesIdNotificationsEndpoint import \
     SalesOrdersStatusesIdNotificationsEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesIdUsagesEndpoint import SalesOrdersStatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OrderStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -17,13 +16,13 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
         self.usages = self._register_child_endpoint(SalesOrdersStatusesIdUsagesEndpoint(client, parent_endpoint=self))
-        self.info = self._register_child_endpoint(SalesOrdersStatusesIdInfoEndpoint(client, parent_endpoint=self))
         self.emailtemplates = self._register_child_endpoint(
             SalesOrdersStatusesIdEmailtemplatesEndpoint(client, parent_endpoint=self)
         )
         self.notifications = self._register_child_endpoint(
             SalesOrdersStatusesIdNotificationsEndpoint(client, parent_endpoint=self)
         )
+        self.info = self._register_child_endpoint(SalesOrdersStatusesIdInfoEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[OrderStatus]:
         """
@@ -58,17 +57,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OrderStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/orders/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OrderStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdInfoEndpoint.py
index b10c60419..a940a90f2 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OrderStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsCountEndpoint.py
index 1fba5cc12..99ae0fa91 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsEndpoint.py
index d983dd194..0e0b02e4f 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsEndpoint.py
@@ -5,7 +5,6 @@
     SalesOrdersStatusesIdNotificationsCountEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesIdNotificationsIdEndpoint import \
     SalesOrdersStatusesIdNotificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OrderStatusNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsIdEndpoint.py
index 7698999b1..556427beb 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdNotificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OrderStatusNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OrderStatusNotification, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/orders/statuses/{id}/notifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OrderStatusNotification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdUsagesEndpoint.py
index 039041e36..643b1bcb6 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesIdUsagesListEndpoint import \
     SalesOrdersStatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdUsagesListEndpoint.py
index fd46d4626..f3d6daf63 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesInfoCountEndpoint.py
index ebb633060..072f0de95 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesInfoEndpoint.py
index eefc20c1d..ccf44b4ed 100644
--- a/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesOrdersStatusesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesOrdersStatusesInfoCountEndpoint import SalesOrdersStatusesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OrderStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesCountEndpoint.py
index 06d8bb2fa..0cb4d25e3 100644
--- a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesEndpoint.py
index eb2113e24..0677aa716 100644
--- a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesProbabilitiesCountEndpoint import SalesProbabilitiesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesProbabilitiesIdEndpoint import SalesProbabilitiesIdEndpoint
 from pyconnectwise.endpoints.manage.SalesProbabilitiesInfoEndpoint import SalesProbabilitiesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesProbability
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesIdEndpoint.py
index 447e05b6a..593f05c27 100644
--- a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesProbabilitiesIdInfoEndpoint import SalesProbabilitiesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesProbability
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SalesProbability, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/probabilities/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SalesProbability:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesIdInfoEndpoint.py
index 24097edf2..9d7f59679 100644
--- a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesProbabilityInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesInfoCountEndpoint.py
index f8f05cd94..bde7cff95 100644
--- a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesInfoEndpoint.py
index eb416926d..495402568 100644
--- a/src/pyconnectwise/endpoints/manage/SalesProbabilitiesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesProbabilitiesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesProbabilitiesInfoCountEndpoint import SalesProbabilitiesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesProbabilityInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesQuotasCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesQuotasCountEndpoint.py
index 2eab9ea6e..4005bf8cb 100644
--- a/src/pyconnectwise/endpoints/manage/SalesQuotasCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesQuotasCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesQuotasEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesQuotasEndpoint.py
index f6eebec40..72c61207a 100644
--- a/src/pyconnectwise/endpoints/manage/SalesQuotasEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesQuotasEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesQuotasCountEndpoint import SalesQuotasCountEndpoint
 from pyconnectwise.endpoints.manage.SalesQuotasIdEndpoint import SalesQuotasIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesQuota
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesQuotasIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesQuotasIdEndpoint.py
index c92184f8e..3f8415d69 100644
--- a/src/pyconnectwise/endpoints/manage/SalesQuotasIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesQuotasIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesQuota
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SalesQuota, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/quotas/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SalesQuota:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesRolesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesRolesCountEndpoint.py
index 3b8af272b..3a07f7366 100644
--- a/src/pyconnectwise/endpoints/manage/SalesRolesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesRolesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesRolesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesRolesEndpoint.py
index b93c8b218..52832e12b 100644
--- a/src/pyconnectwise/endpoints/manage/SalesRolesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesRolesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesRolesCountEndpoint import SalesRolesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesRolesIdEndpoint import SalesRolesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Role
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesRolesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesRolesIdEndpoint.py
index 0e8f4c098..1e4384922 100644
--- a/src/pyconnectwise/endpoints/manage/SalesRolesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesRolesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Role
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(Role, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/roles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Role:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesSalesteamsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesSalesteamsCountEndpoint.py
index db1a77c2e..5d1744caf 100644
--- a/src/pyconnectwise/endpoints/manage/SalesSalesteamsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesSalesteamsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesSalesteamsEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesSalesteamsEndpoint.py
index 4a2f3d915..b665eb852 100644
--- a/src/pyconnectwise/endpoints/manage/SalesSalesteamsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesSalesteamsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesSalesteamsCountEndpoint import SalesSalesteamsCountEndpoint
 from pyconnectwise.endpoints.manage.SalesSalesteamsIdEndpoint import SalesSalesteamsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdEndpoint.py
index fdd64a496..17f3289f1 100644
--- a/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesSalesteamsIdMembersEndpoint import SalesSalesteamsIdMembersEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SalesTeam, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/salesTeams/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SalesTeam:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersCountEndpoint.py
index f882ccf0d..78ad05de4 100644
--- a/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersEndpoint.py
index a228f3afd..883c5e6db 100644
--- a/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesSalesteamsIdMembersCountEndpoint import SalesSalesteamsIdMembersCountEndpoint
 from pyconnectwise.endpoints.manage.SalesSalesteamsIdMembersIdEndpoint import SalesSalesteamsIdMembersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesTeamMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersIdEndpoint.py
index 97ec4a699..19c5cfee3 100644
--- a/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesSalesteamsIdMembersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SalesTeamMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SalesTeamMember, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/salesTeams/{id}/members/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SalesTeamMember:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesScheduleEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesScheduleEndpoint.py
index 586adfc13..ccaf2e3b7 100644
--- a/src/pyconnectwise/endpoints/manage/SalesScheduleEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesScheduleEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesScheduleHolidaylistsEndpoint import SalesScheduleHolidaylistsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsEndpoint.py
index f7154fd41..6a4752b59 100644
--- a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesScheduleHolidaylistsIdEndpoint import SalesScheduleHolidaylistsIdEndpoint
 from pyconnectwise.endpoints.manage.SalesScheduleHolidaylistsInfoEndpoint import SalesScheduleHolidaylistsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdEndpoint.py
index 86a83b8dd..0045ebb45 100644
--- a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesScheduleHolidaylistsIdHolidaysEndpoint import \
     SalesScheduleHolidaylistsIdHolidaysEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysEndpoint.py
index b6f29902f..3934a54da 100644
--- a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesScheduleHolidaylistsIdHolidaysInfoEndpoint import \
     SalesScheduleHolidaylistsIdHolidaysInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysInfoCountEndpoint.py
index 88bf2c5ee..f4d924dac 100644
--- a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysInfoEndpoint.py
index 6c42736a0..4471321fb 100644
--- a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsIdHolidaysInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesScheduleHolidaylistsIdHolidaysInfoCountEndpoint import \
     SalesScheduleHolidaylistsIdHolidaysInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsInfoCountEndpoint.py
index 43d9b3ef6..940a8e39f 100644
--- a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsInfoEndpoint.py
index d227d84d5..7d811215f 100644
--- a/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesScheduleHolidaylistsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesScheduleHolidaylistsInfoCountEndpoint import \
     SalesScheduleHolidaylistsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesServiceEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesServiceEndpoint.py
index ce8f6434a..ce04a1dbe 100644
--- a/src/pyconnectwise/endpoints/manage/SalesServiceEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesServiceEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesServicePriorityEndpoint import SalesServicePriorityEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesServicePriorityEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesServicePriorityEndpoint.py
index f1e3a313c..7e24bef4d 100644
--- a/src/pyconnectwise/endpoints/manage/SalesServicePriorityEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesServicePriorityEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesServicePriorityInfoEndpoint import SalesServicePriorityInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesServicePriorityInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesServicePriorityInfoCountEndpoint.py
index 435577b1d..1f8d9d340 100644
--- a/src/pyconnectwise/endpoints/manage/SalesServicePriorityInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesServicePriorityInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesServicePriorityInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesServicePriorityInfoEndpoint.py
index fdeae55ac..7562c5698 100644
--- a/src/pyconnectwise/endpoints/manage/SalesServicePriorityInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesServicePriorityInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesServicePriorityInfoCountEndpoint import SalesServicePriorityInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesStagesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesStagesCountEndpoint.py
index 4e7de9076..9291e0f05 100644
--- a/src/pyconnectwise/endpoints/manage/SalesStagesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesStagesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesStagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesStagesEndpoint.py
index e0e62e6d2..83be39ded 100644
--- a/src/pyconnectwise/endpoints/manage/SalesStagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesStagesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SalesStagesCountEndpoint import SalesStagesCountEndpoint
 from pyconnectwise.endpoints.manage.SalesStagesIdEndpoint import SalesStagesIdEndpoint
 from pyconnectwise.endpoints.manage.SalesStagesInfoEndpoint import SalesStagesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityStage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesStagesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesStagesIdEndpoint.py
index 876bf789e..24d0406b6 100644
--- a/src/pyconnectwise/endpoints/manage/SalesStagesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesStagesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesStagesIdInfoEndpoint import SalesStagesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.SalesStagesIdUsagesEndpoint import SalesStagesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityStage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(OpportunityStage, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /sales/stages/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> OpportunityStage:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SalesStagesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesStagesIdInfoEndpoint.py
index d54b97276..686c71855 100644
--- a/src/pyconnectwise/endpoints/manage/SalesStagesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesStagesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityStageInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesStagesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesStagesIdUsagesEndpoint.py
index 4943b94ae..36cc8500b 100644
--- a/src/pyconnectwise/endpoints/manage/SalesStagesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesStagesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesStagesIdUsagesListEndpoint import SalesStagesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesStagesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesStagesIdUsagesListEndpoint.py
index 58f61fe51..e3a51d2df 100644
--- a/src/pyconnectwise/endpoints/manage/SalesStagesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesStagesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesStagesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesStagesInfoCountEndpoint.py
index 32c8df984..3d118a596 100644
--- a/src/pyconnectwise/endpoints/manage/SalesStagesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesStagesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SalesStagesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SalesStagesInfoEndpoint.py
index 1ddf56712..e8a1b53e4 100644
--- a/src/pyconnectwise/endpoints/manage/SalesStagesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SalesStagesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SalesStagesInfoCountEndpoint import SalesStagesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OpportunityStageInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsCountEndpoint.py
index d92a5bca9..0d74f0b36 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Calendar
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsEndpoint.py
index 07d139bb3..c60e253d0 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ScheduleCalendarsCountEndpoint import ScheduleCalendarsCountEndpoint
 from pyconnectwise.endpoints.manage.ScheduleCalendarsIdEndpoint import ScheduleCalendarsIdEndpoint
 from pyconnectwise.endpoints.manage.ScheduleCalendarsInfoEndpoint import ScheduleCalendarsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Calendar
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdCopyEndpoint.py
index ffa8aa251..14140d3f9 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Calendar
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdEndpoint.py
index 8c09300d6..1683a956f 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ScheduleCalendarsIdCopyEndpoint import ScheduleCalendarsIdCopyEndpoint
 from pyconnectwise.endpoints.manage.ScheduleCalendarsIdInfoEndpoint import ScheduleCalendarsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ScheduleCalendarsIdUsagesEndpoint import ScheduleCalendarsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Calendar
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -13,9 +12,9 @@ class ScheduleCalendarsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.copy = self._register_child_endpoint(ScheduleCalendarsIdCopyEndpoint(client, parent_endpoint=self))
         self.usages = self._register_child_endpoint(ScheduleCalendarsIdUsagesEndpoint(client, parent_endpoint=self))
         self.info = self._register_child_endpoint(ScheduleCalendarsIdInfoEndpoint(client, parent_endpoint=self))
-        self.copy = self._register_child_endpoint(ScheduleCalendarsIdCopyEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Calendar]:
         """
@@ -74,14 +73,12 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Calendar, super()._make_request("PUT", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /schedule/calendars/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdInfoEndpoint.py
index 3227224f2..bc28cf84d 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CalendarInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdUsagesEndpoint.py
index ec81bd192..1e2ffdd82 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleCalendarsIdUsagesListEndpoint import ScheduleCalendarsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdUsagesListEndpoint.py
index 712f177a6..fe6239fd7 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsInfoCountEndpoint.py
index 8fc5bd968..0769a025e 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CalendarInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsInfoEndpoint.py
index 01abe1898..989a3e953 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleCalendarsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleCalendarsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleCalendarsInfoCountEndpoint import ScheduleCalendarsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CalendarInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleColorsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleColorsCountEndpoint.py
index c6a6d0989..faa020eb3 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleColorsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleColorsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleColorsEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleColorsEndpoint.py
index cd3fdfceb..0b2c169d1 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleColorsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleColorsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ScheduleColorsCountEndpoint import ScheduleColorsCountEndpoint
 from pyconnectwise.endpoints.manage.ScheduleColorsIdEndpoint import ScheduleColorsIdEndpoint
 from pyconnectwise.endpoints.manage.ScheduleColorsResetEndpoint import ScheduleColorsResetEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleColor
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleColorsIdClearEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleColorsIdClearEndpoint.py
index 2c7154f2f..ca0fd2148 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleColorsIdClearEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleColorsIdClearEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleColor
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleColorsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleColorsIdEndpoint.py
index 175630c09..08d3e5df7 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleColorsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleColorsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleColorsIdClearEndpoint import ScheduleColorsIdClearEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleColor
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleColorsResetEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleColorsResetEndpoint.py
index 8e4ae9c2a..59779243d 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleColorsResetEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleColorsResetEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleColor
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleDetailsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleDetailsCountEndpoint.py
index 6fe5c9e04..605eb4f70 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleDetailsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleDetailsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleDetailsEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleDetailsEndpoint.py
index 5c41f55da..dc387aff6 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleDetailsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleDetailsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleDetailsCountEndpoint import ScheduleDetailsCountEndpoint
 from pyconnectwise.endpoints.manage.ScheduleDetailsIdEndpoint import ScheduleDetailsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleEntryDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleDetailsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleDetailsIdEndpoint.py
index 1da15b60b..820e16412 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleDetailsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleDetailsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleEntryDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleEndpoint.py
index ddbac04f8..cf69780a2 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleEndpoint.py
@@ -10,7 +10,6 @@
 from pyconnectwise.endpoints.manage.ScheduleRemindertimesEndpoint import ScheduleRemindertimesEndpoint
 from pyconnectwise.endpoints.manage.ScheduleStatusesEndpoint import ScheduleStatusesEndpoint
 from pyconnectwise.endpoints.manage.ScheduleTypesEndpoint import ScheduleTypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -18,15 +17,15 @@ class ScheduleEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "schedule", parent_endpoint=parent_endpoint)
 
-        self.entries = self._register_child_endpoint(ScheduleEntriesEndpoint(client, parent_endpoint=self))
-        self.portalcalendars = self._register_child_endpoint(
-            SchedulePortalcalendarsEndpoint(client, parent_endpoint=self)
-        )
         self.holiday_lists = self._register_child_endpoint(ScheduleHolidaylistsEndpoint(client, parent_endpoint=self))
         self.details = self._register_child_endpoint(ScheduleDetailsEndpoint(client, parent_endpoint=self))
-        self.reminder_times = self._register_child_endpoint(ScheduleRemindertimesEndpoint(client, parent_endpoint=self))
         self.types = self._register_child_endpoint(ScheduleTypesEndpoint(client, parent_endpoint=self))
-        self.colors = self._register_child_endpoint(ScheduleColorsEndpoint(client, parent_endpoint=self))
-        self.statuses = self._register_child_endpoint(ScheduleStatusesEndpoint(client, parent_endpoint=self))
         self.holidaylists = self._register_child_endpoint(ScheduleHolidaylistsEndpoint(client, parent_endpoint=self))
+        self.reminder_times = self._register_child_endpoint(ScheduleRemindertimesEndpoint(client, parent_endpoint=self))
+        self.portalcalendars = self._register_child_endpoint(
+            SchedulePortalcalendarsEndpoint(client, parent_endpoint=self)
+        )
+        self.entries = self._register_child_endpoint(ScheduleEntriesEndpoint(client, parent_endpoint=self))
+        self.colors = self._register_child_endpoint(ScheduleColorsEndpoint(client, parent_endpoint=self))
         self.calendars = self._register_child_endpoint(ScheduleCalendarsEndpoint(client, parent_endpoint=self))
+        self.statuses = self._register_child_endpoint(ScheduleStatusesEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleEntriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleEntriesCountEndpoint.py
index fc649ed25..d4a7a7700 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleEntriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleEntriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleEntriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleEntriesEndpoint.py
index 290b2e178..c83244c73 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleEntriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleEntriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleEntriesCountEndpoint import ScheduleEntriesCountEndpoint
 from pyconnectwise.endpoints.manage.ScheduleEntriesIdEndpoint import ScheduleEntriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsCountEndpoint.py
index 5a6272478..91c5e0a0f 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsEndpoint.py
index f2368d3f2..f39e3fd97 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleEntriesIdDetailsCountEndpoint import ScheduleEntriesIdDetailsCountEndpoint
 from pyconnectwise.endpoints.manage.ScheduleEntriesIdDetailsIdEndpoint import ScheduleEntriesIdDetailsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsIdEndpoint.py
index 736c9b2f7..12546565f 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdDetailsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdEndpoint.py
index 01580acc9..76aa3828f 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleEntriesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleEntriesIdDetailsEndpoint import ScheduleEntriesIdDetailsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ScheduleEntry, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /schedule/entries/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScheduleEntry:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsCopyEndpoint.py
index 6ab24f89b..94f0827af 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import HolidayList
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsCountEndpoint.py
index 9fc1302df..a80d63a5b 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsEndpoint.py
index 0b6d94157..891d0d6ab 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleHolidaylistsIdEndpoint import ScheduleHolidaylistsIdEndpoint
 from pyconnectwise.endpoints.manage.ScheduleHolidaylistsInfoEndpoint import ScheduleHolidaylistsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdEndpoint.py
index 56adee1e0..0880e2da6 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleHolidaylistsIdHolidaysEndpoint import ScheduleHolidaylistsIdHolidaysEndpoint
 from pyconnectwise.endpoints.manage.ScheduleHolidaylistsIdInfoEndpoint import ScheduleHolidaylistsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -11,7 +10,7 @@ class ScheduleHolidaylistsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.info = self._register_child_endpoint(ScheduleHolidaylistsIdInfoEndpoint(client, parent_endpoint=self))
         self.holidays = self._register_child_endpoint(
             ScheduleHolidaylistsIdHolidaysEndpoint(client, parent_endpoint=self)
         )
+        self.info = self._register_child_endpoint(ScheduleHolidaylistsIdInfoEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysCountEndpoint.py
index 20b5ee29e..c3c7cead2 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysEndpoint.py
index 26325dbd5..182738be8 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysEndpoint.py
@@ -5,7 +5,6 @@
     ScheduleHolidaylistsIdHolidaysIdEndpoint
 from pyconnectwise.endpoints.manage.ScheduleHolidaylistsIdHolidaysInfoEndpoint import \
     ScheduleHolidaylistsIdHolidaysInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysIdEndpoint.py
index 497aa2516..0c7cb0142 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleHolidaylistsIdHolidaysIdInfoEndpoint import \
     ScheduleHolidaylistsIdHolidaysIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysIdInfoEndpoint.py
index a2ad1e6e1..24f6b3dee 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import HolidayInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysInfoEndpoint.py
index 718544ed3..dd8b01607 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdHolidaysInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import HolidayInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdInfoEndpoint.py
index 9c45c9c8a..dbbc4efbd 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import HolidayListInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdUsagesEndpoint.py
index deb546e4f..8db2986ad 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleHolidaylistsIdUsagesListEndpoint import \
     ScheduleHolidaylistsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdUsagesListEndpoint.py
index 5d87b8155..a0cdeefc4 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsInfoEndpoint.py
index 981001225..33b3fa3a5 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleHolidaylistsInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import HolidayListInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsCountEndpoint.py
index 67735402d..55cfa695d 100644
--- a/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsEndpoint.py b/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsEndpoint.py
index 0ec9b73b3..d8759a8d3 100644
--- a/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SchedulePortalcalendarsCountEndpoint import SchedulePortalcalendarsCountEndpoint
 from pyconnectwise.endpoints.manage.SchedulePortalcalendarsIdEndpoint import SchedulePortalcalendarsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalCalendar
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsIdEndpoint.py
index 0f1931ae7..3cdc8af97 100644
--- a/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SchedulePortalcalendarsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalCalendar
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesCountEndpoint.py
index 16d7f16c5..a5cc0e314 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesEndpoint.py
index 4c73fb5e0..0b54c657b 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleRemindertimesCountEndpoint import ScheduleRemindertimesCountEndpoint
 from pyconnectwise.endpoints.manage.ScheduleRemindertimesIdEndpoint import ScheduleRemindertimesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleReminderTime
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesIdEndpoint.py
index 9255278cb..4e3fc26a9 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleRemindertimesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleReminderTime
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleStatusesCountEndpoint.py
index f46f20c2c..a92af79e8 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleStatusesEndpoint.py
index 7e6993a21..42637b25b 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleStatusesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleStatusesCountEndpoint import ScheduleStatusesCountEndpoint
 from pyconnectwise.endpoints.manage.ScheduleStatusesIdEndpoint import ScheduleStatusesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleStatusesIdEndpoint.py
index 552c48aa0..4de388df4 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleStatusesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ScheduleStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /schedule/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScheduleStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleTypesCountEndpoint.py
index e04e419b8..cfe00f852 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleTypesEndpoint.py
index 971f062cf..b25ec3ebe 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleTypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ScheduleTypesCountEndpoint import ScheduleTypesCountEndpoint
 from pyconnectwise.endpoints.manage.ScheduleTypesIdEndpoint import ScheduleTypesIdEndpoint
 from pyconnectwise.endpoints.manage.ScheduleTypesInfoEndpoint import ScheduleTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleTypesIdEndpoint.py
index 670fef81a..7d68dc97c 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleTypesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleTypesIdInfoEndpoint import ScheduleTypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ScheduleTypesIdUsagesEndpoint import ScheduleTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ScheduleType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /schedule/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScheduleType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleTypesIdInfoEndpoint.py
index 4cb2bd77e..975eebdd9 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleTypesIdUsagesEndpoint.py
index 411766323..42aa76ae4 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleTypesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleTypesIdUsagesListEndpoint import ScheduleTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleTypesIdUsagesListEndpoint.py
index 782a04bf6..610e94daf 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleTypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleTypesInfoCountEndpoint.py
index d98a99dce..857452d31 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleTypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleTypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ScheduleTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ScheduleTypesInfoEndpoint.py
index 425d01995..a7b35b495 100644
--- a/src/pyconnectwise/endpoints/manage/ScheduleTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ScheduleTypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ScheduleTypesInfoCountEndpoint import ScheduleTypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsCopyEndpoint.py
index 16164fd44..e77bf7651 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Board
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsCountEndpoint.py
index 91ef36000..2d76b5daf 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsEndpoint.py
index 20f666a6c..50d46bfc1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsCopyEndpoint import ServiceBoardsCopyEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsCountEndpoint import ServiceBoardsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdEndpoint import ServiceBoardsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Board
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesCountEndpoint.py
index 63700e049..b77d5f122 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesEndpoint.py
index 0ea8abd5e..2d9f1b15b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesEndpoint.py
@@ -5,7 +5,6 @@
     ServiceBoardsIdAutoassignresourcesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdAutoassignresourcesIdEndpoint import \
     ServiceBoardsIdAutoassignresourcesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardAutoAssignResource
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesIdEndpoint.py
index 40d6832aa..6cba37b80 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutoassignresourcesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardAutoAssignResource
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardAutoAssignResource, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/autoAssignResources/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardAutoAssignResource:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesCountEndpoint.py
index c2a9fcc0d..5e56d8867 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesEndpoint.py
index 6eb1b720a..336b00605 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsIdAutotemplatesCountEndpoint import \
     ServiceBoardsIdAutotemplatesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdAutotemplatesIdEndpoint import ServiceBoardsIdAutotemplatesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardAutoTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesIdEndpoint.py
index ca78412db..28c95b698 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdAutotemplatesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardAutoTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardAutoTemplate, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/autoTemplates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardAutoTemplate:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdEndpoint.py
index 993670cd1..7a668b6d0 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdEndpoint.py
@@ -14,7 +14,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTypesubtypeitemassociationsEndpoint import \
     ServiceBoardsIdTypesubtypeitemassociationsEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdUsagesEndpoint import ServiceBoardsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Board
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -23,27 +22,27 @@ class ServiceBoardsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.auto_templates = self._register_child_endpoint(
-            ServiceBoardsIdAutotemplatesEndpoint(client, parent_endpoint=self)
-        )
         self.auto_assign_resources = self._register_child_endpoint(
             ServiceBoardsIdAutoassignresourcesEndpoint(client, parent_endpoint=self)
         )
-        self.type_sub_type_item_associations = self._register_child_endpoint(
-            ServiceBoardsIdTypesubtypeitemassociationsEndpoint(client, parent_endpoint=self)
+        self.excluded_members = self._register_child_endpoint(
+            ServiceBoardsIdExcludedmembersEndpoint(client, parent_endpoint=self)
         )
         self.notifications = self._register_child_endpoint(
             ServiceBoardsIdNotificationsEndpoint(client, parent_endpoint=self)
         )
         self.types = self._register_child_endpoint(ServiceBoardsIdTypesEndpoint(client, parent_endpoint=self))
-        self.excluded_members = self._register_child_endpoint(
-            ServiceBoardsIdExcludedmembersEndpoint(client, parent_endpoint=self)
+        self.type_sub_type_item_associations = self._register_child_endpoint(
+            ServiceBoardsIdTypesubtypeitemassociationsEndpoint(client, parent_endpoint=self)
         )
-        self.statuses = self._register_child_endpoint(ServiceBoardsIdStatusesEndpoint(client, parent_endpoint=self))
-        self.items = self._register_child_endpoint(ServiceBoardsIdItemsEndpoint(client, parent_endpoint=self))
-        self.usages = self._register_child_endpoint(ServiceBoardsIdUsagesEndpoint(client, parent_endpoint=self))
         self.teams = self._register_child_endpoint(ServiceBoardsIdTeamsEndpoint(client, parent_endpoint=self))
+        self.auto_templates = self._register_child_endpoint(
+            ServiceBoardsIdAutotemplatesEndpoint(client, parent_endpoint=self)
+        )
+        self.usages = self._register_child_endpoint(ServiceBoardsIdUsagesEndpoint(client, parent_endpoint=self))
         self.subtypes = self._register_child_endpoint(ServiceBoardsIdSubtypesEndpoint(client, parent_endpoint=self))
+        self.statuses = self._register_child_endpoint(ServiceBoardsIdStatusesEndpoint(client, parent_endpoint=self))
+        self.items = self._register_child_endpoint(ServiceBoardsIdItemsEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Board]:
         """
@@ -78,17 +77,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(Board, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Board:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersCountEndpoint.py
index 5271047a3..228d19146 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersEndpoint.py
index 2a19c7fa1..fed3cc16f 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersEndpoint.py
@@ -5,7 +5,6 @@
     ServiceBoardsIdExcludedmembersCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdExcludedmembersIdEndpoint import \
     ServiceBoardsIdExcludedmembersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardExcludedMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersIdEndpoint.py
index 5799d7d50..3f9dd9f50 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdExcludedmembersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardExcludedMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardExcludedMember, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/excludedMembers/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsCountEndpoint.py
index d6879d8ab..af62f1a95 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsEndpoint.py
index 5b98ae3c3..eb5886591 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdItemsCountEndpoint import ServiceBoardsIdItemsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdItemsIdEndpoint import ServiceBoardsIdItemsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsCountEndpoint.py
index e279170d7..9950a65f7 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsEndpoint.py
index 368c9352d..6cb2bbb76 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsEndpoint.py
@@ -5,7 +5,6 @@
     ServiceBoardsIdItemsIdAssociationsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdItemsIdAssociationsIdEndpoint import \
     ServiceBoardsIdItemsIdAssociationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardItemAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsIdEndpoint.py
index 8986a7031..f9aa7d2e5 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdAssociationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardItemAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdEndpoint.py
index e4020596c..425a5217b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsIdItemsIdAssociationsEndpoint import \
     ServiceBoardsIdItemsIdAssociationsEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdItemsIdUsagesEndpoint import ServiceBoardsIdItemsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardItem
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardItem, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/items/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardItem:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdUsagesEndpoint.py
index 50c812362..df17000f8 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdItemsIdUsagesListEndpoint import \
     ServiceBoardsIdItemsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdUsagesListEndpoint.py
index 4df076896..7bd059193 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdItemsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsCountEndpoint.py
index 2d9004af8..cc8ebf3c6 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsEndpoint.py
index 187e7ff47..8bc91d1fd 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsIdNotificationsCountEndpoint import \
     ServiceBoardsIdNotificationsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdNotificationsIdEndpoint import ServiceBoardsIdNotificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsIdEndpoint.py
index 453f1795d..f8bd9864e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdNotificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardNotification, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/notifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardNotification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesCountEndpoint.py
index fbb0bf2a1..2134d5d11 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesEndpoint.py
index d0dffa043..5140b444a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsIdStatusesCountEndpoint import ServiceBoardsIdStatusesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdStatusesIdEndpoint import ServiceBoardsIdStatusesIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdStatusesInfoEndpoint import ServiceBoardsIdStatusesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdEndpoint.py
index db4eedc4b..ce18ae4a2 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdEndpoint.py
@@ -6,7 +6,6 @@
     ServiceBoardsIdStatusesIdNotificationsEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdStatusesIdUsagesEndpoint import \
     ServiceBoardsIdStatusesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardStatus
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -18,10 +17,10 @@ def __init__(self, client, parent_endpoint=None):
         self.usages = self._register_child_endpoint(
             ServiceBoardsIdStatusesIdUsagesEndpoint(client, parent_endpoint=self)
         )
-        self.info = self._register_child_endpoint(ServiceBoardsIdStatusesIdInfoEndpoint(client, parent_endpoint=self))
         self.notifications = self._register_child_endpoint(
             ServiceBoardsIdStatusesIdNotificationsEndpoint(client, parent_endpoint=self)
         )
+        self.info = self._register_child_endpoint(ServiceBoardsIdStatusesIdInfoEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[BoardStatus]:
         """
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardStatus, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/statuses/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardStatus:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdInfoEndpoint.py
index 365dc4a71..eaa800a82 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsCountEndpoint.py
index 975503714..03cf5a040 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsEndpoint.py
index e3a5353c1..440da1535 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsEndpoint.py
@@ -5,7 +5,6 @@
     ServiceBoardsIdStatusesIdNotificationsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdStatusesIdNotificationsIdEndpoint import \
     ServiceBoardsIdStatusesIdNotificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardStatusNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsIdEndpoint.py
index 9397f5701..c2e003a09 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdNotificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardStatusNotification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardStatusNotification, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/statuses/{id}/notifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardStatusNotification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdUsagesEndpoint.py
index 0b11d45cc..1bcb873f1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdStatusesIdUsagesListEndpoint import \
     ServiceBoardsIdStatusesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdUsagesListEndpoint.py
index 6ee38fe80..48028adfd 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesInfoCountEndpoint.py
index f3b366d5f..f7b26ade4 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesInfoEndpoint.py
index 517bc075e..aa0c11e7a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdStatusesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdStatusesInfoCountEndpoint import \
     ServiceBoardsIdStatusesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardStatusInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesCountEndpoint.py
index 53b566a32..fa95ae7e4 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesEndpoint.py
index 8a93309d9..52f254af8 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsIdSubtypesCountEndpoint import ServiceBoardsIdSubtypesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdSubtypesIdEndpoint import ServiceBoardsIdSubtypesIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdSubtypesInfoEndpoint import ServiceBoardsIdSubtypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardSubType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdEndpoint.py
index 996a01d18..0ed557f13 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsIdSubtypesIdInfoEndpoint import ServiceBoardsIdSubtypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdSubtypesIdUsagesEndpoint import \
     ServiceBoardsIdSubtypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardSubType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -53,17 +52,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardSubType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/subtypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardSubType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdInfoEndpoint.py
index d0551c7fd..87f6b20a5 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardSubTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdUsagesEndpoint.py
index a64927b14..0659ee7b1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdSubtypesIdUsagesListEndpoint import \
     ServiceBoardsIdSubtypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdUsagesListEndpoint.py
index d81a6592c..a885873c6 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesInfoCountEndpoint.py
index d520b925e..756b445e2 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesInfoEndpoint.py
index 4cd566941..588a81d7f 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdSubtypesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdSubtypesInfoCountEndpoint import \
     ServiceBoardsIdSubtypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardSubTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsCountEndpoint.py
index e8c77510b..d45a2513d 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsEndpoint.py
index 136dddb9e..a0bee3219 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTeamsCountEndpoint import ServiceBoardsIdTeamsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTeamsIdEndpoint import ServiceBoardsIdTeamsIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTeamsInfoEndpoint import ServiceBoardsIdTeamsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdEndpoint.py
index 3d78e81f9..d48f2948d 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTeamsIdInfoEndpoint import ServiceBoardsIdTeamsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTeamsIdUsagesEndpoint import ServiceBoardsIdTeamsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardTeam, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/teams/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardTeam:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdInfoEndpoint.py
index f8eeb321c..269412054 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardTeamInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdUsagesEndpoint.py
index 73689815c..f60638657 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTeamsIdUsagesListEndpoint import \
     ServiceBoardsIdTeamsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdUsagesListEndpoint.py
index 7c9f96619..0f7cfb4d1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsInfoCountEndpoint.py
index 03a2c5f50..de88b1952 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsInfoEndpoint.py
index f1bdd9f5e..b89c2f38a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTeamsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTeamsInfoCountEndpoint import ServiceBoardsIdTeamsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardTeamInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesCountEndpoint.py
index 502bb9167..b2b44728b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesEndpoint.py
index 174fc19b2..6536056a4 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTypesCountEndpoint import ServiceBoardsIdTypesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTypesIdEndpoint import ServiceBoardsIdTypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdEndpoint.py
index 56b9de5ea..cd7a454ac 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTypesIdUsagesEndpoint import ServiceBoardsIdTypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> B
         """
         return self._parse_one(BoardType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/boards/{id}/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> BoardType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdUsagesEndpoint.py
index d31676728..7e853c0f3 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTypesIdUsagesListEndpoint import \
     ServiceBoardsIdTypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdUsagesListEndpoint.py
index c7112c93c..152a83f9e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsCountEndpoint.py
index 91cb1a770..45be212aa 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsEndpoint.py
index a5fdc713d..535b3575e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsEndpoint.py
@@ -5,7 +5,6 @@
     ServiceBoardsIdTypesubtypeitemassociationsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdTypesubtypeitemassociationsIdEndpoint import \
     ServiceBoardsIdTypesubtypeitemassociationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardTypeSubTypeItemAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsIdEndpoint.py
index 59825f1aa..b3653663b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdTypesubtypeitemassociationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardTypeSubTypeItemAssociation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdUsagesEndpoint.py
index fa0a561ee..ae1b0ac04 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceBoardsIdUsagesListEndpoint import ServiceBoardsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdUsagesListEndpoint.py
index de14a79da..b50176c84 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceBoardsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceBoardsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceCodesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceCodesCountEndpoint.py
index 1433bf950..ad3278f58 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceCodesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceCodesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceCodesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceCodesEndpoint.py
index a5b34fe2c..b496ee621 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceCodesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceCodesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceCodesCountEndpoint import ServiceCodesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceCodesIdEndpoint import ServiceCodesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Code
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceCodesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceCodesIdEndpoint.py
index 3dd7719fe..566ecb909 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceCodesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceCodesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Code
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Code, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/codes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Code:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesCountEndpoint.py
index 4acc73d0b..4ed3ff49b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesEndpoint.py
index 72bc5a21b..37d825f03 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceEmailtemplatesCountEndpoint import ServiceEmailtemplatesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceEmailtemplatesIdEndpoint import ServiceEmailtemplatesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceEmailTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdEndpoint.py
index ad0a63d93..eb33156a3 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceEmailtemplatesIdUsagesEndpoint import ServiceEmailtemplatesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceEmailTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ServiceEmailTemplate, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/emailTemplates/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ServiceEmailTemplate:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdUsagesEndpoint.py
index c59857192..fbd5fa6a9 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceEmailtemplatesIdUsagesListEndpoint import \
     ServiceEmailtemplatesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdUsagesListEndpoint.py
index 46f9e90eb..4713f8c34 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceEmailtemplatesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceEndpoint.py
index 2c0bfe219..201a7cb10 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceEndpoint.py
@@ -26,7 +26,6 @@
 from pyconnectwise.endpoints.manage.ServiceTicketlinksEndpoint import ServiceTicketlinksEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsEndpoint import ServiceTicketsEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsyncsEndpoint import ServiceTicketsyncsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -34,40 +33,40 @@ class ServiceEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "service", parent_endpoint=parent_endpoint)
 
-        self.knowledgebasesettings = self._register_child_endpoint(
-            ServiceKnowledgebasesettingsEndpoint(client, parent_endpoint=self)
-        )
         self.email_templates = self._register_child_endpoint(
             ServiceEmailtemplatesEndpoint(client, parent_endpoint=self)
         )
-        self.locations = self._register_child_endpoint(ServiceLocationsEndpoint(client, parent_endpoint=self))
-        self.s_l_as = self._register_child_endpoint(ServiceSlasEndpoint(client, parent_endpoint=self))
-        self.codes = self._register_child_endpoint(ServiceCodesEndpoint(client, parent_endpoint=self))
-        self.knowledge_base_sub_categories = self._register_child_endpoint(
-            ServiceKnowledgebasesubcategoriesEndpoint(client, parent_endpoint=self)
-        )
-        self.boards = self._register_child_endpoint(ServiceBoardsEndpoint(client, parent_endpoint=self))
-        self.severities = self._register_child_endpoint(ServiceSeveritiesEndpoint(client, parent_endpoint=self))
-        self.scheduling = self._register_child_endpoint(ServiceSchedulingEndpoint(client, parent_endpoint=self))
-        self.templates = self._register_child_endpoint(ServiceTemplatesEndpoint(client, parent_endpoint=self))
         self.impacts = self._register_child_endpoint(ServiceImpactsEndpoint(client, parent_endpoint=self))
-        self.ticket_links = self._register_child_endpoint(ServiceTicketlinksEndpoint(client, parent_endpoint=self))
-        self.sources = self._register_child_endpoint(ServiceSourcesEndpoint(client, parent_endpoint=self))
-        self.priority = self._register_child_endpoint(ServicePriorityEndpoint(client, parent_endpoint=self))
+        self.s_l_as = self._register_child_endpoint(ServiceSlasEndpoint(client, parent_endpoint=self))
         self.team_members = self._register_child_endpoint(ServiceTeammembersEndpoint(client, parent_endpoint=self))
-        self.priorities = self._register_child_endpoint(ServicePrioritiesEndpoint(client, parent_endpoint=self))
+        self.slas = self._register_child_endpoint(ServiceSlasEndpoint(client, parent_endpoint=self))
         self.tickets = self._register_child_endpoint(ServiceTicketsEndpoint(client, parent_endpoint=self))
+        self.knowledgebasesettings = self._register_child_endpoint(
+            ServiceKnowledgebasesettingsEndpoint(client, parent_endpoint=self)
+        )
         self.knowledge_base_categories = self._register_child_endpoint(
             ServiceKnowledgebasecategoriesEndpoint(client, parent_endpoint=self)
         )
+        self.ticket_links = self._register_child_endpoint(ServiceTicketlinksEndpoint(client, parent_endpoint=self))
+        self.ticket_syncs = self._register_child_endpoint(ServiceTicketsyncsEndpoint(client, parent_endpoint=self))
+        self.scheduling = self._register_child_endpoint(ServiceSchedulingEndpoint(client, parent_endpoint=self))
+        self.sources = self._register_child_endpoint(ServiceSourcesEndpoint(client, parent_endpoint=self))
+        self.codes = self._register_child_endpoint(ServiceCodesEndpoint(client, parent_endpoint=self))
+        self.surveys = self._register_child_endpoint(ServiceSurveysEndpoint(client, parent_endpoint=self))
+        self.priorities = self._register_child_endpoint(ServicePrioritiesEndpoint(client, parent_endpoint=self))
         self.service_signoff = self._register_child_endpoint(
             ServiceServicesignoffEndpoint(client, parent_endpoint=self)
         )
+        self.locations = self._register_child_endpoint(ServiceLocationsEndpoint(client, parent_endpoint=self))
+        self.boards = self._register_child_endpoint(ServiceBoardsEndpoint(client, parent_endpoint=self))
+        self.knowledge_base_sub_categories = self._register_child_endpoint(
+            ServiceKnowledgebasesubcategoriesEndpoint(client, parent_endpoint=self)
+        )
+        self.severities = self._register_child_endpoint(ServiceSeveritiesEndpoint(client, parent_endpoint=self))
         self.info = self._register_child_endpoint(ServiceInfoEndpoint(client, parent_endpoint=self))
+        self.teams = self._register_child_endpoint(ServiceTeamsEndpoint(client, parent_endpoint=self))
+        self.templates = self._register_child_endpoint(ServiceTemplatesEndpoint(client, parent_endpoint=self))
         self.knowledge_base_articles = self._register_child_endpoint(
             ServiceKnowledgebasearticlesEndpoint(client, parent_endpoint=self)
         )
-        self.ticket_syncs = self._register_child_endpoint(ServiceTicketsyncsEndpoint(client, parent_endpoint=self))
-        self.surveys = self._register_child_endpoint(ServiceSurveysEndpoint(client, parent_endpoint=self))
-        self.teams = self._register_child_endpoint(ServiceTeamsEndpoint(client, parent_endpoint=self))
-        self.slas = self._register_child_endpoint(ServiceSlasEndpoint(client, parent_endpoint=self))
+        self.priority = self._register_child_endpoint(ServicePriorityEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/ServiceImpactsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceImpactsCountEndpoint.py
index d8029f682..103a476a1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceImpactsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceImpactsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceImpactsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceImpactsEndpoint.py
index c0c07757e..6b8307518 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceImpactsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceImpactsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceImpactsCountEndpoint import ServiceImpactsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceImpactsIdEndpoint import ServiceImpactsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Impact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceImpactsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceImpactsIdEndpoint.py
index fc67de480..1a101b288 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceImpactsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceImpactsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Impact
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsCountEndpoint.py
index 6ace82a22..506616fb2 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsEndpoint.py
index 42a1bccdb..39fead7c6 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceInfoBoardsCountEndpoint import ServiceInfoBoardsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceInfoBoardsIdEndpoint import ServiceInfoBoardsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsIdEndpoint.py
index 574aa49f6..33bf33bd8 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesCountEndpoint.py
index 46bf4a68e..6b77db06d 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesEndpoint.py
index 1fbb03158..92ae626fe 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceInfoBoardtypesCountEndpoint import ServiceInfoBoardtypesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceInfoBoardtypesIdEndpoint import ServiceInfoBoardtypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesIdEndpoint.py
index fb3a42607..0dbf3a44c 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceInfoBoardtypesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BoardTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceInfoEndpoint.py
index 676ed5d6f..0be9e2654 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceInfoBoardsEndpoint import ServiceInfoBoardsEndpoint
 from pyconnectwise.endpoints.manage.ServiceInfoBoardtypesEndpoint import ServiceInfoBoardtypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -11,5 +10,5 @@ class ServiceInfoEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "info", parent_endpoint=parent_endpoint)
 
-        self.boardtypes = self._register_child_endpoint(ServiceInfoBoardtypesEndpoint(client, parent_endpoint=self))
         self.boards = self._register_child_endpoint(ServiceInfoBoardsEndpoint(client, parent_endpoint=self))
+        self.boardtypes = self._register_child_endpoint(ServiceInfoBoardtypesEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesCountEndpoint.py
index 0908c9598..6586596eb 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesEndpoint.py
index 52916f269..01bf5ef64 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceKnowledgebasearticlesCountEndpoint import \
     ServiceKnowledgebasearticlesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceKnowledgebasearticlesIdEndpoint import ServiceKnowledgebasearticlesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KnowledgeBaseArticle
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesIdEndpoint.py
index 076327dc6..86b30eeea 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasearticlesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KnowledgeBaseArticle
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> K
         """
         return self._parse_one(KnowledgeBaseArticle, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/knowledgeBaseArticles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> KnowledgeBaseArticle:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesCountEndpoint.py
index c6db30d9a..e1a0a5fae 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesEndpoint.py
index a4f7184b3..f932509be 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesEndpoint.py
@@ -5,7 +5,6 @@
     ServiceKnowledgebasecategoriesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceKnowledgebasecategoriesIdEndpoint import \
     ServiceKnowledgebasecategoriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KnowledgeBaseCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesIdEndpoint.py
index f30d09dfc..47163822b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasecategoriesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KnowledgeBaseCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> K
         """
         return self._parse_one(KnowledgeBaseCategory, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/knowledgeBaseCategories/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> KnowledgeBaseCategory:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesettingsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesettingsEndpoint.py
index 1bc80e948..1ee90a5e7 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesettingsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceKnowledgebasesettingsIdEndpoint import ServiceKnowledgebasesettingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KnowledgeBaseSettings
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesettingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesettingsIdEndpoint.py
index 10c1e0ca4..16a1d3fcb 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesettingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesettingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KnowledgeBaseSettings
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesCountEndpoint.py
index fb6b8b9dd..8f05f2a7f 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesEndpoint.py
index f0c26bf35..ef448e15e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesEndpoint.py
@@ -5,7 +5,6 @@
     ServiceKnowledgebasesubcategoriesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceKnowledgebasesubcategoriesIdEndpoint import \
     ServiceKnowledgebasesubcategoriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KnowledgeBaseSubCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdEndpoint.py
index ef882caf2..50b194688 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceKnowledgebasesubcategoriesIdUsagesEndpoint import \
     ServiceKnowledgebasesubcategoriesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KnowledgeBaseSubCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> K
         """
         return self._parse_one(KnowledgeBaseSubCategory, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/knowledgeBaseSubCategories/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> KnowledgeBaseSubCategory:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdUsagesEndpoint.py
index b6bb31cf3..39f8df407 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceKnowledgebasesubcategoriesIdUsagesListEndpoint import \
     ServiceKnowledgebasesubcategoriesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdUsagesListEndpoint.py
index e212bbb62..4936ab26d 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceKnowledgebasesubcategoriesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceLocationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceLocationsCountEndpoint.py
index 6b7f2f14b..387b8788c 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceLocationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceLocationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceLocationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceLocationsEndpoint.py
index c6a3aab04..0803df78e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceLocationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceLocationsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceLocationsCountEndpoint import ServiceLocationsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceLocationsIdEndpoint import ServiceLocationsIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceLocationsInfoEndpoint import ServiceLocationsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceLocationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceLocationsIdEndpoint.py
index 2125f7ed9..400ba9a00 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceLocationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceLocationsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceLocationsIdInfoEndpoint import ServiceLocationsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ServiceLocation, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/locations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ServiceLocation:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceLocationsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceLocationsIdInfoEndpoint.py
index 66f3e7aaa..38d537405 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceLocationsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceLocationsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceLocationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceLocationsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceLocationsInfoCountEndpoint.py
index ad7cae470..3ea8fb2d1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceLocationsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceLocationsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceLocationsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceLocationsInfoEndpoint.py
index 1a6c116d9..11ea33834 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceLocationsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceLocationsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceLocationsInfoCountEndpoint import ServiceLocationsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceLocationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServicePrioritiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePrioritiesCountEndpoint.py
index fe69fad49..ffa4ce888 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePrioritiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePrioritiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServicePrioritiesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePrioritiesEndpoint.py
index 1679bdb80..bc3cfb33f 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePrioritiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePrioritiesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServicePrioritiesCountEndpoint import ServicePrioritiesCountEndpoint
 from pyconnectwise.endpoints.manage.ServicePrioritiesIdEndpoint import ServicePrioritiesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Priority
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdEndpoint.py
index 56a9d06b3..0fd3624d9 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServicePrioritiesIdImageEndpoint import ServicePrioritiesIdImageEndpoint
 from pyconnectwise.endpoints.manage.ServicePrioritiesIdUsagesEndpoint import ServicePrioritiesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Priority
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(Priority, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/priorities/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Priority:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdImageEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdImageEndpoint.py
index 12feb7aaf..2f002e152 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdImageEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdImageEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class ServicePrioritiesIdImageEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "image", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a GET request against the /service/priorities/{id}/image endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("GET", data=data, params=params).json())
+        super()._make_request("GET", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdUsagesEndpoint.py
index d68c7f162..b77afed72 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServicePrioritiesIdUsagesListEndpoint import ServicePrioritiesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdUsagesListEndpoint.py
index 67ccc418d..15ed0320a 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePrioritiesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServicePriorityEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePriorityEndpoint.py
index 1e66dd987..12d036540 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePriorityEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePriorityEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServicePriorityIdEndpoint import ServicePriorityIdEndpoint
 from pyconnectwise.endpoints.manage.ServicePriorityInfoEndpoint import ServicePriorityInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServicePriorityIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePriorityIdEndpoint.py
index 5f0860d9a..79a896dcd 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePriorityIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePriorityIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServicePriorityIdInfoEndpoint import ServicePriorityIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServicePriorityIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePriorityIdInfoEndpoint.py
index c5e584210..6a67d5045 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePriorityIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePriorityIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PriorityInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServicePriorityInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServicePriorityInfoEndpoint.py
index 9ac3aad17..5859e9844 100644
--- a/src/pyconnectwise/endpoints/manage/ServicePriorityInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServicePriorityInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PriorityInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSchedulingEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSchedulingEndpoint.py
index 0cf3ea698..f6b4ca2d8 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSchedulingEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSchedulingEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSchedulingMembersEndpoint import ServiceSchedulingMembersEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersEndpoint.py
index 9827518ff..c7db5ba90 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSchedulingMembersIdEndpoint import ServiceSchedulingMembersIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceSchedulingMembersInfoEndpoint import ServiceSchedulingMembersInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersIdEndpoint.py
index 13c8e91fd..da16f0505 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSchedulingMembersIdInfoEndpoint import ServiceSchedulingMembersIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersIdInfoEndpoint.py
index 3c2c1d7ad..b2c176ff1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SchedulingMemberInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersInfoCountEndpoint.py
index df02c968b..8053f317a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersInfoEndpoint.py
index 953ac8ee1..7e3c78cd1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSchedulingMembersInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSchedulingMembersInfoCountEndpoint import \
     ServiceSchedulingMembersInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SchedulingMemberInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffCountEndpoint.py
index faac5d386..c6d822655 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffEndpoint.py
index d0942ab20..eb8dc0061 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceServicesignoffCountEndpoint import ServiceServicesignoffCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceServicesignoffIdEndpoint import ServiceServicesignoffIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceServicesignoffInfoEndpoint import ServiceServicesignoffInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSignoff
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdEndpoint.py
index 47e12decc..358c4a53b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.ServiceServicesignoffIdSignoffcustomfieldsEndpoint import \
     ServiceServicesignoffIdSignoffcustomfieldsEndpoint
 from pyconnectwise.endpoints.manage.ServiceServicesignoffIdUsagesEndpoint import ServiceServicesignoffIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSignoff
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -55,17 +54,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ServiceSignoff, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/serviceSignoff/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ServiceSignoff:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdInfoEndpoint.py
index dfc9f63df..7e9d59238 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSignoffInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsCountEndpoint.py
index e8f3f23a1..fa3d81fee 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsEndpoint.py
index 045307252..92dc1c533 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsEndpoint.py
@@ -5,7 +5,6 @@
     ServiceServicesignoffIdSignoffcustomfieldsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceServicesignoffIdSignoffcustomfieldsIdEndpoint import \
     ServiceServicesignoffIdSignoffcustomfieldsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSignoffCustomField
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsIdEndpoint.py
index a47726851..e09e2f666 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdSignoffcustomfieldsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSignoffCustomField
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -57,17 +56,15 @@ def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ServiceSignoffCustomField, super()._make_request("PUT", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/serviceSignoff/{id}/signoffcustomfields/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ServiceSignoffCustomField:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdUsagesEndpoint.py
index 4d668e3ab..6d4c4b6f5 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceServicesignoffIdUsagesListEndpoint import \
     ServiceServicesignoffIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdUsagesListEndpoint.py
index 71cb2a206..0c1c83bcb 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffInfoCountEndpoint.py
index c70b0cec4..3bc0dd055 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffInfoEndpoint.py
index a3145cc02..0844f29a0 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceServicesignoffInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceServicesignoffInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceServicesignoffInfoCountEndpoint import ServiceServicesignoffInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSignoffInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSeveritiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSeveritiesCountEndpoint.py
index 07194fee7..c433a2e45 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSeveritiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSeveritiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSeveritiesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSeveritiesEndpoint.py
index ffad8cae8..526b82ce8 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSeveritiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSeveritiesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSeveritiesCountEndpoint import ServiceSeveritiesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceSeveritiesIdEndpoint import ServiceSeveritiesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Severity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSeveritiesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSeveritiesIdEndpoint.py
index aa98b1a3c..c3dcd5a39 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSeveritiesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSeveritiesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Severity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasCountEndpoint.py
index 1b2d599f2..c38231875 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasEndpoint.py
index 305e5380a..fa98761ca 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSlasIdEndpoint import ServiceSlasIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceSlasInfoEndpoint import ServiceSlasInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasIdEndpoint.py
index 8d15454a3..b5cddd2f6 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSlasIdInfoEndpoint import ServiceSlasIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasIdInfoEndpoint.py
index 3e8adea57..14f26cc0a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SLAInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesCountEndpoint.py
index 2521d7c42..db4c1cb4d 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesEndpoint.py
index 9c1c7f560..ae317636f 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSlasIdPrioritiesCountEndpoint import ServiceSlasIdPrioritiesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceSlasIdPrioritiesIdEndpoint import ServiceSlasIdPrioritiesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SLAPriority
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesIdEndpoint.py
index 2190f4fca..d781c9c4e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasIdPrioritiesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SLAPriority
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SLAPriority, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/SLAs/{id}/priorities/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SLAPriority:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasIdUsagesEndpoint.py
index 667b815db..e721e0347 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSlasIdUsagesListEndpoint import ServiceSlasIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasIdUsagesListEndpoint.py
index 8f4e1249e..aefdcd6f3 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasInfoCountEndpoint.py
index 5dd328ba5..9e60223ec 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSlasInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSlasInfoEndpoint.py
index d2c4185be..44779ffa9 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSlasInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSlasInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSlasInfoCountEndpoint import ServiceSlasInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSourcesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSourcesCountEndpoint.py
index 30a49bf97..612dd5fdb 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSourcesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSourcesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSourcesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSourcesEndpoint.py
index bd4ec91c5..27a22b52c 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSourcesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSourcesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceSourcesCountEndpoint import ServiceSourcesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceSourcesIdEndpoint import ServiceSourcesIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceSourcesInfoEndpoint import ServiceSourcesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Source
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSourcesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSourcesIdEndpoint.py
index 30588ecb1..162dc3169 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSourcesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSourcesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSourcesIdInfoEndpoint import ServiceSourcesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.ServiceSourcesIdUsagesEndpoint import ServiceSourcesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Source
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(Source, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/sources/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Source:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSourcesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSourcesIdInfoEndpoint.py
index 552de9da4..62bed1013 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSourcesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSourcesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SourceInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSourcesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSourcesIdUsagesEndpoint.py
index b24ee2e6a..4ff9c6e5b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSourcesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSourcesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSourcesIdUsagesListEndpoint import ServiceSourcesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSourcesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSourcesIdUsagesListEndpoint.py
index 8813ff377..a8d28bfd5 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSourcesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSourcesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSourcesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSourcesInfoCountEndpoint.py
index 626db0257..f9998fb47 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSourcesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSourcesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSourcesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSourcesInfoEndpoint.py
index 98841750d..729df7913 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSourcesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSourcesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSourcesInfoCountEndpoint import ServiceSourcesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SourceInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysCountEndpoint.py
index ada3b70f4..e55db3a72 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysEndpoint.py
index 9190ad7b0..6f34e427a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysCountEndpoint import ServiceSurveysCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdEndpoint import ServiceSurveysIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSurvey
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdCopyEndpoint.py
index 646185428..2a0e432c3 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSurvey
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdEndpoint.py
index 67b8aab56..6dfe738c5 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.ServiceSurveysIdQuestionsEndpoint import ServiceSurveysIdQuestionsEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdResultsEndpoint import ServiceSurveysIdResultsEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdUsagesEndpoint import ServiceSurveysIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSurvey
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -14,9 +13,9 @@ class ServiceSurveysIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.copy = self._register_child_endpoint(ServiceSurveysIdCopyEndpoint(client, parent_endpoint=self))
         self.usages = self._register_child_endpoint(ServiceSurveysIdUsagesEndpoint(client, parent_endpoint=self))
         self.questions = self._register_child_endpoint(ServiceSurveysIdQuestionsEndpoint(client, parent_endpoint=self))
-        self.copy = self._register_child_endpoint(ServiceSurveysIdCopyEndpoint(client, parent_endpoint=self))
         self.results = self._register_child_endpoint(ServiceSurveysIdResultsEndpoint(client, parent_endpoint=self))
 
     def paginated(
@@ -54,17 +53,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ServiceSurvey, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/surveys/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ServiceSurvey:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsCountEndpoint.py
index 93b94749c..82ebdb23c 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsEndpoint.py
index ead944be6..19f7a0ff5 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdQuestionsCountEndpoint import ServiceSurveysIdQuestionsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdQuestionsIdEndpoint import ServiceSurveysIdQuestionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSurveyQuestion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdCopyEndpoint.py
index 564038ea1..f3696676a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSurveyQuestion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdEndpoint.py
index c77c4b1bc..7832182be 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdEndpoint.py
@@ -5,7 +5,6 @@
     ServiceSurveysIdQuestionsIdCopyEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdQuestionsIdOptionsEndpoint import \
     ServiceSurveysIdQuestionsIdOptionsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceSurveyQuestion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -54,17 +53,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ServiceSurveyQuestion, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/surveys/{id}/questions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ServiceSurveyQuestion:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsCountEndpoint.py
index a0a1f1f84..bfbc47565 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsEndpoint.py
index f75849c52..0bb03d8b1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsEndpoint.py
@@ -5,7 +5,6 @@
     ServiceSurveysIdQuestionsIdOptionsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdQuestionsIdOptionsIdEndpoint import \
     ServiceSurveysIdQuestionsIdOptionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyOption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsIdEndpoint.py
index dac7540ee..47da884af 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdQuestionsIdOptionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyOption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SurveyOption, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/surveys/{id}/questions/{id}/options/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SurveyOption:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsCountEndpoint.py
index af7376ebb..1a29e7264 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsEndpoint.py
index a204b09a8..d5cbf5c08 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdResultsCountEndpoint import ServiceSurveysIdResultsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdResultsIdEndpoint import ServiceSurveysIdResultsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyResult
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsIdEndpoint.py
index 4bb1d4eb4..73598eff1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdResultsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyResult
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SurveyResult, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/surveys/{id}/results/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SurveyResult:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdUsagesEndpoint.py
index 965ae7c5b..391468ffa 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceSurveysIdUsagesListEndpoint import ServiceSurveysIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdUsagesListEndpoint.py
index b6b2590aa..1830d2c18 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceSurveysIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceSurveysIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTeammembersEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTeammembersEndpoint.py
index f1533daf8..35aabf6dc 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTeammembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTeammembersEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TeamMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTeamsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTeamsCountEndpoint.py
index b193a5aff..aaea05982 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTeamsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTeamsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTeamsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTeamsEndpoint.py
index 26553318a..8be4d12d7 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTeamsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTeamsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTeamsCountEndpoint import ServiceTeamsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceTeamsIdEndpoint import ServiceTeamsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTeamsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTeamsIdEndpoint.py
index a40972b2e..01280cb75 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTeamsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTeamsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTeam
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTemplatesCountEndpoint.py
index f9b72560a..c6054367a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTemplatesEndpoint.py
index c9ca864ac..d576d5109 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTemplatesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceTemplatesCountEndpoint import ServiceTemplatesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceTemplatesIdEndpoint import ServiceTemplatesIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceTemplatesInfoEndpoint import ServiceTemplatesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdEndpoint.py
index 2c22d710c..70a622353 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTemplatesIdGenerateEndpoint import ServiceTemplatesIdGenerateEndpoint
 from pyconnectwise.endpoints.manage.ServiceTemplatesIdInfoEndpoint import ServiceTemplatesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -12,8 +11,8 @@ class ServiceTemplatesIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.info = self._register_child_endpoint(ServiceTemplatesIdInfoEndpoint(client, parent_endpoint=self))
         self.generate = self._register_child_endpoint(ServiceTemplatesIdGenerateEndpoint(client, parent_endpoint=self))
+        self.info = self._register_child_endpoint(ServiceTemplatesIdInfoEndpoint(client, parent_endpoint=self))
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdGenerateEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdGenerateEndpoint.py
index ee7957d56..2630bdf1c 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdGenerateEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdGenerateEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TemplateGeneratedCountsModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdInfoEndpoint.py
index 9b5196177..b05b998a4 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTemplatesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTemplateInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTemplatesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTemplatesInfoCountEndpoint.py
index 65042d683..6e7bc8939 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTemplatesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTemplatesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTemplatesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTemplatesInfoEndpoint.py
index 0da6d825b..4daa7f80a 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTemplatesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTemplatesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTemplatesInfoCountEndpoint import ServiceTemplatesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTemplateInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksCountEndpoint.py
index 8589bb106..9b707e154 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksEndpoint.py
index 3110f9738..f61228612 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.ServiceTicketlinksCountEndpoint import ServiceTicketlinksCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketlinksIdEndpoint import ServiceTicketlinksIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketlinksInfoEndpoint import ServiceTicketlinksInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTicketLink
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksIdEndpoint.py
index a2a51ff33..aa6c63a1e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketlinksIdInfoEndpoint import ServiceTicketlinksIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTicketLink
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ServiceTicketLink, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/ticketLinks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ServiceTicketLink:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksIdInfoEndpoint.py
index af998dbab..14b613d2e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTicketLinkInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksInfoCountEndpoint.py
index 96bea9a39..f82721878 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksInfoEndpoint.py
index 8c87583e8..448925cc8 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketlinksInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketlinksInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketlinksInfoCountEndpoint import ServiceTicketlinksInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTicketLinkInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsCountEndpoint.py
index 7b74b9283..8ab7af152 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsEndpoint.py
index 5ffff14d4..f4c570c96 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.ServiceTicketsIdEndpoint import ServiceTicketsIdEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsInfoEndpoint import ServiceTicketsInfoEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsSearchEndpoint import ServiceTicketsSearchEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Ticket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdActivitiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdActivitiesCountEndpoint.py
index 9f418e665..7ca45f3e1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdActivitiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdActivitiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdActivitiesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdActivitiesEndpoint.py
index cbac73278..84a80eea4 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdActivitiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdActivitiesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdActivitiesCountEndpoint import \
     ServiceTicketsIdActivitiesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdAllnotesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdAllnotesEndpoint.py
index 2b02129a0..a1a964d65 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdAllnotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdAllnotesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceTicketNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdAttachchildrenEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdAttachchildrenEndpoint.py
index 882f4a164..fe1ed95e0 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdAttachchildrenEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdAttachchildrenEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsCountEndpoint.py
index 9c9b6dde6..9b1de2044 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsEndpoint.py
index c1f17384f..4e3329afe 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsEndpoint.py
@@ -5,7 +5,6 @@
     ServiceTicketsIdConfigurationsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdConfigurationsIdEndpoint import \
     ServiceTicketsIdConfigurationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsIdEndpoint.py
index 397058ce7..fb2cc521e 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConfigurationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConfigurationReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ConfigurationReference, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/tickets/{id}/configurations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConvertEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConvertEndpoint.py
index 5acaf7929..909274ddf 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConvertEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdConvertEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdDocumentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdDocumentsCountEndpoint.py
index e9a5adcca..3e7161ead 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdDocumentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdDocumentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdDocumentsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdDocumentsEndpoint.py
index f8e3ce7b0..ad38973c1 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdDocumentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdDocumentsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdDocumentsCountEndpoint import ServiceTicketsIdDocumentsCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DocumentReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdEndpoint.py
index f9784d201..ddff95ec5 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdEndpoint.py
@@ -15,7 +15,6 @@
     ServiceTicketsIdScheduleentriesEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdTasksEndpoint import ServiceTicketsIdTasksEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdTimeentriesEndpoint import ServiceTicketsIdTimeentriesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Ticket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -24,29 +23,29 @@ class ServiceTicketsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.timeentries = self._register_child_endpoint(
-            ServiceTicketsIdTimeentriesEndpoint(client, parent_endpoint=self)
-        )
-        self.convert = self._register_child_endpoint(ServiceTicketsIdConvertEndpoint(client, parent_endpoint=self))
         self.scheduleentries = self._register_child_endpoint(
             ServiceTicketsIdScheduleentriesEndpoint(client, parent_endpoint=self)
         )
-        self.notes = self._register_child_endpoint(ServiceTicketsIdNotesEndpoint(client, parent_endpoint=self))
-        self.configurations = self._register_child_endpoint(
-            ServiceTicketsIdConfigurationsEndpoint(client, parent_endpoint=self)
-        )
-        self.products = self._register_child_endpoint(ServiceTicketsIdProductsEndpoint(client, parent_endpoint=self))
         self.info = self._register_child_endpoint(ServiceTicketsIdInfoEndpoint(client, parent_endpoint=self))
+        self.tasks = self._register_child_endpoint(ServiceTicketsIdTasksEndpoint(client, parent_endpoint=self))
+        self.all_notes = self._register_child_endpoint(ServiceTicketsIdAllnotesEndpoint(client, parent_endpoint=self))
+        self.products = self._register_child_endpoint(ServiceTicketsIdProductsEndpoint(client, parent_endpoint=self))
+        self.timeentries = self._register_child_endpoint(
+            ServiceTicketsIdTimeentriesEndpoint(client, parent_endpoint=self)
+        )
+        self.convert = self._register_child_endpoint(ServiceTicketsIdConvertEndpoint(client, parent_endpoint=self))
         self.merge = self._register_child_endpoint(ServiceTicketsIdMergeEndpoint(client, parent_endpoint=self))
+        self.notes = self._register_child_endpoint(ServiceTicketsIdNotesEndpoint(client, parent_endpoint=self))
         self.activities = self._register_child_endpoint(
             ServiceTicketsIdActivitiesEndpoint(client, parent_endpoint=self)
         )
-        self.all_notes = self._register_child_endpoint(ServiceTicketsIdAllnotesEndpoint(client, parent_endpoint=self))
-        self.tasks = self._register_child_endpoint(ServiceTicketsIdTasksEndpoint(client, parent_endpoint=self))
-        self.documents = self._register_child_endpoint(ServiceTicketsIdDocumentsEndpoint(client, parent_endpoint=self))
         self.attach_children = self._register_child_endpoint(
             ServiceTicketsIdAttachchildrenEndpoint(client, parent_endpoint=self)
         )
+        self.documents = self._register_child_endpoint(ServiceTicketsIdDocumentsEndpoint(client, parent_endpoint=self))
+        self.configurations = self._register_child_endpoint(
+            ServiceTicketsIdConfigurationsEndpoint(client, parent_endpoint=self)
+        )
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Ticket]:
         """
@@ -81,17 +80,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(Ticket, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/tickets/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Ticket:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdInfoEndpoint.py
index 41635ea9d..cd738e556 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdMergeEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdMergeEndpoint.py
index 28f224f03..7aa137a1b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdMergeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdMergeEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesCountEndpoint.py
index 0977e6d13..4f1813eb7 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesEndpoint.py
index 936334163..9a41715f6 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdNotesCountEndpoint import ServiceTicketsIdNotesCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdNotesIdEndpoint import ServiceTicketsIdNotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesIdEndpoint.py
index a0f7c32fe..7ea3fefb8 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdNotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ServiceNote, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/tickets/{id}/notes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ServiceNote:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdProductsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdProductsCountEndpoint.py
index 0b4e445dc..e957f5dfc 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdProductsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdProductsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdProductsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdProductsEndpoint.py
index 366db0ed2..85f2a6297 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdProductsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdProductsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdProductsCountEndpoint import ServiceTicketsIdProductsCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ProductReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdScheduleentriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdScheduleentriesCountEndpoint.py
index d4d36326e..c8a2fef6f 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdScheduleentriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdScheduleentriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdScheduleentriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdScheduleentriesEndpoint.py
index 21e885e6b..effba4b00 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdScheduleentriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdScheduleentriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdScheduleentriesCountEndpoint import \
     ServiceTicketsIdScheduleentriesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleEntryReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksCountEndpoint.py
index fcdc5d024..7c04102cb 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksEndpoint.py
index 1c6136f22..4b486d37b 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdTasksCountEndpoint import ServiceTicketsIdTasksCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdTasksIdEndpoint import ServiceTicketsIdTasksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Task
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksIdEndpoint.py
index 146bc61ba..730bf56bf 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTasksIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Task
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(Task, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/tickets/{id}/tasks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Task:
         """
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTimeentriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTimeentriesCountEndpoint.py
index f0bbe06fe..18ec1878c 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTimeentriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTimeentriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTimeentriesEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTimeentriesEndpoint.py
index 641ab5b9d..800158391 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTimeentriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsIdTimeentriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsIdTimeentriesCountEndpoint import \
     ServiceTicketsIdTimeentriesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeEntryReference
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsInfoCountEndpoint.py
index 8eb6968d7..0b5f967cd 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsInfoEndpoint.py
index 8ffc08c23..9ec1adcac 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsInfoCountEndpoint import ServiceTicketsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsSearchEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsSearchEndpoint.py
index 0497aff0a..66fbf9f69 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsSearchEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsSearchEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Ticket
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsCountEndpoint.py
index 35023ceba..ed7099da0 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsEndpoint.py
index 4e92a6111..c058b7f27 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsyncsCountEndpoint import ServiceTicketsyncsCountEndpoint
 from pyconnectwise.endpoints.manage.ServiceTicketsyncsIdEndpoint import ServiceTicketsyncsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketSync
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsIdEndpoint.py
index bfc257221..d9bcf3bd4 100644
--- a/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/ServiceTicketsyncsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketSync
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TicketSync, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /service/ticketSyncs/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TicketSync:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesCountEndpoint.py
index 3d004b6c7..e7570aecb 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesEndpoint.py
index 2a59067e1..b858daa47 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesIdEndpoint.py
index e23bb40b5..e4c14a627 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAllowedfiletypesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AllowedFileType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AllowedFileType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/allowedfiletypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AllowedFileType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsCountEndpoint.py
index 94a50fd4f..2ca0f0ef5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsEndpoint.py
index 51d159a15..fcf9c1594 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemAllowedoriginsCountEndpoint import SystemAllowedoriginsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemAllowedoriginsIdEndpoint import SystemAllowedoriginsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AllowedOrigin
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsIdEndpoint.py
index a49af4423..df8669970 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAllowedoriginsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AllowedOrigin
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AllowedOrigin, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/allowedorigins/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AllowedOrigin:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemApimembersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemApimembersCountEndpoint.py
index a17f52462..a7411cb0b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemApimembersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemApimembersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemApimembersDefaultEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemApimembersDefaultEndpoint.py
index 73b743152..3f3d84e61 100644
--- a/src/pyconnectwise/endpoints/manage/SystemApimembersDefaultEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemApimembersDefaultEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ApiMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemApimembersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemApimembersEndpoint.py
index 3e11281e4..04fd3f10f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemApimembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemApimembersEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemApimembersCountEndpoint import SystemApimembersCountEndpoint
 from pyconnectwise.endpoints.manage.SystemApimembersDefaultEndpoint import SystemApimembersDefaultEndpoint
 from pyconnectwise.endpoints.manage.SystemApimembersIdEndpoint import SystemApimembersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ApiMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemApimembersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemApimembersIdEndpoint.py
index 3d88f4eb4..cb7510832 100644
--- a/src/pyconnectwise/endpoints/manage/SystemApimembersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemApimembersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ApiMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAudittrailCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAudittrailCountEndpoint.py
index d35409579..0e9118404 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAudittrailCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAudittrailCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAudittrailEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAudittrailEndpoint.py
index 56ec1ada7..f28c59dea 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAudittrailEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAudittrailEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemAudittrailCountEndpoint import SystemAudittrailCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AuditTrailEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAuthanvilsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAuthanvilsCountEndpoint.py
index ae422f918..aeba99cad 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAuthanvilsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAuthanvilsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAuthanvilsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAuthanvilsEndpoint.py
index 5eaf2ae06..e5a90b2c7 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAuthanvilsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAuthanvilsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemAuthanvilsCountEndpoint import SystemAuthanvilsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemAuthanvilsIdEndpoint import SystemAuthanvilsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemAuthanvilsTestconnectionEndpoint import SystemAuthanvilsTestconnectionEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AuthAnvil
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -13,10 +12,10 @@ class SystemAuthanvilsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "authAnvils", parent_endpoint=parent_endpoint)
 
-        self.count = self._register_child_endpoint(SystemAuthanvilsCountEndpoint(client, parent_endpoint=self))
         self.test_connection = self._register_child_endpoint(
             SystemAuthanvilsTestconnectionEndpoint(client, parent_endpoint=self)
         )
+        self.count = self._register_child_endpoint(SystemAuthanvilsCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SystemAuthanvilsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemAuthanvilsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAuthanvilsIdEndpoint.py
index a754cdcfc..82c080157 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAuthanvilsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAuthanvilsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AuthAnvil
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAuthanvilsTestconnectionEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAuthanvilsTestconnectionEndpoint.py
index 12ca01441..a02f979eb 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAuthanvilsTestconnectionEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAuthanvilsTestconnectionEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAutosynctimeCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAutosynctimeCountEndpoint.py
index 313b57367..4aea4d117 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAutosynctimeCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAutosynctimeCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAutosynctimeEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAutosynctimeEndpoint.py
index 1d07dc009..4f413c238 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAutosynctimeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAutosynctimeEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemAutosynctimeCountEndpoint import SystemAutosynctimeCountEndpoint
 from pyconnectwise.endpoints.manage.SystemAutosynctimeIdEndpoint import SystemAutosynctimeIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AutoSyncTime
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemAutosynctimeIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemAutosynctimeIdEndpoint.py
index 1b060954b..1cdaefc4b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemAutosynctimeIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemAutosynctimeIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import AutoSyncTime
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(AutoSyncTime, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/autoSyncTime/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> AutoSyncTime:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemBundlesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemBundlesCountEndpoint.py
index 0de3ae330..c864506a4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemBundlesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemBundlesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BundleResultsCollection
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemBundlesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemBundlesEndpoint.py
index 13d56963d..316087202 100644
--- a/src/pyconnectwise/endpoints/manage/SystemBundlesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemBundlesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemBundlesCountEndpoint import SystemBundlesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BundleResultsCollection
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCallbacksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCallbacksCountEndpoint.py
index be488d200..1db383f11 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCallbacksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCallbacksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCallbacksEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCallbacksEndpoint.py
index 48a67c5d0..38b518926 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCallbacksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCallbacksEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemCallbacksCountEndpoint import SystemCallbacksCountEndpoint
 from pyconnectwise.endpoints.manage.SystemCallbacksIdEndpoint import SystemCallbacksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CallbackEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCallbacksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCallbacksIdEndpoint.py
index c721e7d96..39bdb79aa 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCallbacksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCallbacksIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CallbackEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CallbackEntry, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/callbacks/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CallbackEntry:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemCertificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCertificationsCountEndpoint.py
index 82f671874..b3a316cb8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCertificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCertificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCertificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCertificationsEndpoint.py
index ffc2f6c99..87ce74e3d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCertificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCertificationsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemCertificationsCountEndpoint import SystemCertificationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemCertificationsIdEndpoint import SystemCertificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Certification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCertificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCertificationsIdEndpoint.py
index c38727360..4a7f91875 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCertificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCertificationsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemCertificationsIdUsagesEndpoint import SystemCertificationsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Certification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(Certification, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/certifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Certification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemCertificationsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCertificationsIdUsagesEndpoint.py
index 6160dfa1f..8c936f75c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCertificationsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCertificationsIdUsagesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemCertificationsIdUsagesListEndpoint import \
     SystemCertificationsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCertificationsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCertificationsIdUsagesListEndpoint.py
index f59ab5208..e494c98e2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCertificationsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCertificationsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensCountEndpoint.py
index 55a14995f..42c15f0db 100644
--- a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensEndpoint.py
index d718e24a0..28a1c7b1d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensEndpoint.py
@@ -5,7 +5,6 @@
     SystemConnectwisehostedscreensCountEndpoint
 from pyconnectwise.endpoints.manage.SystemConnectwisehostedscreensIdEndpoint import \
     SystemConnectwisehostedscreensIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConnectWiseHostedScreen
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensIdEndpoint.py
index 5c4342a7d..3d326dd23 100644
--- a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedscreensIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConnectWiseHostedScreen
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsCountEndpoint.py
index 1461260a1..bd587582b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsEndpoint.py
index d6f6f253d..83a0948db 100644
--- a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsEndpoint.py
@@ -5,7 +5,6 @@
     SystemConnectwisehostedsetupsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemConnectwisehostedsetupsIdEndpoint import \
     SystemConnectwisehostedsetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConnectWiseHostedSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsIdEndpoint.py
index 9fea3649a..99f395048 100644
--- a/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemConnectwisehostedsetupsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ConnectWiseHostedSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ConnectWiseHostedSetup, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/connectwisehostedsetups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ConnectWiseHostedSetup:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemContactsyncEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemContactsyncEndpoint.py
index f93643d2b..e6ace1d11 100644
--- a/src/pyconnectwise/endpoints/manage/SystemContactsyncEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemContactsyncEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemContactsyncMonitoringEndpoint import SystemContactsyncMonitoringEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringCountEndpoint.py
index 5c3c59589..6cb27d05c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringEndpoint.py
index 2c80b7895..313ccd574 100644
--- a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringEndpoint.py
@@ -8,7 +8,6 @@
     SystemContactsyncMonitoringNotificationtypeEndpoint
 from pyconnectwise.endpoints.manage.SystemContactsyncMonitoringTypeEndpoint import \
     SystemContactsyncMonitoringTypeEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncMonitoring
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -17,10 +16,10 @@ class SystemContactsyncMonitoringEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "monitoring", parent_endpoint=parent_endpoint)
 
+        self.type = self._register_child_endpoint(SystemContactsyncMonitoringTypeEndpoint(client, parent_endpoint=self))
         self.notificationtype = self._register_child_endpoint(
             SystemContactsyncMonitoringNotificationtypeEndpoint(client, parent_endpoint=self)
         )
-        self.type = self._register_child_endpoint(SystemContactsyncMonitoringTypeEndpoint(client, parent_endpoint=self))
         self.count = self._register_child_endpoint(
             SystemContactsyncMonitoringCountEndpoint(client, parent_endpoint=self)
         )
diff --git a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringIdEndpoint.py
index d73196b47..3143eb173 100644
--- a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncMonitoring
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringNotificationtypeEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringNotificationtypeEndpoint.py
index 05870004b..e7ae48c64 100644
--- a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringNotificationtypeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringNotificationtypeEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringTypeEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringTypeEndpoint.py
index 2b19bc752..ab793b76e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringTypeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringTypeEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemContactsyncMonitoringTypeIdEndpoint import \
     SystemContactsyncMonitoringTypeIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringTypeIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringTypeIdEndpoint.py
index b830f3b3a..1b96c9a84 100644
--- a/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringTypeIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemContactsyncMonitoringTypeIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncMonitoring
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(M365ContactSyncMonitoring, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/contactsync/monitoring/type/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemCustomreportsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCustomreportsCountEndpoint.py
index d25190661..246b00090 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCustomreportsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCustomreportsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCustomreportsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCustomreportsEndpoint.py
index 6e3bf432d..1a6abb773 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCustomreportsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCustomreportsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemCustomreportsCountEndpoint import SystemCustomreportsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemCustomreportsIdEndpoint import SystemCustomreportsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CustomReport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdEndpoint.py
index 580d14fa0..991df0807 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemCustomreportsIdParametersEndpoint import \
     SystemCustomreportsIdParametersEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CustomReport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CustomReport, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/customReports/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CustomReport:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersCountEndpoint.py
index 6288af8d8..d3815aee3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersEndpoint.py
index 587bccdad..e37550a8f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersEndpoint.py
@@ -5,7 +5,6 @@
     SystemCustomreportsIdParametersCountEndpoint
 from pyconnectwise.endpoints.manage.SystemCustomreportsIdParametersIdEndpoint import \
     SystemCustomreportsIdParametersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CustomReportParameter
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersIdEndpoint.py
index d350c6bc7..5298842c0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCustomreportsIdParametersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CustomReportParameter
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(CustomReportParameter, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/customReports/{id}/parameters/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> CustomReportParameter:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemCwtimezonesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCwtimezonesCountEndpoint.py
index 7cf6f4be2..bd72b75af 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCwtimezonesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCwtimezonesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCwtimezonesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCwtimezonesEndpoint.py
index 33ea80d4d..a663dd7bd 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCwtimezonesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCwtimezonesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemCwtimezonesCountEndpoint import SystemCwtimezonesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemCwtimezonesIdEndpoint import SystemCwtimezonesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CwTimeZone
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemCwtimezonesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemCwtimezonesIdEndpoint.py
index 7a0222217..40a607b0e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemCwtimezonesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemCwtimezonesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CwTimeZone
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDepartmentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDepartmentsCountEndpoint.py
index 8ad74dd15..a060f76ec 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDepartmentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDepartmentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDepartmentsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDepartmentsEndpoint.py
index e8907009b..aeeea9f2b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDepartmentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDepartmentsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDepartmentsCountEndpoint import SystemDepartmentsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemDepartmentsIdEndpoint import SystemDepartmentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Department
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdEndpoint.py
index 4a8920581..0444ef355 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDepartmentsIdLocationsEndpoint import SystemDepartmentsIdLocationsEndpoint
 from pyconnectwise.endpoints.manage.SystemDepartmentsIdUsagesEndpoint import SystemDepartmentsIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Department
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> D
         """
         return self._parse_one(Department, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/departments/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Department:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsCountEndpoint.py
index 68b99fd02..425d75a61 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsEndpoint.py
index eed6a418e..b259c439e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemDepartmentsIdLocationsCountEndpoint import \
     SystemDepartmentsIdLocationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemDepartmentsIdLocationsIdEndpoint import SystemDepartmentsIdLocationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DepartmentLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsIdEndpoint.py
index 259bb7e46..9c1828531 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdLocationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DepartmentLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> D
         """
         return self._parse_one(DepartmentLocation, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/departments/{id}/locations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> DepartmentLocation:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdUsagesEndpoint.py
index 915370066..7d071c624 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDepartmentsIdUsagesListEndpoint import SystemDepartmentsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdUsagesListEndpoint.py
index 179c5543b..2938c8bd3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDepartmentsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsEndpoint.py
index 352f2c8cf..465ba41fd 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDirectionalsyncsIdEndpoint import SystemDirectionalsyncsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemDirectionalsyncsInfoEndpoint import SystemDirectionalsyncsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsIdEndpoint.py
index cead84334..12a4d7539 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDirectionalsyncsIdInfoEndpoint import SystemDirectionalsyncsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsIdInfoEndpoint.py
index ed297f4f8..8137e723a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DirectionalSyncInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsInfoCountEndpoint.py
index 767cc4b23..949beb2b5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsInfoEndpoint.py
index 77702499f..bd9a8a0f8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDirectionalsyncsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDirectionalsyncsInfoCountEndpoint import \
     SystemDirectionalsyncsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DirectionalSyncInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumentsCountEndpoint.py
index 26ea28880..341904396 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumentsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumentsEndpoint.py
index f5acd63f8..3b91b88c3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumentsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemDocumentsCountEndpoint import SystemDocumentsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemDocumentsIdEndpoint import SystemDocumentsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemDocumentsUploadsampleEndpoint import SystemDocumentsUploadsampleEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DocumentInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -13,10 +12,10 @@ class SystemDocumentsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "documents", parent_endpoint=parent_endpoint)
 
+        self.count = self._register_child_endpoint(SystemDocumentsCountEndpoint(client, parent_endpoint=self))
         self.uploadsample = self._register_child_endpoint(
             SystemDocumentsUploadsampleEndpoint(client, parent_endpoint=self)
         )
-        self.count = self._register_child_endpoint(SystemDocumentsCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SystemDocumentsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumentsIdDownloadEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumentsIdDownloadEndpoint.py
index 43cc01382..77f24fb00 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumentsIdDownloadEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumentsIdDownloadEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumentsIdEndpoint.py
index e29b1f43a..72e80ae5a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumentsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDocumentsIdDownloadEndpoint import SystemDocumentsIdDownloadEndpoint
 from pyconnectwise.endpoints.manage.SystemDocumentsIdThumbnailEndpoint import SystemDocumentsIdThumbnailEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DocumentInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -12,8 +11,8 @@ class SystemDocumentsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.thumbnail = self._register_child_endpoint(SystemDocumentsIdThumbnailEndpoint(client, parent_endpoint=self))
         self.download = self._register_child_endpoint(SystemDocumentsIdDownloadEndpoint(client, parent_endpoint=self))
+        self.thumbnail = self._register_child_endpoint(SystemDocumentsIdThumbnailEndpoint(client, parent_endpoint=self))
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> D
         """
         return self._parse_one(DocumentInfo, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/documents/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> DocumentInfo:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumentsIdThumbnailEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumentsIdThumbnailEndpoint.py
index 76644ffef..c8872fa25 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumentsIdThumbnailEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumentsIdThumbnailEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumentsUploadsampleEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumentsUploadsampleEndpoint.py
index 42c18d261..f64d56180 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumentsUploadsampleEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumentsUploadsampleEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class SystemDocumentsUploadsampleEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "uploadsample", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a GET request against the /system/documents/uploadsample endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("GET", data=data, params=params).json())
+        super()._make_request("GET", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesEndpoint.py
index 91012d1d9..bc89b7661 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDocumenttypesIdEndpoint import SystemDocumenttypesIdEndpoint
 from pyconnectwise.endpoints.manage.SystemDocumenttypesInfoEndpoint import SystemDocumenttypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesIdEndpoint.py
index 7e0c702f8..20f33569c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDocumenttypesIdInfoEndpoint import SystemDocumenttypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesIdInfoEndpoint.py
index 39dc8e646..741af87c1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DocumentType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesInfoCountEndpoint.py
index e52ac4e69..13926c757 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesInfoEndpoint.py
index 44cd95e9a..386fffcbc 100644
--- a/src/pyconnectwise/endpoints/manage/SystemDocumenttypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemDocumenttypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemDocumenttypesInfoCountEndpoint import SystemDocumenttypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DocumentType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsCountEndpoint.py
index 1243e041d..6bda2b137 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsEndpoint.py
index f41ea86df..46e38d340 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsCountEndpoint import SystemEmailconnectorsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsIdEndpoint import SystemEmailconnectorsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsInfoEndpoint import SystemEmailconnectorsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailConnector
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdEndpoint.py
index e30f8adf3..bc0656ba3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsIdInfoEndpoint import SystemEmailconnectorsIdInfoEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsIdParsingstylesEndpoint import \
     SystemEmailconnectorsIdParsingstylesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailConnector
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -53,17 +52,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
         """
         return self._parse_one(EmailConnector, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/emailConnectors/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> EmailConnector:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdInfoEndpoint.py
index ad484c070..2c0ba5682 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailConnectorInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesCountEndpoint.py
index 03e5b5e3f..7a8d8abb0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesEndpoint.py
index 42301bd41..e44b212c1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesEndpoint.py
@@ -5,7 +5,6 @@
     SystemEmailconnectorsIdParsingstylesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsIdParsingstylesIdEndpoint import \
     SystemEmailconnectorsIdParsingstylesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailConnectorParsingStyle
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdEndpoint.py
index de30b8d51..1b496bbac 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsIdParsingstylesIdParsingrulesEndpoint import \
     SystemEmailconnectorsIdParsingstylesIdParsingrulesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailConnectorParsingStyle
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -53,17 +52,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
             EmailConnectorParsingStyle, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/emailConnectors/{id}/parsingStyles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> EmailConnectorParsingStyle:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesCountEndpoint.py
index 75b96f23e..62a271b3a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesEndpoint.py
index 184706ad3..e81db7bfe 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesEndpoint.py
@@ -5,7 +5,6 @@
     SystemEmailconnectorsIdParsingstylesIdParsingrulesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsIdParsingstylesIdParsingrulesIdEndpoint import \
     SystemEmailconnectorsIdParsingstylesIdParsingrulesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailConnectorParsingRule
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesIdEndpoint.py
index 9043c64d1..e6764f7be 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsIdParsingstylesIdParsingrulesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailConnectorParsingRule
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
         """
         return self._parse_one(EmailConnectorParsingRule, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/emailConnectors/{id}/parsingStyles/{id}/parsingRules/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> EmailConnectorParsingRule:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsInfoCountEndpoint.py
index 1552c2454..906de168b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsInfoEndpoint.py
index 7e11496e2..0382de9e6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailconnectorsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailconnectorsInfoCountEndpoint import SystemEmailconnectorsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailConnectorInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsCountEndpoint.py
index 4cf93ba59..5a2862fed 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsEndpoint.py
index 387b0157f..ca0860008 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailexclusionsCountEndpoint import SystemEmailexclusionsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailexclusionsIdEndpoint import SystemEmailexclusionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailExclusion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsIdEndpoint.py
index 02c481b09..d4a25184c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailexclusionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailExclusion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
         """
         return self._parse_one(EmailExclusion, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/emailExclusions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> EmailExclusion:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailtokensCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailtokensCountEndpoint.py
index 8486b44fd..c317adaa1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailtokensCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailtokensCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailtokensEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailtokensEndpoint.py
index 686f650fd..f87ea3233 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailtokensEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailtokensEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailtokensCountEndpoint import SystemEmailtokensCountEndpoint
 from pyconnectwise.endpoints.manage.SystemEmailtokensIdEndpoint import SystemEmailtokensIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailToken
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEmailtokensIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEmailtokensIdEndpoint.py
index b6ad6de23..f7e98117e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEmailtokensIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEmailtokensIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EmailToken
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEndpoint.py
index 77f8c4bb5..98970d24e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEndpoint.py
@@ -73,7 +73,6 @@
 from pyconnectwise.endpoints.manage.SystemUserdefinedfieldsEndpoint import SystemUserdefinedfieldsEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowactionsEndpoint import SystemWorkflowactionsEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsEndpoint import SystemWorkflowsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -81,132 +80,132 @@ class SystemEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "system", parent_endpoint=parent_endpoint)
 
-        self.on_premise_search_setting = self._register_child_endpoint(
-            SystemOnpremisesearchsettingEndpoint(client, parent_endpoint=self)
-        )
-        self.portal_reports = self._register_child_endpoint(SystemPortalreportsEndpoint(client, parent_endpoint=self))
-        self.email_exclusions = self._register_child_endpoint(
-            SystemEmailexclusionsEndpoint(client, parent_endpoint=self)
+        self.membertemplates = self._register_child_endpoint(
+            SystemMembertemplatesEndpoint(client, parent_endpoint=self)
         )
-        self.allowed_file_types = self._register_child_endpoint(
-            SystemAllowedfiletypesEndpoint(client, parent_endpoint=self)
+        self.directional_syncs = self._register_child_endpoint(
+            SystemDirectionalsyncsEndpoint(client, parent_endpoint=self)
         )
-        self.integrator_tags = self._register_child_endpoint(SystemIntegratortagsEndpoint(client, parent_endpoint=self))
-        self.reports = self._register_child_endpoint(SystemReportsEndpoint(client, parent_endpoint=self))
-        self.experiments = self._register_child_endpoint(SystemExperimentsEndpoint(client, parent_endpoint=self))
-        self.integratorlogins = self._register_child_endpoint(
-            SystemIntegratorloginsEndpoint(client, parent_endpoint=self)
+        self.notification_recipients = self._register_child_endpoint(
+            SystemNotificationrecipientsEndpoint(client, parent_endpoint=self)
         )
-        self.document_types = self._register_child_endpoint(SystemDocumenttypesEndpoint(client, parent_endpoint=self))
-        self.googleemailsetup = self._register_child_endpoint(
-            SystemGoogleemailsetupEndpoint(client, parent_endpoint=self)
+        self.imaps = self._register_child_endpoint(SystemImapsEndpoint(client, parent_endpoint=self))
+        self.ldap_configurations = self._register_child_endpoint(
+            SystemLdapconfigurationsEndpoint(client, parent_endpoint=self)
         )
+        self.menuentries = self._register_child_endpoint(SystemMenuentriesEndpoint(client, parent_endpoint=self))
         self.fileuploadsettings = self._register_child_endpoint(
             SystemFileuploadsettingsEndpoint(client, parent_endpoint=self)
         )
-        self.connect_wise_hosted_screens = self._register_child_endpoint(
-            SystemConnectwisehostedscreensEndpoint(client, parent_endpoint=self)
+        self.securityroles = self._register_child_endpoint(SystemSecurityrolesEndpoint(client, parent_endpoint=self))
+        self.office365 = self._register_child_endpoint(SystemOffice365Endpoint(client, parent_endpoint=self))
+        self.quote_link_setup = self._register_child_endpoint(
+            SystemQuotelinksetupEndpoint(client, parent_endpoint=self)
         )
-        self.locations = self._register_child_endpoint(SystemLocationsEndpoint(client, parent_endpoint=self))
-        self.email_connectors = self._register_child_endpoint(
-            SystemEmailconnectorsEndpoint(client, parent_endpoint=self)
+        self.setup_screens = self._register_child_endpoint(SystemSetupscreensEndpoint(client, parent_endpoint=self))
+        self.connectwisehostedsetups = self._register_child_endpoint(
+            SystemConnectwisehostedsetupsEndpoint(client, parent_endpoint=self)
+        )
+        self.workflows = self._register_child_endpoint(SystemWorkflowsEndpoint(client, parent_endpoint=self))
+        self.skills = self._register_child_endpoint(SystemSkillsEndpoint(client, parent_endpoint=self))
+        self.my_members = self._register_child_endpoint(SystemMymembersEndpoint(client, parent_endpoint=self))
+        self.marketplaceimport = self._register_child_endpoint(
+            SystemMarketplaceimportEndpoint(client, parent_endpoint=self)
         )
-        self.parsing_types = self._register_child_endpoint(SystemParsingtypesEndpoint(client, parent_endpoint=self))
         self.in_out_boards = self._register_child_endpoint(SystemInoutboardsEndpoint(client, parent_endpoint=self))
-        self.allowedorigins = self._register_child_endpoint(SystemAllowedoriginsEndpoint(client, parent_endpoint=self))
-        self.cw_time_zones = self._register_child_endpoint(SystemCwtimezonesEndpoint(client, parent_endpoint=self))
-        self.in_out_types = self._register_child_endpoint(SystemInouttypesEndpoint(client, parent_endpoint=self))
-        self.m365contactsync = self._register_child_endpoint(
-            SystemM365contactsyncEndpoint(client, parent_endpoint=self)
+        self.email_connectors = self._register_child_endpoint(
+            SystemEmailconnectorsEndpoint(client, parent_endpoint=self)
         )
+        self.auth_anvils = self._register_child_endpoint(SystemAuthanvilsEndpoint(client, parent_endpoint=self))
         self.osgradeweights = self._register_child_endpoint(SystemOsgradeweightsEndpoint(client, parent_endpoint=self))
+        self.contactsync = self._register_child_endpoint(SystemContactsyncEndpoint(client, parent_endpoint=self))
+        self.experiments = self._register_child_endpoint(SystemExperimentsEndpoint(client, parent_endpoint=self))
+        self.sso_users = self._register_child_endpoint(SystemSsousersEndpoint(client, parent_endpoint=self))
+        self.bundles = self._register_child_endpoint(SystemBundlesEndpoint(client, parent_endpoint=self))
         self.report_cards = self._register_child_endpoint(SystemReportcardsEndpoint(client, parent_endpoint=self))
-        self.sso_configurations = self._register_child_endpoint(
-            SystemSsoconfigurationsEndpoint(client, parent_endpoint=self)
-        )
-        self.menuentries = self._register_child_endpoint(SystemMenuentriesEndpoint(client, parent_endpoint=self))
-        self.documents = self._register_child_endpoint(SystemDocumentsEndpoint(client, parent_endpoint=self))
+        self.callbacks = self._register_child_endpoint(SystemCallbacksEndpoint(client, parent_endpoint=self))
         self.allowedfiletypes = self._register_child_endpoint(
             SystemAllowedfiletypesEndpoint(client, parent_endpoint=self)
         )
-        self.workflow_actions = self._register_child_endpoint(
-            SystemWorkflowactionsEndpoint(client, parent_endpoint=self)
+        self.integratorlogins = self._register_child_endpoint(
+            SystemIntegratorloginsEndpoint(client, parent_endpoint=self)
         )
-        self.setup_screens = self._register_child_endpoint(SystemSetupscreensEndpoint(client, parent_endpoint=self))
-        self.securityroles = self._register_child_endpoint(SystemSecurityrolesEndpoint(client, parent_endpoint=self))
-        self.directional_syncs = self._register_child_endpoint(
-            SystemDirectionalsyncsEndpoint(client, parent_endpoint=self)
+        self.import_mass_maintenance = self._register_child_endpoint(
+            SystemImportmassmaintenanceEndpoint(client, parent_endpoint=self)
+        )
+        self.audittrail = self._register_child_endpoint(SystemAudittrailEndpoint(client, parent_endpoint=self))
+        self.departments = self._register_child_endpoint(SystemDepartmentsEndpoint(client, parent_endpoint=self))
+        self.members = self._register_child_endpoint(SystemMembersEndpoint(client, parent_endpoint=self))
+        self.sso_configurations = self._register_child_endpoint(
+            SystemSsoconfigurationsEndpoint(client, parent_endpoint=self)
         )
         self.time_zone_setups = self._register_child_endpoint(
             SystemTimezonesetupsEndpoint(client, parent_endpoint=self)
         )
-        self.office365 = self._register_child_endpoint(SystemOffice365Endpoint(client, parent_endpoint=self))
-        self.quote_link_setup = self._register_child_endpoint(
-            SystemQuotelinksetupEndpoint(client, parent_endpoint=self)
-        )
-        self.e_pay_configurations = self._register_child_endpoint(
-            SystemEpayconfigurationsEndpoint(client, parent_endpoint=self)
+        self.workflow_actions = self._register_child_endpoint(
+            SystemWorkflowactionsEndpoint(client, parent_endpoint=self)
         )
-        self.links = self._register_child_endpoint(SystemLinksEndpoint(client, parent_endpoint=self))
-        self.my_company = self._register_child_endpoint(SystemMycompanyEndpoint(client, parent_endpoint=self))
+        self.portal_reports = self._register_child_endpoint(SystemPortalreportsEndpoint(client, parent_endpoint=self))
         self.menu_entries = self._register_child_endpoint(SystemMenuentriesEndpoint(client, parent_endpoint=self))
-        self.workflows = self._register_child_endpoint(SystemWorkflowsEndpoint(client, parent_endpoint=self))
-        self.members = self._register_child_endpoint(SystemMembersEndpoint(client, parent_endpoint=self))
+        self.parsing_types = self._register_child_endpoint(SystemParsingtypesEndpoint(client, parent_endpoint=self))
+        self.standard_notes = self._register_child_endpoint(SystemStandardnotesEndpoint(client, parent_endpoint=self))
+        self.custom_reports = self._register_child_endpoint(SystemCustomreportsEndpoint(client, parent_endpoint=self))
+        self.document_types = self._register_child_endpoint(SystemDocumenttypesEndpoint(client, parent_endpoint=self))
+        self.connect_wise_hosted_screens = self._register_child_endpoint(
+            SystemConnectwisehostedscreensEndpoint(client, parent_endpoint=self)
+        )
         self.email_tokens = self._register_child_endpoint(SystemEmailtokensEndpoint(client, parent_endpoint=self))
-        self.kpis = self._register_child_endpoint(SystemKpisEndpoint(client, parent_endpoint=self))
-        self.marketplaceimport = self._register_child_endpoint(
-            SystemMarketplaceimportEndpoint(client, parent_endpoint=self)
+        self.documents = self._register_child_endpoint(SystemDocumentsEndpoint(client, parent_endpoint=self))
+        self.my_company = self._register_child_endpoint(SystemMycompanyEndpoint(client, parent_endpoint=self))
+        self.security_roles = self._register_child_endpoint(SystemSecurityrolesEndpoint(client, parent_endpoint=self))
+        self.my_security = self._register_child_endpoint(SystemMysecurityEndpoint(client, parent_endpoint=self))
+        self.settings = self._register_child_endpoint(SystemSettingsEndpoint(client, parent_endpoint=self))
+        self.googleemailsetup = self._register_child_endpoint(
+            SystemGoogleemailsetupEndpoint(client, parent_endpoint=self)
         )
+        self.surveys = self._register_child_endpoint(SystemSurveysEndpoint(client, parent_endpoint=self))
+        self.certifications = self._register_child_endpoint(SystemCertificationsEndpoint(client, parent_endpoint=self))
+        self.mycompany = self._register_child_endpoint(SystemMycompanyEndpoint(client, parent_endpoint=self))
         self.today_page_categories = self._register_child_endpoint(
             SystemTodaypagecategoriesEndpoint(client, parent_endpoint=self)
         )
-        self.settings = self._register_child_endpoint(SystemSettingsEndpoint(client, parent_endpoint=self))
-        self.management_network_securities = self._register_child_endpoint(
-            SystemManagementnetworksecuritiesEndpoint(client, parent_endpoint=self)
-        )
-        self.departments = self._register_child_endpoint(SystemDepartmentsEndpoint(client, parent_endpoint=self))
-        self.contactsync = self._register_child_endpoint(SystemContactsyncEndpoint(client, parent_endpoint=self))
-        self.connectwisehostedsetups = self._register_child_endpoint(
-            SystemConnectwisehostedsetupsEndpoint(client, parent_endpoint=self)
-        )
-        self.membertemplates = self._register_child_endpoint(
-            SystemMembertemplatesEndpoint(client, parent_endpoint=self)
-        )
-        self.import_mass_maintenance = self._register_child_endpoint(
-            SystemImportmassmaintenanceEndpoint(client, parent_endpoint=self)
-        )
-        self.bundles = self._register_child_endpoint(SystemBundlesEndpoint(client, parent_endpoint=self))
-        self.my_account = self._register_child_endpoint(SystemMyaccountEndpoint(client, parent_endpoint=self))
-        self.parsing_variables = self._register_child_endpoint(
-            SystemParsingvariablesEndpoint(client, parent_endpoint=self)
+        self.locations = self._register_child_endpoint(SystemLocationsEndpoint(client, parent_endpoint=self))
+        self.api_members = self._register_child_endpoint(SystemApimembersEndpoint(client, parent_endpoint=self))
+        self.in_out_types = self._register_child_endpoint(SystemInouttypesEndpoint(client, parent_endpoint=self))
+        self.on_premise_search_setting = self._register_child_endpoint(
+            SystemOnpremisesearchsettingEndpoint(client, parent_endpoint=self)
         )
         self.skill_categories = self._register_child_endpoint(
             SystemSkillcategoriesEndpoint(client, parent_endpoint=self)
         )
-        self.my_members = self._register_child_endpoint(SystemMymembersEndpoint(client, parent_endpoint=self))
-        self.skills = self._register_child_endpoint(SystemSkillsEndpoint(client, parent_endpoint=self))
-        self.kpi_categories = self._register_child_endpoint(SystemKpicategoriesEndpoint(client, parent_endpoint=self))
-        self.custom_reports = self._register_child_endpoint(SystemCustomreportsEndpoint(client, parent_endpoint=self))
+        self.email_exclusions = self._register_child_endpoint(
+            SystemEmailexclusionsEndpoint(client, parent_endpoint=self)
+        )
+        self.links = self._register_child_endpoint(SystemLinksEndpoint(client, parent_endpoint=self))
         self.auto_sync_time = self._register_child_endpoint(SystemAutosynctimeEndpoint(client, parent_endpoint=self))
-        self.certifications = self._register_child_endpoint(SystemCertificationsEndpoint(client, parent_endpoint=self))
-        self.imaps = self._register_child_endpoint(SystemImapsEndpoint(client, parent_endpoint=self))
-        self.notification_recipients = self._register_child_endpoint(
-            SystemNotificationrecipientsEndpoint(client, parent_endpoint=self)
+        self.info = self._register_child_endpoint(SystemInfoEndpoint(client, parent_endpoint=self))
+        self.allowed_file_types = self._register_child_endpoint(
+            SystemAllowedfiletypesEndpoint(client, parent_endpoint=self)
+        )
+        self.kpis = self._register_child_endpoint(SystemKpisEndpoint(client, parent_endpoint=self))
+        self.management_network_securities = self._register_child_endpoint(
+            SystemManagementnetworksecuritiesEndpoint(client, parent_endpoint=self)
         )
+        self.cw_time_zones = self._register_child_endpoint(SystemCwtimezonesEndpoint(client, parent_endpoint=self))
         self.user_defined_fields = self._register_child_endpoint(
             SystemUserdefinedfieldsEndpoint(client, parent_endpoint=self)
         )
-        self.api_members = self._register_child_endpoint(SystemApimembersEndpoint(client, parent_endpoint=self))
-        self.auth_anvils = self._register_child_endpoint(SystemAuthanvilsEndpoint(client, parent_endpoint=self))
-        self.info = self._register_child_endpoint(SystemInfoEndpoint(client, parent_endpoint=self))
-        self.ldap_configurations = self._register_child_endpoint(
-            SystemLdapconfigurationsEndpoint(client, parent_endpoint=self)
+        self.kpi_categories = self._register_child_endpoint(SystemKpicategoriesEndpoint(client, parent_endpoint=self))
+        self.parsing_variables = self._register_child_endpoint(
+            SystemParsingvariablesEndpoint(client, parent_endpoint=self)
         )
-        self.my_security = self._register_child_endpoint(SystemMysecurityEndpoint(client, parent_endpoint=self))
-        self.sso_users = self._register_child_endpoint(SystemSsousersEndpoint(client, parent_endpoint=self))
-        self.standard_notes = self._register_child_endpoint(SystemStandardnotesEndpoint(client, parent_endpoint=self))
-        self.security_roles = self._register_child_endpoint(SystemSecurityrolesEndpoint(client, parent_endpoint=self))
-        self.mycompany = self._register_child_endpoint(SystemMycompanyEndpoint(client, parent_endpoint=self))
-        self.surveys = self._register_child_endpoint(SystemSurveysEndpoint(client, parent_endpoint=self))
-        self.audittrail = self._register_child_endpoint(SystemAudittrailEndpoint(client, parent_endpoint=self))
-        self.callbacks = self._register_child_endpoint(SystemCallbacksEndpoint(client, parent_endpoint=self))
+        self.integrator_tags = self._register_child_endpoint(SystemIntegratortagsEndpoint(client, parent_endpoint=self))
+        self.reports = self._register_child_endpoint(SystemReportsEndpoint(client, parent_endpoint=self))
+        self.allowedorigins = self._register_child_endpoint(SystemAllowedoriginsEndpoint(client, parent_endpoint=self))
+        self.e_pay_configurations = self._register_child_endpoint(
+            SystemEpayconfigurationsEndpoint(client, parent_endpoint=self)
+        )
+        self.m365contactsync = self._register_child_endpoint(
+            SystemM365contactsyncEndpoint(client, parent_endpoint=self)
+        )
+        self.my_account = self._register_child_endpoint(SystemMyaccountEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsCountEndpoint.py
index 60b926041..09d2836ec 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsEndpoint.py
index 0f831acf9..10da6ace0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemEpayconfigurationsCountEndpoint import SystemEpayconfigurationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemEpayconfigurationsIdEndpoint import SystemEpayconfigurationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EPayConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsIdEndpoint.py
index 2988ad1ed..dc9601b8e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemEpayconfigurationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import EPayConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> E
         """
         return self._parse_one(EPayConfiguration, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/ePayConfigurations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> EPayConfiguration:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemExperimentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemExperimentsCountEndpoint.py
index b5d799171..8d04075b9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemExperimentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemExperimentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemExperimentsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemExperimentsEndpoint.py
index 0f9236f91..271224b3a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemExperimentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemExperimentsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemExperimentsCountEndpoint import SystemExperimentsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemExperimentsIdEndpoint import SystemExperimentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Experiment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemExperimentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemExperimentsIdEndpoint.py
index bde8bf59e..39be6722d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemExperimentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemExperimentsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Experiment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsCountEndpoint.py
index b97df1a20..520cb55ce 100644
--- a/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsEndpoint.py
index 77131cc60..54643e643 100644
--- a/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemFileuploadsettingsCountEndpoint import SystemFileuploadsettingsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemFileuploadsettingsIdEndpoint import SystemFileuploadsettingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsIdEndpoint.py
index ff41e6c35..96feabecd 100644
--- a/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemFileuploadsettingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import FileUploadSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupCountEndpoint.py
index 0cfa47811..1202d9680 100644
--- a/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupEndpoint.py
index d95115591..2a9db0eb0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemGoogleemailsetupCountEndpoint import SystemGoogleemailsetupCountEndpoint
 from pyconnectwise.endpoints.manage.SystemGoogleemailsetupIdEndpoint import SystemGoogleemailsetupIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupIdEndpoint.py
index 43207e5e7..66f8db6f0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemGoogleemailsetupIdTestconnectionEndpoint import \
     SystemGoogleemailsetupIdTestconnectionEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import GoogleEmailSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> G
         """
         return self._parse_one(GoogleEmailSetup, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/googleemailsetup/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GoogleEmailSetup:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupIdTestconnectionEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupIdTestconnectionEndpoint.py
index 155d15e3f..e6bab87fd 100644
--- a/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupIdTestconnectionEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemGoogleemailsetupIdTestconnectionEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemImapsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemImapsCountEndpoint.py
index e8f2ff083..9011dbb14 100644
--- a/src/pyconnectwise/endpoints/manage/SystemImapsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemImapsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemImapsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemImapsEndpoint.py
index 00bb80985..3067e409b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemImapsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemImapsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemImapsCountEndpoint import SystemImapsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemImapsIdEndpoint import SystemImapsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemImapsInfoEndpoint import SystemImapsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Imap
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemImapsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemImapsIdEndpoint.py
index 9ea0b755a..5d59562cb 100644
--- a/src/pyconnectwise/endpoints/manage/SystemImapsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemImapsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemImapsIdInfoEndpoint import SystemImapsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Imap
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(Imap, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/imaps/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Imap:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemImapsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemImapsIdInfoEndpoint.py
index 31d3d492e..4324e99f8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemImapsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemImapsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ImapInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemImapsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemImapsInfoCountEndpoint.py
index d2271b898..5eae10cbf 100644
--- a/src/pyconnectwise/endpoints/manage/SystemImapsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemImapsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemImapsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemImapsInfoEndpoint.py
index 1fa20ac41..42a9b2ff3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemImapsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemImapsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemImapsInfoCountEndpoint import SystemImapsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ImapInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemImportmassmaintenanceEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemImportmassmaintenanceEndpoint.py
index 37672c6b8..c8775db17 100644
--- a/src/pyconnectwise/endpoints/manage/SystemImportmassmaintenanceEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemImportmassmaintenanceEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemImportmassmaintenanceIdEndpoint import SystemImportmassmaintenanceIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemImportmassmaintenanceIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemImportmassmaintenanceIdEndpoint.py
index 5d6f5fd9d..81e85e681 100644
--- a/src/pyconnectwise/endpoints/manage/SystemImportmassmaintenanceIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemImportmassmaintenanceIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ImportMassMaintenance
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsCountEndpoint.py
index 934f4daab..747ce674c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsEndpoint.py
index bdc45cd7e..2850b80bd 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsEndpoint.py
@@ -5,7 +5,6 @@
     SystemInfoDepartmentlocationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoDepartmentlocationsIdEndpoint import \
     SystemInfoDepartmentlocationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DepartmentLocationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsIdEndpoint.py
index b6a340ccc..52968fb07 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentlocationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DepartmentLocationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsCountEndpoint.py
index 14ca95a29..dcbad4f27 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsEndpoint.py
index a3aa4044a..5438ca977 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoDepartmentsCountEndpoint import SystemInfoDepartmentsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoDepartmentsIdEndpoint import SystemInfoDepartmentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DepartmentInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsIdEndpoint.py
index 3a8d2bf28..c1ed945b8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoDepartmentsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DepartmentInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoEndpoint.py
index 9e1a77d81..b9986b28f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoEndpoint.py
@@ -9,7 +9,6 @@
 from pyconnectwise.endpoints.manage.SystemInfoMembersEndpoint import SystemInfoMembersEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoPersonasEndpoint import SystemInfoPersonasEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoStandardnotesEndpoint import SystemInfoStandardnotesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Info
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -18,18 +17,18 @@ class SystemInfoEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "info", parent_endpoint=parent_endpoint)
 
+        self.links = self._register_child_endpoint(SystemInfoLinksEndpoint(client, parent_endpoint=self))
         self.personas = self._register_child_endpoint(SystemInfoPersonasEndpoint(client, parent_endpoint=self))
         self.departmentlocations = self._register_child_endpoint(
             SystemInfoDepartmentlocationsEndpoint(client, parent_endpoint=self)
         )
+        self.departments = self._register_child_endpoint(SystemInfoDepartmentsEndpoint(client, parent_endpoint=self))
         self.locales = self._register_child_endpoint(SystemInfoLocalesEndpoint(client, parent_endpoint=self))
-        self.links = self._register_child_endpoint(SystemInfoLinksEndpoint(client, parent_endpoint=self))
         self.locations = self._register_child_endpoint(SystemInfoLocationsEndpoint(client, parent_endpoint=self))
         self.members = self._register_child_endpoint(SystemInfoMembersEndpoint(client, parent_endpoint=self))
         self.standard_notes = self._register_child_endpoint(
             SystemInfoStandardnotesEndpoint(client, parent_endpoint=self)
         )
-        self.departments = self._register_child_endpoint(SystemInfoDepartmentsEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Info]:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLinksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLinksCountEndpoint.py
index 5916f295e..f7e629d5f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLinksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLinksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLinksEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLinksEndpoint.py
index 25a1a1907..4d5adad23 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLinksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLinksEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoLinksCountEndpoint import SystemInfoLinksCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoLinksIdEndpoint import SystemInfoLinksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LinkInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLinksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLinksIdEndpoint.py
index e358b9119..a81ead9ce 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLinksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLinksIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoLinksIdResolveurlEndpoint import SystemInfoLinksIdResolveurlEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LinkInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLinksIdResolveurlEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLinksIdResolveurlEndpoint.py
index 09559584b..0b30951e4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLinksIdResolveurlEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLinksIdResolveurlEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LinkResolveUrlInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLocalesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLocalesCountEndpoint.py
index 2e846a10c..7f9d2d31e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLocalesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLocalesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLocalesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLocalesEndpoint.py
index ad2abc70c..c6e7bca0c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLocalesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLocalesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoLocalesCountEndpoint import SystemInfoLocalesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoLocalesIdEndpoint import SystemInfoLocalesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LocaleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLocalesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLocalesIdEndpoint.py
index 53e60697e..30ea53147 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLocalesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLocalesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LocaleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLocationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLocationsCountEndpoint.py
index 45e94c8ed..354bdda92 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLocationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLocationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLocationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLocationsEndpoint.py
index b1000c29a..9e25bb0c7 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLocationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLocationsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoLocationsCountEndpoint import SystemInfoLocationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoLocationsIdEndpoint import SystemInfoLocationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LocationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoLocationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoLocationsIdEndpoint.py
index c76695196..99f088fa0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoLocationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoLocationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LocationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoMembersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoMembersCountEndpoint.py
index 84f44c3c0..45bcd9a48 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoMembersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoMembersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoMembersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoMembersEndpoint.py
index 83aacbc5c..c8382d082 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoMembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoMembersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoMembersCountEndpoint import SystemInfoMembersCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoMembersIdEndpoint import SystemInfoMembersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoMembersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoMembersIdEndpoint.py
index a81776109..3493c58a0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoMembersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoMembersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoPersonasCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoPersonasCountEndpoint.py
index bf05af874..b31ef353a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoPersonasCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoPersonasCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoPersonasEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoPersonasEndpoint.py
index 27f3be3ea..d8d5ac5b9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoPersonasEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoPersonasEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoPersonasCountEndpoint import SystemInfoPersonasCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoPersonasIdEndpoint import SystemInfoPersonasIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PersonasInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoPersonasIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoPersonasIdEndpoint.py
index 05801ad46..6fe6b4bbf 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoPersonasIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoPersonasIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PersonasInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesCountEndpoint.py
index 61f2699ef..0d5c3afa7 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesEndpoint.py
index a05609906..8adccbe12 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoStandardnotesCountEndpoint import SystemInfoStandardnotesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInfoStandardnotesIdEndpoint import SystemInfoStandardnotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import StandardNoteInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesIdEndpoint.py
index 5b417e065..0b32c899c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInfoStandardnotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import StandardNoteInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInoutboardsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInoutboardsCountEndpoint.py
index 72ed0c6d2..c25da1df6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInoutboardsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInoutboardsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInoutboardsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInoutboardsEndpoint.py
index 677ce8c25..917af414d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInoutboardsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInoutboardsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInoutboardsCountEndpoint import SystemInoutboardsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInoutboardsIdEndpoint import SystemInoutboardsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InOutBoard
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInoutboardsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInoutboardsIdEndpoint.py
index 1be3b1275..e95e7e654 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInoutboardsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInoutboardsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InOutBoard
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(InOutBoard, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/inOutBoards/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> InOutBoard:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemInouttypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInouttypesCountEndpoint.py
index 0780c427d..5a8a48259 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInouttypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInouttypesCountEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInouttypesCountInfoEndpoint import SystemInouttypesCountInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInouttypesCountInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInouttypesCountInfoEndpoint.py
index a2b544f27..a2a27432c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInouttypesCountInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInouttypesCountInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInouttypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInouttypesEndpoint.py
index bf4a2b368..fa38df32c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInouttypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInouttypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemInouttypesCountEndpoint import SystemInouttypesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemInouttypesIdEndpoint import SystemInouttypesIdEndpoint
 from pyconnectwise.endpoints.manage.SystemInouttypesInfoEndpoint import SystemInouttypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InOutType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInouttypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInouttypesIdEndpoint.py
index 8b52687c6..5fff5b34d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInouttypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInouttypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemInouttypesIdInfoEndpoint import SystemInouttypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InOutType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(InOutType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/inOutTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> InOutType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemInouttypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInouttypesIdInfoEndpoint.py
index 1b5c81861..0c0737698 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInouttypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInouttypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InOutTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemInouttypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemInouttypesInfoEndpoint.py
index 0f1c0f6ad..61384079c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemInouttypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemInouttypesInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import InOutTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsCountEndpoint.py
index 43ec724a8..ae4f33aa9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsEndpoint.py
index 44018ff00..6be98cc8d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemIntegratorloginsCountEndpoint import SystemIntegratorloginsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemIntegratorloginsIdEndpoint import SystemIntegratorloginsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import IntegratorLogin
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsIdEndpoint.py
index 732bc8aca..3ee87c051 100644
--- a/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemIntegratorloginsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import IntegratorLogin
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(IntegratorLogin, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/integratorlogins/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> IntegratorLogin:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemIntegratortagsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemIntegratortagsCountEndpoint.py
index cc1b5f636..85b790c08 100644
--- a/src/pyconnectwise/endpoints/manage/SystemIntegratortagsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemIntegratortagsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemIntegratortagsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemIntegratortagsEndpoint.py
index ae1f9a828..2e4368bc8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemIntegratortagsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemIntegratortagsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemIntegratortagsCountEndpoint import SystemIntegratortagsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemIntegratortagsIdEndpoint import SystemIntegratortagsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import IntegratorTag
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemIntegratortagsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemIntegratortagsIdEndpoint.py
index a416fc307..0fc75d3b9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemIntegratortagsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemIntegratortagsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import IntegratorTag
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> I
         """
         return self._parse_one(IntegratorTag, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/integratorTags/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> IntegratorTag:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemKpicategoriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemKpicategoriesCountEndpoint.py
index 6aae678db..765658d8d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemKpicategoriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemKpicategoriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemKpicategoriesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemKpicategoriesEndpoint.py
index 743f88f21..8f2a02191 100644
--- a/src/pyconnectwise/endpoints/manage/SystemKpicategoriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemKpicategoriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemKpicategoriesCountEndpoint import SystemKpicategoriesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemKpicategoriesIdEndpoint import SystemKpicategoriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KPICategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemKpicategoriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemKpicategoriesIdEndpoint.py
index 2f986e423..d452b687a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemKpicategoriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemKpicategoriesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KPICategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemKpisCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemKpisCountEndpoint.py
index a400144a2..c015c0a01 100644
--- a/src/pyconnectwise/endpoints/manage/SystemKpisCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemKpisCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemKpisEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemKpisEndpoint.py
index 48df02af2..f3ed0b883 100644
--- a/src/pyconnectwise/endpoints/manage/SystemKpisEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemKpisEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemKpisCountEndpoint import SystemKpisCountEndpoint
 from pyconnectwise.endpoints.manage.SystemKpisIdEndpoint import SystemKpisIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KPI
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemKpisIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemKpisIdEndpoint.py
index ea9fe3b49..bbc4637ff 100644
--- a/src/pyconnectwise/endpoints/manage/SystemKpisIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemKpisIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import KPI
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsCountEndpoint.py
index 8fa764bf7..f97e589af 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsEndpoint.py
index fe7acca1e..4648efd55 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.SystemLdapconfigurationsInfoEndpoint import SystemLdapconfigurationsInfoEndpoint
 from pyconnectwise.endpoints.manage.SystemLdapconfigurationsTestlinkEndpoint import \
     SystemLdapconfigurationsTestlinkEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LdapConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -16,10 +15,10 @@ def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "ldapConfigurations", parent_endpoint=parent_endpoint)
 
         self.info = self._register_child_endpoint(SystemLdapconfigurationsInfoEndpoint(client, parent_endpoint=self))
+        self.count = self._register_child_endpoint(SystemLdapconfigurationsCountEndpoint(client, parent_endpoint=self))
         self.test_link = self._register_child_endpoint(
             SystemLdapconfigurationsTestlinkEndpoint(client, parent_endpoint=self)
         )
-        self.count = self._register_child_endpoint(SystemLdapconfigurationsCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SystemLdapconfigurationsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsIdEndpoint.py
index 69aee0915..49d6c133f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemLdapconfigurationsIdInfoEndpoint import SystemLdapconfigurationsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LdapConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> L
         """
         return self._parse_one(LdapConfiguration, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/ldapConfigurations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> LdapConfiguration:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsIdInfoEndpoint.py
index 84cd7e611..ca2aafbfd 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LdapConfigurationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsInfoCountEndpoint.py
index 2a8d3a391..35aa1f017 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsInfoEndpoint.py
index ef9d693b0..74e38d544 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemLdapconfigurationsInfoCountEndpoint import \
     SystemLdapconfigurationsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LdapConfigurationInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsTestlinkEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsTestlinkEndpoint.py
index 4f2cf789d..820a35ed2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsTestlinkEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLdapconfigurationsTestlinkEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLinksCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLinksCountEndpoint.py
index 5e72b5b2e..18d5bf311 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLinksCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLinksCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLinksEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLinksEndpoint.py
index 32360796d..8f86a29e9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLinksEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLinksEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemLinksCountEndpoint import SystemLinksCountEndpoint
 from pyconnectwise.endpoints.manage.SystemLinksIdEndpoint import SystemLinksIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Link
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLinksIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLinksIdEndpoint.py
index 31ab67195..d3710d86a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLinksIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLinksIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Link
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> L
         """
         return self._parse_one(Link, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/links/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Link:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsCountEndpoint.py
index 59b96df3d..7e328b467 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsEndpoint.py
index 261b582ca..fc2728160 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemLocationsCountEndpoint import SystemLocationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemLocationsIdEndpoint import SystemLocationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Location
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsCountEndpoint.py
index a03a317d4..cdf8bc8fd 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsEndpoint.py
index 20028fd31..449bd0535 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemLocationsIdDepartmentsCountEndpoint import \
     SystemLocationsIdDepartmentsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemLocationsIdDepartmentsIdEndpoint import SystemLocationsIdDepartmentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LocationDepartment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsIdEndpoint.py
index 1c5b4c278..907ad94c9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdDepartmentsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LocationDepartment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdEndpoint.py
index 2e4f1a126..ab0cfd204 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemLocationsIdDepartmentsEndpoint import SystemLocationsIdDepartmentsEndpoint
 from pyconnectwise.endpoints.manage.SystemLocationsIdUsagesEndpoint import SystemLocationsIdUsagesEndpoint
 from pyconnectwise.endpoints.manage.SystemLocationsIdWorkrolesEndpoint import SystemLocationsIdWorkrolesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Location
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -54,17 +53,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> L
         """
         return self._parse_one(Location, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/locations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Location:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdUsagesEndpoint.py
index d75246ea7..176dae2e2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemLocationsIdUsagesListEndpoint import SystemLocationsIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdUsagesListEndpoint.py
index 65ad062ec..81e4e2207 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesCountEndpoint.py
index 1ca34d51f..00aff3455 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesEndpoint.py
index 8ce101d81..c59f05fc0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemLocationsIdWorkrolesCountEndpoint import \
     SystemLocationsIdWorkrolesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemLocationsIdWorkrolesIdEndpoint import SystemLocationsIdWorkrolesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LocationWorkRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesIdEndpoint.py
index 27f2dcec7..7b2be946a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemLocationsIdWorkrolesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import LocationWorkRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncAuthorizeEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncAuthorizeEndpoint.py
index f9da13449..ff5283745 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncAuthorizeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncAuthorizeEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncCheckvalidsyncEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncCheckvalidsyncEndpoint.py
index 8ba022d2d..8e163f85b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncCheckvalidsyncEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncCheckvalidsyncEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncEndpoint.py
index 4f5440653..ca5c57fba 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncEndpoint.py
@@ -10,7 +10,6 @@
     SystemM365contactsyncNotifydeactivationEndpoint
 from pyconnectwise.endpoints.manage.SystemM365contactsyncNotifyerrorEndpoint import \
     SystemM365contactsyncNotifyerrorEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -18,18 +17,18 @@ class SystemM365contactsyncEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "m365contactsync", parent_endpoint=parent_endpoint)
 
+        self.info = self._register_child_endpoint(SystemM365contactsyncInfoEndpoint(client, parent_endpoint=self))
         self.checkvalidsync = self._register_child_endpoint(
             SystemM365contactsyncCheckvalidsyncEndpoint(client, parent_endpoint=self)
         )
-        self.info = self._register_child_endpoint(SystemM365contactsyncInfoEndpoint(client, parent_endpoint=self))
-        self.authorize = self._register_child_endpoint(
-            SystemM365contactsyncAuthorizeEndpoint(client, parent_endpoint=self)
+        self.notifydeactivation = self._register_child_endpoint(
+            SystemM365contactsyncNotifydeactivationEndpoint(client, parent_endpoint=self)
         )
         self.notifyerror = self._register_child_endpoint(
             SystemM365contactsyncNotifyerrorEndpoint(client, parent_endpoint=self)
         )
-        self.notifydeactivation = self._register_child_endpoint(
-            SystemM365contactsyncNotifydeactivationEndpoint(client, parent_endpoint=self)
+        self.authorize = self._register_child_endpoint(
+            SystemM365contactsyncAuthorizeEndpoint(client, parent_endpoint=self)
         )
 
     def id(self, id: int) -> SystemM365contactsyncIdEndpoint:
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdEndpoint.py
index ec7e59abc..0b1c7d280 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.SystemM365contactsyncIdTestEndpoint import SystemM365contactsyncIdTestEndpoint
 from pyconnectwise.endpoints.manage.SystemM365contactsyncIdViewauthEndpoint import \
     SystemM365contactsyncIdViewauthEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -13,8 +12,8 @@ class SystemM365contactsyncIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.test = self._register_child_endpoint(SystemM365contactsyncIdTestEndpoint(client, parent_endpoint=self))
-        self.info = self._register_child_endpoint(SystemM365contactsyncIdInfoEndpoint(client, parent_endpoint=self))
         self.viewauth = self._register_child_endpoint(
             SystemM365contactsyncIdViewauthEndpoint(client, parent_endpoint=self)
         )
+        self.info = self._register_child_endpoint(SystemM365contactsyncIdInfoEndpoint(client, parent_endpoint=self))
+        self.test = self._register_child_endpoint(SystemM365contactsyncIdTestEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdInfoEndpoint.py
index 125717c10..ce55d80eb 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdTestEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdTestEndpoint.py
index a77321d2e..2287a8d42 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdTestEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdTestEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdViewauthEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdViewauthEndpoint.py
index 40bdc69ea..a2e3baca8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdViewauthEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncIdViewauthEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncInfoCountEndpoint.py
index 0d0685191..b35e16fd9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncInfoEndpoint.py
index e8b7658d6..74e52a824 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemM365contactsyncInfoCountEndpoint import SystemM365contactsyncInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import M365ContactSyncInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncNotifydeactivationEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncNotifydeactivationEndpoint.py
index f1e5cc21b..ad538ed55 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncNotifydeactivationEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncNotifydeactivationEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncNotifyerrorEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncNotifyerrorEndpoint.py
index df97ec157..fbd4f7180 100644
--- a/src/pyconnectwise/endpoints/manage/SystemM365contactsyncNotifyerrorEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemM365contactsyncNotifyerrorEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesCountEndpoint.py
index 2792865f8..869bc489e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesEndpoint.py
index c2f7a35d0..9e56828c0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesEndpoint.py
@@ -5,7 +5,6 @@
     SystemManagementnetworksecuritiesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemManagementnetworksecuritiesIdEndpoint import \
     SystemManagementnetworksecuritiesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementNetworkSecurity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesIdEndpoint.py
index ea4f0d3c3..aa7add15a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemManagementnetworksecuritiesIdTestcredentialsEndpoint import \
     SystemManagementnetworksecuritiesIdTestcredentialsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagementNetworkSecurity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(ManagementNetworkSecurity, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/managementNetworkSecurities/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ManagementNetworkSecurity:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesIdTestcredentialsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesIdTestcredentialsEndpoint.py
index 734b88a0f..9c50cca31 100644
--- a/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesIdTestcredentialsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemManagementnetworksecuritiesIdTestcredentialsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportEndpoint.py
index a91085c61..fe379b9e1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemMarketplaceimportGetdefinitionEndpoint import \
     SystemMarketplaceimportGetdefinitionEndpoint
 from pyconnectwise.endpoints.manage.SystemMarketplaceimportImportEndpoint import SystemMarketplaceimportImportEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -12,9 +11,9 @@ class SystemMarketplaceimportEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "marketplaceimport", parent_endpoint=parent_endpoint)
 
-        self.getdefinition = self._register_child_endpoint(
-            SystemMarketplaceimportGetdefinitionEndpoint(client, parent_endpoint=self)
-        )
         self.import_ = self._register_child_endpoint(
             SystemMarketplaceimportImportEndpoint(client, parent_endpoint=self)
         )
+        self.getdefinition = self._register_child_endpoint(
+            SystemMarketplaceimportGetdefinitionEndpoint(client, parent_endpoint=self)
+        )
diff --git a/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportGetdefinitionEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportGetdefinitionEndpoint.py
index 0a722e728..3d011836c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportGetdefinitionEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportGetdefinitionEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMarketplaceimportGetdefinitionIdEndpoint import \
     SystemMarketplaceimportGetdefinitionIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportGetdefinitionIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportGetdefinitionIdEndpoint.py
index 9deeb671e..8e5d0ff1b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportGetdefinitionIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportGetdefinitionIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketplaceImport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportImportEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportImportEndpoint.py
index b77677e5a..335a217ef 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportImportEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMarketplaceimportImportEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MarketplaceImport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersCountEndpoint.py
index 84633ab4a..def3e395e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersEndpoint.py
index c04fda7a4..bcb629795 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.SystemMembersIdEndpoint import SystemMembersIdEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersTypesEndpoint import SystemMembersTypesEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersWithssoEndpoint import SystemMembersWithssoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Member
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -14,9 +13,9 @@ class SystemMembersEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "members", parent_endpoint=parent_endpoint)
 
+        self.with_sso = self._register_child_endpoint(SystemMembersWithssoEndpoint(client, parent_endpoint=self))
         self.types = self._register_child_endpoint(SystemMembersTypesEndpoint(client, parent_endpoint=self))
         self.count = self._register_child_endpoint(SystemMembersCountEndpoint(client, parent_endpoint=self))
-        self.with_sso = self._register_child_endpoint(SystemMembersWithssoEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SystemMembersIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsCountEndpoint.py
index 12a2add87..e206ef145 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsEndpoint.py
index aaccb0e7c..16346eb80 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdAccrualsCountEndpoint import SystemMembersIdAccrualsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdAccrualsIdEndpoint import SystemMembersIdAccrualsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberAccrual
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsIdEndpoint.py
index 8f6c7b039..3036063c8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdAccrualsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberAccrual
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberAccrual, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/{id}/accruals/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberAccrual:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsCountEndpoint.py
index e2aac8263..2054274e7 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsEndpoint.py
index f447f8e02..58ec36f61 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsEndpoint.py
@@ -5,7 +5,6 @@
     SystemMembersIdCertificationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdCertificationsIdEndpoint import \
     SystemMembersIdCertificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberCertification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsIdEndpoint.py
index 9200b8fe6..f549d1cd2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdCertificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberCertification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberCertification, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/{id}/certifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberCertification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdDeactivateEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdDeactivateEndpoint.py
index a657892c7..1becb5574 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdDeactivateEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdDeactivateEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberDeactivation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsCountEndpoint.py
index 78b9e7664..fdf519b07 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsEndpoint.py
index 5e51dbf1e..de04fb2b5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemMembersIdDelegationsCountEndpoint import \
     SystemMembersIdDelegationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdDelegationsIdEndpoint import SystemMembersIdDelegationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberDelegation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsIdEndpoint.py
index 6de82e8f6..a7754c3e2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdDelegationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberDelegation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberDelegation, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/{id}/delegations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberDelegation:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdEndpoint.py
index 19b35533f..56d03e204 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdEndpoint.py
@@ -21,7 +21,6 @@
 from pyconnectwise.endpoints.manage.SystemMembersIdUnusedtimesheetsEndpoint import \
     SystemMembersIdUnusedtimesheetsEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdUsagesEndpoint import SystemMembersIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Member
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -30,38 +29,38 @@ class SystemMembersIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.submit = self._register_child_endpoint(SystemMembersIdSubmitEndpoint(client, parent_endpoint=self))
-        self.personas = self._register_child_endpoint(SystemMembersIdPersonasEndpoint(client, parent_endpoint=self))
+        self.delegations = self._register_child_endpoint(
+            SystemMembersIdDelegationsEndpoint(client, parent_endpoint=self)
+        )
         self.unlink_sso_user = self._register_child_endpoint(
             SystemMembersIdUnlinkssouserEndpoint(client, parent_endpoint=self)
         )
-        self.delegations = self._register_child_endpoint(
-            SystemMembersIdDelegationsEndpoint(client, parent_endpoint=self)
+        self.unused_time_sheets = self._register_child_endpoint(
+            SystemMembersIdUnusedtimesheetsEndpoint(client, parent_endpoint=self)
         )
-        self.notification_settings = self._register_child_endpoint(
-            SystemMembersIdNotificationsettingsEndpoint(client, parent_endpoint=self)
+        self.image = self._register_child_endpoint(SystemMembersIdImageEndpoint(client, parent_endpoint=self))
+        self.accruals = self._register_child_endpoint(SystemMembersIdAccrualsEndpoint(client, parent_endpoint=self))
+        self.submit = self._register_child_endpoint(SystemMembersIdSubmitEndpoint(client, parent_endpoint=self))
+        self.certifications = self._register_child_endpoint(
+            SystemMembersIdCertificationsEndpoint(client, parent_endpoint=self)
         )
-        self.tokens = self._register_child_endpoint(SystemMembersIdTokensEndpoint(client, parent_endpoint=self))
-        self.deactivate = self._register_child_endpoint(SystemMembersIdDeactivateEndpoint(client, parent_endpoint=self))
         self.managed_device_accounts = self._register_child_endpoint(
             SystemMembersIdManageddeviceaccountsEndpoint(client, parent_endpoint=self)
         )
-        self.skills = self._register_child_endpoint(SystemMembersIdSkillsEndpoint(client, parent_endpoint=self))
         self.mycertifications = self._register_child_endpoint(
             SystemMembersIdMycertificationsEndpoint(client, parent_endpoint=self)
         )
-        self.link_sso_user = self._register_child_endpoint(
-            SystemMembersIdLinkssouserEndpoint(client, parent_endpoint=self)
-        )
-        self.image = self._register_child_endpoint(SystemMembersIdImageEndpoint(client, parent_endpoint=self))
-        self.certifications = self._register_child_endpoint(
-            SystemMembersIdCertificationsEndpoint(client, parent_endpoint=self)
+        self.notification_settings = self._register_child_endpoint(
+            SystemMembersIdNotificationsettingsEndpoint(client, parent_endpoint=self)
         )
+        self.tokens = self._register_child_endpoint(SystemMembersIdTokensEndpoint(client, parent_endpoint=self))
+        self.personas = self._register_child_endpoint(SystemMembersIdPersonasEndpoint(client, parent_endpoint=self))
+        self.skills = self._register_child_endpoint(SystemMembersIdSkillsEndpoint(client, parent_endpoint=self))
         self.usages = self._register_child_endpoint(SystemMembersIdUsagesEndpoint(client, parent_endpoint=self))
-        self.unused_time_sheets = self._register_child_endpoint(
-            SystemMembersIdUnusedtimesheetsEndpoint(client, parent_endpoint=self)
+        self.deactivate = self._register_child_endpoint(SystemMembersIdDeactivateEndpoint(client, parent_endpoint=self))
+        self.link_sso_user = self._register_child_endpoint(
+            SystemMembersIdLinkssouserEndpoint(client, parent_endpoint=self)
         )
-        self.accruals = self._register_child_endpoint(SystemMembersIdAccrualsEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Member]:
         """
@@ -95,3 +94,27 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
             Member: The parsed response data.
         """
         return self._parse_one(Member, super()._make_request("GET", data=data, params=params).json())
+
+    def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Member:
+        """
+        Performs a PUT request against the /system/members/{id} endpoint.
+
+        Parameters:
+            data (dict[str, Any]): The data to send in the request body.
+            params (dict[str, int | str]): The parameters to send in the request query string.
+        Returns:
+            Member: The parsed response data.
+        """
+        return self._parse_one(Member, super()._make_request("PUT", data=data, params=params).json())
+
+    def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Member:
+        """
+        Performs a PATCH request against the /system/members/{id} endpoint.
+
+        Parameters:
+            data (dict[str, Any]): The data to send in the request body.
+            params (dict[str, int | str]): The parameters to send in the request query string.
+        Returns:
+            Member: The parsed response data.
+        """
+        return self._parse_one(Member, super()._make_request("PATCH", data=data, params=params).json())
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdImageEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdImageEndpoint.py
index d7a91b055..6b16f9e8b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdImageEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdImageEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class SystemMembersIdImageEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "image", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a GET request against the /system/members/{id}/image endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("GET", data=data, params=params).json())
+        super()._make_request("GET", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdLinkssouserEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdLinkssouserEndpoint.py
index ea7bd730a..84bc1f018 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdLinkssouserEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdLinkssouserEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdManageddeviceaccountsBulkEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdManageddeviceaccountsBulkEndpoint.py
index 3a28fa2cc..45f8d883b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdManageddeviceaccountsBulkEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdManageddeviceaccountsBulkEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import BulkResult
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdManageddeviceaccountsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdManageddeviceaccountsEndpoint.py
index c42ca054e..e2f4409b1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdManageddeviceaccountsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdManageddeviceaccountsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdManageddeviceaccountsBulkEndpoint import \
     SystemMembersIdManageddeviceaccountsBulkEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ManagedDeviceAccount
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsCountEndpoint.py
index a37c37134..5dd78793d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsEndpoint.py
index c01dbcf20..aa010ace5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsEndpoint.py
@@ -5,7 +5,6 @@
     SystemMembersIdMycertificationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdMycertificationsIdEndpoint import \
     SystemMembersIdMycertificationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberCertification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsIdEndpoint.py
index 57f49e8f3..c64ee650d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdMycertificationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberCertification
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberCertification, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/{id}/mycertifications/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberCertification:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsCountEndpoint.py
index 90cd4d850..4a55804bc 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsEndpoint.py
index 8dd96c7b9..1d50dbfa4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsEndpoint.py
@@ -5,7 +5,6 @@
     SystemMembersIdNotificationsettingsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdNotificationsettingsIdEndpoint import \
     SystemMembersIdNotificationsettingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberNotificationSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsIdEndpoint.py
index 52a657e61..816abbb11 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdNotificationsettingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberNotificationSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberNotificationSetting, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/{id}/notificationSettings/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberNotificationSetting:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasCountEndpoint.py
index 983f66c08..13e783a09 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasEndpoint.py
index 5bc093209..13df46530 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdPersonasCountEndpoint import SystemMembersIdPersonasCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdPersonasIdEndpoint import SystemMembersIdPersonasIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberPersona
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasIdEndpoint.py
index c12805da8..15509e177 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdPersonasIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberPersona
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberPersona, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/{id}/personas/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberPersona:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsCountEndpoint.py
index 72e641f6a..7ae13937f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsEndpoint.py
index 8530f71cb..34ef3e6c9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdSkillsCountEndpoint import SystemMembersIdSkillsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdSkillsIdEndpoint import SystemMembersIdSkillsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberSkill
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsIdEndpoint.py
index ab1b8fbac..477bb9b61 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdSkillsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberSkill
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberSkill, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/{id}/skills/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberSkill:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdSubmitEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdSubmitEndpoint.py
index c7fa9bad8..fbdc8e620 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdSubmitEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdSubmitEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdTokensEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdTokensEndpoint.py
index 0efa851ba..e3aaf85d4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdTokensEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdTokensEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Token
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdUnlinkssouserEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdUnlinkssouserEndpoint.py
index 796f81d75..d37624986 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdUnlinkssouserEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdUnlinkssouserEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdUnusedtimesheetsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdUnusedtimesheetsEndpoint.py
index 5943548a5..96fba54c7 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdUnusedtimesheetsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdUnusedtimesheetsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class SystemMembersIdUnusedtimesheetsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "unusedTimeSheets", parent_endpoint=parent_endpoint)
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/{id}/unusedTimeSheets endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdUsagesEndpoint.py
index 81fdb7b85..f13560d69 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersIdUsagesListEndpoint import SystemMembersIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersIdUsagesListEndpoint.py
index 7a81930c4..109eb25b5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersTypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersTypesCountEndpoint.py
index bb29f4390..90743a117 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersTypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersTypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersTypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersTypesEndpoint.py
index af6cab2ca..1c36011a6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersTypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersTypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemMembersTypesCountEndpoint import SystemMembersTypesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersTypesIdEndpoint import SystemMembersTypesIdEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersTypesInfoEndpoint import SystemMembersTypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersTypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersTypesIdEndpoint.py
index 3d1cf4310..87b8a5cd0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersTypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersTypesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersTypesIdInfoEndpoint import SystemMembersTypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/members/types/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersTypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersTypesIdInfoEndpoint.py
index ce57f9a8b..1481c68ef 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersTypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersTypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersTypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersTypesInfoCountEndpoint.py
index aebf1330f..34ffed925 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersTypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersTypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersTypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersTypesInfoEndpoint.py
index 6a3510b19..ac0bf3a53 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersTypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersTypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMembersTypesInfoCountEndpoint import SystemMembersTypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembersWithssoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembersWithssoEndpoint.py
index 94e53533b..01bb34da6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembersWithssoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembersWithssoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Member
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembertemplatesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembertemplatesCountEndpoint.py
index 4707250df..97d9411a0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembertemplatesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembertemplatesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembertemplatesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembertemplatesEndpoint.py
index f26082528..53d6e42fc 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembertemplatesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembertemplatesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMembertemplatesCountEndpoint import SystemMembertemplatesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMembertemplatesIdEndpoint import SystemMembertemplatesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMembertemplatesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMembertemplatesIdEndpoint.py
index b6c2f8358..ac3918110 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMembertemplatesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMembertemplatesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberTemplate
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMenuentriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMenuentriesCountEndpoint.py
index b6803fd44..231672aae 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMenuentriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMenuentriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMenuentriesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMenuentriesEndpoint.py
index e70305b02..59e55c6ed 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMenuentriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMenuentriesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMenuentriesIdEndpoint import SystemMenuentriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdEndpoint.py
index 715cac1e3..1e7d10e75 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMenuentriesIdLocationsEndpoint import SystemMenuentriesIdLocationsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdImageEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdImageEndpoint.py
index b04666fac..5e2e28b34 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdImageEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdImageEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,26 +8,22 @@ class SystemMenuentriesIdImageEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "image", parent_endpoint=parent_endpoint)
 
-    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a GET request against the /system/menuentries/{id}/image endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("GET", data=data, params=params).json())
+        super()._make_request("GET", data=data, params=params)
 
-    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def post(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a POST request against the /system/menuentries/{id}/image endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("POST", data=data, params=params).json())
+        super()._make_request("POST", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsCountEndpoint.py
index 315a62f3d..6bb503c86 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsEndpoint.py
index 9fa6dc258..73221cd49 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemMenuentriesIdLocationsCountEndpoint import \
     SystemMenuentriesIdLocationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMenuentriesIdLocationsIdEndpoint import SystemMenuentriesIdLocationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MenuEntryLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsIdEndpoint.py
index 3ca79ab65..b4a3da949 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMenuentriesIdLocationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MenuEntryLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,14 +44,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MenuEntryLocation, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/menuEntries/{id}/locations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemMyaccountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMyaccountEndpoint.py
index 6b8069a5b..627533a57 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMyaccountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMyaccountEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMyaccountIdEndpoint import SystemMyaccountIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsCountEndpoint.py
index f18b461f5..c484b6c32 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsEndpoint.py
index abac700c8..50e9eec70 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemMyaccountIdDelegationsCountEndpoint import \
     SystemMyaccountIdDelegationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMyaccountIdDelegationsIdEndpoint import SystemMyaccountIdDelegationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberDelegation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsIdEndpoint.py
index 3bf26f0a8..97a2b2b44 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdDelegationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberDelegation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberDelegation, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/myAccount/{id}/delegations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberDelegation:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdEndpoint.py
index ab1d73685..cba46e765 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMyaccountIdDelegationsEndpoint import SystemMyaccountIdDelegationsEndpoint
 from pyconnectwise.endpoints.manage.SystemMyaccountIdSkillsEndpoint import SystemMyaccountIdSkillsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MyAccount
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -12,10 +11,10 @@ class SystemMyaccountIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.skills = self._register_child_endpoint(SystemMyaccountIdSkillsEndpoint(client, parent_endpoint=self))
         self.delegations = self._register_child_endpoint(
             SystemMyaccountIdDelegationsEndpoint(client, parent_endpoint=self)
         )
-        self.skills = self._register_child_endpoint(SystemMyaccountIdSkillsEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[MyAccount]:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsCountEndpoint.py
index 95b444248..6c0bab4a3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsEndpoint.py
index c257c6d66..c3c0a31f1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMyaccountIdSkillsCountEndpoint import SystemMyaccountIdSkillsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMyaccountIdSkillsIdEndpoint import SystemMyaccountIdSkillsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberSkill
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsIdEndpoint.py
index adb829e58..9ebb6ef57 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMyaccountIdSkillsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MemberSkill
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> M
         """
         return self._parse_one(MemberSkill, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/myAccount/{id}/skills/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> MemberSkill:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureCountEndpoint.py
index 11171a1b5..3cd649312 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureEndpoint.py
index f84e1f358..d9a51eaf6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureEndpoint.py
@@ -7,7 +7,6 @@
     SystemMycompanyCorporatestructureIdEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyCorporatestructureInfoEndpoint import \
     SystemMycompanyCorporatestructureInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CorporateStructure
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureIdEndpoint.py
index aef694b2a..d0827acbe 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyCorporatestructureIdInfoEndpoint import \
     SystemMycompanyCorporatestructureIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CorporateStructure
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureIdInfoEndpoint.py
index 1ccd5f45f..061bd597d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CorporateStructureInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureInfoCountEndpoint.py
index f83ee77f8..33d148811 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureInfoEndpoint.py
index de0a1b7e7..44e548beb 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructureInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyCorporatestructureInfoCountEndpoint import \
     SystemMycompanyCorporatestructureInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CorporateStructureInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsCountEndpoint.py
index e2617f513..eea088af2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsEndpoint.py
index 3b4c3d527..cae6fbd04 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsEndpoint.py
@@ -5,7 +5,6 @@
     SystemMycompanyCorporatestructurelevelsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyCorporatestructurelevelsIdEndpoint import \
     SystemMycompanyCorporatestructurelevelsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CorporateStructureLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsIdEndpoint.py
index 2bda9b571..24365050a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCorporatestructurelevelsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CorporateStructureLevel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmCountEndpoint.py
index 61eaef9c0..443439e59 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmEndpoint.py
index c942fcb4d..0218b18ac 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemMycompanyCrmCountEndpoint import SystemMycompanyCrmCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyCrmIdEndpoint import SystemMycompanyCrmIdEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyCrmInfoEndpoint import SystemMycompanyCrmInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Crm
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmIdEndpoint.py
index 6ab9d7e20..225629af1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyCrmIdInfoEndpoint import SystemMycompanyCrmIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Crm
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmIdInfoEndpoint.py
index 495edf01b..e26632fda 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CrmInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmInfoCountEndpoint.py
index bb4675542..42fcc1c6e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmInfoEndpoint.py
index 61e3c3666..cf8406a81 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyCrmInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyCrmInfoCountEndpoint import SystemMycompanyCrmInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import CrmInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyDocumentsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyDocumentsEndpoint.py
index a2d0ce4a1..ba806b750 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyDocumentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyDocumentsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyDocumentsIdEndpoint import SystemMycompanyDocumentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DocumentSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyDocumentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyDocumentsIdEndpoint.py
index 7b59f982e..4e5b242c7 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyDocumentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyDocumentsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import DocumentSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyEndpoint.py
index caceda717..1c70dc188 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.SystemMycompanyReportingservicesEndpoint import \
     SystemMycompanyReportingservicesEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyServicesEndpoint import SystemMycompanyServicesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoEndpoint.py
index ecb0c9e65..d531fd193 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyInfoServicesEndpoint import SystemMycompanyInfoServicesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoServicesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoServicesEndpoint.py
index b4d9b3178..047bbb14f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoServicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoServicesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyInfoServicesIdEndpoint import SystemMycompanyInfoServicesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoServicesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoServicesIdEndpoint.py
index f786c91ee..3670c525d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoServicesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyInfoServicesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ServiceInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherCountEndpoint.py
index bd5df07e6..1e564fcf6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherEndpoint.py
index e675fe3d7..8242a9b93 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyOtherCountEndpoint import SystemMycompanyOtherCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyOtherIdEndpoint import SystemMycompanyOtherIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Other
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherIdEndpoint.py
index c926269ea..5861f6df1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyOtherIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Other
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesEndpoint.py
index 360da5b9a..52733c3ae 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyReportingservicesIdEndpoint import \
     SystemMycompanyReportingservicesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportingService
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesIdEndpoint.py
index 23ac0468c..942982a05 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyReportingservicesIdTestconnectionEndpoint import \
     SystemMycompanyReportingservicesIdTestconnectionEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportingService
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesIdTestconnectionEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesIdTestconnectionEndpoint.py
index 64717404f..37332f406 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesIdTestconnectionEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyReportingservicesIdTestconnectionEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyServicesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyServicesEndpoint.py
index 106a1bc74..8100214d4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyServicesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyServicesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyServicesIdEndpoint import SystemMycompanyServicesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Service
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyServicesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyServicesIdEndpoint.py
index 8e9b5acbd..44aad2500 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyServicesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyServicesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Service
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseCountEndpoint.py
index 4490c60bd..55d7a18c2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseEndpoint.py
index 4f8d8dc42..f70358a3f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemMycompanyTimeexpenseCountEndpoint import \
     SystemMycompanyTimeexpenseCountEndpoint
 from pyconnectwise.endpoints.manage.SystemMycompanyTimeexpenseIdEndpoint import SystemMycompanyTimeexpenseIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeExpense
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseIdEndpoint.py
index 2155f517e..e5807d7ba 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMycompanyTimeexpenseIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeExpense
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMymembersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMymembersEndpoint.py
index e60feb16e..93cee4629 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMymembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMymembersEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMymembersInfoEndpoint import SystemMymembersInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MyMember
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMymembersInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMymembersInfoEndpoint.py
index 338606c4b..a7b91282b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMymembersInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMymembersInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MyMemberInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMysecurityCustomizeitemsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMysecurityCustomizeitemsEndpoint.py
index 90a80d5eb..a3ef54122 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMysecurityCustomizeitemsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMysecurityCustomizeitemsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemMysecurityEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemMysecurityEndpoint.py
index a728d7084..8eb1d350d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemMysecurityEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemMysecurityEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemMysecurityCustomizeitemsEndpoint import SystemMysecurityCustomizeitemsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import MySecurity
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsCountEndpoint.py
index c63a23a0c..ec74777a3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsEndpoint.py
index 3f98617e4..e19a28206 100644
--- a/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemNotificationrecipientsCountEndpoint import \
     SystemNotificationrecipientsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemNotificationrecipientsIdEndpoint import SystemNotificationrecipientsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import NotificationRecipient
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsIdEndpoint.py
index 460e0411d..a6fbce0b4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemNotificationrecipientsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import NotificationRecipient
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsCountEndpoint.py
index a97249348..9db246a95 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsEndpoint.py
index 17cf3d8b7..e892e698c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemOffice365EmailsetupsCountEndpoint import \
     SystemOffice365EmailsetupsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemOffice365EmailsetupsIdEndpoint import SystemOffice365EmailsetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Office365EmailSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdAuthorizeEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdAuthorizeEndpoint.py
index 96bcadfb5..7daa3ab9e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdAuthorizeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdAuthorizeEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdEndpoint.py
index 86c2005d8..f904ad9fd 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdEndpoint.py
@@ -5,7 +5,6 @@
     SystemOffice365EmailsetupsIdAuthorizeEndpoint
 from pyconnectwise.endpoints.manage.SystemOffice365EmailsetupsIdTestconnectionEndpoint import \
     SystemOffice365EmailsetupsIdTestconnectionEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Office365EmailSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -14,12 +13,12 @@ class SystemOffice365EmailsetupsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.authorize = self._register_child_endpoint(
-            SystemOffice365EmailsetupsIdAuthorizeEndpoint(client, parent_endpoint=self)
-        )
         self.test_connection = self._register_child_endpoint(
             SystemOffice365EmailsetupsIdTestconnectionEndpoint(client, parent_endpoint=self)
         )
+        self.authorize = self._register_child_endpoint(
+            SystemOffice365EmailsetupsIdAuthorizeEndpoint(client, parent_endpoint=self)
+        )
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
@@ -56,17 +55,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> O
         """
         return self._parse_one(Office365EmailSetup, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/office365/emailSetups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Office365EmailSetup:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdTestconnectionEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdTestconnectionEndpoint.py
index 9a04b54a6..1f94ea934 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdTestconnectionEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOffice365EmailsetupsIdTestconnectionEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOffice365Endpoint.py b/src/pyconnectwise/endpoints/manage/SystemOffice365Endpoint.py
index f9a18d897..a5be7a789 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOffice365Endpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOffice365Endpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemOffice365EmailsetupsEndpoint import SystemOffice365EmailsetupsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingCountEndpoint.py
index 59cebd751..82689d232 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingEndpoint.py
index 24475bba7..be2066a5d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemOnpremisesearchsettingCountEndpoint import \
     SystemOnpremisesearchsettingCountEndpoint
 from pyconnectwise.endpoints.manage.SystemOnpremisesearchsettingIdEndpoint import SystemOnpremisesearchsettingIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingIdEndpoint.py
index cc2073a38..17e204c75 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOnpremisesearchsettingIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OnPremiseSearchSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsCountEndpoint.py
index d9045f017..381492732 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsEndpoint.py
index 76d40579a..db8f6eff2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemOsgradeweightsCountEndpoint import SystemOsgradeweightsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemOsgradeweightsIdEndpoint import SystemOsgradeweightsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OsGradeWeight
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsIdEndpoint.py
index df889ed79..8b027b675 100644
--- a/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemOsgradeweightsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import OsGradeWeight
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemParsingtypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemParsingtypesCountEndpoint.py
index 75db5edde..b532d45b6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemParsingtypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemParsingtypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemParsingtypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemParsingtypesEndpoint.py
index 35ea4cf43..69051760d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemParsingtypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemParsingtypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemParsingtypesCountEndpoint import SystemParsingtypesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemParsingtypesIdEndpoint import SystemParsingtypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ParsingType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemParsingtypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemParsingtypesIdEndpoint.py
index 21213fb38..68b88aa90 100644
--- a/src/pyconnectwise/endpoints/manage/SystemParsingtypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemParsingtypesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ParsingType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemParsingvariablesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemParsingvariablesCountEndpoint.py
index 8b716c17f..be057e860 100644
--- a/src/pyconnectwise/endpoints/manage/SystemParsingvariablesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemParsingvariablesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemParsingvariablesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemParsingvariablesEndpoint.py
index ea9b248d9..c41507bd5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemParsingvariablesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemParsingvariablesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemParsingvariablesCountEndpoint import SystemParsingvariablesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemParsingvariablesIdEndpoint import SystemParsingvariablesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ParsingVariable
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemParsingvariablesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemParsingvariablesIdEndpoint.py
index ef207b366..0228931e2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemParsingvariablesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemParsingvariablesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ParsingVariable
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemPortalreportsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemPortalreportsCountEndpoint.py
index 208ae0a2c..929044aa2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemPortalreportsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemPortalreportsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemPortalreportsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemPortalreportsEndpoint.py
index d0bbf09e3..c2b9ce43a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemPortalreportsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemPortalreportsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemPortalreportsCountEndpoint import SystemPortalreportsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemPortalreportsIdEndpoint import SystemPortalreportsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalReport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemPortalreportsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemPortalreportsIdEndpoint.py
index bb58cd0d0..7e27ea97e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemPortalreportsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemPortalreportsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import PortalReport
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> P
         """
         return self._parse_one(PortalReport, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/portalReports/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> PortalReport:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupCountEndpoint.py
index 9163f1c4c..6a72dc5da 100644
--- a/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupEndpoint.py
index 203bd2341..d34ed94b2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupEndpoint.py
@@ -5,7 +5,6 @@
 from pyconnectwise.endpoints.manage.SystemQuotelinksetupIdEndpoint import SystemQuotelinksetupIdEndpoint
 from pyconnectwise.endpoints.manage.SystemQuotelinksetupTestconnectionEndpoint import \
     SystemQuotelinksetupTestconnectionEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import QuoteLink
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -14,10 +13,10 @@ class SystemQuotelinksetupEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "quoteLinkSetup", parent_endpoint=parent_endpoint)
 
-        self.count = self._register_child_endpoint(SystemQuotelinksetupCountEndpoint(client, parent_endpoint=self))
         self.test_connection = self._register_child_endpoint(
             SystemQuotelinksetupTestconnectionEndpoint(client, parent_endpoint=self)
         )
+        self.count = self._register_child_endpoint(SystemQuotelinksetupCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SystemQuotelinksetupIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupIdEndpoint.py
index aca8f3004..68a93297d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import QuoteLink
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -43,17 +42,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Q
         """
         return self._parse_one(QuoteLink, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/quoteLinkSetup/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> QuoteLink:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupTestconnectionEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupTestconnectionEndpoint.py
index e36d2d08e..00a29009f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupTestconnectionEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemQuotelinksetupTestconnectionEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsCountEndpoint.py
index 96a75c6f7..6f70f872e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsEndpoint.py
index 406665426..72f1f9dca 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemReportcardsCountEndpoint import SystemReportcardsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemReportcardsIdEndpoint import SystemReportcardsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemReportcardsInfoEndpoint import SystemReportcardsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportCard
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsCountEndpoint.py
index 1f1cfc0dd..e229de88b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsEndpoint.py
index 2ee74e4d5..a8590c545 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemReportcardsIdDetailsCountEndpoint import \
     SystemReportcardsIdDetailsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemReportcardsIdDetailsIdEndpoint import SystemReportcardsIdDetailsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportCardDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsIdEndpoint.py
index 80df0d8f2..d067b5a6b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdDetailsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportCardDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(ReportCardDetail, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/reportCards/{id}/details/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ReportCardDetail:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdEndpoint.py
index f1d25644d..0375c681f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemReportcardsIdDetailsEndpoint import SystemReportcardsIdDetailsEndpoint
 from pyconnectwise.endpoints.manage.SystemReportcardsIdInfoEndpoint import SystemReportcardsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportCard
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> R
         """
         return self._parse_one(ReportCard, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/reportCards/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ReportCard:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdInfoEndpoint.py
index 802a2c7d3..2c1cb1f93 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportCardInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsInfoCountEndpoint.py
index 9c516d6af..b0bc686a3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportcardsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportcardsInfoEndpoint.py
index 05ca70f26..ec822b5c0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportcardsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportcardsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemReportcardsInfoCountEndpoint import SystemReportcardsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportCardInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportsEndpoint.py
index dcba1aa3a..7cb8f3dac 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemReportsIdEndpoint import SystemReportsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Report
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportsIdColumnsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportsIdColumnsEndpoint.py
index 27290d034..44b687095 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportsIdColumnsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportsIdColumnsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportsIdCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportsIdCountEndpoint.py
index 9d3393400..169a1a1c3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportsIdCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportsIdCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemReportsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemReportsIdEndpoint.py
index 87308fa9e..a7a16ce4a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemReportsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemReportsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemReportsIdColumnsEndpoint import SystemReportsIdColumnsEndpoint
 from pyconnectwise.endpoints.manage.SystemReportsIdCountEndpoint import SystemReportsIdCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ReportDataResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesCountEndpoint.py
index 4fe68475b..bd6d811d6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesEndpoint.py
index 9dfda877a..a65cf14d6 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSecurityrolesIdEndpoint import SystemSecurityrolesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdEndpoint.py
index d9c7e242d..ad0a5b258 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSecurityrolesIdSettingsEndpoint import SystemSecurityrolesIdSettingsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdInfoEndpoint.py
index 4e4482d63..b4e8f5af8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SecurityRoleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsCountEndpoint.py
index bab6c7173..cce88a547 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsEndpoint.py
index 05289e6fd..7ccdf341a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsEndpoint.py
@@ -5,7 +5,6 @@
     SystemSecurityrolesIdSettingsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSecurityrolesIdSettingsIdEndpoint import \
     SystemSecurityrolesIdSettingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SecurityRoleSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsIdEndpoint.py
index 188f4f076..02815a3e3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesIdSettingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SecurityRoleSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesInfoCountEndpoint.py
index fcc19ad8d..bf9f9ca5d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesInfoEndpoint.py
index 669049367..b1afeebf5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSecurityrolesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSecurityrolesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSecurityrolesInfoCountEndpoint import SystemSecurityrolesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SecurityRoleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSettingsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSettingsCountEndpoint.py
index eebdb635a..b5ff5194c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSettingsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSettingsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSettingsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSettingsEndpoint.py
index d0bec9ab7..2deafbb75 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSettingsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSettingsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSettingsCountEndpoint import SystemSettingsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSettingsIdEndpoint import SystemSettingsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SystemSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSettingsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSettingsIdEndpoint.py
index 27464b5ba..1a40e9724 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSettingsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSettingsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SystemSetting
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSetupscreensCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSetupscreensCountEndpoint.py
index f565112f4..9098e3204 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSetupscreensCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSetupscreensCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSetupscreensEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSetupscreensEndpoint.py
index 0254016cb..8e246f9ee 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSetupscreensEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSetupscreensEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSetupscreensCountEndpoint import SystemSetupscreensCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSetupscreensIdEndpoint import SystemSetupscreensIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SetupScreen
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSetupscreensIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSetupscreensIdEndpoint.py
index 37a34104a..47cd00982 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSetupscreensIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSetupscreensIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SetupScreen
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesCountEndpoint.py
index 12251f1e6..c2b247c4e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesEndpoint.py
index 19afea9cc..23e902a7a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSkillcategoriesCountEndpoint import SystemSkillcategoriesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSkillcategoriesIdEndpoint import SystemSkillcategoriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SkillCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesIdEndpoint.py
index a7769e554..b4ed92990 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillcategoriesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SkillCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SkillCategory, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/skillCategories/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SkillCategory:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillsCountEndpoint.py
index c1d76f410..4a6e845c3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillsEndpoint.py
index 4f062522f..ae5dde970 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemSkillsCountEndpoint import SystemSkillsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSkillsIdEndpoint import SystemSkillsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemSkillsInfoEndpoint import SystemSkillsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Skill
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillsIdEndpoint.py
index 3e9fb23f0..f7ffc0276 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSkillsIdInfoEndpoint import SystemSkillsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Skill
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(Skill, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/skills/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Skill:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillsIdInfoEndpoint.py
index f66bf5d3a..039f399a4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SkillInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillsInfoCountEndpoint.py
index a50d4b57b..7d0620acc 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSkillsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSkillsInfoEndpoint.py
index fac631015..141b231ca 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSkillsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSkillsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSkillsInfoCountEndpoint import SystemSkillsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SkillInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsCountEndpoint.py
index 997bb10e6..51c4ba8c3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsEndpoint.py
index 4a8a212af..6b0604493 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSsoconfigurationsCountEndpoint import SystemSsoconfigurationsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSsoconfigurationsIdEndpoint import SystemSsoconfigurationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SsoConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdEndpoint.py
index a245b1899..16253c832 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdEndpoint.py
@@ -5,7 +5,6 @@
     SystemSsoconfigurationsIdRegistertokenEndpoint
 from pyconnectwise.endpoints.manage.SystemSsoconfigurationsIdSubmitmembersEndpoint import \
     SystemSsoconfigurationsIdSubmitmembersEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SsoConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -14,12 +13,12 @@ class SystemSsoconfigurationsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.registertoken = self._register_child_endpoint(
-            SystemSsoconfigurationsIdRegistertokenEndpoint(client, parent_endpoint=self)
-        )
         self.submitmembers = self._register_child_endpoint(
             SystemSsoconfigurationsIdSubmitmembersEndpoint(client, parent_endpoint=self)
         )
+        self.registertoken = self._register_child_endpoint(
+            SystemSsoconfigurationsIdRegistertokenEndpoint(client, parent_endpoint=self)
+        )
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
@@ -80,14 +79,12 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
         """
         return self._parse_one(SsoConfiguration, super()._make_request("PATCH", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/ssoConfigurations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdRegistertokenEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdRegistertokenEndpoint.py
index dbc44a4ea..2957902bb 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdRegistertokenEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdRegistertokenEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SsoConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdSubmitmembersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdSubmitmembersEndpoint.py
index d018a7d5b..353a2209e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdSubmitmembersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSsoconfigurationsIdSubmitmembersEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SsoConfiguration
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSsousersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSsousersCountEndpoint.py
index b27cd7e50..efe420457 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSsousersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSsousersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSsousersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSsousersEndpoint.py
index c1f3647e7..67a7271f2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSsousersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSsousersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSsousersCountEndpoint import SystemSsousersCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSsousersIdEndpoint import SystemSsousersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SsoUser
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSsousersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSsousersIdEndpoint.py
index 760b6d64e..29747bb99 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSsousersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSsousersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SsoUser
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemStandardnotesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemStandardnotesCountEndpoint.py
index 832a2fd92..e76e650d1 100644
--- a/src/pyconnectwise/endpoints/manage/SystemStandardnotesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemStandardnotesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemStandardnotesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemStandardnotesEndpoint.py
index 758376846..a387c985d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemStandardnotesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemStandardnotesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemStandardnotesCountEndpoint import SystemStandardnotesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemStandardnotesIdEndpoint import SystemStandardnotesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import StandardNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemStandardnotesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemStandardnotesIdEndpoint.py
index 17f465dbd..ffbcac883 100644
--- a/src/pyconnectwise/endpoints/manage/SystemStandardnotesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemStandardnotesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import StandardNote
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(StandardNote, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/standardNotes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> StandardNote:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysCountEndpoint.py
index e4df2badb..ec8c07ff2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysEndpoint.py
index 95ca4d0b7..14e6bdeb4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemSurveysCountEndpoint import SystemSurveysCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysIdEndpoint import SystemSurveysIdEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysInfoEndpoint import SystemSurveysInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Survey
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysIdCopyEndpoint.py
index baa20435c..a80a34c2c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Survey
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysIdEndpoint.py
index 87ab73012..31fe958a9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemSurveysIdCopyEndpoint import SystemSurveysIdCopyEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysIdInfoEndpoint import SystemSurveysIdInfoEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysIdQuestionsEndpoint import SystemSurveysIdQuestionsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Survey
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -13,9 +12,9 @@ class SystemSurveysIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
+        self.copy = self._register_child_endpoint(SystemSurveysIdCopyEndpoint(client, parent_endpoint=self))
         self.info = self._register_child_endpoint(SystemSurveysIdInfoEndpoint(client, parent_endpoint=self))
         self.questions = self._register_child_endpoint(SystemSurveysIdQuestionsEndpoint(client, parent_endpoint=self))
-        self.copy = self._register_child_endpoint(SystemSurveysIdCopyEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Survey]:
         """
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(Survey, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/surveys/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Survey:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysIdInfoEndpoint.py
index 9423f6807..16a4fffd8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsCountEndpoint.py
index b38372564..1c6af2b43 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsEndpoint.py
index 27a19dbc1..713554e42 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysIdQuestionsCountEndpoint import SystemSurveysIdQuestionsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysIdQuestionsIdEndpoint import SystemSurveysIdQuestionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyQuestion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdEndpoint.py
index d787467a0..27970f2e5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysIdQuestionsIdValuesEndpoint import \
     SystemSurveysIdQuestionsIdValuesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyQuestion
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -51,17 +50,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SurveyQuestion, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/surveys/{id}/questions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SurveyQuestion:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdValuesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdValuesEndpoint.py
index 9f469cd3b..b8b1f868b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdValuesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdValuesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysIdQuestionsIdValuesIdEndpoint import \
     SystemSurveysIdQuestionsIdValuesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyQuestionValue
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdValuesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdValuesIdEndpoint.py
index b9b544b00..667e73305 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdValuesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysIdQuestionsIdValuesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyQuestionValue
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(SurveyQuestionValue, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/surveys/{id}/questions/{id}/values/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> SurveyQuestionValue:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysInfoCountEndpoint.py
index f259230c7..c6c017add 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemSurveysInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemSurveysInfoEndpoint.py
index d3c4e1e9b..cda2ff334 100644
--- a/src/pyconnectwise/endpoints/manage/SystemSurveysInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemSurveysInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemSurveysInfoCountEndpoint import SystemSurveysInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SurveyInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsCountEndpoint.py
index cf9d60dc1..3ca12ca7d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsEndpoint.py
index 42f353d30..5a31aeeb8 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemTimezonesetupsCountEndpoint import SystemTimezonesetupsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemTimezonesetupsIdEndpoint import SystemTimezonesetupsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemTimezonesetupsInfoEndpoint import SystemTimezonesetupsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeZoneSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsIdEndpoint.py
index 96192498f..57db863ed 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemTimezonesetupsIdInfoEndpoint import SystemTimezonesetupsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeZoneSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -72,14 +71,12 @@ def patch(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) ->
         """
         return self._parse_one(TimeZoneSetup, super()._make_request("PATCH", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/timeZoneSetups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsIdInfoEndpoint.py
index 5270b5c8a..5cde8ff6e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeZoneSetupInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsInfoCountEndpoint.py
index 26241b47b..3d2438700 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsInfoEndpoint.py
index 4cbccac25..a1ea36800 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTimezonesetupsInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemTimezonesetupsInfoCountEndpoint import SystemTimezonesetupsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeZoneSetupInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesCountEndpoint.py
index 947af7035..b994213fb 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesEndpoint.py
index 21da6efc9..96b9385d9 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemTodaypagecategoriesCountEndpoint import SystemTodaypagecategoriesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemTodaypagecategoriesIdEndpoint import SystemTodaypagecategoriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TodayPageCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesIdEndpoint.py
index c1a7e8f58..0eee57f07 100644
--- a/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemTodaypagecategoriesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TodayPageCategory
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TodayPageCategory, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/todayPageCategories/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TodayPageCategory:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsCountEndpoint.py
index 611ab3d87..5a3c23880 100644
--- a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsEndpoint.py
index b1b829e29..74ed1e08d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemUserdefinedfieldsCountEndpoint import SystemUserdefinedfieldsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemUserdefinedfieldsIdEndpoint import SystemUserdefinedfieldsIdEndpoint
 from pyconnectwise.endpoints.manage.SystemUserdefinedfieldsInfoEndpoint import SystemUserdefinedfieldsInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UserDefinedField
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsIdEndpoint.py
index 69f4ad0d2..97005eb88 100644
--- a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemUserdefinedfieldsIdInfoEndpoint import SystemUserdefinedfieldsIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UserDefinedField
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> U
         """
         return self._parse_one(UserDefinedField, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/userDefinedFields/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> UserDefinedField:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsIdInfoEndpoint.py
index f059d7d33..e25b3c736 100644
--- a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UserDefinedFieldInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsInfoCountEndpoint.py
index 30b5f3879..4878c048f 100644
--- a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsInfoEndpoint.py
index 65ba3e36a..f7aaf83e4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemUserdefinedfieldsInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemUserdefinedfieldsInfoCountEndpoint import \
     SystemUserdefinedfieldsInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import UserDefinedFieldInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsEndpoint.py
index 98ba6d106..60c862880 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowactionsIdEndpoint import SystemWorkflowactionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersCountEndpoint.py
index 376941be4..95a8cdad4 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersEndpoint.py
index be555dbcc..46f9f9d66 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersEndpoint.py
@@ -5,7 +5,6 @@
     SystemWorkflowactionsIdAutomateparametersCountEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowactionsIdAutomateparametersIdEndpoint import \
     SystemWorkflowactionsIdAutomateparametersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowActionAutomateParameter
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersIdEndpoint.py
index ff358af4b..1f3682583 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdAutomateparametersIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowActionAutomateParameter
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -47,17 +46,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
             WorkflowActionAutomateParameter, super()._make_request("GET", data=data, params=params).json()
         )
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/workflowActions/{id}/automateParameters/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> WorkflowActionAutomateParameter:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdEndpoint.py
index 71c5b3dc7..f18ccbc8d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowactionsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowactionsIdAutomateparametersEndpoint import \
     SystemWorkflowactionsIdAutomateparametersEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsCountEndpoint.py
index 6cb6e020e..3e90d0a74 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsEndpoint.py
index 5b021d841..c20aca46a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.SystemWorkflowsTabletypesEndpoint import SystemWorkflowsTabletypesEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsUserdefinedfieldsEndpoint import \
     SystemWorkflowsUserdefinedfieldsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Workflow
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -18,10 +17,10 @@ def __init__(self, client, parent_endpoint=None):
         self.userdefinedfields = self._register_child_endpoint(
             SystemWorkflowsUserdefinedfieldsEndpoint(client, parent_endpoint=self)
         )
+        self.count = self._register_child_endpoint(SystemWorkflowsCountEndpoint(client, parent_endpoint=self))
         self.table_types = self._register_child_endpoint(
             SystemWorkflowsTabletypesEndpoint(client, parent_endpoint=self)
         )
-        self.count = self._register_child_endpoint(SystemWorkflowsCountEndpoint(client, parent_endpoint=self))
 
     def id(self, id: int) -> SystemWorkflowsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsCountEndpoint.py
index 92975e8c6..e3e17a822 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsEndpoint.py
index df9083bb0..95eb409f2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdAttachmentsCountEndpoint import \
     SystemWorkflowsIdAttachmentsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdAttachmentsIdEndpoint import SystemWorkflowsIdAttachmentsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowAttachment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsIdEndpoint.py
index 72feba784..ba903de54 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdAttachmentsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowAttachment
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdCopyEndpoint.py
index a19891cbb..677028efa 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Workflow
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEndpoint.py
index e08795546..b21d1b0ba 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdEventsEndpoint import SystemWorkflowsIdEventsEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdNotifytypesEndpoint import SystemWorkflowsIdNotifytypesEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdTriggersEndpoint import SystemWorkflowsIdTriggersEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Workflow
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -15,15 +14,15 @@ class SystemWorkflowsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.events = self._register_child_endpoint(SystemWorkflowsIdEventsEndpoint(client, parent_endpoint=self))
         self.triggers = self._register_child_endpoint(SystemWorkflowsIdTriggersEndpoint(client, parent_endpoint=self))
+        self.notify_types = self._register_child_endpoint(
+            SystemWorkflowsIdNotifytypesEndpoint(client, parent_endpoint=self)
+        )
         self.copy = self._register_child_endpoint(SystemWorkflowsIdCopyEndpoint(client, parent_endpoint=self))
         self.attachments = self._register_child_endpoint(
             SystemWorkflowsIdAttachmentsEndpoint(client, parent_endpoint=self)
         )
-        self.notify_types = self._register_child_endpoint(
-            SystemWorkflowsIdNotifytypesEndpoint(client, parent_endpoint=self)
-        )
+        self.events = self._register_child_endpoint(SystemWorkflowsIdEventsEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[Workflow]:
         """
@@ -58,17 +57,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(Workflow, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/workflows/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> Workflow:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsCountEndpoint.py
index a027dc70f..42a74dd54 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsEndpoint.py
index fe5d74b04..f23c25294 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdEventsCountEndpoint import SystemWorkflowsIdEventsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdEventsIdEndpoint import SystemWorkflowsIdEventsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowEvent
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsCountEndpoint.py
index 4b077859f..7ca96d240 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsEndpoint.py
index 750034cb9..794ad0700 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsEndpoint.py
@@ -5,7 +5,6 @@
     SystemWorkflowsIdEventsIdActionsCountEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdEventsIdActionsIdEndpoint import \
     SystemWorkflowsIdEventsIdActionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowAction
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsIdEndpoint.py
index c98dc5a3a..0b30129d2 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdActionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowAction
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(WorkflowAction, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/workflows/{id}/events/{id}/actions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> WorkflowAction:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdCopyEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdCopyEndpoint.py
index 9a1c49023..e50a9003a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdCopyEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdCopyEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowEvent
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdEndpoint.py
index 489e3980c..96b4d3620 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdEndpoint.py
@@ -5,7 +5,6 @@
     SystemWorkflowsIdEventsIdActionsEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdEventsIdCopyEndpoint import SystemWorkflowsIdEventsIdCopyEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdEventsIdTestEndpoint import SystemWorkflowsIdEventsIdTestEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowEvent
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -14,11 +13,11 @@ class SystemWorkflowsIdEventsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-        self.test = self._register_child_endpoint(SystemWorkflowsIdEventsIdTestEndpoint(client, parent_endpoint=self))
+        self.copy = self._register_child_endpoint(SystemWorkflowsIdEventsIdCopyEndpoint(client, parent_endpoint=self))
         self.actions = self._register_child_endpoint(
             SystemWorkflowsIdEventsIdActionsEndpoint(client, parent_endpoint=self)
         )
-        self.copy = self._register_child_endpoint(SystemWorkflowsIdEventsIdCopyEndpoint(client, parent_endpoint=self))
+        self.test = self._register_child_endpoint(SystemWorkflowsIdEventsIdTestEndpoint(client, parent_endpoint=self))
 
     def paginated(
         self, page: int, page_size: int, params: dict[str, int | str] = {}
@@ -55,17 +54,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(WorkflowEvent, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/workflows/{id}/events/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> WorkflowEvent:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdTestEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdTestEndpoint.py
index f2959063c..a866ac1c0 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdTestEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdEventsIdTestEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesCountEndpoint.py
index 052f7eb02..64e96ab00 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesEndpoint.py
index 3dff7df4d..deafbe28b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdNotifytypesIdEndpoint import SystemWorkflowsIdNotifytypesIdEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdNotifytypesInfoEndpoint import \
     SystemWorkflowsIdNotifytypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowNotifyType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesIdEndpoint.py
index 1f0050667..8861aa8a3 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdNotifytypesIdInfoEndpoint import \
     SystemWorkflowsIdNotifytypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowNotifyType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesIdInfoEndpoint.py
index 16ab57c02..59242633d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowNotifyTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesInfoCountEndpoint.py
index 3f9b1eee5..474d0d88c 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesInfoEndpoint.py
index 5b8e13963..05821a45d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdNotifytypesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdNotifytypesInfoCountEndpoint import \
     SystemWorkflowsIdNotifytypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowNotifyTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersCountEndpoint.py
index e2dbcde90..bf8ce2401 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersEndpoint.py
index 5646b0e20..b827b32e5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdTriggersCountEndpoint import SystemWorkflowsIdTriggersCountEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdTriggersIdEndpoint import SystemWorkflowsIdTriggersIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowTrigger
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdEndpoint.py
index f930744bc..2a4c80aa5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdTriggersIdOptionsEndpoint import \
     SystemWorkflowsIdTriggersIdOptionsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdOptionsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdOptionsCountEndpoint.py
index d8b2295c9..dd49f502a 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdOptionsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdOptionsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdOptionsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdOptionsEndpoint.py
index a209de5d6..4ab54f471 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdOptionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsIdTriggersIdOptionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsIdTriggersIdOptionsCountEndpoint import \
     SystemWorkflowsIdTriggersIdOptionsCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowTriggerOption
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesCountEndpoint.py
index 39b3a4d44..3ca274eb5 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesEndpoint.py
index 87e4c97ae..3eb503320 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.SystemWorkflowsTabletypesCountEndpoint import SystemWorkflowsTabletypesCountEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsTabletypesIdEndpoint import SystemWorkflowsTabletypesIdEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsTabletypesInfoEndpoint import SystemWorkflowsTabletypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowTableType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesIdEndpoint.py
index 0eb54c620..eeea8fcff 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsTabletypesIdInfoEndpoint import \
     SystemWorkflowsTabletypesIdInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowTableType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesIdInfoEndpoint.py
index fb770be10..55edb7a7d 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowTableTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesInfoCountEndpoint.py
index d60f6e728..3147535eb 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesInfoEndpoint.py
index 47fcb5fda..aa80ed118 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsTabletypesInfoEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsTabletypesInfoCountEndpoint import \
     SystemWorkflowsTabletypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowTableTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsActionsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsActionsEndpoint.py
index 8df3a8471..f4c126670 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsActionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsActionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsUserdefinedfieldsActionsIdEndpoint import \
     SystemWorkflowsUserdefinedfieldsActionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsActionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsActionsIdEndpoint.py
index 9471bdb4e..0722bc742 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsActionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsActionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -9,14 +8,12 @@ class SystemWorkflowsUserdefinedfieldsActionsIdEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "{id}", parent_endpoint=parent_endpoint)
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /system/workflows/userdefinedfields/actions/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEndpoint.py
index c68d13678..4709dcc16 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEndpoint.py
@@ -7,7 +7,6 @@
     SystemWorkflowsUserdefinedfieldsEventsEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsUserdefinedfieldsIdEndpoint import \
     SystemWorkflowsUserdefinedfieldsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -15,12 +14,12 @@ class SystemWorkflowsUserdefinedfieldsEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "userdefinedfields", parent_endpoint=parent_endpoint)
 
-        self.events = self._register_child_endpoint(
-            SystemWorkflowsUserdefinedfieldsEventsEndpoint(client, parent_endpoint=self)
-        )
         self.actions = self._register_child_endpoint(
             SystemWorkflowsUserdefinedfieldsActionsEndpoint(client, parent_endpoint=self)
         )
+        self.events = self._register_child_endpoint(
+            SystemWorkflowsUserdefinedfieldsEventsEndpoint(client, parent_endpoint=self)
+        )
 
     def id(self, id: int) -> SystemWorkflowsUserdefinedfieldsIdEndpoint:
         """
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsEndpoint.py
index 4133b07a5..399b58d8b 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsUserdefinedfieldsEventsIdEndpoint import \
     SystemWorkflowsUserdefinedfieldsEventsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdActionsEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdActionsEndpoint.py
index e3d8f1379..db9feb9af 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdActionsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdActionsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsUserdefinedfieldsEventsIdActionsIdEndpoint import \
     SystemWorkflowsUserdefinedfieldsEventsIdActionsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdActionsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdActionsIdEndpoint.py
index a36192082..1606077de 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdActionsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdActionsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowActionUserDefinedField
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdEndpoint.py
index 890ad32e0..518a6a11e 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsEventsIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.SystemWorkflowsUserdefinedfieldsEventsIdActionsEndpoint import \
     SystemWorkflowsUserdefinedfieldsEventsIdActionsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowActionUserDefinedField
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsIdEndpoint.py
index bd4b3ae77..f10c02eee 100644
--- a/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/SystemWorkflowsUserdefinedfieldsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkflowActionUserDefinedField
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeAccrualsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeAccrualsCountEndpoint.py
index 7c39105e7..a72dcbc5e 100644
--- a/src/pyconnectwise/endpoints/manage/TimeAccrualsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeAccrualsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeAccrualsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeAccrualsEndpoint.py
index 27afa0963..0fcaa3ef8 100644
--- a/src/pyconnectwise/endpoints/manage/TimeAccrualsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeAccrualsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeAccrualsCountEndpoint import TimeAccrualsCountEndpoint
 from pyconnectwise.endpoints.manage.TimeAccrualsIdEndpoint import TimeAccrualsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeAccrual
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsCountEndpoint.py
index 6c9628402..09c9dce3f 100644
--- a/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsEndpoint.py
index 22aa8e46b..58fad66bd 100644
--- a/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeAccrualsIdDetailsCountEndpoint import TimeAccrualsIdDetailsCountEndpoint
 from pyconnectwise.endpoints.manage.TimeAccrualsIdDetailsIdEndpoint import TimeAccrualsIdDetailsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeAccrualDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsIdEndpoint.py
index 0e18bce4e..f49afab64 100644
--- a/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeAccrualsIdDetailsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeAccrualDetail
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TimeAccrualDetail, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/accruals/{id}/details/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TimeAccrualDetail:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeAccrualsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeAccrualsIdEndpoint.py
index 194cfb486..d209b7056 100644
--- a/src/pyconnectwise/endpoints/manage/TimeAccrualsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeAccrualsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeAccrualsIdDetailsEndpoint import TimeAccrualsIdDetailsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeAccrual
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TimeAccrual, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/accruals/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TimeAccrual:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesCountEndpoint.py
index 18f26f9c7..73e1220c1 100644
--- a/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesEndpoint.py
index c321d286b..b6297c72f 100644
--- a/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeActivitystopwatchesCountEndpoint import TimeActivitystopwatchesCountEndpoint
 from pyconnectwise.endpoints.manage.TimeActivitystopwatchesIdEndpoint import TimeActivitystopwatchesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityStopwatch
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesIdEndpoint.py
index 2649d3629..fa363692c 100644
--- a/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeActivitystopwatchesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ActivityStopwatch
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> A
         """
         return self._parse_one(ActivityStopwatch, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/activitystopwatches/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ActivityStopwatch:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesCountEndpoint.py
index bc31751d8..0cdb21f1d 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesEndpoint.py
index 1f5be5b18..b7673b0b3 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.TimeChargecodesCountEndpoint import TimeChargecodesCountEndpoint
 from pyconnectwise.endpoints.manage.TimeChargecodesIdEndpoint import TimeChargecodesIdEndpoint
 from pyconnectwise.endpoints.manage.TimeChargecodesInfoEndpoint import TimeChargecodesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ChargeCode
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdEndpoint.py
index cb0fe1d53..68cec611a 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.TimeChargecodesIdExpensetypesEndpoint import TimeChargecodesIdExpensetypesEndpoint
 from pyconnectwise.endpoints.manage.TimeChargecodesIdInfoEndpoint import TimeChargecodesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.TimeChargecodesIdUsagesEndpoint import TimeChargecodesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ChargeCode
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -52,17 +51,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ChargeCode, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/chargeCodes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ChargeCode:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesCountEndpoint.py
index 096a46821..f7eeb40ef 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesEndpoint.py
index 8a5c3104e..2708e6c1f 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesEndpoint.py
@@ -5,7 +5,6 @@
     TimeChargecodesIdExpensetypesCountEndpoint
 from pyconnectwise.endpoints.manage.TimeChargecodesIdExpensetypesIdEndpoint import \
     TimeChargecodesIdExpensetypesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ChargeCodeExpenseType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesIdEndpoint.py
index 34ecad432..db5e7d95f 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdExpensetypesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ChargeCodeExpenseType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> C
         """
         return self._parse_one(ChargeCodeExpenseType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/chargeCodes/{id}/expenseTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ChargeCodeExpenseType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdInfoEndpoint.py
index f33d60d3a..8ef5fe27c 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ChargeCodeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdUsagesEndpoint.py
index a30cf7506..fdb7c77d8 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeChargecodesIdUsagesListEndpoint import TimeChargecodesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdUsagesListEndpoint.py
index 502fde81c..751e6c804 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesInfoCountEndpoint.py
index 30fb5fbf6..663572189 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeChargecodesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeChargecodesInfoEndpoint.py
index 2d304cd3a..5fca4e8bb 100644
--- a/src/pyconnectwise/endpoints/manage/TimeChargecodesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeChargecodesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeChargecodesInfoCountEndpoint import TimeChargecodesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ChargeCodeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeEndpoint.py
index 11c7558e6..56793edf8 100644
--- a/src/pyconnectwise/endpoints/manage/TimeEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeEndpoint.py
@@ -12,7 +12,6 @@
 from pyconnectwise.endpoints.manage.TimeTimeperiodsetupsEndpoint import TimeTimeperiodsetupsEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesEndpoint import TimeWorkrolesEndpoint
 from pyconnectwise.endpoints.manage.TimeWorktypesEndpoint import TimeWorktypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
@@ -20,22 +19,22 @@ class TimeEndpoint(ConnectWiseEndpoint):
     def __init__(self, client, parent_endpoint=None):
         super().__init__(client, "time", parent_endpoint=parent_endpoint)
 
+        self.info = self._register_child_endpoint(TimeInfoEndpoint(client, parent_endpoint=self))
+        self.accruals = self._register_child_endpoint(TimeAccrualsEndpoint(client, parent_endpoint=self))
+        self.time_period_setups = self._register_child_endpoint(
+            TimeTimeperiodsetupsEndpoint(client, parent_endpoint=self)
+        )
+        self.activitystopwatches = self._register_child_endpoint(
+            TimeActivitystopwatchesEndpoint(client, parent_endpoint=self)
+        )
         self.entries = self._register_child_endpoint(TimeEntriesEndpoint(client, parent_endpoint=self))
-        self.work_roles = self._register_child_endpoint(TimeWorkrolesEndpoint(client, parent_endpoint=self))
         self.work_types = self._register_child_endpoint(TimeWorktypesEndpoint(client, parent_endpoint=self))
         self.sheets = self._register_child_endpoint(TimeSheetsEndpoint(client, parent_endpoint=self))
         self.schedulestopwatches = self._register_child_endpoint(
             TimeSchedulestopwatchesEndpoint(client, parent_endpoint=self)
         )
-        self.info = self._register_child_endpoint(TimeInfoEndpoint(client, parent_endpoint=self))
+        self.charge_codes = self._register_child_endpoint(TimeChargecodesEndpoint(client, parent_endpoint=self))
+        self.work_roles = self._register_child_endpoint(TimeWorkrolesEndpoint(client, parent_endpoint=self))
         self.ticketstopwatches = self._register_child_endpoint(
             TimeTicketstopwatchesEndpoint(client, parent_endpoint=self)
         )
-        self.charge_codes = self._register_child_endpoint(TimeChargecodesEndpoint(client, parent_endpoint=self))
-        self.time_period_setups = self._register_child_endpoint(
-            TimeTimeperiodsetupsEndpoint(client, parent_endpoint=self)
-        )
-        self.activitystopwatches = self._register_child_endpoint(
-            TimeActivitystopwatchesEndpoint(client, parent_endpoint=self)
-        )
-        self.accruals = self._register_child_endpoint(TimeAccrualsEndpoint(client, parent_endpoint=self))
diff --git a/src/pyconnectwise/endpoints/manage/TimeEntriesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeEntriesCountEndpoint.py
index 77c37042e..9839ae8cf 100644
--- a/src/pyconnectwise/endpoints/manage/TimeEntriesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeEntriesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeEntriesDefaultsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeEntriesDefaultsEndpoint.py
index a00ae337f..accb6e062 100644
--- a/src/pyconnectwise/endpoints/manage/TimeEntriesDefaultsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeEntriesDefaultsEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeEntriesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeEntriesEndpoint.py
index 85f8addfb..0bcfdaa2e 100644
--- a/src/pyconnectwise/endpoints/manage/TimeEntriesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeEntriesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.TimeEntriesCountEndpoint import TimeEntriesCountEndpoint
 from pyconnectwise.endpoints.manage.TimeEntriesDefaultsEndpoint import TimeEntriesDefaultsEndpoint
 from pyconnectwise.endpoints.manage.TimeEntriesIdEndpoint import TimeEntriesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsCountEndpoint.py
index 2a1547d32..e1eee1025 100644
--- a/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsEndpoint.py
index ea7b50faa..f100069f2 100644
--- a/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeEntriesIdAuditsCountEndpoint import TimeEntriesIdAuditsCountEndpoint
 from pyconnectwise.endpoints.manage.TimeEntriesIdAuditsIdEndpoint import TimeEntriesIdAuditsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeEntryAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsIdEndpoint.py
index a26769e86..47b0902fb 100644
--- a/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeEntriesIdAuditsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeEntryAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeEntriesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeEntriesIdEndpoint.py
index 6e9800ef3..95aae117e 100644
--- a/src/pyconnectwise/endpoints/manage/TimeEntriesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeEntriesIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeEntriesIdAuditsEndpoint import TimeEntriesIdAuditsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeEntry
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -46,17 +45,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TimeEntry, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/entries/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TimeEntry:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeInfoChargecodeexpensetypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeInfoChargecodeexpensetypesCountEndpoint.py
index 5cffa01e5..bbebd1df8 100644
--- a/src/pyconnectwise/endpoints/manage/TimeInfoChargecodeexpensetypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeInfoChargecodeexpensetypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeInfoChargecodeexpensetypesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeInfoChargecodeexpensetypesEndpoint.py
index 25b17b357..4ed80a822 100644
--- a/src/pyconnectwise/endpoints/manage/TimeInfoChargecodeexpensetypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeInfoChargecodeexpensetypesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeInfoChargecodeexpensetypesCountEndpoint import \
     TimeInfoChargecodeexpensetypesCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ChargeCodeExpenseType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeInfoEndpoint.py
index 6a0398146..b04b0251c 100644
--- a/src/pyconnectwise/endpoints/manage/TimeInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeInfoChargecodeexpensetypesEndpoint import TimeInfoChargecodeexpensetypesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesCountEndpoint.py
index 5db81272a..4c475a1d3 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesEndpoint.py
index fd044062a..380216ad1 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeSchedulestopwatchesCountEndpoint import TimeSchedulestopwatchesCountEndpoint
 from pyconnectwise.endpoints.manage.TimeSchedulestopwatchesIdEndpoint import TimeSchedulestopwatchesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleStopwatch
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesIdEndpoint.py
index 3d4a53b07..25d90ea77 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSchedulestopwatchesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import ScheduleStopwatch
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> S
         """
         return self._parse_one(ScheduleStopwatch, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/schedulestopwatches/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> ScheduleStopwatch:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsCountEndpoint.py
index 52eb9a69f..fbf531e9a 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsEndpoint.py
index bc9757273..f49183f02 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeSheetsCountEndpoint import TimeSheetsCountEndpoint
 from pyconnectwise.endpoints.manage.TimeSheetsIdEndpoint import TimeSheetsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeSheet
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsIdApproveEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsIdApproveEndpoint.py
index 496b796a5..42efd215b 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsIdApproveEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsIdApproveEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsCountEndpoint.py
index 993128ba9..d599770d1 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsEndpoint.py
index 8468ee2e0..a146beaa5 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeSheetsIdAuditsCountEndpoint import TimeSheetsIdAuditsCountEndpoint
 from pyconnectwise.endpoints.manage.TimeSheetsIdAuditsIdEndpoint import TimeSheetsIdAuditsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeSheetAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsIdEndpoint.py
index 228b8fe38..6e865610e 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsIdAuditsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeSheetAudit
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsIdEndpoint.py
index 4dcc1274e..1ef56d4fc 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsIdEndpoint.py
@@ -6,7 +6,6 @@
 from pyconnectwise.endpoints.manage.TimeSheetsIdRejectEndpoint import TimeSheetsIdRejectEndpoint
 from pyconnectwise.endpoints.manage.TimeSheetsIdReverseEndpoint import TimeSheetsIdReverseEndpoint
 from pyconnectwise.endpoints.manage.TimeSheetsIdSubmitEndpoint import TimeSheetsIdSubmitEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimeSheet
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -17,9 +16,9 @@ def __init__(self, client, parent_endpoint=None):
 
         self.reverse = self._register_child_endpoint(TimeSheetsIdReverseEndpoint(client, parent_endpoint=self))
         self.submit = self._register_child_endpoint(TimeSheetsIdSubmitEndpoint(client, parent_endpoint=self))
-        self.approve = self._register_child_endpoint(TimeSheetsIdApproveEndpoint(client, parent_endpoint=self))
         self.reject = self._register_child_endpoint(TimeSheetsIdRejectEndpoint(client, parent_endpoint=self))
         self.audits = self._register_child_endpoint(TimeSheetsIdAuditsEndpoint(client, parent_endpoint=self))
+        self.approve = self._register_child_endpoint(TimeSheetsIdApproveEndpoint(client, parent_endpoint=self))
 
     def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}) -> PaginatedResponse[TimeSheet]:
         """
@@ -54,14 +53,12 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TimeSheet, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/sheets/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsIdRejectEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsIdRejectEndpoint.py
index fd6d20c61..1b711b125 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsIdRejectEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsIdRejectEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsIdReverseEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsIdReverseEndpoint.py
index a80d0c6fd..b0700e40d 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsIdReverseEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsIdReverseEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeSheetsIdSubmitEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeSheetsIdSubmitEndpoint.py
index ac7f9716f..4aa931c3d 100644
--- a/src/pyconnectwise/endpoints/manage/TimeSheetsIdSubmitEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeSheetsIdSubmitEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import SuccessResponse
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesCountEndpoint.py
index 34aa06915..35d92b5ed 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesEndpoint.py
index 40b5c3b6e..2d121a5b3 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeTicketstopwatchesCountEndpoint import TimeTicketstopwatchesCountEndpoint
 from pyconnectwise.endpoints.manage.TimeTicketstopwatchesIdEndpoint import TimeTicketstopwatchesIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketStopwatch
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesIdEndpoint.py
index 479701c27..acb3be2ff 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTicketstopwatchesIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TicketStopwatch
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TicketStopwatch, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/ticketstopwatches/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TicketStopwatch:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsCountEndpoint.py
index 66c24a5e3..1a901330d 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsDefaultEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsDefaultEndpoint.py
index d29d85f3a..8aa4fed89 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsDefaultEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsDefaultEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimePeriodSetupDefaults
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsEndpoint.py
index 40ae34d3e..2b5281e90 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.TimeTimeperiodsetupsCountEndpoint import TimeTimeperiodsetupsCountEndpoint
 from pyconnectwise.endpoints.manage.TimeTimeperiodsetupsDefaultEndpoint import TimeTimeperiodsetupsDefaultEndpoint
 from pyconnectwise.endpoints.manage.TimeTimeperiodsetupsIdEndpoint import TimeTimeperiodsetupsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimePeriodSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdEndpoint.py
index 0f5895336..8b441cccd 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeTimeperiodsetupsIdPeriodsEndpoint import TimeTimeperiodsetupsIdPeriodsEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimePeriodSetup
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> T
         """
         return self._parse_one(TimePeriodSetup, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/timePeriodSetups/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> TimePeriodSetup:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsCountEndpoint.py
index 96ff2d999..4b277e9f7 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsEndpoint.py
index e555eb6a9..358e4f8c0 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsEndpoint.py
@@ -5,7 +5,6 @@
     TimeTimeperiodsetupsIdPeriodsCountEndpoint
 from pyconnectwise.endpoints.manage.TimeTimeperiodsetupsIdPeriodsIdEndpoint import \
     TimeTimeperiodsetupsIdPeriodsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimePeriod
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsIdEndpoint.py
index e27344b20..08c709a72 100644
--- a/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeTimeperiodsetupsIdPeriodsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import TimePeriod
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesCountEndpoint.py
index 5dd01d526..1292c966b 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesEndpoint.py
index 5f363a263..095375bfc 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.TimeWorkrolesCountEndpoint import TimeWorkrolesCountEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesIdEndpoint import TimeWorkrolesIdEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesInfoEndpoint import TimeWorkrolesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdEndpoint.py
index 7b36f5081..172a19619 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.TimeWorkrolesIdInfoEndpoint import TimeWorkrolesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesIdLocationsEndpoint import TimeWorkrolesIdLocationsEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesIdUsagesEndpoint import TimeWorkrolesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkRole
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -50,17 +49,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(WorkRole, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/workRoles/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> WorkRole:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdInfoEndpoint.py
index 7072b497a..2000e34a4 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkRoleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsCountEndpoint.py
index 8a1607adb..25e0d0dee 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsEndpoint.py
index d8038d978..9e09897bb 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesIdLocationsCountEndpoint import TimeWorkrolesIdLocationsCountEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesIdLocationsIdEndpoint import TimeWorkrolesIdLocationsIdEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkRoleLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsIdEndpoint.py
index cd49ee037..a62d12abd 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdLocationsIdEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkRoleLocation
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -45,17 +44,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(WorkRoleLocation, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/workRoles/{id}/locations/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> WorkRoleLocation:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdUsagesEndpoint.py
index 8b8d44210..6ed257202 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesIdUsagesListEndpoint import TimeWorkrolesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdUsagesListEndpoint.py
index 2f3ad88a4..e83245540 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesInfoCountEndpoint.py
index 0c7747e9e..5579041c9 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorkrolesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorkrolesInfoEndpoint.py
index c16a1a3c9..cf312cf8a 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorkrolesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorkrolesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeWorkrolesInfoCountEndpoint import TimeWorkrolesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkRoleInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorktypesCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorktypesCountEndpoint.py
index 197760e70..87cc7cbd7 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorktypesCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorktypesCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorktypesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorktypesEndpoint.py
index 7f6e08082..29b71f764 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorktypesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorktypesEndpoint.py
@@ -4,7 +4,6 @@
 from pyconnectwise.endpoints.manage.TimeWorktypesCountEndpoint import TimeWorktypesCountEndpoint
 from pyconnectwise.endpoints.manage.TimeWorktypesIdEndpoint import TimeWorktypesIdEndpoint
 from pyconnectwise.endpoints.manage.TimeWorktypesInfoEndpoint import TimeWorktypesInfoEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorktypesIdEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorktypesIdEndpoint.py
index da9f23bdf..ba2fe77cf 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorktypesIdEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorktypesIdEndpoint.py
@@ -3,7 +3,6 @@
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeWorktypesIdInfoEndpoint import TimeWorktypesIdInfoEndpoint
 from pyconnectwise.endpoints.manage.TimeWorktypesIdUsagesEndpoint import TimeWorktypesIdUsagesEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkType
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
@@ -48,17 +47,15 @@ def get(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> W
         """
         return self._parse_one(WorkType, super()._make_request("GET", data=data, params=params).json())
 
-    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> GenericMessageModel:
+    def delete(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> None:
         """
         Performs a DELETE request against the /time/workTypes/{id} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
-        Returns:
-            GenericMessageModel: The parsed response data.
         """
-        return self._parse_one(GenericMessageModel, super()._make_request("DELETE", data=data, params=params).json())
+        super()._make_request("DELETE", data=data, params=params)
 
     def put(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> WorkType:
         """
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorktypesIdInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorktypesIdInfoEndpoint.py
index f54509f43..cfa52dac1 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorktypesIdInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorktypesIdInfoEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorktypesIdUsagesEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorktypesIdUsagesEndpoint.py
index 008ebb752..eba1479ff 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorktypesIdUsagesEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorktypesIdUsagesEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeWorktypesIdUsagesListEndpoint import TimeWorktypesIdUsagesListEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorktypesIdUsagesListEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorktypesIdUsagesListEndpoint.py
index 5121e7f22..903a98fbd 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorktypesIdUsagesListEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorktypesIdUsagesListEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Usage
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorktypesInfoCountEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorktypesInfoCountEndpoint.py
index 51d6fcee9..d61bab674 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorktypesInfoCountEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorktypesInfoCountEndpoint.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import Count
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/endpoints/manage/TimeWorktypesInfoEndpoint.py b/src/pyconnectwise/endpoints/manage/TimeWorktypesInfoEndpoint.py
index c7a742a20..1d87592bb 100644
--- a/src/pyconnectwise/endpoints/manage/TimeWorktypesInfoEndpoint.py
+++ b/src/pyconnectwise/endpoints/manage/TimeWorktypesInfoEndpoint.py
@@ -2,7 +2,6 @@
 
 from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.endpoints.manage.TimeWorktypesInfoCountEndpoint import TimeWorktypesInfoCountEndpoint
-from pyconnectwise.models.base.message_model import GenericMessageModel
 from pyconnectwise.models.manage import WorkTypeInfo
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/AiAssistSetting.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/AiAssistSetting.py
deleted file mode 100644
index f224b0de3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/AiAssistSetting.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AiAssistSettingBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ai_assist_setting_guids: (list[UUID] | None) = Field(default=None, alias='AiAssistSettingGuids')
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/AlertTemplates.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/AlertTemplates.py
deleted file mode 100644
index b9869c44b..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/AlertTemplates.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AlertTemplate(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    template_id: (int | None) = Field(default=None, alias='TemplateId')
-    template_name: (str | None) = Field(default=None, alias='TemplateName')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Alerts.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Alerts.py
deleted file mode 100644
index d0185d858..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Alerts.py
+++ /dev/null
@@ -1,56 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AlertClient(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class AlertComputer(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    computer_status: (str | None) = Field(default=None, alias='ComputerStatus')
-
-class AlertDevice(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class AlertLocation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class AlertMonitor(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class AlertSeverityItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class AlertTemplate(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_template_id: (int | None) = Field(default=None, alias='AlertTemplateId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class Alert(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_id: (int | None) = Field(default=None, alias='AlertId')
-    client: (AlertClient | None) = Field(default=None, alias='Client')
-    computer: (AlertComputer | None) = Field(default=None, alias='Computer')
-    device: (AlertDevice | None) = Field(default=None, alias='Device')
-    location: (AlertLocation | None) = Field(default=None, alias='Location')
-    monitor: (AlertMonitor | None) = Field(default=None, alias='Monitor')
-    alert_date: (datetime | None) = Field(default=None, alias='AlertDate')
-    severity: (AlertSeverityItem | None) = Field(default=None, alias='Severity')
-    source: (str | None) = Field(default=None, alias='Source')
-    message: (str | None) = Field(default=None, alias='Message')
-    field_name: (str | None) = Field(default=None, alias='FieldName')
-    alert_age: (str | None) = Field(default=None, alias='AlertAge')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Analytics.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Analytics.py
deleted file mode 100644
index 358bc6ac2..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Analytics.py
+++ /dev/null
@@ -1,20 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class RecordedActionType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    recorded_action_type_id: (int | None) = Field(default=None, alias='RecordedActionTypeId')
-
-class RecordedActionSource(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    recorded_action_source_id: (int | None) = Field(default=None, alias='RecordedActionSourceId')
-
-class RecordedAction(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    type: (RecordedActionType | None) = Field(default=None, alias='Type')
-    object_id: (int | None) = Field(default=None, alias='ObjectId')
-    secondary_identifier: (str | None) = Field(default=None, alias='SecondaryIdentifier')
-    description: (str | None) = Field(default=None, alias='Description')
-    source: (RecordedActionSource | None) = Field(default=None, alias='Source')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchApprovalPolicies.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchApprovalPolicies.py
deleted file mode 100644
index a47348686..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchApprovalPolicies.py
+++ /dev/null
@@ -1,25 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class WindowsApprovalPolicyPatch(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    approval_action_id: (int | None) = Field(default=None, alias='ApprovalActionId')
-    hotfix_id: (UUID | None) = Field(default=None, alias='HotfixId', example='00000000-0000-0000-0000-000000000000')
-    operating_system: (str | None) = Field(default=None, alias='OperatingSystem')
-
-class ApprovalPolicyThirdPartyPatchSetting(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    patch_approval: (int | None) = Field(default=None, alias='PatchApproval')
-    lt_product_key: (UUID | None) = Field(default=None, alias='LTProductKey', example='00000000-0000-0000-0000-000000000000')
-    version: (str | None) = Field(default=None, alias='Version')
-
-class WindowsApprovalPolicyPatchBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    patch_policies: (list[WindowsApprovalPolicyPatch] | None) = Field(default=None, alias='PatchPolicies')
-
-class ApprovalPolicyThirdPartyPatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    patch_policies: (list[ApprovalPolicyThirdPartyPatchSetting] | None) = Field(default=None, alias='PatchPolicies')
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchBinaryExtension.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchBinaryExtension.py
deleted file mode 100644
index 7c4d5db25..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchBinaryExtension.py
+++ /dev/null
@@ -1,8 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class BinaryExtensionBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    binary_extension_ids: (list[int] | None) = Field(default=None, alias='BinaryExtensionIds')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Computer.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Computer.py
deleted file mode 100644
index 39a1354cf..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Computer.py
+++ /dev/null
@@ -1,76 +0,0 @@
-
-from __future__ import annotations
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class EntityType(Enum):
-    SYSTEM = 'System'
-    COMPUTER = 'Computer'
-    SITE = 'Site'
-    COMPANY = 'Company'
-    PROBE = 'Probe'
-    NETWORK_DEVICE = 'NetworkDevice'
-    TICKET = 'Ticket'
-    GROUP = 'Group'
-    MOBILE_DEVICE = 'MobileDevice'
-    VENDOR = 'Vendor'
-    VENDOR_PRODUCT = 'VendorProduct'
-    POSSIBILITY = 'Possibility'
-    OPPORTUNITY = 'Opportunity'
-    CONTACT = 'Contact'
-    USER = 'User'
-    SCRIPT = 'Script'
-    PLUGIN = 'Plugin'
-    SERVICE = 'Service'
-    SERVICE_BUNDLE = 'ServiceBundle'
-    SEARCH = 'Search'
-    SEARCH_FOLDER = 'SearchFolder'
-    DATAVIEW = 'Dataview'
-    DATAVIEW_FOLDER = 'DataviewFolder'
-    USER_FOLDER = 'UserFolder'
-    USER_CLASS = 'UserClass'
-    SCRIPT_FOLDER = 'ScriptFolder'
-    REMOTE_MONITOR_TEMPLATE = 'RemoteMonitorTemplate'
-    EXTRA_FIELD = 'ExtraField'
-
-class ExecuteResendInventoryCommandBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    inventory_types: (list[int] | None) = Field(default=None, alias='InventoryTypes')
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-
-class ExecuteComputersBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-
-class ExecuteRebootCommandBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    reboot_type: (int | None) = Field(default=None, alias='RebootType')
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-
-class ExecuteComputerCommandResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    command_id: (int | None) = Field(default=None, alias='CommandId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class ToggleServiceUserLocalAccountCredentials(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    username: (str | None) = Field(default=None, alias='Username')
-    password: (str | None) = Field(default=None, alias='Password')
-
-class ExecuteComputersBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_command_result_list: (list[ExecuteComputerCommandResult] | None) = Field(default=None, alias='ComputerCommandResultList')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-
-class ExecuteToggleServiceUserCommandBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    use_local_account: (bool | None) = Field(default=None, alias='UseLocalAccount')
-    local_account_credentials: (ToggleServiceUserLocalAccountCredentials | None) = Field(default=None, alias='LocalAccountCredentials')
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-from .. import ResponseResult
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Group.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Group.py
deleted file mode 100644
index 8c4b8312e..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Group.py
+++ /dev/null
@@ -1,41 +0,0 @@
-
-from __future__ import annotations
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class EntityType(Enum):
-    SYSTEM = 'System'
-    COMPUTER = 'Computer'
-    SITE = 'Site'
-    COMPANY = 'Company'
-    PROBE = 'Probe'
-    NETWORK_DEVICE = 'NetworkDevice'
-    TICKET = 'Ticket'
-    GROUP = 'Group'
-    MOBILE_DEVICE = 'MobileDevice'
-    VENDOR = 'Vendor'
-    VENDOR_PRODUCT = 'VendorProduct'
-    POSSIBILITY = 'Possibility'
-    OPPORTUNITY = 'Opportunity'
-    CONTACT = 'Contact'
-    USER = 'User'
-    SCRIPT = 'Script'
-    PLUGIN = 'Plugin'
-    SERVICE = 'Service'
-    SERVICE_BUNDLE = 'ServiceBundle'
-    SEARCH = 'Search'
-    SEARCH_FOLDER = 'SearchFolder'
-    DATAVIEW = 'Dataview'
-    DATAVIEW_FOLDER = 'DataviewFolder'
-    USER_FOLDER = 'UserFolder'
-    USER_CLASS = 'UserClass'
-    SCRIPT_FOLDER = 'ScriptFolder'
-    REMOTE_MONITOR_TEMPLATE = 'RemoteMonitorTemplate'
-    EXTRA_FIELD = 'ExtraField'
-
-class RemoveEntitiesFromGroupRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Probe.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Probe.py
deleted file mode 100644
index af1ae401b..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/Probe.py
+++ /dev/null
@@ -1,24 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ExecuteProbeBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_ids: (list[int] | None) = Field(default=None, alias='ProbeIds')
-
-class ExecuteProbeCommandResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_id: (int | None) = Field(default=None, alias='ProbeId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class ExecuteToggleProbeCommandBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_ids: (list[int] | None) = Field(default=None, alias='ComputerIds')
-    enable_probe: (bool | None) = Field(default=None, alias='EnableProbe')
-
-class ExecuteProbeBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_command_results: (list[ExecuteProbeCommandResult] | None) = Field(default=None, alias='ProbeCommandResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-from .. import ResponseResult
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/SendTo.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/SendTo.py
deleted file mode 100644
index 2ea5e5605..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/SendTo.py
+++ /dev/null
@@ -1,72 +0,0 @@
-
-from __future__ import annotations
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class EntityType(Enum):
-    SYSTEM = 'System'
-    COMPUTER = 'Computer'
-    SITE = 'Site'
-    COMPANY = 'Company'
-    PROBE = 'Probe'
-    NETWORK_DEVICE = 'NetworkDevice'
-    TICKET = 'Ticket'
-    GROUP = 'Group'
-    MOBILE_DEVICE = 'MobileDevice'
-    VENDOR = 'Vendor'
-    VENDOR_PRODUCT = 'VendorProduct'
-    POSSIBILITY = 'Possibility'
-    OPPORTUNITY = 'Opportunity'
-    CONTACT = 'Contact'
-    USER = 'User'
-    SCRIPT = 'Script'
-    PLUGIN = 'Plugin'
-    SERVICE = 'Service'
-    SERVICE_BUNDLE = 'ServiceBundle'
-    SEARCH = 'Search'
-    SEARCH_FOLDER = 'SearchFolder'
-    DATAVIEW = 'Dataview'
-    DATAVIEW_FOLDER = 'DataviewFolder'
-    USER_FOLDER = 'UserFolder'
-    USER_CLASS = 'UserClass'
-    SCRIPT_FOLDER = 'ScriptFolder'
-    REMOTE_MONITOR_TEMPLATE = 'RemoteMonitorTemplate'
-    EXTRA_FIELD = 'ExtraField'
-
-class TargetType(Enum):
-    SYSTEM = 'System'
-    COMPUTER = 'Computer'
-    SITE = 'Site'
-    COMPANY = 'Company'
-    PROBE = 'Probe'
-    NETWORK_DEVICE = 'NetworkDevice'
-    TICKET = 'Ticket'
-    GROUP = 'Group'
-    MOBILE_DEVICE = 'MobileDevice'
-    VENDOR = 'Vendor'
-    VENDOR_PRODUCT = 'VendorProduct'
-    POSSIBILITY = 'Possibility'
-    OPPORTUNITY = 'Opportunity'
-    CONTACT = 'Contact'
-    USER = 'User'
-    SCRIPT = 'Script'
-    PLUGIN = 'Plugin'
-    SERVICE = 'Service'
-    SERVICE_BUNDLE = 'ServiceBundle'
-    SEARCH = 'Search'
-    SEARCH_FOLDER = 'SearchFolder'
-    DATAVIEW = 'Dataview'
-    DATAVIEW_FOLDER = 'DataviewFolder'
-    USER_FOLDER = 'UserFolder'
-    USER_CLASS = 'UserClass'
-    SCRIPT_FOLDER = 'ScriptFolder'
-    REMOTE_MONITOR_TEMPLATE = 'RemoteMonitorTemplate'
-    EXTRA_FIELD = 'ExtraField'
-
-class SendToCommandBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-    target_type: (TargetType | None) = Field(default=None, alias='TargetType')
-    target_id: (int | None) = Field(default=None, alias='TargetId')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/SetMasterMode.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/SetMasterMode.py
deleted file mode 100644
index d8716758c..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/SetMasterMode.py
+++ /dev/null
@@ -1,41 +0,0 @@
-
-from __future__ import annotations
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class EntityType(Enum):
-    SYSTEM = 'System'
-    COMPUTER = 'Computer'
-    SITE = 'Site'
-    COMPANY = 'Company'
-    PROBE = 'Probe'
-    NETWORK_DEVICE = 'NetworkDevice'
-    TICKET = 'Ticket'
-    GROUP = 'Group'
-    MOBILE_DEVICE = 'MobileDevice'
-    VENDOR = 'Vendor'
-    VENDOR_PRODUCT = 'VendorProduct'
-    POSSIBILITY = 'Possibility'
-    OPPORTUNITY = 'Opportunity'
-    CONTACT = 'Contact'
-    USER = 'User'
-    SCRIPT = 'Script'
-    PLUGIN = 'Plugin'
-    SERVICE = 'Service'
-    SERVICE_BUNDLE = 'ServiceBundle'
-    SEARCH = 'Search'
-    SEARCH_FOLDER = 'SearchFolder'
-    DATAVIEW = 'Dataview'
-    DATAVIEW_FOLDER = 'DataviewFolder'
-    USER_FOLDER = 'UserFolder'
-    USER_CLASS = 'UserClass'
-    SCRIPT_FOLDER = 'ScriptFolder'
-    REMOTE_MONITOR_TEMPLATE = 'RemoteMonitorTemplate'
-    EXTRA_FIELD = 'ExtraField'
-
-class SetMasterModeBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-    master_mode_type: (str | None) = Field(default=None, alias='MasterModeType')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchCommands/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchContacts.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchContacts.py
deleted file mode 100644
index 65b350521..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchContacts.py
+++ /dev/null
@@ -1,76 +0,0 @@
-
-from __future__ import annotations
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class RequestType(Enum):
-    INVITE = 'Invite'
-    RESET = 'Reset'
-
-class EntityType(Enum):
-    SYSTEM = 'System'
-    COMPUTER = 'Computer'
-    SITE = 'Site'
-    COMPANY = 'Company'
-    PROBE = 'Probe'
-    NETWORK_DEVICE = 'NetworkDevice'
-    TICKET = 'Ticket'
-    GROUP = 'Group'
-    MOBILE_DEVICE = 'MobileDevice'
-    VENDOR = 'Vendor'
-    VENDOR_PRODUCT = 'VendorProduct'
-    POSSIBILITY = 'Possibility'
-    OPPORTUNITY = 'Opportunity'
-    CONTACT = 'Contact'
-    USER = 'User'
-    SCRIPT = 'Script'
-    PLUGIN = 'Plugin'
-    SERVICE = 'Service'
-    SERVICE_BUNDLE = 'ServiceBundle'
-    SEARCH = 'Search'
-    SEARCH_FOLDER = 'SearchFolder'
-    DATAVIEW = 'Dataview'
-    DATAVIEW_FOLDER = 'DataviewFolder'
-    USER_FOLDER = 'UserFolder'
-    USER_CLASS = 'UserClass'
-    SCRIPT_FOLDER = 'ScriptFolder'
-    REMOTE_MONITOR_TEMPLATE = 'RemoteMonitorTemplate'
-    EXTRA_FIELD = 'ExtraField'
-
-class WebClientAccessBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    request_type: (RequestType | None) = Field(default=None, alias='RequestType')
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-
-class RequestTypeModel(Enum):
-    ADD = 'Add'
-    REMOVE = 'Remove'
-
-class ContactPermissionBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    request_type: (RequestTypeModel | None) = Field(default=None, alias='RequestType')
-    contact_ids: (list[int] | None) = Field(default=None, alias='ContactIds')
-    permissions: (list[str] | None) = Field(default=None, alias='Permissions')
-
-class ContactPermissionBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    contact_id: (int | None) = Field(default=None, alias='ContactId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class WebClientAccessBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    contact_id: (int | None) = Field(default=None, alias='ContactId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class ContactPermissionBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    contact_permission_results: (list[ContactPermissionBatchResult] | None) = Field(default=None, alias='ContactPermissionResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-
-class WebClientAccessBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_client_access_results: (list[WebClientAccessBatchResult] | None) = Field(default=None, alias='WebClientAccessResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-from . import ResponseResult
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchIpRestrictions.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchIpRestrictions.py
deleted file mode 100644
index 7aa45714e..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchIpRestrictions.py
+++ /dev/null
@@ -1,38 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class DeleteIpRestrictionsBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_restrictions_ids: (list[UUID] | None) = Field(default=None, alias='IpRestrictionsIds')
-
-class DeleteIpRestrictionsBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_restrictions_id: (UUID | None) = Field(default=None, alias='IpRestrictionsId', example='00000000-0000-0000-0000-000000000000')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class AddIpRestrictionsBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_address_guid: (UUID | None) = Field(default=None, alias='IpAddressGuid', example='00000000-0000-0000-0000-000000000000')
-    name: (str | None) = Field(default=None, alias='Name')
-    ip_address: (str | None) = Field(default=None, alias='IpAddress')
-    windows_client_access: (bool | None) = Field(default=None, alias='WindowsClientAccess')
-    web_client_access: (bool | None) = Field(default=None, alias='WebClientAccess')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class DeleteIpRestrictionsBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_restrictions_results: (list[DeleteIpRestrictionsBatchResult] | None) = Field(default=None, alias='IpRestrictionsResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-
-class AddIpRestrictionsBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_restriction_rules: (list[IpRestrictions.IpRestrictionRule] | None) = Field(default=None, alias='IpRestrictionRules')
-
-class AddIpRestrictionsBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_restrictions_results: (list[AddIpRestrictionsBatchResult] | None) = Field(default=None, alias='IpRestrictionsResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-from . import IpRestrictions, ResponseResult
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchMaintenanceModes/MaintenanceModes.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchMaintenanceModes/MaintenanceModes.py
deleted file mode 100644
index 48e61258e..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchMaintenanceModes/MaintenanceModes.py
+++ /dev/null
@@ -1,45 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class EntityType(Enum):
-    SYSTEM = 'System'
-    COMPUTER = 'Computer'
-    SITE = 'Site'
-    COMPANY = 'Company'
-    PROBE = 'Probe'
-    NETWORK_DEVICE = 'NetworkDevice'
-    TICKET = 'Ticket'
-    GROUP = 'Group'
-    MOBILE_DEVICE = 'MobileDevice'
-    VENDOR = 'Vendor'
-    VENDOR_PRODUCT = 'VendorProduct'
-    POSSIBILITY = 'Possibility'
-    OPPORTUNITY = 'Opportunity'
-    CONTACT = 'Contact'
-    USER = 'User'
-    SCRIPT = 'Script'
-    PLUGIN = 'Plugin'
-    SERVICE = 'Service'
-    SERVICE_BUNDLE = 'ServiceBundle'
-    SEARCH = 'Search'
-    SEARCH_FOLDER = 'SearchFolder'
-    DATAVIEW = 'Dataview'
-    DATAVIEW_FOLDER = 'DataviewFolder'
-    USER_FOLDER = 'UserFolder'
-    USER_CLASS = 'UserClass'
-    SCRIPT_FOLDER = 'ScriptFolder'
-    REMOTE_MONITOR_TEMPLATE = 'RemoteMonitorTemplate'
-    EXTRA_FIELD = 'ExtraField'
-
-class MaintenanceModeQueueBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-    start_date: (datetime | None) = Field(default=None, alias='StartDate')
-    duration_in_minutes: (int | None) = Field(default=None, alias='DurationInMinutes')
-    mode: (str | None) = Field(default=None, alias='Mode')
-    comments: (str | None) = Field(default=None, alias='Comments')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchMaintenanceModes/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchMaintenanceModes/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchMaintenanceModes/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchRemoteMonitors.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchRemoteMonitors.py
deleted file mode 100644
index 6acb733b6..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchRemoteMonitors.py
+++ /dev/null
@@ -1,20 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class DeleteRemoteMonitorsBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    remote_monitor_ids: (list[int] | None) = Field(default=None, alias='RemoteMonitorIds')
-
-class DeleteRemoteMonitorBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    remote_monitor_id: (int | None) = Field(default=None, alias='RemoteMonitorId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class DeleteRemoteMonitorBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    remote_monitor_results: (list[DeleteRemoteMonitorBatchResult] | None) = Field(default=None, alias='RemoteMonitorResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-from . import ResponseResult
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchScripts.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchScripts.py
deleted file mode 100644
index 864cb5b56..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchScripts.py
+++ /dev/null
@@ -1,79 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class EntityType(Enum):
-    SYSTEM = 'System'
-    COMPUTER = 'Computer'
-    SITE = 'Site'
-    COMPANY = 'Company'
-    PROBE = 'Probe'
-    NETWORK_DEVICE = 'NetworkDevice'
-    TICKET = 'Ticket'
-    GROUP = 'Group'
-    MOBILE_DEVICE = 'MobileDevice'
-    VENDOR = 'Vendor'
-    VENDOR_PRODUCT = 'VendorProduct'
-    POSSIBILITY = 'Possibility'
-    OPPORTUNITY = 'Opportunity'
-    CONTACT = 'Contact'
-    USER = 'User'
-    SCRIPT = 'Script'
-    PLUGIN = 'Plugin'
-    SERVICE = 'Service'
-    SERVICE_BUNDLE = 'ServiceBundle'
-    SEARCH = 'Search'
-    SEARCH_FOLDER = 'SearchFolder'
-    DATAVIEW = 'Dataview'
-    DATAVIEW_FOLDER = 'DataviewFolder'
-    USER_FOLDER = 'UserFolder'
-    USER_CLASS = 'UserClass'
-    SCRIPT_FOLDER = 'ScriptFolder'
-    REMOTE_MONITOR_TEMPLATE = 'RemoteMonitorTemplate'
-    EXTRA_FIELD = 'ExtraField'
-
-class ScheduleScriptBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    entity_id: (int | None) = Field(default=None, alias='EntityId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class DeleteScriptBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_ids: (list[int] | None) = Field(default=None, alias='ScriptIds')
-
-class DeleteScriptBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_id: (int | None) = Field(default=None, alias='ScriptId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class ScheduleScriptBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_results: (list[ScheduleScriptBatchResult] | None) = Field(default=None, alias='ScriptResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-
-class DeleteScriptBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_results: (list[DeleteScriptBatchResult] | None) = Field(default=None, alias='ScriptResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-
-class ScheduleScriptBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    entity_type: (EntityType | None) = Field(default=None, alias='EntityType')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-    script_id: (int | None) = Field(default=None, alias='ScriptId')
-    script_guid: (str | None) = Field(default=None, alias='ScriptGuid')
-    schedule: (Scripts.ScriptScheduleSettings | None) = Field(default=None, alias='Schedule')
-    parameters: (list[String_System.String] | None) = Field(default=None, alias='Parameters')
-    use_agent_time: (bool | None) = Field(default=None, alias='UseAgentTime')
-    start_date: (datetime | None) = Field(default=None, alias='StartDate')
-    expire_date: (datetime | None) = Field(default=None, alias='ExpireDate')
-    offline_action_flags: (Scripts.ScheduledScriptOfflineActionFlags | None) = Field(default=None, alias='OfflineActionFlags')
-    distribution_window: (ScheduledScripts.DistributionWindow | None) = Field(default=None, alias='DistributionWindow')
-    priority: (int | None) = Field(default=None, alias='Priority')
-    include_sub_groups: (bool | None) = Field(default=None, alias='IncludeSubGroups')
-from .Scripts import ScheduledScripts
-from . import ResponseResult, Scripts
-from .....System.Collections.Generic.KeyValuePair_System import String_System
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UserClassMembership.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UserClassMembership.py
deleted file mode 100644
index eccb0554c..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UserClassMembership.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class UserClassMembershipRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_ids: (list[int] | None) = Field(default=None, alias='UserIds')
-    user_class_ids: (list[int] | None) = Field(default=None, alias='UserClassIds')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UsersGroupMembership.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UsersGroupMembership.py
deleted file mode 100644
index aa0a181c1..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UsersGroupMembership.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class UsersGroupMembershipBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_ids: (list[int] | None) = Field(default=None, alias='UserIds')
-    group_ids: (list[int] | None) = Field(default=None, alias='GroupIds')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UsersUnlock.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UsersUnlock.py
deleted file mode 100644
index a356b1b14..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/UsersUnlock.py
+++ /dev/null
@@ -1,8 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class UsersUnlockRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_ids: (list[int] | None) = Field(default=None, alias='UserIds')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/__init__.py
deleted file mode 100644
index d3ca782cc..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchUsers/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class GeneratePasswordResetTokenBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_ids: (list[int] | None) = Field(default=None, alias='UserIds')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchWebExtension.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchWebExtension.py
deleted file mode 100644
index 1a2d6ace8..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/BatchWebExtension.py
+++ /dev/null
@@ -1,8 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class WebExtensionBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_extension_ids: (list[int] | None) = Field(default=None, alias='WebExtensionIds')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Clients.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Clients.py
deleted file mode 100644
index dd3bb2f9b..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Clients.py
+++ /dev/null
@@ -1,92 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from typing import Any
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class FilterByComputerPermissionsRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_permissions: (list[str] | None) = Field(default=None, alias='ComputerPermissions')
-
-class Client(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ContactSource(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    contact_source_type_id: (int | None) = Field(default=None, alias='ContactSourceTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class DeploymentLogin(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    deployment_login_id: (int | None) = Field(default=None, alias='DeploymentLoginId')
-    client: (Client | None) = Field(default=None, alias='Client')
-    location: (Location | None) = Field(default=None, alias='Location')
-    title: (str | None) = Field(default=None, alias='Title')
-    username: (str | None) = Field(default=None, alias='Username')
-    password: (str | None) = Field(default=None, alias='Password')
-    url: (str | None) = Field(default=None, alias='Url')
-    notes: (str | None) = Field(default=None, alias='Notes')
-
-class Location(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    location_id: (int | None) = Field(default=None, alias='LocationId')
-    name: (str | None) = Field(default=None, alias='Name')
-    fax_number: (str | None) = Field(default=None, alias='FaxNumber')
-    maintenance_window: (TemporaryApiContracts.MaintenanceWindowDefinition | None) = Field(default=None, alias='MaintenanceWindow')
-    deployment_template: (Models.RemoteAgentTemplate | None) = Field(default=None, alias='DeploymentTemplate')
-    router: (Models.Router | None) = Field(default=None, alias='Router')
-    probe_id: (int | None) = Field(default=None, alias='ProbeId')
-    external_id: (int | None) = Field(default=None, alias='ExternalId')
-    script_extra2: (str | None) = Field(default=None, alias='ScriptExtra2')
-    script_extra1: (str | None) = Field(default=None, alias='ScriptExtra1')
-    script_router_address: (str | None) = Field(default=None, alias='ScriptRouterAddress')
-    script_password: (str | None) = Field(default=None, alias='ScriptPassword')
-    script_username: (str | None) = Field(default=None, alias='ScriptUsername')
-    script_drive: (str | None) = Field(default=None, alias='ScriptDrive')
-    router_port: (int | None) = Field(default=None, alias='RouterPort')
-    comments: (str | None) = Field(default=None, alias='Comments')
-    contact: (Models.Contact | None) = Field(default=None, alias='Contact')
-    default_deployment_login: (TemporaryApiContracts.DeploymentLogin | None) = Field(default=None, alias='DefaultDeploymentLogin')
-    phone_number: (str | None) = Field(default=None, alias='PhoneNumber')
-    country: (str | None) = Field(default=None, alias='Country')
-    zip_code: (str | None) = Field(default=None, alias='ZipCode')
-    state: (str | None) = Field(default=None, alias='State')
-    city: (str | None) = Field(default=None, alias='City')
-    address2: (str | None) = Field(default=None, alias='Address2')
-    address1: (str | None) = Field(default=None, alias='Address1')
-    client: (Models.Client | None) = Field(default=None, alias='Client')
-    default_deployment_group: (Models.Group | None) = Field(default=None, alias='DefaultDeploymentGroup')
-    extra_fields: (list[ExtraFields.ExtraField] | None) = Field(default=None, alias='ExtraFields')
-
-class Contact(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    contact_id: (int | None) = Field(default=None, alias='ContactId')
-    first_name: (str | None) = Field(default=None, alias='FirstName')
-    last_name: (str | None) = Field(default=None, alias='LastName')
-    email_address: (str | None) = Field(default=None, alias='EmailAddress')
-    phone_number: (str | None) = Field(default=None, alias='PhoneNumber')
-    mobile_number: (str | None) = Field(default=None, alias='MobileNumber')
-    pager_number: (str | None) = Field(default=None, alias='PagerNumber')
-    fax_number: (str | None) = Field(default=None, alias='FaxNumber')
-    address1: (str | None) = Field(default=None, alias='Address1')
-    address2: (str | None) = Field(default=None, alias='Address2')
-    city: (str | None) = Field(default=None, alias='City')
-    state: (str | None) = Field(default=None, alias='State')
-    zip_code: (str | None) = Field(default=None, alias='ZipCode')
-    client: (Client | None) = Field(default=None, alias='Client')
-    location: (Location | None) = Field(default=None, alias='Location')
-    password: (str | None) = Field(default=None, alias='Password')
-    permissions: (list[str] | None) = Field(default=None, alias='Permissions')
-    is_managed: (bool | None) = Field(default=None, alias='IsManaged')
-    is_activated: (bool | None) = Field(default=None, alias='IsActivated')
-    date_created: (datetime | None) = Field(default=None, alias='DateCreated')
-    last_update_date: (datetime | None) = Field(default=None, alias='LastUpdateDate')
-    plugin_data: (dict[(str, dict[(str, dict[(str, Any)])])] | None) = Field(default=None, alias='PluginData')
-    source: (ContactSource | None) = Field(default=None, alias='Source')
-from . import ExtraFields
-from .....LabTech.Models import TemporaryApiContracts
-from .....LabTech import Models
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Compatibility.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Compatibility.py
deleted file mode 100644
index 919df39b2..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Compatibility.py
+++ /dev/null
@@ -1,18 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class CommandHistory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    date_executed: (datetime | None) = Field(default=None, alias='DateExecuted')
-    command_id: (int | None) = Field(default=None, alias='CommandId')
-    command: (str | None) = Field(default=None, alias='Command')
-    status: (str | None) = Field(default=None, alias='Status')
-    output: (str | None) = Field(default=None, alias='Output')
-    parameters: (str | None) = Field(default=None, alias='Parameters')
-    user: (str | None) = Field(default=None, alias='User')
-    date_finished: (datetime | None) = Field(default=None, alias='DateFinished')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Computers.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Computers.py
deleted file mode 100644
index bb9fbd7f3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Computers.py
+++ /dev/null
@@ -1,28 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ContactAssociatedComputer(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    computer_name: (str | None) = Field(default=None, alias='ComputerName')
-    has_primary_contact: (bool | None) = Field(default=None, alias='HasPrimaryContact')
-    is_primary_contact: (bool | None) = Field(default=None, alias='IsPrimaryContact')
-    can_user_set_primary_status: (bool | None) = Field(default=None, alias='CanUserSetPrimaryStatus')
-    client_name: (str | None) = Field(default=None, alias='ClientName')
-    location_name: (str | None) = Field(default=None, alias='LocationName')
-
-class SetComputerPrimaryContactRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_primary_contact: (bool | None) = Field(default=None, alias='IsPrimaryContact')
-
-class Computer(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    name: (str | None) = Field(default=None, alias='Name')
-    friendly_name: (str | None) = Field(default=None, alias='FriendlyName')
-    is_online: (bool | None) = Field(default=None, alias='IsOnline')
-    location: (Clients.Location | None) = Field(default=None, alias='Location')
-    client: (Clients.Client | None) = Field(default=None, alias='Client')
-from . import Clients
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/DeviceCommands.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/DeviceCommands.py
deleted file mode 100644
index 2ac62221a..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/DeviceCommands.py
+++ /dev/null
@@ -1,19 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ExecuteDeviceCommandsRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    device_id_list: (list[int] | None) = Field(default=None, alias='DeviceIdList')
-
-class ExecuteDeviceCommandResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    device_id: (int | None) = Field(default=None, alias='DeviceId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class ExecuteDeviceCommandResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    command_result_list: (list[ExecuteDeviceCommandResult] | None) = Field(default=None, alias='CommandResultList')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-from . import ResponseResult
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/ExtraFields.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/ExtraFields.py
deleted file mode 100644
index 1fcbc92c1..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/ExtraFields.py
+++ /dev/null
@@ -1,75 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ExtraFieldDisplayFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extra_field_display_format_id: (int | None) = Field(default=None, alias='ExtraFieldDisplayFormatId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ExtraFieldLocation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extra_field_location_id: (int | None) = Field(default=None, alias='ExtraFieldLocationId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ExtraFieldTitleFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extra_field_title_format_id: (int | None) = Field(default=None, alias='ExtraFieldTitleFormatId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TextFieldSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_masked: (bool | None) = Field(default=None, alias='IsMasked')
-    value: (str | None) = Field(default=None, alias='Value')
-    default_value: (str | None) = Field(default=None, alias='DefaultValue')
-
-class DropdownSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    available_options: (dict[(str, str)] | None) = Field(default=None, alias='AvailableOptions')
-    selected_value: (str | None) = Field(default=None, alias='SelectedValue')
-    default_value: (str | None) = Field(default=None, alias='DefaultValue')
-
-class CheckboxSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_checked: (bool | None) = Field(default=None, alias='IsChecked')
-    default_value: (bool | None) = Field(default=None, alias='DefaultValue')
-
-class ExtraFieldSectionResetRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    section: (str | None) = Field(default=None, alias='Section')
-
-class ExtraField(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    target_id: (int | None) = Field(default=None, alias='TargetId')
-    extra_field_definition_id: (int | None) = Field(default=None, alias='ExtraFieldDefinitionId')
-    title: (str | None) = Field(default=None, alias='Title')
-    display_format: (ExtraFieldDisplayFormat | None) = Field(default=None, alias='DisplayFormat')
-    location: (ExtraFieldLocation | None) = Field(default=None, alias='Location')
-    title_format: (ExtraFieldTitleFormat | None) = Field(default=None, alias='TitleFormat')
-    section: (str | None) = Field(default=None, alias='Section')
-    tooltip: (str | None) = Field(default=None, alias='Tooltip')
-    is_read_only: (bool | None) = Field(default=None, alias='IsReadOnly')
-    text_field_settings: (TextFieldSettings | None) = Field(default=None, alias='TextFieldSettings')
-    dropdown_settings: (DropdownSettings | None) = Field(default=None, alias='DropdownSettings')
-    checkbox_settings: (CheckboxSettings | None) = Field(default=None, alias='CheckboxSettings')
-
-class ExtraFieldDefinition(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    sort_oder: (int | None) = Field(default=None, alias='SortOder')
-    is_encrypted: (bool | None) = Field(default=None, alias='IsEncrypted')
-    is_restricted: (bool | None) = Field(default=None, alias='IsRestricted')
-    read_user_classes: (list[Users.UserClass] | None) = Field(default=None, alias='ReadUserClasses')
-    edit_user_classes: (list[Users.UserClass] | None) = Field(default=None, alias='EditUserClasses')
-    extra_field_definition_id: (int | None) = Field(default=None, alias='ExtraFieldDefinitionId')
-    title: (str | None) = Field(default=None, alias='Title')
-    display_format: (ExtraFieldDisplayFormat | None) = Field(default=None, alias='DisplayFormat')
-    location: (ExtraFieldLocation | None) = Field(default=None, alias='Location')
-    title_format: (ExtraFieldTitleFormat | None) = Field(default=None, alias='TitleFormat')
-    section: (str | None) = Field(default=None, alias='Section')
-    tooltip: (str | None) = Field(default=None, alias='Tooltip')
-    is_read_only: (bool | None) = Field(default=None, alias='IsReadOnly')
-    text_field_settings: (TextFieldSettings | None) = Field(default=None, alias='TextFieldSettings')
-    dropdown_settings: (DropdownSettings | None) = Field(default=None, alias='DropdownSettings')
-    checkbox_settings: (CheckboxSettings | None) = Field(default=None, alias='CheckboxSettings')
-from . import Users
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/InternalMonitors.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/InternalMonitors.py
deleted file mode 100644
index 7ef3173ed..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/InternalMonitors.py
+++ /dev/null
@@ -1,40 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class MonitorAlertPolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    effective_policy_type_id: (int | None) = Field(default=None, alias='EffectivePolicyTypeId')
-    effective_policy_type_name: (str | None) = Field(default=None, alias='EffectivePolicyTypeName')
-    is_alert_template_overridden: (bool | None) = Field(default=None, alias='IsAlertTemplateOverridden')
-    alert_template_id: (int | None) = Field(default=None, alias='AlertTemplateId')
-    alert_template_name: (str | None) = Field(default=None, alias='AlertTemplateName')
-    alert_template_description: (str | None) = Field(default=None, alias='AlertTemplateDescription')
-    is_ticket_category_overridden: (bool | None) = Field(default=None, alias='IsTicketCategoryOverridden')
-    ticket_category_id: (int | None) = Field(default=None, alias='TicketCategoryId')
-    ticket_category_name: (str | None) = Field(default=None, alias='TicketCategoryName')
-    inheritance_source_name: (str | None) = Field(default=None, alias='InheritanceSourceName')
-
-class AlertingOverride(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_template: (InternalMonitor.AlertTemplate | None) = Field(default=None, alias='AlertTemplate')
-    ticket_category: (InternalMonitor.TicketCategory | None) = Field(default=None, alias='TicketCategory')
-
-class GroupInternalMonitorInfo(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monitor_id: (int | None) = Field(default=None, alias='MonitorId')
-    monitor_name: (str | None) = Field(default=None, alias='MonitorName')
-    is_monitor_globally_applied: (bool | None) = Field(default=None, alias='IsMonitorGloballyApplied')
-    is_subscription_inherited: (bool | None) = Field(default=None, alias='IsSubscriptionInherited')
-    is_group_subscribed: (bool | None) = Field(default=None, alias='IsGroupSubscribed')
-    monitor_interval: (str | None) = Field(default=None, alias='MonitorInterval')
-    monitor_next_scan_date: (datetime | None) = Field(default=None, alias='MonitorNextScanDate')
-    effective_alert_policy: (MonitorAlertPolicy | None) = Field(default=None, alias='EffectiveAlertPolicy')
-
-class UpdateGroupMonitorSubscriptionRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_subscribed: (bool | None) = Field(default=None, alias='IsSubscribed')
-    overrides: (AlertingOverride | None) = Field(default=None, alias='Overrides')
-from ...PresentationLayer.ViewModels.Groups import InternalMonitor
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/Permissions.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/Permissions.py
deleted file mode 100644
index c96193cea..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/Permissions.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class GroupPermissionSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_inherited: (bool | None) = Field(default=None, alias='IsInherited')
-    computer_permission_settings: (dict[(str, list[str])] | None) = Field(default=None, alias='ComputerPermissionSettings')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/RemoteMonitors.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/RemoteMonitors.py
deleted file mode 100644
index bbd1ddf25..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/RemoteMonitors.py
+++ /dev/null
@@ -1,27 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class TargetType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    target_type_id: (int | None) = Field(default=None, alias='TargetTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class RemoteMonitorTemplate(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    limiting_search: (Searches.Search | None) = Field(default=None, alias='LimitingSearch')
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    target_type: (TargetType | None) = Field(default=None, alias='TargetType')
-    install_count: (int | None) = Field(default=None, alias='InstallCount')
-    sub_type: (str | None) = Field(default=None, alias='SubType')
-    details: (str | None) = Field(default=None, alias='Details')
-    last_edited_by: (str | None) = Field(default=None, alias='LastEditedBy')
-    last_edited_time: (datetime | None) = Field(default=None, alias='LastEditedTime')
-    remote_monitor_id: (int | None) = Field(default=None, alias='RemoteMonitorId')
-    name: (str | None) = Field(default=None, alias='Name')
-    alerting_settings: (Remote.AlertingSettings | None) = Field(default=None, alias='AlertingSettings')
-    configuration: (Remote.Configuration | None) = Field(default=None, alias='Configuration')
-from ..Monitors import Remote
-from .. import Searches
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/__init__.py
deleted file mode 100644
index 103f37671..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Groups/__init__.py
+++ /dev/null
@@ -1,93 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class MembershipConfiguration(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    membership_type: (str | None) = Field(default=None, alias='MembershipType')
-    computer_search_name: (str | None) = Field(default=None, alias='ComputerSearchName')
-    is_limited_to_computer_search: (bool | None) = Field(default=None, alias='IsLimitedToComputerSearch')
-    network_device_search_name: (str | None) = Field(default=None, alias='NetworkDeviceSearchName')
-    is_limited_to_network_device_search: (bool | None) = Field(default=None, alias='IsLimitedToNetworkDeviceSearch')
-    contact_search_name: (str | None) = Field(default=None, alias='ContactSearchName')
-    is_limited_to_contact_search: (bool | None) = Field(default=None, alias='IsLimitedToContactSearch')
-    includes_contact_associated_computers: (bool | None) = Field(default=None, alias='IncludesContactAssociatedComputers')
-
-class GroupType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_type_id: (int | None) = Field(default=None, alias='GroupTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class LinkingSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_link_type_id: (int | None) = Field(default=None, alias='GroupLinkTypeId')
-    group_link_type_name: (str | None) = Field(default=None, alias='GroupLinkTypeName')
-    linked_entity_id: (int | None) = Field(default=None, alias='LinkedEntityId')
-    linked_entity_name: (str | None) = Field(default=None, alias='LinkedEntityName')
-    is_synchronized: (bool | None) = Field(default=None, alias='IsSynchronized')
-
-class MasterStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    master_status_type_id: (int | None) = Field(default=None, alias='MasterStatusTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MaintenanceWindowSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    maintenance_window_id: (int | None) = Field(default=None, alias='MaintenanceWindowId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class RemoteAgentTemplate(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    remote_agent_template_id: (int | None) = Field(default=None, alias='RemoteAgentTemplateId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class SearchSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    auto_join_search_id: (int | None) = Field(default=None, alias='AutoJoinSearchId')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_limited_to_search: (bool | None) = Field(default=None, alias='IsLimitedToSearch')
-
-class ContactSearchSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    should_include_associated_computers: (bool | None) = Field(default=None, alias='ShouldIncludeAssociatedComputers')
-    auto_join_search_id: (int | None) = Field(default=None, alias='AutoJoinSearchId')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_limited_to_search: (bool | None) = Field(default=None, alias='IsLimitedToSearch')
-
-class TemplateSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    remote_agent_template: (RemoteAgentTemplate | None) = Field(default=None, alias='RemoteAgentTemplate')
-    priority: (int | None) = Field(default=None, alias='Priority')
-
-class AutoJoinSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_search_settings: (SearchSettings | None) = Field(default=None, alias='ComputerSearchSettings')
-    network_device_search_settings: (SearchSettings | None) = Field(default=None, alias='NetworkDeviceSearchSettings')
-    contact_search_settings: (ContactSearchSettings | None) = Field(default=None, alias='ContactSearchSettings')
-
-class GroupAutoJoinSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_auto_join_search: (Searches.Search | None) = Field(default=None, alias='ComputerAutoJoinSearch')
-    is_limited_to_computer_auto_join: (bool | None) = Field(default=None, alias='IsLimitedToComputerAutoJoin')
-
-class Group(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    name: (str | None) = Field(default=None, alias='Name')
-    full_name: (str | None) = Field(default=None, alias='FullName')
-    description: (str | None) = Field(default=None, alias='Description')
-    group_type: (GroupType | None) = Field(default=None, alias='GroupType')
-    template_settings: (TemplateSettings | None) = Field(default=None, alias='TemplateSettings')
-    auto_join_settings: (AutoJoinSettings | None) = Field(default=None, alias='AutoJoinSettings')
-    linking_settings: (LinkingSettings | None) = Field(default=None, alias='LinkingSettings')
-    master_status: (MasterStatus | None) = Field(default=None, alias='MasterStatus')
-    maintenance_window_settings: (MaintenanceWindowSettings | None) = Field(default=None, alias='MaintenanceWindowSettings')
-
-class PatchingPolicies(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    microsoft_update_policy: (Patching.MicrosoftUpdatePolicy | None) = Field(default=None, alias='MicrosoftUpdatePolicy')
-    reboot_policy: (Patching.RebootPolicy | None) = Field(default=None, alias='RebootPolicy')
-    third_party_update_policy: (Patching.ThirdPartyUpdatePolicy | None) = Field(default=None, alias='ThirdPartyUpdatePolicy')
-    approval_policies: (list[Patching.ApprovalPolicy] | None) = Field(default=None, alias='ApprovalPolicies')
-from .. import Patching, Searches
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/IpRestrictions.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/IpRestrictions.py
deleted file mode 100644
index 7d17a2dc9..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/IpRestrictions.py
+++ /dev/null
@@ -1,22 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class IpRestrictionRule(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_address_guid: (UUID | None) = Field(default=None, alias='IpAddressGuid', example='00000000-0000-0000-0000-000000000000')
-    name: (str | None) = Field(default=None, alias='Name')
-    ip_address: (str | None) = Field(default=None, alias='IpAddress')
-    windows_client_access: (bool | None) = Field(default=None, alias='WindowsClientAccess')
-    web_client_access: (bool | None) = Field(default=None, alias='WebClientAccess')
-    created_by: (str | None) = Field(default=None, alias='CreatedBy')
-    create_date: (datetime | None) = Field(default=None, alias='CreateDate')
-    updated_by: (str | None) = Field(default=None, alias='UpdatedBy')
-    update_date: (datetime | None) = Field(default=None, alias='UpdateDate')
-
-class IpRestrictionStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_enabled: (bool | None) = Field(default=None, alias='IsEnabled')
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Maintenance.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Maintenance.py
deleted file mode 100644
index e5c797f90..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Maintenance.py
+++ /dev/null
@@ -1,21 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class MaintenanceModeQueueEntry(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    maintenance_mode_queue_id: (int | None) = Field(default=None, alias='MaintenanceModeQueueId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    start_date: (datetime | None) = Field(default=None, alias='StartDate')
-    duration_in_minutes: (int | None) = Field(default=None, alias='DurationInMinutes')
-    mode: (str | None) = Field(default=None, alias='Mode')
-    user_id: (int | None) = Field(default=None, alias='UserId')
-    comments: (str | None) = Field(default=None, alias='Comments')
-
-class MaintenanceWindowDefinition(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    maintenance_window_definition_id: (int | None) = Field(default=None, alias='MaintenanceWindowDefinitionId')
-    name: (str | None) = Field(default=None, alias='Name')
-    comment: (str | None) = Field(default=None, alias='Comment')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/Remote/CheckSettings.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/Remote/CheckSettings.py
deleted file mode 100644
index c864c20e5..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/Remote/CheckSettings.py
+++ /dev/null
@@ -1,93 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class PingSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    server_address: (str | None) = Field(default=None, alias='ServerAddress')
-
-class LatencySettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    server_address: (str | None) = Field(default=None, alias='ServerAddress')
-
-class TcpSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    server_address: (str | None) = Field(default=None, alias='ServerAddress')
-    port: (int | None) = Field(default=None, alias='Port')
-    data_to_send: (str | None) = Field(default=None, alias='DataToSend')
-
-class UdpSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    server_address: (str | None) = Field(default=None, alias='ServerAddress')
-    port: (int | None) = Field(default=None, alias='Port')
-    data_to_send: (str | None) = Field(default=None, alias='DataToSend')
-
-class SnmpSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    server_address: (str | None) = Field(default=None, alias='ServerAddress')
-    community_string: (str | None) = Field(default=None, alias='CommunityString')
-    oid: (str | None) = Field(default=None, alias='Oid')
-    should_use_snmp_v2: (bool | None) = Field(default=None, alias='ShouldUseSnmpV2')
-
-class PerformanceCounterSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    performance_object: (str | None) = Field(default=None, alias='PerformanceObject')
-    performance_counter: (str | None) = Field(default=None, alias='PerformanceCounter')
-    instance: (str | None) = Field(default=None, alias='Instance')
-
-class FileOrDirectorySettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    path: (str | None) = Field(default=None, alias='Path')
-
-class ServiceSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    service_name: (str | None) = Field(default=None, alias='ServiceName')
-
-class DiskSpaceSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    drive_letter: (str | None) = Field(default=None, alias='DriveLetter')
-
-class RegistrySettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    registry_hive_type_id: (int | None) = Field(default=None, alias='RegistryHiveTypeId')
-    registry_key: (str | None) = Field(default=None, alias='RegistryKey')
-    value_name: (str | None) = Field(default=None, alias='ValueName')
-
-class ProcessSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    process_name: (str | None) = Field(default=None, alias='ProcessName')
-
-class EventLogSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    log_file_name: (str | None) = Field(default=None, alias='LogFileName')
-    event_type_id: (int | None) = Field(default=None, alias='EventTypeId')
-    source: (str | None) = Field(default=None, alias='Source')
-    event_id: (str | None) = Field(default=None, alias='EventId')
-    message_regex: (str | None) = Field(default=None, alias='MessageRegex')
-
-class ExecutableSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    executable_invocation: (str | None) = Field(default=None, alias='ExecutableInvocation')
-
-class WmiSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    wmi_query: (str | None) = Field(default=None, alias='WmiQuery')
-
-class BandwidthSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_address: (str | None) = Field(default=None, alias='IpAddress')
-    snmp_version_id: (int | None) = Field(default=None, alias='SnmpVersionId')
-    community_string: (str | None) = Field(default=None, alias='CommunityString')
-    data_to_watch_id: (int | None) = Field(default=None, alias='DataToWatchId')
-    index_to_watch: (str | None) = Field(default=None, alias='IndexToWatch')
-    snmp_v3_user_name: (str | None) = Field(default=None, alias='SnmpV3UserName')
-    snmp_v3_auth_password: (str | None) = Field(default=None, alias='SnmpV3AuthPassword')
-    snmp_v3_auth_method_id: (int | None) = Field(default=None, alias='SnmpV3AuthMethodId')
-    snmp_v3_encryption_password: (str | None) = Field(default=None, alias='SnmpV3EncryptionPassword')
-    snmp_v3_encryption_method_id: (int | None) = Field(default=None, alias='SnmpV3EncryptionMethodId')
-
-class SensorSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    sensor_number: (int | None) = Field(default=None, alias='SensorNumber')
-    sensor_type_id: (int | None) = Field(default=None, alias='SensorTypeId')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/Remote/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/Remote/__init__.py
deleted file mode 100644
index a8a1102fb..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/Remote/__init__.py
+++ /dev/null
@@ -1,76 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AlertStyleType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_style_type_id: (int | None) = Field(default=None, alias='AlertStyleTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class AlertScript(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_script_id: (int | None) = Field(default=None, alias='AlertScriptId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class CheckType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    check_type_id: (int | None) = Field(default=None, alias='CheckTypeId')
-    legacy_check_type_id: (int | None) = Field(default=None, alias='LegacyCheckTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class CheckInterval(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    interval_in_seconds: (int | None) = Field(default=None, alias='IntervalInSeconds')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class StateCondition(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    conditional_type_id: (int | None) = Field(default=None, alias='ConditionalTypeId')
-    comparand: (str | None) = Field(default=None, alias='Comparand')
-
-class AlertingSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_alerting_enabled: (bool | None) = Field(default=None, alias='IsAlertingEnabled')
-    alert_template: (Alerts.AlertTemplate | None) = Field(default=None, alias='AlertTemplate')
-    alert_style_type: (AlertStyleType | None) = Field(default=None, alias='AlertStyleType')
-    alert_success_subject: (str | None) = Field(default=None, alias='AlertSuccessSubject')
-    alert_success_message: (str | None) = Field(default=None, alias='AlertSuccessMessage')
-    alert_failure_subject: (str | None) = Field(default=None, alias='AlertFailureSubject')
-    alert_failure_message: (str | None) = Field(default=None, alias='AlertFailureMessage')
-    should_run_script: (bool | None) = Field(default=None, alias='ShouldRunScript')
-    alert_script: (AlertScript | None) = Field(default=None, alias='AlertScript')
-    ticket_category: (Ticketing.TicketCategory | None) = Field(default=None, alias='TicketCategory')
-    report_category: (Reporting.ReportCategory | None) = Field(default=None, alias='ReportCategory')
-
-class Condition(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    condition_type_id: (int | None) = Field(default=None, alias='ConditionTypeId')
-    comparand: (str | None) = Field(default=None, alias='Comparand')
-    normal_state_condition: (StateCondition | None) = Field(default=None, alias='NormalStateCondition')
-    warning_state_condition: (StateCondition | None) = Field(default=None, alias='WarningStateCondition')
-    error_state_condition: (StateCondition | None) = Field(default=None, alias='ErrorStateCondition')
-
-class Configuration(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    check_type: (CheckType | None) = Field(default=None, alias='CheckType')
-    interval: (CheckInterval | None) = Field(default=None, alias='Interval')
-    condition: (Condition | None) = Field(default=None, alias='Condition')
-    ping_settings: (CheckSettings.PingSettings | None) = Field(default=None, alias='PingSettings')
-    latency_settings: (CheckSettings.LatencySettings | None) = Field(default=None, alias='LatencySettings')
-    tcp_settings: (CheckSettings.TcpSettings | None) = Field(default=None, alias='TcpSettings')
-    udp_settings: (CheckSettings.UdpSettings | None) = Field(default=None, alias='UdpSettings')
-    snmp_settings: (CheckSettings.SnmpSettings | None) = Field(default=None, alias='SnmpSettings')
-    performance_counter_settings: (CheckSettings.PerformanceCounterSettings | None) = Field(default=None, alias='PerformanceCounterSettings')
-    file_or_directory_settings: (CheckSettings.FileOrDirectorySettings | None) = Field(default=None, alias='FileOrDirectorySettings')
-    service_settings: (CheckSettings.ServiceSettings | None) = Field(default=None, alias='ServiceSettings')
-    disk_space_settings: (CheckSettings.DiskSpaceSettings | None) = Field(default=None, alias='DiskSpaceSettings')
-    registry_settings: (CheckSettings.RegistrySettings | None) = Field(default=None, alias='RegistrySettings')
-    process_settings: (CheckSettings.ProcessSettings | None) = Field(default=None, alias='ProcessSettings')
-    event_log_settings: (CheckSettings.EventLogSettings | None) = Field(default=None, alias='EventLogSettings')
-    executable_settings: (CheckSettings.ExecutableSettings | None) = Field(default=None, alias='ExecutableSettings')
-    wmi_settings: (CheckSettings.WmiSettings | None) = Field(default=None, alias='WmiSettings')
-    bandwidth_settings: (CheckSettings.BandwidthSettings | None) = Field(default=None, alias='BandwidthSettings')
-    sensor_settings: (CheckSettings.SensorSettings | None) = Field(default=None, alias='SensorSettings')
-from .. import CheckSettings
-from ... import Alerts, Reporting, Ticketing
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/__init__.py
deleted file mode 100644
index 49c0f9186..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Monitors/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class MonitorCount(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    internal_monitor_total_count: (int | None) = Field(default=None, alias='InternalMonitorTotalCount')
-    internal_monitor_total_disable_count: (int | None) = Field(default=None, alias='InternalMonitorTotalDisableCount')
-    internal_monitor_total_detected_count: (int | None) = Field(default=None, alias='InternalMonitorTotalDetectedCount')
-    remote_monitor_total_count: (int | None) = Field(default=None, alias='RemoteMonitorTotalCount')
-    remote_monitor_total_failure_count: (int | None) = Field(default=None, alias='RemoteMonitorTotalFailureCount')
-    remote_monitor_total_warning_count: (int | None) = Field(default=None, alias='RemoteMonitorTotalWarningCount')
-
-class Monitor(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monitor_id: (int | None) = Field(default=None, alias='MonitorId')
-    name: (str | None) = Field(default=None, alias='Name')
-    groups: (list[Groups.Group] | None) = Field(default=None, alias='Groups')
-    target_computer: (Computers.Computer | None) = Field(default=None, alias='TargetComputer')
-from .. import Computers, Groups
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/NetworkDevices.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/NetworkDevices.py
deleted file mode 100644
index 52b044400..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/NetworkDevices.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class NetworkDevice(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    network_device_id: (int | None) = Field(default=None, alias='NetworkDeviceId')
-    name: (str | None) = Field(default=None, alias='Name')
-    friendly_name: (str | None) = Field(default=None, alias='FriendlyName')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/BatchingContracts.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/BatchingContracts.py
deleted file mode 100644
index 8b38ae697..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/BatchingContracts.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class HotfixOperatingSystemCombination(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    hotfix_id: (UUID | None) = Field(default=None, alias='HotfixId', example='00000000-0000-0000-0000-000000000000')
-    operating_system: (str | None) = Field(default=None, alias='OperatingSystem')
-
-class AdvanceStageRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    hotfixes_to_advance: (list[HotfixOperatingSystemCombination] | None) = Field(default=None, alias='HotfixesToAdvance')
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/RpcContracts.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/RpcContracts.py
deleted file mode 100644
index a9d1bf092..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/RpcContracts.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class PatchActionInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    product_key_id_list: (list[str] | None) = Field(default=None, alias='ProductKeyIdList')
-
-class ExecutePatchActionRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    patch_action_detail_list: (list[PatchActionInformation] | None) = Field(default=None, alias='PatchActionDetailList')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/__init__.py
deleted file mode 100644
index bd805694b..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/__init__.py
+++ /dev/null
@@ -1,270 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class WindowsUpdateCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    category_id: (int | None) = Field(default=None, alias='CategoryId')
-    category_name: (str | None) = Field(default=None, alias='CategoryName')
-
-class ApprovalPolicyStats(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    approval_policy_id: (int | None) = Field(default=None, alias='ApprovalPolicyId')
-    approval_policy_name: (str | None) = Field(default=None, alias='ApprovalPolicyName')
-    pending_approval_count: (int | None) = Field(default=None, alias='PendingApprovalCount')
-
-class ComputerPatchingStats(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    overall_compliance: (float | None) = Field(default=None, alias='OverallCompliance')
-    installed_patch_count: (int | None) = Field(default=None, alias='InstalledPatchCount')
-    missing_patch_count: (int | None) = Field(default=None, alias='MissingPatchCount')
-    failed_patch_count: (int | None) = Field(default=None, alias='FailedPatchCount')
-    compliant_software_count: (int | None) = Field(default=None, alias='CompliantSoftwareCount')
-    non_compliant_software_count: (int | None) = Field(default=None, alias='NonCompliantSoftwareCount')
-    failed_software_count: (int | None) = Field(default=None, alias='FailedSoftwareCount')
-    incorrect_software_count: (int | None) = Field(default=None, alias='IncorrectSoftwareCount')
-    stage: (str | None) = Field(default=None, alias='Stage')
-    no_patch_inventory: (bool | None) = Field(default=None, alias='NoPatchInventory')
-    wsus_enabled: (bool | None) = Field(default=None, alias='WSUSEnabled')
-    patch_job_running: (bool | None) = Field(default=None, alias='PatchJobRunning')
-    daytime_patching_enabled: (bool | None) = Field(default=None, alias='DaytimePatchingEnabled')
-    wua_out_of_date: (bool | None) = Field(default=None, alias='WUAOutOfDate')
-    missing_baseline_patches: (bool | None) = Field(default=None, alias='MissingBaselinePatches')
-    wua_version: (str | None) = Field(default=None, alias='WUAVersion')
-    last_install_window: (datetime | None) = Field(default=None, alias='LastInstallWindow')
-    next_install_window: (datetime | None) = Field(default=None, alias='NextInstallWindow')
-    last_software_window: (datetime | None) = Field(default=None, alias='LastSoftwareWindow')
-    next_software_window: (datetime | None) = Field(default=None, alias='NextSoftwareWindow')
-    last_patched_date: (datetime | None) = Field(default=None, alias='LastPatchedDate')
-    last_microsoft_patched_date: (datetime | None) = Field(default=None, alias='LastMicrosoftPatchedDate')
-    last_third_party_patched_date: (datetime | None) = Field(default=None, alias='LastThirdPartyPatchedDate')
-    last_patch_inventory: (datetime | None) = Field(default=None, alias='LastPatchInventory')
-    is_microsoft_managed: (bool | None) = Field(default=None, alias='IsMicrosoftManaged')
-    is_third_party_managed: (bool | None) = Field(default=None, alias='IsThirdPartyManaged')
-
-class DevicesSummaryData(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    compliance_score: (float | None) = Field(default=None, alias='ComplianceScore')
-    devices_affecting_compliance_count: (int | None) = Field(default=None, alias='DevicesAffectingComplianceCount')
-    devices_affecting_pilot_stage_compliance_count: (int | None) = Field(default=None, alias='DevicesAffectingPilotStageComplianceCount')
-    devices_affecting_production_stage_compliance_count: (int | None) = Field(default=None, alias='DevicesAffectingProductionStageComplianceCount')
-    devices_affecting_test_stage_compliance_count: (int | None) = Field(default=None, alias='DevicesAffectingTestStageComplianceCount')
-    devices_needing_attention_count: (int | None) = Field(default=None, alias='DevicesNeedingAttentionCount')
-    enabled_wsus_count: (int | None) = Field(default=None, alias='EnabledWsusCount')
-    entity_id: (int | None) = Field(default=None, alias='EntityId')
-    entity_name: (str | None) = Field(default=None, alias='EntityName')
-    in_daytime_patching_count: (int | None) = Field(default=None, alias='InDaytimePatchingCount')
-    last_patch_job_failed_count: (int | None) = Field(default=None, alias='LastPatchJobFailedCount')
-    missing_baseline_patches_count: (int | None) = Field(default=None, alias='MissingBaselinePatchesCount')
-    missing_patch_inventory_count: (int | None) = Field(default=None, alias='MissingPatchInventoryCount')
-    out_of_date_wua_count: (int | None) = Field(default=None, alias='OutOfDateWuaCount')
-    pending_reboot_count: (int | None) = Field(default=None, alias='PendingRebootCount')
-    pending_update_count: (int | None) = Field(default=None, alias='PendingUpdateCount')
-    pilot_stage_compliance_score: (float | None) = Field(default=None, alias='PilotStageComplianceScore')
-    production_stage_compliance_score: (float | None) = Field(default=None, alias='ProductionStageComplianceScore')
-    running_patch_installation_count: (int | None) = Field(default=None, alias='RunningPatchInstallationCount')
-    servers_affecting_compliance_count: (int | None) = Field(default=None, alias='ServersAffectingComplianceCount')
-    servers_compliance_score: (float | None) = Field(default=None, alias='ServersComplianceScore')
-    test_stage_compliance_score: (float | None) = Field(default=None, alias='TestStageComplianceScore')
-    workstations_affecting_compliance_count: (int | None) = Field(default=None, alias='WorkstationsAffectingComplianceCount')
-    workstations_compliance_score: (float | None) = Field(default=None, alias='WorkstationsComplianceScore')
-
-class WindowsUpdateAgentMode(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class Windows10UpdatePolicySettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    service_branch: (str | None) = Field(default=None, alias='ServiceBranch')
-    feature_update_deferment: (int | None) = Field(default=None, alias='FeatureUpdateDeferment')
-    quality_update_deferment: (int | None) = Field(default=None, alias='QualityUpdateDeferment')
-
-class UpdatePolicyScheduleDay(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class PatchRebootAction(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class PatchRebootMode(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class PolicyScheduleType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class DatesScheduleSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monthly_occurence: (list[str] | None) = Field(default=None, alias='MonthlyOccurence')
-    dates: (list[int] | None) = Field(default=None, alias='Dates')
-    last_day_of_month: (bool | None) = Field(default=None, alias='LastDayOfMonth')
-
-class DaysScheduleSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monthly_occurence: (list[str] | None) = Field(default=None, alias='MonthlyOccurence')
-    weekly_occurence: (list[str] | None) = Field(default=None, alias='WeeklyOccurence')
-    daily_occurence: (list[str] | None) = Field(default=None, alias='DailyOccurence')
-
-class PatchingPolicyScript(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_guid: (UUID | None) = Field(default=None, alias='ScriptGuid', example='00000000-0000-0000-0000-000000000000')
-    script_name: (str | None) = Field(default=None, alias='ScriptName')
-
-class NonCompliantSummaryData(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    low_severity_count: (int | None) = Field(default=None, alias='LowSeverityCount')
-    moderate_severity_count: (int | None) = Field(default=None, alias='ModerateSeverityCount')
-    important_severity_count: (int | None) = Field(default=None, alias='ImportantSeverityCount')
-    critical_severity_count: (int | None) = Field(default=None, alias='CriticalSeverityCount')
-    unspecified_severity_count: (int | None) = Field(default=None, alias='UnspecifiedSeverityCount')
-    low_cvss_count: (int | None) = Field(default=None, alias='LowCvssCount')
-    medium_cvss_count: (int | None) = Field(default=None, alias='MediumCvssCount')
-    high_cvss_count: (int | None) = Field(default=None, alias='HighCvssCount')
-    total_non_compliant_count: (int | None) = Field(default=None, alias='TotalNonCompliantCount')
-
-class ThirdPartyPatchesSummaryData(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    third_party_compliance_score: (float | None) = Field(default=None, alias='ThirdPartyComplianceScore')
-    third_party_server_compliance_score: (float | None) = Field(default=None, alias='ThirdPartyServerComplianceScore')
-    third_party_workstation_compliance_score: (float | None) = Field(default=None, alias='ThirdPartyWorkstationComplianceScore')
-    devices_affecting_compliance_count: (int | None) = Field(default=None, alias='DevicesAffectingComplianceCount')
-    servers_affecting_compliance_count: (int | None) = Field(default=None, alias='ServersAffectingComplianceCount')
-    workstations_affecting_compliance_count: (int | None) = Field(default=None, alias='WorkstationsAffectingComplianceCount')
-    approved_count: (int | None) = Field(default=None, alias='ApprovedCount')
-    compliant_count: (int | None) = Field(default=None, alias='CompliantCount')
-    failed_count: (int | None) = Field(default=None, alias='FailedCount')
-    incorrect_version_count: (int | None) = Field(default=None, alias='IncorrectVersionCount')
-    non_compliant_count: (int | None) = Field(default=None, alias='NonCompliantCount')
-    not_attempted_count: (int | None) = Field(default=None, alias='NotAttemptedCount')
-
-class ThirdPartyPatchVersion(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    lt_product_key: (UUID | None) = Field(default=None, alias='LTProductKey', example='00000000-0000-0000-0000-000000000000')
-    versions: (list[str] | None) = Field(default=None, alias='Versions')
-
-class WindowsReleaseStats(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    release_id: (int | None) = Field(default=None, alias='ReleaseId')
-    release_count: (int | None) = Field(default=None, alias='ReleaseCount')
-
-class AutomaticApprovalSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    cvss_lower_bound: (int | None) = Field(default=None, alias='CvssLowerBound')
-    severities: (list[str] | None) = Field(default=None, alias='Severities')
-    categories: (list[WindowsUpdateCategory] | None) = Field(default=None, alias='Categories')
-    titles: (list[str] | None) = Field(default=None, alias='Titles')
-
-class AutomaticPolicySettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    severities: (list[str] | None) = Field(default=None, alias='Severities')
-    categories: (list[WindowsUpdateCategory] | None) = Field(default=None, alias='Categories')
-    titles: (list[str] | None) = Field(default=None, alias='Titles')
-
-class RebootPolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    minutes_after_install_to_reboot: (int | None) = Field(default=None, alias='MinutesAfterInstallToReboot')
-    name: (str | None) = Field(default=None, alias='Name')
-    reboot_action: (PatchRebootAction | None) = Field(default=None, alias='RebootAction')
-    reboot_mode: (PatchRebootMode | None) = Field(default=None, alias='RebootMode')
-    reboot_prior_to_first_patch_install: (bool | None) = Field(default=None, alias='RebootPriorToFirstPatchInstall')
-    set_maintenance_window_for_reboot: (bool | None) = Field(default=None, alias='SetMaintenanceWindowForReboot')
-
-class ThirdPartyUpdatePolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    create_restore_point: (bool | None) = Field(default=None, alias='CreateRestorePoint')
-    daytime_patching: (bool | None) = Field(default=None, alias='DaytimePatching')
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    schedule_day: (UpdatePolicyScheduleDay | None) = Field(default=None, alias='ScheduleDay')
-    schedule_start_hour: (str | None) = Field(default=None, alias='ScheduleStartHour')
-    schedule_time_span: (str | None) = Field(default=None, alias='ScheduleTimeSpan')
-    wake_system: (bool | None) = Field(default=None, alias='WakeSystem')
-
-class PatchingPolicySchedule(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    start_time: (int | None) = Field(default=None, alias='StartTime')
-    duration: (str | None) = Field(default=None, alias='Duration')
-    policy_schedule_type: (PolicyScheduleType | None) = Field(default=None, alias='PolicyScheduleType')
-    dates_schedule_settings: (DatesScheduleSettings | None) = Field(default=None, alias='DatesScheduleSettings')
-    days_schedule_settings: (DaysScheduleSettings | None) = Field(default=None, alias='DaysScheduleSettings')
-
-class PatchingPolicyScriptOptions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    before_script: (PatchingPolicyScript | None) = Field(default=None, alias='BeforeScript')
-    after_script: (PatchingPolicyScript | None) = Field(default=None, alias='AfterScript')
-    cancel_action_on_before_script_failure: (bool | None) = Field(default=None, alias='CancelActionOnBeforeScriptFailure')
-
-class WindowsServiceBranchStats(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    server_release_counts: (list[WindowsReleaseStats] | None) = Field(default=None, alias='ServerReleaseCounts')
-    server_no_channel_count: (int | None) = Field(default=None, alias='ServerNoChannelCount')
-    server_semi_annual_channel_count: (int | None) = Field(default=None, alias='ServerSemiAnnualChannelCount')
-    server_semi_annual_channel_targeted_count: (int | None) = Field(default=None, alias='ServerSemiAnnualChannelTargetedCount')
-    workstation_release_counts: (list[WindowsReleaseStats] | None) = Field(default=None, alias='WorkstationReleaseCounts')
-    workstation_no_channel_count: (int | None) = Field(default=None, alias='WorkstationNoChannelCount')
-    workstation_semi_annual_channel_count: (int | None) = Field(default=None, alias='WorkstationSemiAnnualChannelCount')
-    workstation_semi_annual_channel_targeted_count: (int | None) = Field(default=None, alias='WorkstationSemiAnnualChannelTargetedCount')
-
-class ApprovalPolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_default_policy: (bool | None) = Field(default=None, alias='IsDefaultPolicy')
-    has_staging: (bool | None) = Field(default=None, alias='HasStaging')
-    test_duration: (int | None) = Field(default=None, alias='TestDuration')
-    pilot_duration: (int | None) = Field(default=None, alias='PilotDuration')
-    automatic_approval_settings: (AutomaticApprovalSettings | None) = Field(default=None, alias='AutomaticApprovalSettings')
-    automatic_ignore_settings: (AutomaticPolicySettings | None) = Field(default=None, alias='AutomaticIgnoreSettings')
-    automatic_deny_settings: (AutomaticPolicySettings | None) = Field(default=None, alias='AutomaticDenySettings')
-
-class MicrosoftUpdatePolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    update_mode: (WindowsUpdateAgentMode | None) = Field(default=None, alias='UpdateMode')
-    create_restore_point: (bool | None) = Field(default=None, alias='CreateRestorePoint')
-    daytime_patching: (bool | None) = Field(default=None, alias='DaytimePatching')
-    daytime_patching_minimum_uptime: (int | None) = Field(default=None, alias='DaytimePatchingMinimumUptime')
-    install_missing_baseline_patches: (bool | None) = Field(default=None, alias='InstallMissingBaselinePatches')
-    wake_system: (bool | None) = Field(default=None, alias='WakeSystem')
-    patching_policy_schedule: (PatchingPolicySchedule | None) = Field(default=None, alias='PatchingPolicySchedule')
-    windows10_update_policy_settings: (Windows10UpdatePolicySettings | None) = Field(default=None, alias='Windows10UpdatePolicySettings')
-    patching_policy_script_options: (PatchingPolicyScriptOptions | None) = Field(default=None, alias='PatchingPolicyScriptOptions')
-    schedule_day: (UpdatePolicyScheduleDay | None) = Field(default=None, alias='ScheduleDay')
-    schedule_start_hour: (str | None) = Field(default=None, alias='ScheduleStartHour')
-    schedule_time_span: (str | None) = Field(default=None, alias='ScheduleTimeSpan')
-
-class LocalOverridePolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    approval_policies: (list[ApprovalPolicy] | None) = Field(default=None, alias='ApprovalPolicies')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    microsoft_update_policy: (MicrosoftUpdatePolicy | None) = Field(default=None, alias='MicrosoftUpdatePolicy')
-    reboot_policy: (RebootPolicy | None) = Field(default=None, alias='RebootPolicy')
-    third_party_update_policy: (ThirdPartyUpdatePolicy | None) = Field(default=None, alias='ThirdPartyUpdatePolicy')
-
-class GroupPatchingPolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    approval_policies: (list[ApprovalPolicy] | None) = Field(default=None, alias='ApprovalPolicies')
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    group_name: (str | None) = Field(default=None, alias='GroupName')
-    is_manual: (bool | None) = Field(default=None, alias='IsManual')
-    is_patching_group: (bool | None) = Field(default=None, alias='IsPatchingGroup')
-    microsoft_update_policy: (MicrosoftUpdatePolicy | None) = Field(default=None, alias='MicrosoftUpdatePolicy')
-    priority: (int | None) = Field(default=None, alias='Priority')
-    reboot_policy: (RebootPolicy | None) = Field(default=None, alias='RebootPolicy')
-    third_party_update_policy: (ThirdPartyUpdatePolicy | None) = Field(default=None, alias='ThirdPartyUpdatePolicy')
-    auto_join_settings: (Groups.GroupAutoJoinSettings | None) = Field(default=None, alias='AutoJoinSettings')
-    windows_computer_count: (int | None) = Field(default=None, alias='WindowsComputerCount')
-from .. import Groups
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/RebootPolicy.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/RebootPolicy.py
deleted file mode 100644
index 764c9eafc..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/RebootPolicy.py
+++ /dev/null
@@ -1,63 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class DisableServerPatchRebootWorkstationSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    prompt_message: (str | None) = Field(default=None, alias='PromptMessage')
-    prompt_interval: (str | None) = Field(default=None, alias='PromptInterval')
-    reboot_deadline: (str | None) = Field(default=None, alias='RebootDeadline')
-    reboot_deadline_prompt_message: (str | None) = Field(default=None, alias='RebootDeadlinePromptMessage')
-    reboot_deadline_prompt_duration: (str | None) = Field(default=None, alias='RebootDeadlinePromptDuration')
-    send_wake_on_lan_packet: (bool | None) = Field(default=None, alias='SendWakeOnLanPacket')
-    reboot_if_no_user_logged_in: (bool | None) = Field(default=None, alias='RebootIfNoUserLoggedIn')
-
-class PostPatchInstallTriggerSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    limit_to_microsoft_update_policy_window: (bool | None) = Field(default=None, alias='LimitToMicrosoftUpdatePolicyWindow')
-    window_extension: (str | None) = Field(default=None, alias='WindowExtension')
-
-class RebootPolicyPromptSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    use_prompt: (bool | None) = Field(default=None, alias='UsePrompt')
-    requires_confirmation: (bool | None) = Field(default=None, alias='RequiresConfirmation')
-    reboot_if_no_user_logged_on: (bool | None) = Field(default=None, alias='RebootIfNoUserLoggedOn')
-
-class RebootPolicyMaintenanceModeOptions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    set_window: (bool | None) = Field(default=None, alias='SetWindow')
-    window_ignore_types: (list[str] | None) = Field(default=None, alias='WindowIgnoreTypes')
-    window_duration: (str | None) = Field(default=None, alias='WindowDuration')
-
-class PromptWithoutDeadlineSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    reboot_trigger_type: (str | None) = Field(default=None, alias='RebootTriggerType')
-    post_patch_install_trigger_settings: (PostPatchInstallTriggerSettings | None) = Field(default=None, alias='PostPatchInstallTriggerSettings')
-    schedule_trigger_settings: (Schedule.PatchingPolicySchedule | None) = Field(default=None, alias='ScheduleTriggerSettings')
-    prompt_settings: (RebootPolicyPromptSettings | None) = Field(default=None, alias='PromptSettings')
-    reboot_prior_to_patch_job_installs: (bool | None) = Field(default=None, alias='RebootPriorToPatchJobInstalls')
-    maintenance_mode_options: (RebootPolicyMaintenanceModeOptions | None) = Field(default=None, alias='MaintenanceModeOptions')
-    script_options: (PatchingPolicyScriptOptions | None) = Field(default=None, alias='ScriptOptions')
-
-class DisableServerPatchRebootServerSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_template: (AlertTemplates.AlertTemplate | None) = Field(default=None, alias='AlertTemplate')
-    alert_message: (str | None) = Field(default=None, alias='AlertMessage')
-    ticket_category: (Ticketing.TicketCategory | None) = Field(default=None, alias='TicketCategory')
-    report_category: (Reporting.ReportCategory | None) = Field(default=None, alias='ReportCategory')
-
-class DisableServerPatchRebootSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    server_settings: (DisableServerPatchRebootServerSettings | None) = Field(default=None, alias='ServerSettings')
-    workstation_settings: (DisableServerPatchRebootWorkstationSettings | None) = Field(default=None, alias='WorkstationSettings')
-
-class RebootPolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    policy_id: (int | None) = Field(default=None, alias='PolicyId')
-    policy_name: (str | None) = Field(default=None, alias='PolicyName')
-    reboot_policy_type: (str | None) = Field(default=None, alias='RebootPolicyType')
-    disable_server_patch_reboot_settings: (DisableServerPatchRebootSettings | None) = Field(default=None, alias='DisableServerPatchRebootSettings')
-    prompt_without_deadline_settings: (PromptWithoutDeadlineSettings | None) = Field(default=None, alias='PromptWithoutDeadlineSettings')
-from . import PatchingPolicyScriptOptions, Schedule
-from ... import AlertTemplates, Reporting, Ticketing
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/Schedule.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/Schedule.py
deleted file mode 100644
index 41bf78f83..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/Schedule.py
+++ /dev/null
@@ -1,30 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class DatesScheduleSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monthly_occurrence: (list[str] | None) = Field(default=None, alias='MonthlyOccurrence')
-    dates: (list[int] | None) = Field(default=None, alias='Dates')
-    last_day_of_month: (bool | None) = Field(default=None, alias='LastDayOfMonth')
-
-class DaysScheduleSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monthly_occurrence: (list[str] | None) = Field(default=None, alias='MonthlyOccurrence')
-    weekly_occurrence: (list[str] | None) = Field(default=None, alias='WeeklyOccurrence')
-    daily_occurrence: (list[str] | None) = Field(default=None, alias='DailyOccurrence')
-
-class PatchTuesdayScheduleSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    delay_in_days: (int | None) = Field(default=None, alias='DelayInDays')
-
-class PatchingPolicySchedule(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    use_schedule: (bool | None) = Field(default=None, alias='UseSchedule')
-    window_start: (str | None) = Field(default=None, alias='WindowStart')
-    window_duration: (str | None) = Field(default=None, alias='WindowDuration')
-    policy_schedule_type: (str | None) = Field(default=None, alias='PolicyScheduleType')
-    dates_settings: (DatesScheduleSettings | None) = Field(default=None, alias='DatesSettings')
-    days_settings: (DaysScheduleSettings | None) = Field(default=None, alias='DaysSettings')
-    patch_tuesday_settings: (PatchTuesdayScheduleSettings | None) = Field(default=None, alias='PatchTuesdaySettings')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/UpdatePolicy.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/UpdatePolicy.py
deleted file mode 100644
index 9fc092756..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/UpdatePolicy.py
+++ /dev/null
@@ -1,66 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class WindowsUpdateAgentSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    use_windows_update_agent_mode: (bool | None) = Field(default=None, alias='UseWindowsUpdateAgentMode')
-    mode: (str | None) = Field(default=None, alias='Mode')
-    disable_user_interface: (bool | None) = Field(default=None, alias='DisableUserInterface')
-
-class MicrosoftUpdatePolicyOptions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    install_missing_baseline_patches: (bool | None) = Field(default=None, alias='InstallMissingBaselinePatches')
-
-class DaytimePatchingOptions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    allow_daytime_patching: (bool | None) = Field(default=None, alias='AllowDaytimePatching')
-    require_minimum_uptime: (bool | None) = Field(default=None, alias='RequireMinimumUptime')
-    minimum_uptime: (str | None) = Field(default=None, alias='MinimumUptime')
-    update_only: (bool | None) = Field(default=None, alias='UpdateOnly')
-    prompt_interval: (str | None) = Field(default=None, alias='PromptInterval')
-    prompt_deadline: (int | None) = Field(default=None, alias='PromptDeadline')
-    prompt_message: (str | None) = Field(default=None, alias='PromptMessage')
-
-class ServiceBranchSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    use_service_branch: (bool | None) = Field(default=None, alias='UseServiceBranch')
-    is_targeted: (bool | None) = Field(default=None, alias='IsTargeted')
-
-class UpdateDefermentSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    use_deferment: (bool | None) = Field(default=None, alias='UseDeferment')
-    deferment_period_days: (int | None) = Field(default=None, alias='DefermentPeriodDays')
-
-class PatchingPolicyWorkstationOptions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    send_wake_on_lan_packet: (bool | None) = Field(default=None, alias='SendWakeOnLanPacket')
-    create_windows_restore_point: (bool | None) = Field(default=None, alias='CreateWindowsRestorePoint')
-    daytime_patching_options: (DaytimePatchingOptions | None) = Field(default=None, alias='DaytimePatchingOptions')
-
-class MicrosoftUpdatePolicyWindows10Options(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    service_branch_settings: (ServiceBranchSettings | None) = Field(default=None, alias='ServiceBranchSettings')
-    feature_update_deferment_settings: (UpdateDefermentSettings | None) = Field(default=None, alias='FeatureUpdateDefermentSettings')
-    quality_update_deferment_settings: (UpdateDefermentSettings | None) = Field(default=None, alias='QualityUpdateDefermentSettings')
-
-class ThirdPartyUpdatePolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    policy_id: (int | None) = Field(default=None, alias='PolicyId')
-    policy_name: (str | None) = Field(default=None, alias='PolicyName')
-    patching_policy_schedule: (Schedule.PatchingPolicySchedule | None) = Field(default=None, alias='PatchingPolicySchedule')
-    workstation_options: (PatchingPolicyWorkstationOptions | None) = Field(default=None, alias='WorkstationOptions')
-    script_options: (PatchingPolicyScriptOptions | None) = Field(default=None, alias='ScriptOptions')
-
-class MicrosoftUpdatePolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    policy_id: (int | None) = Field(default=None, alias='PolicyId')
-    policy_name: (str | None) = Field(default=None, alias='PolicyName')
-    schedule_settings: (Schedule.PatchingPolicySchedule | None) = Field(default=None, alias='ScheduleSettings')
-    windows_update_agent_settings: (WindowsUpdateAgentSettings | None) = Field(default=None, alias='WindowsUpdateAgentSettings')
-    policy_options: (MicrosoftUpdatePolicyOptions | None) = Field(default=None, alias='PolicyOptions')
-    workstation_options: (PatchingPolicyWorkstationOptions | None) = Field(default=None, alias='WorkstationOptions')
-    windows10_update_options: (MicrosoftUpdatePolicyWindows10Options | None) = Field(default=None, alias='Windows10UpdateOptions')
-    script_options: (PatchingPolicyScriptOptions | None) = Field(default=None, alias='ScriptOptions')
-from . import PatchingPolicyScriptOptions, Schedule
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/__init__.py
deleted file mode 100644
index ef41ce83e..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Patching/v1_5/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class PatchingPolicyScript(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    run_script: (bool | None) = Field(default=None, alias='RunScript')
-    script_guid: (UUID | None) = Field(default=None, alias='ScriptGuid', example='00000000-0000-0000-0000-000000000000')
-    script_name: (str | None) = Field(default=None, alias='ScriptName')
-    cancel_action_on_script_failure: (bool | None) = Field(default=None, alias='CancelActionOnScriptFailure')
-
-class PatchingGroup(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    group_name: (str | None) = Field(default=None, alias='GroupName')
-
-class PatchingPolicyScriptOptions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    before_script_options: (PatchingPolicyScript | None) = Field(default=None, alias='BeforeScriptOptions')
-    after_script_options: (PatchingPolicyScript | None) = Field(default=None, alias='AfterScriptOptions')
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/ManagementPacks.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/ManagementPacks.py
deleted file mode 100644
index c4a3d98f6..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/ManagementPacks.py
+++ /dev/null
@@ -1,27 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ManagementPackQuickSettingsRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_core_services_enabled: (bool | None) = Field(default=None, alias='IsCoreServicesEnabled')
-    is_database_enabled: (bool | None) = Field(default=None, alias='IsDatabaseEnabled')
-    is_messaging_services_enabled: (bool | None) = Field(default=None, alias='IsMessagingServicesEnabled')
-    is_network_ports_enabled: (bool | None) = Field(default=None, alias='IsNetworkPortsEnabled')
-    is_websites_and_proxies_enabled: (bool | None) = Field(default=None, alias='IsWebsitesAndProxiesEnabled')
-    alert_level: (str | None) = Field(default=None, alias='AlertLevel')
-
-class ManagementPackStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_installed: (bool | None) = Field(default=None, alias='IsInstalled')
-    is_enabled: (bool | None) = Field(default=None, alias='IsEnabled')
-    alert_level: (str | None) = Field(default=None, alias='AlertLevel')
-
-class ManagementPackQuickSettingsResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    core_services_status: (ManagementPackStatus | None) = Field(default=None, alias='CoreServicesStatus')
-    database_status: (ManagementPackStatus | None) = Field(default=None, alias='DatabaseStatus')
-    messaging_services_status: (ManagementPackStatus | None) = Field(default=None, alias='MessagingServicesStatus')
-    network_port_status: (ManagementPackStatus | None) = Field(default=None, alias='NetworkPortStatus')
-    websites_and_proxies_status: (ManagementPackStatus | None) = Field(default=None, alias='WebsitesAndProxiesStatus')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/WebExtensions.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/WebExtensions.py
deleted file mode 100644
index 022ef5fc9..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/WebExtensions.py
+++ /dev/null
@@ -1,27 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ExtensionClaimViewModel(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extension_claim_type_id: (int | None) = Field(default=None, alias='ExtensionClaimTypeId')
-    display_name: (str | None) = Field(default=None, alias='DisplayName')
-    description: (str | None) = Field(default=None, alias='Description')
-    is_assigned: (bool | None) = Field(default=None, alias='IsAssigned')
-    is_default_claim: (bool | None) = Field(default=None, alias='IsDefaultClaim')
-
-class AssignedWebExtension(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_extension_id: (int | None) = Field(default=None, alias='WebExtensionId')
-    assigned_claims: (list[int] | None) = Field(default=None, alias='AssignedClaims')
-
-class UserClassWebExtensionViewModel(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_extension_id: (int | None) = Field(default=None, alias='WebExtensionId')
-    web_extension_name: (str | None) = Field(default=None, alias='WebExtensionName')
-    extension_claims: (list[ExtensionClaimViewModel] | None) = Field(default=None, alias='ExtensionClaims')
-
-class UserClassWebExtensionRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    assigned_extensions: (list[AssignedWebExtension] | None) = Field(default=None, alias='AssignedExtensions')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/PresentationLayer/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Reporting.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Reporting.py
deleted file mode 100644
index 60b635ee4..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Reporting.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ReportCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    category_id: (int | None) = Field(default=None, alias='CategoryId')
-    category_name: (str | None) = Field(default=None, alias='CategoryName')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Functions.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Functions.py
deleted file mode 100644
index a5e0ead3e..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Functions.py
+++ /dev/null
@@ -1,8 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ScriptFunctionBase(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_function_id: (int | None) = Field(default=None, alias='ScriptFunctionId')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/RunningScripts.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/RunningScripts.py
deleted file mode 100644
index 44d986027..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/RunningScripts.py
+++ /dev/null
@@ -1,27 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class RunningScriptTargetType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    target_type_id: (int | None) = Field(default=None, alias='TargetTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class RunningScript(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_instance_id: (int | None) = Field(default=None, alias='ScriptInstanceId')
-    target: (RunningScriptTarget | None) = Field(default=None, alias='Target')
-    script: (Script | None) = Field(default=None, alias='Script')
-    source: (ScriptSource | None) = Field(default=None, alias='Source')
-    state: (ScriptState | None) = Field(default=None, alias='State')
-    start_date: (datetime | None) = Field(default=None, alias='StartDate')
-
-class RunningScriptTarget(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    target_type: (RunningScriptTargetType | None) = Field(default=None, alias='TargetType')
-    computer: (Computers.Computer | None) = Field(default=None, alias='Computer')
-    client: (Clients.Client | None) = Field(default=None, alias='Client')
-from . import Script, ScriptSource, ScriptState
-from .. import Clients, Computers
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/ScheduledScripts/Frequency.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/ScheduledScripts/Frequency.py
deleted file mode 100644
index a98cd371a..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/ScheduledScripts/Frequency.py
+++ /dev/null
@@ -1,69 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ScriptScheduleFrequency(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_schedule_frequency_id: (int | None) = Field(default=None, alias='ScriptScheduleFrequencyId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MinutelyScheduleFrequency(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    minutely_interval: (int | None) = Field(default=None, alias='MinutelyInterval')
-    exclusion_start_time: (str | None) = Field(default=None, alias='ExclusionStartTime')
-    exclusion_end_time: (str | None) = Field(default=None, alias='ExclusionEndTime')
-
-class HourlyScheduleFrequency(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    hourly_interval: (int | None) = Field(default=None, alias='HourlyInterval')
-    exclusion_start_time: (str | None) = Field(default=None, alias='ExclusionStartTime')
-    exclusion_end_time: (str | None) = Field(default=None, alias='ExclusionEndTime')
-
-class MonthlyScheduleFrequency(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    runs_at: (str | None) = Field(default=None, alias='RunsAt')
-    monthly_interval: (int | None) = Field(default=None, alias='MonthlyInterval')
-    day: (int | None) = Field(default=None, alias='Day')
-
-class DaysOfWeekSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    sunday: (bool | None) = Field(default=None, alias='Sunday')
-    monday: (bool | None) = Field(default=None, alias='Monday')
-    tuesday: (bool | None) = Field(default=None, alias='Tuesday')
-    wednesday: (bool | None) = Field(default=None, alias='Wednesday')
-    thursday: (bool | None) = Field(default=None, alias='Thursday')
-    friday: (bool | None) = Field(default=None, alias='Friday')
-    saturday: (bool | None) = Field(default=None, alias='Saturday')
-
-class WeeksOfMonthSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    first: (bool | None) = Field(default=None, alias='First')
-    second: (bool | None) = Field(default=None, alias='Second')
-    third: (bool | None) = Field(default=None, alias='Third')
-    fourth: (bool | None) = Field(default=None, alias='Fourth')
-    last: (bool | None) = Field(default=None, alias='Last')
-
-class DailyScriptRepeatFrequency(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    daily_script_repeat_frequency_id: (int | None) = Field(default=None, alias='DailyScriptRepeatFrequencyId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class WeeklyScheduleFrequency(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    runs_at: (str | None) = Field(default=None, alias='RunsAt')
-    weeks_of_month_settings: (WeeksOfMonthSettings | None) = Field(default=None, alias='WeeksOfMonthSettings')
-    days_of_week_settings: (DaysOfWeekSettings | None) = Field(default=None, alias='DaysOfWeekSettings')
-
-class DailyRepeatSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    daily_script_repeat_frequency: (DailyScriptRepeatFrequency | None) = Field(default=None, alias='DailyScriptRepeatFrequency')
-    daily_repeat_interval: (int | None) = Field(default=None, alias='DailyRepeatInterval')
-    maximum_repetitions: (int | None) = Field(default=None, alias='MaximumRepetitions')
-
-class DailyScheduleFrequency(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    runs_at: (str | None) = Field(default=None, alias='RunsAt')
-    daily_interval: (int | None) = Field(default=None, alias='DailyInterval')
-    days_of_week_settings: (DaysOfWeekSettings | None) = Field(default=None, alias='DaysOfWeekSettings')
-    daily_repeat_settings: (DailyRepeatSettings | None) = Field(default=None, alias='DailyRepeatSettings')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/ScheduledScripts/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/ScheduledScripts/__init__.py
deleted file mode 100644
index 8273aa9ba..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/ScheduledScripts/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class DistributionWindowType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    distribution_window_type_id: (int | None) = Field(default=None, alias='DistributionWindowTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ScheduleTargetType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    schedule_target_type_id: (int | None) = Field(default=None, alias='ScheduleTargetTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class DistributionWindow(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    distribution_window_type: (DistributionWindowType | None) = Field(default=None, alias='DistributionWindowType')
-    amount: (int | None) = Field(default=None, alias='Amount')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Settings.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Settings.py
deleted file mode 100644
index 8577df87b..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Settings.py
+++ /dev/null
@@ -1,58 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class UserClassAccess(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_class_id: (int | None) = Field(default=None, alias='UserClassId')
-    name: (str | None) = Field(default=None, alias='Name')
-    can_execute: (bool | None) = Field(default=None, alias='CanExecute')
-    can_edit: (bool | None) = Field(default=None, alias='CanEdit')
-
-class TicketEntryCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ticket_category_id: (int | None) = Field(default=None, alias='TicketCategoryId')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_overridden: (bool | None) = Field(default=None, alias='IsOverridden')
-    custom_value: (str | None) = Field(default=None, alias='CustomValue')
-
-class CloseTicketTrigger(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    close_ticket_trigger_type_id: (int | None) = Field(default=None, alias='CloseTicketTriggerTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TimeEntryCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    time_category_id: (int | None) = Field(default=None, alias='TimeCategoryId')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_overridden: (bool | None) = Field(default=None, alias='IsOverridden')
-    custom_value: (str | None) = Field(default=None, alias='CustomValue')
-
-class StopTimerTrigger(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    stop_timer_trigger_type_id: (int | None) = Field(default=None, alias='StopTimerTriggerTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TimeEntryTechnician(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_id: (int | None) = Field(default=None, alias='UserId')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_overridden: (bool | None) = Field(default=None, alias='IsOverridden')
-    custom_value: (str | None) = Field(default=None, alias='CustomValue')
-
-class TicketEntrySettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ticket_subject: (str | None) = Field(default=None, alias='TicketSubject')
-    ticket_requestor: (str | None) = Field(default=None, alias='TicketRequestor')
-    ticket_category: (TicketEntryCategory | None) = Field(default=None, alias='TicketCategory')
-    close_ticket_trigger: (CloseTicketTrigger | None) = Field(default=None, alias='CloseTicketTrigger')
-
-class TimeEntrySettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ticket_id: (str | None) = Field(default=None, alias='TicketId')
-    minutes_to_log: (str | None) = Field(default=None, alias='MinutesToLog')
-    time_category: (TimeEntryCategory | None) = Field(default=None, alias='TimeCategory')
-    stop_timer_trigger: (StopTimerTrigger | None) = Field(default=None, alias='StopTimerTrigger')
-    notes: (str | None) = Field(default=None, alias='Notes')
-    technician: (TimeEntryTechnician | None) = Field(default=None, alias='Technician')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Specialized.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Specialized.py
deleted file mode 100644
index 8675d8211..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/Specialized.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class RemoteCommand(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    remote_command_id: (int | None) = Field(default=None, alias='RemoteCommandId')
-    parameters: (str | None) = Field(default=None, alias='Parameters')
-
-class CreateScriptFromCommandsRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_folder_id: (int | None) = Field(default=None, alias='ScriptFolderId')
-    commands: (list[RemoteCommand] | None) = Field(default=None, alias='Commands')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/__init__.py
deleted file mode 100644
index 9eb7da321..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Scripts/__init__.py
+++ /dev/null
@@ -1,157 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ScheduledScriptOfflineActionFlags(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    skips_offline_agents: (bool | None) = Field(default=None, alias='SkipsOfflineAgents')
-    wakes_offline_agents: (bool | None) = Field(default=None, alias='WakesOfflineAgents')
-    only_runs_on_offline_agents: (bool | None) = Field(default=None, alias='OnlyRunsOnOfflineAgents')
-
-class ScriptState(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    state_id: (int | None) = Field(default=None, alias='StateId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ScriptFolder(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_folder_id: (int | None) = Field(default=None, alias='ScriptFolderId')
-    name: (str | None) = Field(default=None, alias='Name')
-    child_folders: (list[ScriptFolder] | None) = Field(default=None, alias='ChildFolders')
-
-class ScriptTarget(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_target_type_id: (int | None) = Field(default=None, alias='ScriptTargetTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ScriptOptions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_isolated_script: (bool | None) = Field(default=None, alias='IsIsolatedScript')
-    is_maintenance_script: (bool | None) = Field(default=None, alias='IsMaintenanceScript')
-    is_function_script: (bool | None) = Field(default=None, alias='IsFunctionScript')
-    is_offline_script: (bool | None) = Field(default=None, alias='IsOfflineScript')
-    is_system_script: (bool | None) = Field(default=None, alias='IsSystemScript')
-
-class SourceType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    source_type_id: (int | None) = Field(default=None, alias='SourceTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ScriptFunctionTarget(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    target_type_id: (int | None) = Field(default=None, alias='TargetTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ScriptFunctionParameter(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-    type: (str | None) = Field(default=None, alias='Type')
-
-class SubmittableScriptFolder(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_folder_id: (int | None) = Field(default=None, alias='ScriptFolderId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ScriptSummary(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-    folder: (ScriptFolder | None) = Field(default=None, alias='Folder')
-    script_target_type: (ScriptTarget | None) = Field(default=None, alias='ScriptTargetType')
-    script_options: (ScriptOptions | None) = Field(default=None, alias='ScriptOptions')
-    automation_minutes: (int | None) = Field(default=None, alias='AutomationMinutes')
-
-class ScriptSource(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    source_type: (SourceType | None) = Field(default=None, alias='SourceType')
-    name: (str | None) = Field(default=None, alias='Name')
-    alternative_name: (str | None) = Field(default=None, alias='AlternativeName')
-
-class ScriptStep(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    operating_system: (int | None) = Field(default=None, alias='OperatingSystem')
-    is_enabled: (bool | None) = Field(default=None, alias='IsEnabled')
-    should_continue_on_failure: (bool | None) = Field(default=None, alias='ShouldContinueOnFailure')
-    indentation_level: (int | None) = Field(default=None, alias='IndentationLevel')
-    function: (Functions.ScriptFunctionBase | None) = Field(default=None, alias='Function')
-
-class ScriptFunction(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    function_id: (int | None) = Field(default=None, alias='FunctionId')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_conditional_function: (bool | None) = Field(default=None, alias='IsConditionalFunction')
-    description: (str | None) = Field(default=None, alias='Description')
-    target_type: (ScriptFunctionTarget | None) = Field(default=None, alias='TargetType')
-    parameters: (list[ScriptFunctionParameter] | None) = Field(default=None, alias='Parameters')
-
-class Script(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_id: (int | None) = Field(default=None, alias='ScriptId')
-    ticket_entry_settings: (Settings.TicketEntrySettings | None) = Field(default=None, alias='TicketEntrySettings')
-    time_entry_settings: (Settings.TimeEntrySettings | None) = Field(default=None, alias='TimeEntrySettings')
-    user_class_access_settings: (list[Settings.UserClassAccess] | None) = Field(default=None, alias='UserClassAccessSettings')
-    is_protected: (bool | None) = Field(default=None, alias='IsProtected')
-    uses_enhanced_logging: (bool | None) = Field(default=None, alias='UsesEnhancedLogging')
-    steps: (list[ScriptStep] | None) = Field(default=None, alias='Steps')
-    global_variables: (dict[(str, str)] | None) = Field(default=None, alias='GlobalVariables')
-    parameters: (list[str] | None) = Field(default=None, alias='Parameters')
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-    folder: (ScriptFolder | None) = Field(default=None, alias='Folder')
-    script_target_type: (ScriptTarget | None) = Field(default=None, alias='ScriptTargetType')
-    script_options: (ScriptOptions | None) = Field(default=None, alias='ScriptOptions')
-    automation_minutes: (int | None) = Field(default=None, alias='AutomationMinutes')
-
-class ScriptScheduleSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_schedule_frequency: (Frequency.ScriptScheduleFrequency | None) = Field(default=None, alias='ScriptScheduleFrequency')
-    minutely_settings: (Frequency.MinutelyScheduleFrequency | None) = Field(default=None, alias='MinutelySettings')
-    hourly_settings: (Frequency.HourlyScheduleFrequency | None) = Field(default=None, alias='HourlySettings')
-    daily_settings: (Frequency.DailyScheduleFrequency | None) = Field(default=None, alias='DailySettings')
-    weekly_settings: (Frequency.WeeklyScheduleFrequency | None) = Field(default=None, alias='WeeklySettings')
-    monthly_settings: (Frequency.MonthlyScheduleFrequency | None) = Field(default=None, alias='MonthlySettings')
-
-class ScheduledScript(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    scheduled_script_id: (int | None) = Field(default=None, alias='ScheduledScriptId')
-    script: (Script | None) = Field(default=None, alias='Script')
-    schedule_target: (ScheduledScriptTarget | None) = Field(default=None, alias='ScheduleTarget')
-    schedule: (ScriptScheduleSettings | None) = Field(default=None, alias='Schedule')
-    limiting_search: (Searches.Search | None) = Field(default=None, alias='LimitingSearch')
-    offline_action_flags: (ScheduledScriptOfflineActionFlags | None) = Field(default=None, alias='OfflineActionFlags')
-    distribution_window: (ScheduledScripts.DistributionWindow | None) = Field(default=None, alias='DistributionWindow')
-    parameters: (list[String_System.String] | None) = Field(default=None, alias='Parameters')
-    use_agent_time: (bool | None) = Field(default=None, alias='UseAgentTime')
-    scheduled_by: (str | None) = Field(default=None, alias='ScheduledBy')
-    occurrences: (int | None) = Field(default=None, alias='Occurrences')
-    start_date: (datetime | None) = Field(default=None, alias='StartDate')
-    expire_date: (datetime | None) = Field(default=None, alias='ExpireDate')
-    next_run_date: (datetime | None) = Field(default=None, alias='NextRunDate')
-    is_disabled: (bool | None) = Field(default=None, alias='IsDisabled')
-    priority: (int | None) = Field(default=None, alias='Priority')
-    include_sub_groups: (bool | None) = Field(default=None, alias='IncludeSubGroups')
-    is_inherited: (bool | None) = Field(default=None, alias='IsInherited')
-
-class ScheduledScriptTarget(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    schedule_target_type: (ScheduledScripts.ScheduleTargetType | None) = Field(default=None, alias='ScheduleTargetType')
-    group: (Groups.Group | None) = Field(default=None, alias='Group')
-    client: (Clients.Client | None) = Field(default=None, alias='Client')
-    location: (Clients.Location | None) = Field(default=None, alias='Location')
-    computer: (Computers.Computer | None) = Field(default=None, alias='Computer')
-    network_device: (NetworkDevices.NetworkDevice | None) = Field(default=None, alias='NetworkDevice')
-    contact: (Clients.Contact | None) = Field(default=None, alias='Contact')
-
-class ScriptReferences(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    schedule_count: (int | None) = Field(default=None, alias='ScheduleCount')
-    internal_monitors: (list[Monitors.Monitor] | None) = Field(default=None, alias='InternalMonitors')
-    remote_monitors: (list[Monitors.Monitor] | None) = Field(default=None, alias='RemoteMonitors')
-    alert_templates: (list[Alerts.AlertTemplate] | None) = Field(default=None, alias='AlertTemplates')
-from .ScheduledScripts import Frequency
-from .. import Alerts, Clients, Computers, Groups, Monitors, NetworkDevices, Searches
-from . import Functions, Settings, ScheduledScripts
-from ......System.Collections.Generic.KeyValuePair_System import String_System
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Searches.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Searches.py
deleted file mode 100644
index 2c4dcc9e1..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Searches.py
+++ /dev/null
@@ -1,92 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from enum import Enum
-from typing import Any
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class DeleteSearchesBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_ids: (list[int] | None) = Field(default=None, alias='SearchIds')
-
-class DeleteSearchesBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_id: (int | None) = Field(default=None, alias='SearchId')
-    search_name: (str | None) = Field(default=None, alias='SearchName')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class SendToSearchesBatchRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_ids: (list[int] | None) = Field(default=None, alias='SearchIds')
-    folder_id: (int | None) = Field(default=None, alias='FolderId')
-
-class SendToBatchResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_id: (int | None) = Field(default=None, alias='SearchId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class SearchTargetType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_target_type_id: (int | None) = Field(default=None, alias='SearchTargetTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class NodeType(Enum):
-    AND_NODE = 'AndNode'
-    OR_NODE = 'OrNode'
-    COMPARISON_NODE = 'ComparisonNode'
-    ANY_MEETS_NODE = 'AnyMeetsNode'
-    NOT_NODE = 'NotNode'
-
-class Operator(Enum):
-    IS_TRUE = 'IsTrue'
-    IS_FALSE = 'IsFalse'
-    EQUALS = 'Equals'
-    GREATER_THAN = 'GreaterThan'
-    GREATER_THAN_EQUAL = 'GreaterThanEqual'
-    LESS_THAN = 'LessThan'
-    LESS_THAN_EQUAL = 'LessThanEqual'
-    TEXT_LIKE = 'TextLike'
-    NOT_EQUAL = 'NotEqual'
-    NOT_TEXT_LIKE = 'NotTextLike'
-    CONTAINS = 'Contains'
-    NOT_CONTAINS = 'NotContains'
-    IS_ASSIGNED = 'IsAssigned'
-    IS_NOT_ASSIGNED = 'IsNotAssigned'
-    HAS_ROLE = 'HasRole'
-    NOT_HAS_ROLE = 'NotHasRole'
-
-class FilterCriteria(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    left_operand: (str | None) = Field(default=None, alias='LeftOperand')
-    operator: (Operator | None) = Field(default=None, alias='Operator')
-    right_operand: (dict[(str, Any)] | None) = Field(default=None, alias='RightOperand')
-
-class SearchesBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    searches_results: (list[DeleteSearchesBatchResult] | None) = Field(default=None, alias='SearchesResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-
-class SendToSearchesBatchResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_results: (list[SendToBatchResult] | None) = Field(default=None, alias='SearchResults')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
-
-class Search(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_id: (int | None) = Field(default=None, alias='SearchId')
-    name: (str | None) = Field(default=None, alias='Name')
-    search_target_type: (SearchTargetType | None) = Field(default=None, alias='SearchTargetType')
-    search_folder: (Models.SearchFolder | None) = Field(default=None, alias='SearchFolder')
-    update_date: (datetime | None) = Field(default=None, alias='UpdateDate')
-    updated_by: (str | None) = Field(default=None, alias='UpdatedBy')
-    is_read_only: (bool | None) = Field(default=None, alias='IsReadOnly')
-
-class AdvancedSearchFilter(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    node_type: (NodeType | None) = Field(default=None, alias='NodeType')
-    node_name: (str | None) = Field(default=None, alias='NodeName')
-    filter_criterias: (list[FilterCriteria] | None) = Field(default=None, alias='FilterCriterias')
-    child_nodes: (list[AdvancedSearchFilter] | None) = Field(default=None, alias='ChildNodes')
-from . import ResponseResult
-from .....LabTech import Models
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Security.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Security.py
deleted file mode 100644
index d6220eb8d..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Security.py
+++ /dev/null
@@ -1,59 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AuthService(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    service_id: (int | None) = Field(default=None, alias='ServiceId')
-    service_name: (str | None) = Field(default=None, alias='ServiceName')
-    service_uri: (str | None) = Field(default=None, alias='ServiceURI')
-    service_type: (int | None) = Field(default=None, alias='ServiceType')
-    client_id: (str | None) = Field(default=None, alias='ClientId')
-    is_default: (bool | None) = Field(default=None, alias='IsDefault')
-    is_automatic: (bool | None) = Field(default=None, alias='IsAutomatic')
-    service_guid: (str | None) = Field(default=None, alias='ServiceGuid')
-    is_enabled: (bool | None) = Field(default=None, alias='IsEnabled')
-    is_local_login_enabled: (bool | None) = Field(default=None, alias='IsLocalLoginEnabled')
-    authentication_type: (int | None) = Field(default=None, alias='AuthenticationType')
-
-class TokenCredentials(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    username: (str | None) = Field(default=None, alias='Username')
-    password: (str | None) = Field(default=None, alias='Password')
-    two_factor_passcode: (str | None) = Field(default=None, alias='TwoFactorPasscode')
-
-class TokenResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    access_token: (str | None) = Field(default=None, alias='AccessToken')
-    token_type: (str | None) = Field(default=None, alias='TokenType')
-    expiration_date: (datetime | None) = Field(default=None, alias='ExpirationDate')
-    absolute_expiration_date: (datetime | None) = Field(default=None, alias='AbsoluteExpirationDate')
-    user_id: (str | None) = Field(default=None, alias='UserId')
-    internal_user_name: (str | None) = Field(default=None, alias='InternalUserName')
-    is_two_factor_required: (bool | None) = Field(default=None, alias='IsTwoFactorRequired')
-    is_internal_two_factor_required: (bool | None) = Field(default=None, alias='IsInternalTwoFactorRequired')
-    sso_access_token: (str | None) = Field(default=None, alias='SSOAccessToken')
-
-class PkceRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    authorization_code: (str | None) = Field(default=None, alias='AuthorizationCode')
-    code_verifier: (str | None) = Field(default=None, alias='CodeVerifier')
-    client_id: (str | None) = Field(default=None, alias='ClientId')
-    redirect_uri: (str | None) = Field(default=None, alias='RedirectUri')
-
-class DisableTokenRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    security_token: (str | None) = Field(default=None, alias='SecurityToken')
-
-class ImplicitClientUpgradeRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    implicit_token: (str | None) = Field(default=None, alias='ImplicitToken')
-
-class AuthInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    allow_direct: (bool | None) = Field(default=None, alias='AllowDirect')
-    allow_service_registration: (bool | None) = Field(default=None, alias='AllowServiceRegistration')
-    automate_redirect_uri: (str | None) = Field(default=None, alias='AutomateRedirectUri')
-    services: (list[AuthService] | None) = Field(default=None, alias='Services')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SingleSignOn.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SingleSignOn.py
deleted file mode 100644
index 36f78843a..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SingleSignOn.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class RegisterSsoRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    registration_token: (str | None) = Field(default=None, alias='RegistrationToken')
-    enabled_user_folders: (list[int] | None) = Field(default=None, alias='EnabledUserFolders')
-
-class UnregisterSsoRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    client_id: (str | None) = Field(default=None, alias='ClientId')
-
-class LinkToSsoRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    service_identifier: (str | None) = Field(default=None, alias='ServiceIdentifier')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Statistics.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Statistics.py
deleted file mode 100644
index e70228788..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Statistics.py
+++ /dev/null
@@ -1,64 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AgentStatistics(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    total_agents_purchased: (int | None) = Field(default=None, alias='TotalAgentsPurchased')
-    total_agents_deployed: (int | None) = Field(default=None, alias='TotalAgentsDeployed')
-
-class ScriptAutomationTimeResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    successful_scripts: (int | None) = Field(default=None, alias='SuccessfulScripts')
-    automation_time_minutes: (int | None) = Field(default=None, alias='AutomationTimeMinutes')
-    automation_value: (int | None) = Field(default=None, alias='AutomationValue')
-
-class ScriptAutomationTimeUserResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    name: (str | None) = Field(default=None, alias='Name')
-    successful_scripts: (int | None) = Field(default=None, alias='SuccessfulScripts')
-    automation_time_minutes: (int | None) = Field(default=None, alias='AutomationTimeMinutes')
-    automation_value: (int | None) = Field(default=None, alias='AutomationValue')
-
-class GetComputerStatisticsRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    number_of_days: (int | None) = Field(default=None, alias='NumberOfDays')
-    entity_ids: (list[int] | None) = Field(default=None, alias='EntityIds')
-    entity_type: (str | None) = Field(default=None, alias='EntityType')
-
-class GetScriptStatisticsResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_history_count: (int | None) = Field(default=None, alias='ScriptHistoryCount')
-    script_pending_count: (int | None) = Field(default=None, alias='ScriptPendingCount')
-    script_running_count: (int | None) = Field(default=None, alias='ScriptRunningCount')
-    script_failure_count: (int | None) = Field(default=None, alias='ScriptFailureCount')
-    script_success_count: (int | None) = Field(default=None, alias='ScriptSuccessCount')
-
-class GetCommandStatisticsResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    command_pending_count: (int | None) = Field(default=None, alias='CommandPendingCount')
-    command_failure_count: (int | None) = Field(default=None, alias='CommandFailureCount')
-
-class IndividualScriptStatisticsResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    success_count: (int | None) = Field(default=None, alias='SuccessCount')
-    total_run_count: (int | None) = Field(default=None, alias='TotalRunCount')
-    last_run_target: (str | None) = Field(default=None, alias='LastRunTarget')
-    last_run_date: (datetime | None) = Field(default=None, alias='LastRunDate')
-    total_value: (int | None) = Field(default=None, alias='TotalValue')
-    last_history_date_available: (datetime | None) = Field(default=None, alias='LastHistoryDateAvailable')
-    last_run_status: (str | None) = Field(default=None, alias='LastRunStatus')
-
-class ScriptAutomationTimeCategoryResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    total: (ScriptAutomationTimeResult | None) = Field(default=None, alias='Total')
-    system: (ScriptAutomationTimeResult | None) = Field(default=None, alias='System')
-    users: (ScriptAutomationTimeResult | None) = Field(default=None, alias='Users')
-    maximum_history_days_available: (int | None) = Field(default=None, alias='MaximumHistoryDaysAvailable')
-
-class ScriptAutomationTimeUserResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_list: (list[ScriptAutomationTimeUserResult] | None) = Field(default=None, alias='UserList')
-    maximum_history_days_available: (int | None) = Field(default=None, alias='MaximumHistoryDaysAvailable')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/System.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/System.py
deleted file mode 100644
index 99d66c0bf..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/System.py
+++ /dev/null
@@ -1,40 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ClientPermissionsResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    permissions: (list[str] | None) = Field(default=None, alias='Permissions')
-
-class PasswordResetConfigurationResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    can_generate_password_reset_token: (bool | None) = Field(default=None, alias='CanGeneratePasswordResetToken')
-
-class PasswordResetTokenRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    username: (str | None) = Field(default=None, alias='Username')
-    password_reset_token: (str | None) = Field(default=None, alias='PasswordResetToken')
-
-class PasswordResetTokenResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_valid: (bool | None) = Field(default=None, alias='IsValid')
-
-class ValidatePasswordResetRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    password_reset_token: (str | None) = Field(default=None, alias='PasswordResetToken')
-
-class ServerInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    server_id: (int | None) = Field(default=None, alias='ServerId')
-    operating_system: (str | None) = Field(default=None, alias='OperatingSystem')
-    mac_address: (str | None) = Field(default=None, alias='MacAddress')
-    machine_name: (str | None) = Field(default=None, alias='MachineName')
-    cpu_name: (str | None) = Field(default=None, alias='CPUName')
-    cpu_sockets: (int | None) = Field(default=None, alias='CPUSockets')
-    cpu_cores: (int | None) = Field(default=None, alias='CPUCores')
-    logical_processors: (int | None) = Field(default=None, alias='LogicalProcessors')
-    memory_total: (int | None) = Field(default=None, alias='MemoryTotal')
-    is_database_server: (bool | None) = Field(default=None, alias='IsDatabaseServer')
-    is_web_server: (bool | None) = Field(default=None, alias='IsWebServer')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SystemExtensions/Binary.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SystemExtensions/Binary.py
deleted file mode 100644
index 7c015f8c3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SystemExtensions/Binary.py
+++ /dev/null
@@ -1,47 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class RunStyle(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    run_style_id: (int | None) = Field(default=None, alias='RunStyleId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class BinaryExtensionPermission(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extension_permission_id: (int | None) = Field(default=None, alias='ExtensionPermissionId')
-    extension_guid: (UUID | None) = Field(default=None, alias='ExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    extension_name: (str | None) = Field(default=None, alias='ExtensionName')
-    permission_id: (int | None) = Field(default=None, alias='PermissionId')
-    permission_name: (str | None) = Field(default=None, alias='PermissionName')
-
-class UserBinaryExtensionPermission(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    has_permission: (bool | None) = Field(default=None, alias='HasPermission')
-    extension_permission_id: (int | None) = Field(default=None, alias='ExtensionPermissionId')
-    extension_guid: (UUID | None) = Field(default=None, alias='ExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    extension_name: (str | None) = Field(default=None, alias='ExtensionName')
-    permission_id: (int | None) = Field(default=None, alias='PermissionId')
-    permission_name: (str | None) = Field(default=None, alias='PermissionName')
-
-class BinaryExtension(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    category: (str | None) = Field(default=None, alias='Category')
-    description: (str | None) = Field(default=None, alias='Description')
-    file_data: (str | None) = Field(default=None, alias='FileData')
-    is_enabled: (bool | None) = Field(default=None, alias='IsEnabled')
-    is_loaded_in_automation_server: (bool | None) = Field(default=None, alias='IsLoadedInAutomationServer')
-    is_loaded_in_iis: (bool | None) = Field(default=None, alias='IsLoadedInIIS')
-    is_remote_agent_extension: (bool | None) = Field(default=None, alias='IsRemoteAgentExtension')
-    release_date: (datetime | None) = Field(default=None, alias='ReleaseDate')
-    run_style: (RunStyle | None) = Field(default=None, alias='RunStyle')
-    author: (str | None) = Field(default=None, alias='Author')
-    file_checksum: (str | None) = Field(default=None, alias='FileChecksum')
-    file_name: (str | None) = Field(default=None, alias='FileName')
-    extension_name: (str | None) = Field(default=None, alias='ExtensionName')
-    extension_guid: (UUID | None) = Field(default=None, alias='ExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    extension_id: (int | None) = Field(default=None, alias='ExtensionId')
-    version: (str | None) = Field(default=None, alias='Version')
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SystemExtensions/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SystemExtensions/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/SystemExtensions/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Ticketing.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Ticketing.py
deleted file mode 100644
index e9c7b6c14..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Ticketing.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class TicketCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    category_id: (int | None) = Field(default=None, alias='CategoryId')
-    category_name: (str | None) = Field(default=None, alias='CategoryName')
-
-class TicketLevel(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ticket_level_id: (int | None) = Field(default=None, alias='TicketLevelId')
-    name: (str | None) = Field(default=None, alias='Name')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Users.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Users.py
deleted file mode 100644
index cc415e5a3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Users.py
+++ /dev/null
@@ -1,193 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class UserClassUserPermissions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    super_admin: (bool | None) = Field(default=None, alias='SuperAdmin')
-    system_config: (bool | None) = Field(default=None, alias='SystemConfig')
-    class_config: (bool | None) = Field(default=None, alias='ClassConfig')
-    create_tickets: (bool | None) = Field(default=None, alias='CreateTickets')
-    shared_links: (bool | None) = Field(default=None, alias='SharedLinks')
-    template_read: (bool | None) = Field(default=None, alias='TemplateRead')
-    template_edit: (bool | None) = Field(default=None, alias='TemplateEdit')
-    template_delete: (bool | None) = Field(default=None, alias='TemplateDelete')
-    client_read: (bool | None) = Field(default=None, alias='ClientRead')
-    client_edit: (bool | None) = Field(default=None, alias='ClientEdit')
-    client_delete: (bool | None) = Field(default=None, alias='ClientDelete')
-    report_read: (bool | None) = Field(default=None, alias='ReportRead')
-    report_edit: (bool | None) = Field(default=None, alias='ReportEdit')
-    report_delete: (bool | None) = Field(default=None, alias='ReportDelete')
-    contact_read: (bool | None) = Field(default=None, alias='ContactRead')
-    contact_edit: (bool | None) = Field(default=None, alias='ContactEdit')
-    contact_delete: (bool | None) = Field(default=None, alias='ContactDelete')
-    user_read: (bool | None) = Field(default=None, alias='UserRead')
-    user_edit: (bool | None) = Field(default=None, alias='UserEdit')
-    user_delete: (bool | None) = Field(default=None, alias='UserDelete')
-    tool_read: (bool | None) = Field(default=None, alias='ToolRead')
-    tool_edit: (bool | None) = Field(default=None, alias='ToolEdit')
-    tool_delete: (bool | None) = Field(default=None, alias='ToolDelete')
-    script_read: (bool | None) = Field(default=None, alias='ScriptRead')
-    script_edit: (bool | None) = Field(default=None, alias='ScriptEdit')
-    script_delete: (bool | None) = Field(default=None, alias='ScriptDelete')
-    manage_groups: (bool | None) = Field(default=None, alias='ManageGroups')
-    dash_ticketing: (bool | None) = Field(default=None, alias='DashTicketing')
-    dash_time: (bool | None) = Field(default=None, alias='DashTime')
-    dash_manage: (bool | None) = Field(default=None, alias='DashManage')
-    dash_trending: (bool | None) = Field(default=None, alias='DashTrending')
-    dash_overview: (bool | None) = Field(default=None, alias='DashOverview')
-    hud_update: (bool | None) = Field(default=None, alias='HUDUpdate')
-    hud_show_all: (bool | None) = Field(default=None, alias='HUDShowAll')
-    data_view_update: (bool | None) = Field(default=None, alias='DataViewUpdate')
-    data_view_delete: (bool | None) = Field(default=None, alias='DataViewDelete')
-    data_view_show_all: (bool | None) = Field(default=None, alias='DataViewShowAll')
-    users_show_all: (bool | None) = Field(default=None, alias='UsersShowAll')
-    user_class_create: (bool | None) = Field(default=None, alias='UserClassCreate')
-    user_class_update: (bool | None) = Field(default=None, alias='UserClassUpdate')
-    patch_manager_config: (bool | None) = Field(default=None, alias='PatchManagerConfig')
-    reports_create: (bool | None) = Field(default=None, alias='ReportsCreate')
-    probe_template_execute: (bool | None) = Field(default=None, alias='ProbeTemplateExecute')
-    scheduled_scripts_update: (bool | None) = Field(default=None, alias='ScheduledScriptsUpdate')
-    clients_show_all: (bool | None) = Field(default=None, alias='ClientsShowAll')
-    show_passwords: (bool | None) = Field(default=None, alias='ShowPasswords')
-    locations_show_all: (bool | None) = Field(default=None, alias='LocationsShowAll')
-    computers_create: (bool | None) = Field(default=None, alias='ComputersCreate')
-    computers_update: (bool | None) = Field(default=None, alias='ComputersUpdate')
-    computers_delete: (bool | None) = Field(default=None, alias='ComputersDelete')
-    computers_show_all: (bool | None) = Field(default=None, alias='ComputersShowAll')
-    computers_force_update: (bool | None) = Field(default=None, alias='ComputersForceUpdate')
-    network_device_update: (bool | None) = Field(default=None, alias='NetworkDeviceUpdate')
-    network_device_delete: (bool | None) = Field(default=None, alias='NetworkDeviceDelete')
-    network_device_show_all: (bool | None) = Field(default=None, alias='NetworkDeviceShowAll')
-    retired_assets_delete: (bool | None) = Field(default=None, alias='RetiredAssetsDelete')
-    groups_create: (bool | None) = Field(default=None, alias='GroupsCreate')
-    groups_delete: (bool | None) = Field(default=None, alias='GroupsDelete')
-    groups_show_all: (bool | None) = Field(default=None, alias='GroupsShowAll')
-    groups_schedule_script: (bool | None) = Field(default=None, alias='GroupsScheduleScript')
-    group_monitors_update: (bool | None) = Field(default=None, alias='GroupMonitorsUpdate')
-    group_info_update: (bool | None) = Field(default=None, alias='GroupInfoUpdate')
-    group_managed_services: (bool | None) = Field(default=None, alias='GroupManagedServices')
-    remote_monitors_create: (bool | None) = Field(default=None, alias='RemoteMonitorsCreate')
-    remote_monitors_delete: (bool | None) = Field(default=None, alias='RemoteMonitorsDelete')
-    internal_monitors_create: (bool | None) = Field(default=None, alias='InternalMonitorsCreate')
-    internal_monitors_update: (bool | None) = Field(default=None, alias='InternalMonitorsUpdate')
-    internal_monitors_delete: (bool | None) = Field(default=None, alias='InternalMonitorsDelete')
-    alerts_update: (bool | None) = Field(default=None, alias='AlertsUpdate')
-    alerts_delete_all: (bool | None) = Field(default=None, alias='AlertsDeleteAll')
-    tickets_read: (bool | None) = Field(default=None, alias='TicketsRead')
-    tickets_update: (bool | None) = Field(default=None, alias='TicketsUpdate')
-    tickets_delete: (bool | None) = Field(default=None, alias='TicketsDelete')
-    tickets_request: (bool | None) = Field(default=None, alias='TicketsRequest')
-    searches_read: (bool | None) = Field(default=None, alias='SearchesRead')
-    searches_update: (bool | None) = Field(default=None, alias='SearchesUpdate')
-    searches_delete: (bool | None) = Field(default=None, alias='SearchesDelete')
-    patch_manager_read: (bool | None) = Field(default=None, alias='PatchManagerRead')
-    patch_manager_update: (bool | None) = Field(default=None, alias='PatchManagerUpdate')
-    language_pack_editor: (bool | None) = Field(default=None, alias='LanguagePackEditor')
-    managed_service_catalog: (bool | None) = Field(default=None, alias='ManagedServiceCatalog')
-    navigation_menu_update: (bool | None) = Field(default=None, alias='NavigationMenuUpdate')
-    rss_feed_read: (bool | None) = Field(default=None, alias='RSSFeedRead')
-    rss_feed_update: (bool | None) = Field(default=None, alias='RSSFeedUpdate')
-    links_delete: (bool | None) = Field(default=None, alias='LinksDelete')
-    plugin_manager: (bool | None) = Field(default=None, alias='PluginManager')
-    solution_center: (bool | None) = Field(default=None, alias='SolutionCenter')
-    database_execute: (bool | None) = Field(default=None, alias='DatabaseExecute')
-    server_status: (bool | None) = Field(default=None, alias='ServerStatus')
-    manage_audits: (bool | None) = Field(default=None, alias='ManageAudits')
-    manage_remote_commands: (bool | None) = Field(default=None, alias='ManageRemoteCommands')
-    manage_service_logs: (bool | None) = Field(default=None, alias='ManageServiceLogs')
-    manage_outdated: (bool | None) = Field(default=None, alias='ManageOutdated')
-    manage_offline_computers: (bool | None) = Field(default=None, alias='ManageOfflineComputers')
-    manage_schedule_client_scripts: (bool | None) = Field(default=None, alias='ManageScheduleClientScripts')
-    dashboard_config: (bool | None) = Field(default=None, alias='DashboardConfig')
-    config_application_list: (bool | None) = Field(default=None, alias='ConfigApplicationList')
-    config_event_black_list: (bool | None) = Field(default=None, alias='ConfigEventBlackList')
-    quick_connect: (bool | None) = Field(default=None, alias='QuickConnect')
-    permissions_update: (bool | None) = Field(default=None, alias='PermissionsUpdate')
-    user_class_read: (bool | None) = Field(default=None, alias='UserClassRead')
-    user_class_delete: (bool | None) = Field(default=None, alias='UserClassDelete')
-
-class ChangePasswordRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    old_password: (str | None) = Field(default=None, alias='OldPassword')
-    new_password: (str | None) = Field(default=None, alias='NewPassword')
-
-class UserPasswordResetRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    username: (str | None) = Field(default=None, alias='Username')
-    password_reset_token: (str | None) = Field(default=None, alias='PasswordResetToken')
-    new_password: (str | None) = Field(default=None, alias='NewPassword')
-
-class UserAvatar(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    file_data: (str | None) = Field(default=None, alias='FileData')
-
-class UserFolder(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_folder_id: (int | None) = Field(default=None, alias='UserFolderId')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_sso_enabled: (bool | None) = Field(default=None, alias='IsSsoEnabled')
-
-class UserSingleSignOnStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    sso_status_id: (int | None) = Field(default=None, alias='SsoStatusId')
-    status_name: (str | None) = Field(default=None, alias='StatusName')
-
-class UserLockoutInfo(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_name: (str | None) = Field(default=None, alias='UserName')
-    user_id: (int | None) = Field(default=None, alias='UserId')
-    last_ip_address: (str | None) = Field(default=None, alias='LastIPAddress')
-    is_locked: (bool | None) = Field(default=None, alias='IsLocked')
-    failed_login_count: (int | None) = Field(default=None, alias='FailedLoginCount')
-    last_fail_date_utc: (datetime | None) = Field(default=None, alias='LastFailDateUtc')
-    lock_out_expiration_date_utc: (datetime | None) = Field(default=None, alias='LockOutExpirationDateUtc')
-
-class UserClass(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_class_id: (int | None) = Field(default=None, alias='UserClassId')
-    name: (str | None) = Field(default=None, alias='Name')
-    permissions: (UserClassUserPermissions | None) = Field(default=None, alias='Permissions')
-    binary_extension_permissions: (list[Binary.BinaryExtensionPermission] | None) = Field(default=None, alias='BinaryExtensionPermissions')
-    web_extension_claims: (list[WebExtensions.WebExtensionPermission] | None) = Field(default=None, alias='WebExtensionClaims')
-
-class UserAccess(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_id: (int | None) = Field(default=None, alias='UserId')
-    user_permissions: (list[str] | None) = Field(default=None, alias='UserPermissions')
-    plugin_permissions: (list[Binary.UserBinaryExtensionPermission] | None) = Field(default=None, alias='PluginPermissions')
-    web_extension_claims: (list[WebExtensions.UserExtensionClaimType] | None) = Field(default=None, alias='WebExtensionClaims')
-
-class User(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_id: (int | None) = Field(default=None, alias='UserId')
-    name: (str | None) = Field(default=None, alias='Name')
-    first_name: (str | None) = Field(default=None, alias='FirstName')
-    last_name: (str | None) = Field(default=None, alias='LastName')
-    last_successful_login: (datetime | None) = Field(default=None, alias='LastSuccessfulLogin')
-    password: (str | None) = Field(default=None, alias='Password')
-    folder: (UserFolder | None) = Field(default=None, alias='Folder')
-    email_address: (str | None) = Field(default=None, alias='EmailAddress')
-    auditing_level: (int | None) = Field(default=None, alias='AuditingLevel')
-    command_level: (int | None) = Field(default=None, alias='CommandLevel')
-    uses_ticket_based_security: (bool | None) = Field(default=None, alias='UsesTicketBasedSecurity')
-    new_ticket_display_limit: (int | None) = Field(default=None, alias='NewTicketDisplayLimit')
-    open_ticket_limit: (int | None) = Field(default=None, alias='OpenTicketLimit')
-    is_integrator: (bool | None) = Field(default=None, alias='IsIntegrator')
-    is_locked: (bool | None) = Field(default=None, alias='IsLocked')
-    is_ticket_router: (bool | None) = Field(default=None, alias='IsTicketRouter')
-    is_ticket_supervisor: (bool | None) = Field(default=None, alias='IsTicketSupervisor')
-    ticket_level: (Ticketing.TicketLevel | None) = Field(default=None, alias='TicketLevel')
-    requires_login_report: (bool | None) = Field(default=None, alias='RequiresLoginReport')
-    requires_logout_report: (bool | None) = Field(default=None, alias='RequiresLogoutReport')
-    last_updated: (datetime | None) = Field(default=None, alias='LastUpdated')
-    primary_clients: (list[Clients.Client] | None) = Field(default=None, alias='PrimaryClients')
-    user_classes: (list[UserClass] | None) = Field(default=None, alias='UserClasses')
-    associated_groups: (list[Groups.Group] | None) = Field(default=None, alias='AssociatedGroups')
-    sso_status: (UserSingleSignOnStatus | None) = Field(default=None, alias='SsoStatus')
-    sso_email: (str | None) = Field(default=None, alias='SsoEmail')
-    allow_legacy_api_access: (bool | None) = Field(default=None, alias='AllowLegacyApiAccess')
-from .SystemExtensions import Binary
-from . import Clients, Groups, Ticketing, WebExtensions
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/WebExtensions.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/WebExtensions.py
deleted file mode 100644
index d1fbef76c..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/WebExtensions.py
+++ /dev/null
@@ -1,185 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class SessionViewerUser(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    permissions: (str | None) = Field(default=None, alias='Permissions')
-
-class WebExtensionPermission(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_extension_permission_id: (int | None) = Field(default=None, alias='WebExtensionPermissionId')
-    web_extension_id: (int | None) = Field(default=None, alias='WebExtensionId')
-    permission_key: (str | None) = Field(default=None, alias='PermissionKey')
-    permission_name: (str | None) = Field(default=None, alias='PermissionName')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class UserExtensionClaimType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    has_claim: (bool | None) = Field(default=None, alias='HasClaim')
-    extension_claim_type_id: (int | None) = Field(default=None, alias='ExtensionClaimTypeId')
-    web_extension_id: (int | None) = Field(default=None, alias='WebExtensionId')
-    display_name: (str | None) = Field(default=None, alias='DisplayName')
-    claim_key: (str | None) = Field(default=None, alias='ClaimKey')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class WebExtensionArea(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_extension_area_id: (int | None) = Field(default=None, alias='WebExtensionAreaId')
-    web_extension_area_name: (str | None) = Field(default=None, alias='WebExtensionAreaName')
-    web_extension_screen_id: (int | None) = Field(default=None, alias='WebExtensionScreenId')
-
-class ExtensionClaimType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extension_claim_type_id: (int | None) = Field(default=None, alias='ExtensionClaimTypeId')
-    web_extension_id: (int | None) = Field(default=None, alias='WebExtensionId')
-    display_name: (str | None) = Field(default=None, alias='DisplayName')
-    claim_key: (str | None) = Field(default=None, alias='ClaimKey')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class WebExtensionTileSize(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    tile_size_id: (int | None) = Field(default=None, alias='TileSizeId')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class WebExtensionUrlOpenType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    url_open_type_id: (int | None) = Field(default=None, alias='UrlOpenTypeId')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class ExtensionSolution(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extension_solution_id: (int | None) = Field(default=None, alias='ExtensionSolutionId')
-    solution_guid: (UUID | None) = Field(default=None, alias='SolutionGuid', example='00000000-0000-0000-0000-000000000000')
-    solution_name: (str | None) = Field(default=None, alias='SolutionName')
-    is_installed: (bool | None) = Field(default=None, alias='IsInstalled')
-    installed_version: (str | None) = Field(default=None, alias='InstalledVersion')
-    latest_version: (str | None) = Field(default=None, alias='LatestVersion')
-
-class ExtensionStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extension_status_id: (int | None) = Field(default=None, alias='ExtensionStatusId')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class SessionViewerSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    domain: (str | None) = Field(default=None, alias='Domain')
-    port: (int | None) = Field(default=None, alias='Port')
-    api_token: (str | None) = Field(default=None, alias='ApiToken')
-    instance_id: (str | None) = Field(default=None, alias='InstanceId')
-    extension_id: (str | None) = Field(default=None, alias='ExtensionId')
-    enable_wcc_element: (bool | None) = Field(default=None, alias='EnableWccElement')
-    user: (SessionViewerUser | None) = Field(default=None, alias='User')
-
-class WebExtensionTile(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    tile_guid: (UUID | None) = Field(default=None, alias='TileGuid', example='00000000-0000-0000-0000-000000000000')
-    normal_tile_source_url: (str | None) = Field(default=None, alias='NormalTileSourceUrl')
-    normal_tile_header_url: (str | None) = Field(default=None, alias='NormalTileHeaderUrl')
-    max_tile_source_url: (str | None) = Field(default=None, alias='MaxTileSourceUrl')
-    tile_title: (str | None) = Field(default=None, alias='TileTitle')
-    tile_size: (WebExtensionTileSize | None) = Field(default=None, alias='TileSize')
-    web_extension_control_id: (int | None) = Field(default=None, alias='WebExtensionControlId')
-    web_extension_control_name: (str | None) = Field(default=None, alias='WebExtensionControlName')
-    web_extension_guid: (UUID | None) = Field(default=None, alias='WebExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    extension_claim_type: (ExtensionClaimType | None) = Field(default=None, alias='ExtensionClaimType')
-    is_core_extension: (bool | None) = Field(default=None, alias='IsCoreExtension')
-    web_extension_area_control_type_ids: (list[int] | None) = Field(default=None, alias='WebExtensionAreaControlTypeIds')
-
-class WebExtensionRedirect(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    redirect_guid: (UUID | None) = Field(default=None, alias='RedirectGuid', example='00000000-0000-0000-0000-000000000000')
-    source_url: (str | None) = Field(default=None, alias='SourceUrl')
-    web_extension_control_id: (int | None) = Field(default=None, alias='WebExtensionControlId')
-    web_extension_control_name: (str | None) = Field(default=None, alias='WebExtensionControlName')
-    web_extension_guid: (UUID | None) = Field(default=None, alias='WebExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    extension_claim_type: (ExtensionClaimType | None) = Field(default=None, alias='ExtensionClaimType')
-    is_core_extension: (bool | None) = Field(default=None, alias='IsCoreExtension')
-    web_extension_area_control_type_ids: (list[int] | None) = Field(default=None, alias='WebExtensionAreaControlTypeIds')
-
-class WebExtensionInlineFrame(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    inline_frame_guid: (UUID | None) = Field(default=None, alias='InlineFrameGuid', example='00000000-0000-0000-0000-000000000000')
-    source_url: (str | None) = Field(default=None, alias='SourceUrl')
-    web_extension_control_id: (int | None) = Field(default=None, alias='WebExtensionControlId')
-    web_extension_control_name: (str | None) = Field(default=None, alias='WebExtensionControlName')
-    web_extension_guid: (UUID | None) = Field(default=None, alias='WebExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    extension_claim_type: (ExtensionClaimType | None) = Field(default=None, alias='ExtensionClaimType')
-    is_core_extension: (bool | None) = Field(default=None, alias='IsCoreExtension')
-    web_extension_area_control_type_ids: (list[int] | None) = Field(default=None, alias='WebExtensionAreaControlTypeIds')
-
-class WebExtensionClickAction(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    click_action_id: (int | None) = Field(default=None, alias='ClickActionId')
-    url: (str | None) = Field(default=None, alias='Url')
-    url_open_type: (WebExtensionUrlOpenType | None) = Field(default=None, alias='UrlOpenType')
-
-class WebExtensionMenuItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_extension_menu_item_id: (int | None) = Field(default=None, alias='WebExtensionMenuItemId')
-    web_extension_menu_item_parent_id: (int | None) = Field(default=None, alias='WebExtensionMenuItemParentId')
-    menu_text: (str | None) = Field(default=None, alias='MenuText')
-    click_action: (WebExtensionClickAction | None) = Field(default=None, alias='ClickAction')
-    menu_items: (list[WebExtensionMenuItem] | None) = Field(default=None, alias='MenuItems')
-
-class WebExtensionClickButton(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    icon_url: (str | None) = Field(default=None, alias='IconUrl')
-    button_text: (str | None) = Field(default=None, alias='ButtonText')
-    click_action: (WebExtensionClickAction | None) = Field(default=None, alias='ClickAction')
-    allows_multi_select: (bool | None) = Field(default=None, alias='AllowsMultiSelect')
-    web_extension_control_id: (int | None) = Field(default=None, alias='WebExtensionControlId')
-    web_extension_control_name: (str | None) = Field(default=None, alias='WebExtensionControlName')
-    web_extension_guid: (UUID | None) = Field(default=None, alias='WebExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    extension_claim_type: (ExtensionClaimType | None) = Field(default=None, alias='ExtensionClaimType')
-    is_core_extension: (bool | None) = Field(default=None, alias='IsCoreExtension')
-    web_extension_area_control_type_ids: (list[int] | None) = Field(default=None, alias='WebExtensionAreaControlTypeIds')
-
-class WebExtensionMenuButton(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    icon_url: (str | None) = Field(default=None, alias='IconUrl')
-    button_text: (str | None) = Field(default=None, alias='ButtonText')
-    menu_items: (list[WebExtensionMenuItem] | None) = Field(default=None, alias='MenuItems')
-    allows_multi_select: (bool | None) = Field(default=None, alias='AllowsMultiSelect')
-    web_extension_control_id: (int | None) = Field(default=None, alias='WebExtensionControlId')
-    web_extension_control_name: (str | None) = Field(default=None, alias='WebExtensionControlName')
-    web_extension_guid: (UUID | None) = Field(default=None, alias='WebExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    extension_claim_type: (ExtensionClaimType | None) = Field(default=None, alias='ExtensionClaimType')
-    is_core_extension: (bool | None) = Field(default=None, alias='IsCoreExtension')
-    web_extension_area_control_type_ids: (list[int] | None) = Field(default=None, alias='WebExtensionAreaControlTypeIds')
-
-class WebExtension(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_extension_id: (int | None) = Field(default=None, alias='WebExtensionId')
-    extension_solution: (ExtensionSolution | None) = Field(default=None, alias='ExtensionSolution')
-    extension_status: (ExtensionStatus | None) = Field(default=None, alias='ExtensionStatus')
-    web_extension_guid: (UUID | None) = Field(default=None, alias='WebExtensionGuid', example='00000000-0000-0000-0000-000000000000')
-    web_extension_name: (str | None) = Field(default=None, alias='WebExtensionName')
-    author: (str | None) = Field(default=None, alias='Author')
-    description: (str | None) = Field(default=None, alias='Description')
-    version: (str | None) = Field(default=None, alias='Version')
-    file_url: (str | None) = Field(default=None, alias='FileUrl')
-    filename: (str | None) = Field(default=None, alias='Filename')
-    file_check_sum: (str | None) = Field(default=None, alias='FileCheckSum')
-    has_static_files: (bool | None) = Field(default=None, alias='HasStaticFiles')
-    has_graph_files: (bool | None) = Field(default=None, alias='HasGraphFiles')
-    is_core_extension: (bool | None) = Field(default=None, alias='IsCoreExtension')
-    extension_claim_types: (list[ExtensionClaimType] | None) = Field(default=None, alias='ExtensionClaimTypes')
-    redirects: (list[WebExtensionRedirect] | None) = Field(default=None, alias='Redirects')
-    tiles: (list[WebExtensionTile] | None) = Field(default=None, alias='Tiles')
-    inline_frames: (list[WebExtensionInlineFrame] | None) = Field(default=None, alias='InlineFrames')
-    menu_buttons: (list[WebExtensionMenuButton] | None) = Field(default=None, alias='MenuButtons')
-    click_buttons: (list[WebExtensionClickButton] | None) = Field(default=None, alias='ClickButtons')
-
-class WebExtensionAreaControls(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_extension_area: (WebExtensionArea | None) = Field(default=None, alias='WebExtensionArea')
-    click_buttons: (list[WebExtensionClickButton] | None) = Field(default=None, alias='ClickButtons')
-    menu_buttons: (list[WebExtensionMenuButton] | None) = Field(default=None, alias='MenuButtons')
-    tiles: (list[WebExtensionTile] | None) = Field(default=None, alias='Tiles')
-    redirects: (list[WebExtensionRedirect] | None) = Field(default=None, alias='Redirects')
-    inline_frames: (list[WebExtensionInlineFrame] | None) = Field(default=None, alias='InlineFrames')
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Workflows.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Workflows.py
deleted file mode 100644
index 5595d72b6..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/Workflows.py
+++ /dev/null
@@ -1,30 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class WorkflowStep(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    workflow_step_id: (int | None) = Field(default=None, alias='WorkflowStepId')
-    description: (str | None) = Field(default=None, alias='Description')
-    is_required: (bool | None) = Field(default=None, alias='IsRequired')
-    prerequisite_id: (int | None) = Field(default=None, alias='PrerequisiteId')
-
-class WorkflowStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    workflow_status_id: (int | None) = Field(default=None, alias='WorkflowStatusId')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class WorkflowMetadata(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    system_workflow_progress_metadata_id: (int | None) = Field(default=None, alias='SystemWorkflowProgressMetadataId')
-    metadata_key: (str | None) = Field(default=None, alias='MetadataKey')
-    metadata_value: (str | None) = Field(default=None, alias='MetadataValue')
-
-class SystemWorkflowProgressEntry(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    system_workflow_progress_id: (int | None) = Field(default=None, alias='SystemWorkflowProgressId')
-    description: (str | None) = Field(default=None, alias='Description')
-    workflow_step: (WorkflowStep | None) = Field(default=None, alias='WorkflowStep')
-    workflow_status: (WorkflowStatus | None) = Field(default=None, alias='WorkflowStatus')
-    workflow_metadata: (list[WorkflowMetadata] | None) = Field(default=None, alias='WorkflowMetadata')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/__init__.py
deleted file mode 100644
index d3a113af0..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Contracts/__init__.py
+++ /dev/null
@@ -1,79 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AccountInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_trial_account: (bool | None) = Field(default=None, alias='IsTrialAccount')
-
-class ResponseResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    result_status: (int | None) = Field(default=None, alias='ResultStatus')
-    reason_code: (int | None) = Field(default=None, alias='ReasonCode')
-    message: (str | None) = Field(default=None, alias='Message')
-
-class CommandPromptCommand(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    run_as_admin: (bool | None) = Field(default=None, alias='RunAsAdmin')
-    use_power_shell: (bool | None) = Field(default=None, alias='UsePowerShell')
-    command_text: (str | None) = Field(default=None, alias='CommandText')
-    directory: (str | None) = Field(default=None, alias='Directory')
-
-class DatabaseInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    database_id: (int | None) = Field(default=None, alias='DatabaseId')
-    database_version: (str | None) = Field(default=None, alias='DatabaseVersion')
-    uptime: (str | None) = Field(default=None, alias='Uptime')
-    current_connections: (int | None) = Field(default=None, alias='CurrentConnections')
-    max_connections: (int | None) = Field(default=None, alias='MaxConnections')
-    peak_connections: (int | None) = Field(default=None, alias='PeakConnections')
-    running_queries: (int | None) = Field(default=None, alias='RunningQueries')
-    last_backup_file_path: (str | None) = Field(default=None, alias='LastBackupFilePath')
-    last_backup_date: (datetime | None) = Field(default=None, alias='LastBackupDate')
-    last_backup_size: (str | None) = Field(default=None, alias='LastBackupSize')
-    last_backup_status: (int | None) = Field(default=None, alias='LastBackupStatus')
-
-class ExecuteDeviceScriptRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_id: (int | None) = Field(default=None, alias='ScriptId')
-    parameter_list: (list[str] | None) = Field(default=None, alias='ParameterList')
-    device_id_list: (list[int] | None) = Field(default=None, alias='DeviceIdList')
-
-class ExecuteDeviceScriptResult(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    device_id: (int | None) = Field(default=None, alias='DeviceId')
-    result_details: (ResponseResult | None) = Field(default=None, alias='ResultDetails')
-
-class ProbeRemoteCommand(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class ProbeCommandStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ProbeCommandHistoryEntry(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_command_history_id: (int | None) = Field(default=None, alias='ProbeCommandHistoryId')
-    probe_id: (int | None) = Field(default=None, alias='ProbeId')
-    date_executed: (datetime | None) = Field(default=None, alias='DateExecuted')
-    status: (ProbeCommandStatus | None) = Field(default=None, alias='Status')
-    probe_remote_command: (ProbeRemoteCommand | None) = Field(default=None, alias='ProbeRemoteCommand')
-    output: (str | None) = Field(default=None, alias='Output')
-    user: (str | None) = Field(default=None, alias='User')
-    date_finished: (datetime | None) = Field(default=None, alias='DateFinished')
-
-class InstallerRequest(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    location_id: (int | None) = Field(default=None, alias='LocationId')
-    installer_type: (int | None) = Field(default=None, alias='InstallerType')
-
-class ExecuteDeviceScriptResponse(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_result_list: (list[ExecuteDeviceScriptResult] | None) = Field(default=None, alias='ScriptResultList')
-    contains_unsuccessful_results: (bool | None) = Field(default=None, alias='ContainsUnsuccessfulResults')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/ExternalContracts/ConnectWiseSso.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/ExternalContracts/ConnectWiseSso.py
deleted file mode 100644
index c9fcc49fc..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/ExternalContracts/ConnectWiseSso.py
+++ /dev/null
@@ -1,18 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class SsoUser(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    partner_id: (str | None) = Field(default=None, alias='PartnerId')
-    id: (str | None) = Field(default=None, alias='Id')
-    user_name: (str | None) = Field(default=None, alias='UserName')
-    email: (str | None) = Field(default=None, alias='Email')
-    first_name: (str | None) = Field(default=None, alias='FirstName')
-    last_name: (str | None) = Field(default=None, alias='LastName')
-    login_scheme: (str | None) = Field(default=None, alias='LoginScheme')
-    email_confirmed: (bool | None) = Field(default=None, alias='EmailConfirmed')
-    is_disabled: (bool | None) = Field(default=None, alias='IsDisabled')
-    created: (int | None) = Field(default=None, alias='Created')
-    updated: (int | None) = Field(default=None, alias='Updated')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/ExternalContracts/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/ExternalContracts/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/ExternalContracts/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Models/Searches.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Models/Searches.py
deleted file mode 100644
index 0332ffe4e..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Models/Searches.py
+++ /dev/null
@@ -1,63 +0,0 @@
-
-from __future__ import annotations
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class DataType(Enum):
-    TYPE_BOOLEAN = 'TypeBoolean'
-    TYPE_NUMBER = 'TypeNumber'
-    TYPE_TEXT = 'TypeText'
-    TYPE_VERSION = 'TypeVersion'
-    TYPE_DATE = 'TypeDate'
-    TYPE_ASSIGNED = 'TypeAssigned'
-    TYPE_EQUALITY = 'TypeEquality'
-    TYPE_ROLE = 'TypeRole'
-
-class DataLookUpType(Enum):
-    NONE = 'None'
-    STATIC = 'Static'
-    DYNAMIC = 'Dynamic'
-
-class SearchValueLookUp(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class AdvancedSearchDataLookup(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class SearchAttributes(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    key: (str | None) = Field(default=None, alias='Key')
-    text: (str | None) = Field(default=None, alias='Text')
-    description: (str | None) = Field(default=None, alias='Description')
-    data_type: (DataType | None) = Field(default=None, alias='DataType')
-    data_look_up_type: (DataLookUpType | None) = Field(default=None, alias='DataLookUpType')
-    data_lookup: (list[SearchValueLookUp] | None) = Field(default=None, alias='DataLookup')
-    collection_node: (str | None) = Field(default=None, alias='CollectionNode')
-
-class AdvancedSearchDynamicLookup(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_key: (str | None) = Field(default=None, alias='SearchKey')
-    advanced_search_data_lookups: (list[AdvancedSearchDataLookup] | None) = Field(default=None, alias='AdvancedSearchDataLookups')
-
-class AdvancedSearchDetails(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search: (Searches.Search | None) = Field(default=None, alias='Search')
-    advanced_search_filter: (Searches.AdvancedSearchFilter | None) = Field(default=None, alias='AdvancedSearchFilter')
-
-class SearchLookUpBase(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_node: (str | None) = Field(default=None, alias='SearchNode')
-    is_leaf_node: (bool | None) = Field(default=None, alias='IsLeafNode')
-    child_nodes: (list[SearchLookUpBase] | None) = Field(default=None, alias='ChildNodes')
-    attributes: (SearchAttributes | None) = Field(default=None, alias='Attributes')
-
-class AdvancedSearchLookUp(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    look_up_nodes: (list[SearchLookUpBase] | None) = Field(default=None, alias='LookUpNodes')
-    collection_nodes: (list[str] | None) = Field(default=None, alias='CollectionNodes')
-from ..Contracts import Searches
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/Models/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/Models/__init__.py
deleted file mode 100644
index e2762ce07..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/Models/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AuditAnalyticsBundle(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    audit_action_id: (int | None) = Field(default=None, alias='AuditActionId')
-    external_id: (int | None) = Field(default=None, alias='ExternalId')
-    secondary_identifier: (str | None) = Field(default=None, alias='SecondaryIdentifier')
-    unsanitized_base_message: (str | None) = Field(default=None, alias='UnsanitizedBaseMessage')
-    extra_log_values: (list[String_System.String] | None) = Field(default=None, alias='ExtraLogValues')
-    sanitized_analytics_description: (str | None) = Field(default=None, alias='SanitizedAnalyticsDescription')
-from .....System.Collections.Generic.KeyValuePair_System import String_System
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/AvailableValues.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/AvailableValues.py
deleted file mode 100644
index dd9eb4bc3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/AvailableValues.py
+++ /dev/null
@@ -1,20 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ComputerServiceItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ComputerProcessItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ServerFileItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    relative_path: (str | None) = Field(default=None, alias='RelativePath')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/GroupConfiguration.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/GroupConfiguration.py
deleted file mode 100644
index 7a821b125..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/GroupConfiguration.py
+++ /dev/null
@@ -1,70 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class Search(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    search_id: (int | None) = Field(default=None, alias='SearchId')
-    name: (str | None) = Field(default=None, alias='Name')
-    folder_name: (str | None) = Field(default=None, alias='FolderName')
-
-class Client(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class Location(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    location_id: (int | None) = Field(default=None, alias='LocationId')
-    name: (str | None) = Field(default=None, alias='Name')
-    client: (Client | None) = Field(default=None, alias='Client')
-
-class MaintenanceWindow(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    maintenance_window_id: (int | None) = Field(default=None, alias='MaintenanceWindowId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class UserClass(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_class_id: (int | None) = Field(default=None, alias='UserClassId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class GroupType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_type_id: (int | None) = Field(default=None, alias='GroupTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class RemoteAgentTemplate(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    remote_agent_template_id: (int | None) = Field(default=None, alias='RemoteAgentTemplateId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class GroupTypeInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    inherited_group_type_id: (int | None) = Field(default=None, alias='InheritedGroupTypeId')
-    is_modifiable: (bool | None) = Field(default=None, alias='IsModifiable')
-    group_types: (list[GroupType] | None) = Field(default=None, alias='GroupTypes')
-
-class RemoteAgentTemplateInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    inherited_remote_agent_template_id: (int | None) = Field(default=None, alias='InheritedRemoteAgentTemplateId')
-    is_modifiable: (bool | None) = Field(default=None, alias='IsModifiable')
-    remote_agent_templates: (list[RemoteAgentTemplate] | None) = Field(default=None, alias='RemoteAgentTemplates')
-
-class ComputerSearchInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_modifiable: (bool | None) = Field(default=None, alias='IsModifiable')
-    searches: (list[Search] | None) = Field(default=None, alias='Searches')
-
-class GroupConfigurationViewModel(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_type_information: (GroupTypeInformation | None) = Field(default=None, alias='GroupTypeInformation')
-    remote_agent_template_information: (RemoteAgentTemplateInformation | None) = Field(default=None, alias='RemoteAgentTemplateInformation')
-    computer_search_information: (ComputerSearchInformation | None) = Field(default=None, alias='ComputerSearchInformation')
-    network_device_searches: (list[Search] | None) = Field(default=None, alias='NetworkDeviceSearches')
-    contact_searches: (list[Search] | None) = Field(default=None, alias='ContactSearches')
-    clients: (list[Client] | None) = Field(default=None, alias='Clients')
-    locations: (list[Location] | None) = Field(default=None, alias='Locations')
-    maintenance_windows: (list[MaintenanceWindow] | None) = Field(default=None, alias='MaintenanceWindows')
-    user_classes: (list[UserClass] | None) = Field(default=None, alias='UserClasses')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/InternalMonitor.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/InternalMonitor.py
deleted file mode 100644
index 9798092a0..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/InternalMonitor.py
+++ /dev/null
@@ -1,26 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AlertTemplate(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_template_id: (int | None) = Field(default=None, alias='AlertTemplateId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TicketCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ticket_category_id: (int | None) = Field(default=None, alias='TicketCategoryId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class InternalMonitorSubscriptionViewModel(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_templates: (list[AlertTemplate] | None) = Field(default=None, alias='AlertTemplates')
-    ticket_categories: (list[TicketCategory] | None) = Field(default=None, alias='TicketCategories')
-    is_group_subscribed: (bool | None) = Field(default=None, alias='IsGroupSubscribed')
-    is_subscription_inherited: (bool | None) = Field(default=None, alias='IsSubscriptionInherited')
-    is_override_applied: (bool | None) = Field(default=None, alias='IsOverrideApplied')
-    monitor_alert_template_id: (int | None) = Field(default=None, alias='MonitorAlertTemplateId')
-    monitor_ticket_category_id: (int | None) = Field(default=None, alias='MonitorTicketCategoryId')
-    overridden_alert_template_id: (int | None) = Field(default=None, alias='OverriddenAlertTemplateId')
-    overridden_ticket_category_id: (int | None) = Field(default=None, alias='OverriddenTicketCategoryId')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/__init__.py
deleted file mode 100644
index 4a5fa09da..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Groups/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class GroupTreeItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    parent_id: (int | None) = Field(default=None, alias='ParentId')
-    name: (str | None) = Field(default=None, alias='Name')
-    full_name: (str | None) = Field(default=None, alias='FullName')
-    user_has_direct_access: (bool | None) = Field(default=None, alias='UserHasDirectAccess')
-    is_limited_to_computer_auto_join_search: (bool | None) = Field(default=None, alias='IsLimitedToComputerAutoJoinSearch')
-    is_limited_to_network_device_auto_join_search: (bool | None) = Field(default=None, alias='IsLimitedToNetworkDeviceAutoJoinSearch')
-    is_limited_to_contact_auto_join_search: (bool | None) = Field(default=None, alias='IsLimitedToContactAutoJoinSearch')
-    parent_groups: (list[GroupTreeItem] | None) = Field(default=None, alias='ParentGroups')
-    child_groups: (list[GroupTreeItem] | None) = Field(default=None, alias='ChildGroups')
-    direct_computer_membership_count: (int | None) = Field(default=None, alias='DirectComputerMembershipCount')
-    indirect_computer_membership_count: (int | None) = Field(default=None, alias='IndirectComputerMembershipCount')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py
deleted file mode 100644
index 915d8746d..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py
+++ /dev/null
@@ -1,12 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class CommandMenuItemBase(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    command_key: (str | None) = Field(default=None, alias='CommandKey')
-    display_name: (str | None) = Field(default=None, alias='DisplayName')
-    display_order: (int | None) = Field(default=None, alias='DisplayOrder')
-    route: (str | None) = Field(default=None, alias='Route')
-    require_confirmation: (bool | None) = Field(default=None, alias='RequireConfirmation')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py
deleted file mode 100644
index 47add052a..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py
+++ /dev/null
@@ -1,12 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class CommandMenuItemBase(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    menu_key: (str | None) = Field(default=None, alias='MenuKey')
-    sub_menus: (list[ComputerCommands.CommandMenuItemBase] | None) = Field(default=None, alias='SubMenus')
-    menu_items: (list[ComputerCommands_1.CommandMenuItemBase] | None) = Field(default=None, alias='MenuItems')
-from .......SubMenu_Automate.Api.Domain.PresentationLayer.ViewModels.Menus import ComputerCommands
-from ....... import ComputerCommands as ComputerCommands_1
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py
deleted file mode 100644
index e8a581fb3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from __future__ import annotations
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/__init__.py
deleted file mode 100644
index e8a581fb3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/ViewModels/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from __future__ import annotations
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/__init__.py
deleted file mode 100644
index e8a581fb3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/PresentationLayer/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from __future__ import annotations
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/__init__.py
deleted file mode 100644
index e8a581fb3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/Domain/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from __future__ import annotations
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/__init__.py
deleted file mode 100644
index e8a581fb3..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/Api/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from __future__ import annotations
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/Menu_Automate/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py
deleted file mode 100644
index a1dff4196..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/ComputerCommands.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class CommandMenuItemBase(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    display_name: (str | None) = Field(default=None, alias='DisplayName')
-    display_order: (int | None) = Field(default=None, alias='DisplayOrder')
-    menu_key: (str | None) = Field(default=None, alias='MenuKey')
-    sub_menus: (list[CommandMenuItemBase] | None) = Field(default=None, alias='SubMenus')
-    menu_items: (list[ComputerCommands.CommandMenuItemBase] | None) = Field(default=None, alias='MenuItems')
-from ....... import ComputerCommands
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/ViewModels/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/ViewModels/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/PresentationLayer/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/Domain/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/Api/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/SubMenu_Automate/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Menus/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/DataLists.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/DataLists.py
deleted file mode 100644
index 82b22cd33..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/DataLists.py
+++ /dev/null
@@ -1,64 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class GroupItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TicketPriorityItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class RoleDefinitionItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ReportItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ServerFileItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TemplatePropertyItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class UserItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class HotfixDataItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class StartupDefinitionItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class SmartAttributeItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class LicenseTypeItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ExtraFieldDefinitionItem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptDataListItem_System.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptDataListItem_System.py
deleted file mode 100644
index 7c80ed95f..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptDataListItem_System.py
+++ /dev/null
@@ -1,20 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class String(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class Guid(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (UUID | None) = Field(default=None, alias='Id', example='00000000-0000-0000-0000-000000000000')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class Int32(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-from uuid import UUID
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptSettings.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptSettings.py
deleted file mode 100644
index 641774e41..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptSettings.py
+++ /dev/null
@@ -1,43 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class UserClass(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_class_id: (int | None) = Field(default=None, alias='UserClassId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TicketEntryCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ticket_category_id: (int | None) = Field(default=None, alias='TicketCategoryId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class CloseTicketTrigger(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    close_ticket_trigger_type_id: (int | None) = Field(default=None, alias='CloseTicketTriggerTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TimeEntryTechnician(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_id: (int | None) = Field(default=None, alias='UserId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class StopTimerTrigger(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    stop_timer_trigger_type_id: (int | None) = Field(default=None, alias='StopTimerTriggerTypeId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TimeEntryCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    time_category_id: (int | None) = Field(default=None, alias='TimeCategoryId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ScriptSettingsViewModel(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_classes: (list[UserClass] | None) = Field(default=None, alias='UserClasses')
-    ticket_categories: (list[TicketEntryCategory] | None) = Field(default=None, alias='TicketCategories')
-    close_ticket_triggers: (list[CloseTicketTrigger] | None) = Field(default=None, alias='CloseTicketTriggers')
-    users: (list[TimeEntryTechnician] | None) = Field(default=None, alias='Users')
-    stop_timer_triggers: (list[StopTimerTrigger] | None) = Field(default=None, alias='StopTimerTriggers')
-    ticket_time_categories: (list[TimeEntryCategory] | None) = Field(default=None, alias='TicketTimeCategories')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptSteps.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptSteps.py
deleted file mode 100644
index 45f84e272..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/ScriptSteps.py
+++ /dev/null
@@ -1,8 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ScriptStepsViewModel(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    disallowed_script_function_ids: (list[int] | None) = Field(default=None, alias='DisallowedScriptFunctionIds')
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/Scripts/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/ViewModels/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/PresentationLayer/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/Automate/Api/Domain/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/Domain/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Automate/Api/Domain/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Automate/Api/__init__.py b/src/pyconnectwise/models/automate/Automate/Api/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/Automate/__init__.py b/src/pyconnectwise/models/automate/Automate/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/Api/Domain/Contracts.py b/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/Api/Domain/Contracts.py
deleted file mode 100644
index 0b6d655d2..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/Api/Domain/Contracts.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ProbeCommandHistoryEntry(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    result_set: (list[Contracts.ProbeCommandHistoryEntry] | None) = Field(default=None, alias='ResultSet')
-    total_record_count: (int | None) = Field(default=None, alias='TotalRecordCount')
-from ......Automate.Api.Domain import Contracts
diff --git a/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/Api/Domain/__init__.py b/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/Api/Domain/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/Api/Domain/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/Api/__init__.py b/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/Api/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/__init__.py b/src/pyconnectwise/models/automate/LabTech/Database/ResultSetWithCount_Automate/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/LabTech/Database/__init__.py b/src/pyconnectwise/models/automate/LabTech/Database/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/LabTech/Models/Monitors/RoutineParameters.py b/src/pyconnectwise/models/automate/LabTech/Models/Monitors/RoutineParameters.py
deleted file mode 100644
index 1884ae587..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Models/Monitors/RoutineParameters.py
+++ /dev/null
@@ -1,141 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class MonitorRoutineParametersFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class UnformattedMonitorRoutineParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    where: (str | None) = Field(default=None, alias='Where')
-    what: (str | None) = Field(default=None, alias='What')
-    data_out: (str | None) = Field(default=None, alias='DataOut')
-    id_field: (str | None) = Field(default=None, alias='IdField')
-
-class InternalDatabaseQueryParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    field_to_check: (str | None) = Field(default=None, alias='FieldToCheck')
-    table_or_view_to_query: (str | None) = Field(default=None, alias='TableOrViewToQuery')
-    additional_conditions: (str | None) = Field(default=None, alias='AdditionalConditions')
-    identity_field: (str | None) = Field(default=None, alias='IdentityField')
-
-class GetNetworkResponseParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    target: (str | None) = Field(default=None, alias='Target')
-    port: (str | None) = Field(default=None, alias='Port')
-    payload: (str | None) = Field(default=None, alias='Payload')
-
-class PerformanceCounterQueryParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    performance_object: (str | None) = Field(default=None, alias='PerformanceObject')
-    performance_counter: (str | None) = Field(default=None, alias='PerformanceCounter')
-    instance: (str | None) = Field(default=None, alias='Instance')
-
-class NetworkDeviceWbemQueryParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    namespace: (str | None) = Field(default=None, alias='Namespace')
-    query: (str | None) = Field(default=None, alias='Query')
-
-class GetPluginCommandResultParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    command_number: (int | None) = Field(default=None, alias='CommandNumber')
-    data: (str | None) = Field(default=None, alias='Data')
-
-class FileOrDirectoryQueryParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    directory: (str | None) = Field(default=None, alias='Directory')
-    file: (str | None) = Field(default=None, alias='File')
-
-class GetExecutableResultParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    fully_qualified_executable_string: (str | None) = Field(default=None, alias='FullyQualifiedExecutableString')
-    result_transform_regular_expression: (str | None) = Field(default=None, alias='ResultTransformRegularExpression')
-
-class SnmpOidQuerySnmpVersion(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class SnmpOidQueryEncryptionMethod(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class SnmpOidQueryAuthenticationMethod(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class HardwareSensorQuerySensor(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class RegistryValueQueryRegistryHive(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class EventLogQueryEventLevelFilter(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    match_verbose: (bool | None) = Field(default=None, alias='MatchVerbose')
-    match_informational: (bool | None) = Field(default=None, alias='MatchInformational')
-    match_warning: (bool | None) = Field(default=None, alias='MatchWarning')
-    match_error: (bool | None) = Field(default=None, alias='MatchError')
-    match_critical: (bool | None) = Field(default=None, alias='MatchCritical')
-
-class SnmpOidQueryParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ip_address: (str | None) = Field(default=None, alias='IpAddress')
-    snmp_version: (SnmpOidQuerySnmpVersion | None) = Field(default=None, alias='SnmpVersion')
-    community: (str | None) = Field(default=None, alias='Community')
-    username: (str | None) = Field(default=None, alias='Username')
-    encryption_method: (SnmpOidQueryEncryptionMethod | None) = Field(default=None, alias='EncryptionMethod')
-    encryption_password: (str | None) = Field(default=None, alias='EncryptionPassword')
-    authentication_method: (SnmpOidQueryAuthenticationMethod | None) = Field(default=None, alias='AuthenticationMethod')
-    authentication_password: (str | None) = Field(default=None, alias='AuthenticationPassword')
-    object_identifier: (str | None) = Field(default=None, alias='ObjectIdentifier')
-
-class HardwareSensorQueryParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    sensor: (HardwareSensorQuerySensor | None) = Field(default=None, alias='Sensor')
-    sensor_number: (str | None) = Field(default=None, alias='SensorNumber')
-
-class RegistryValueQueryParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    hive: (RegistryValueQueryRegistryHive | None) = Field(default=None, alias='Hive')
-    key: (str | None) = Field(default=None, alias='Key')
-    value: (str | None) = Field(default=None, alias='Value')
-
-class EventLogQueryParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    log: (str | None) = Field(default=None, alias='Log')
-    level_filter: (EventLogQueryEventLevelFilter | None) = Field(default=None, alias='LevelFilter')
-    keywords: (int | None) = Field(default=None, alias='Keywords')
-    source: (str | None) = Field(default=None, alias='Source')
-    event_id: (int | None) = Field(default=None, alias='EventId')
-    regular_expression_filter: (str | None) = Field(default=None, alias='RegularExpressionFilter')
-
-class MonitorRoutineParameters(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    format: (MonitorRoutineParametersFormat | None) = Field(default=None, alias='Format')
-    unformatted_monitor_parameters: (UnformattedMonitorRoutineParameters | None) = Field(default=None, alias='UnformattedMonitorParameters')
-    internal_database_query_parameters: (InternalDatabaseQueryParameters | None) = Field(default=None, alias='InternalDatabaseQueryParameters')
-    latency_target: (str | None) = Field(default=None, alias='LatencyTarget')
-    get_network_response_parameters: (GetNetworkResponseParameters | None) = Field(default=None, alias='GetNetworkResponseParameters')
-    snmp_oid_query_parameters: (SnmpOidQueryParameters | None) = Field(default=None, alias='SnmpOidQueryParameters')
-    performance_counter_query_parameters: (PerformanceCounterQueryParameters | None) = Field(default=None, alias='PerformanceCounterQueryParameters')
-    hardware_sensor_query_parameters: (HardwareSensorQueryParameters | None) = Field(default=None, alias='HardwareSensorQueryParameters')
-    network_device_wbem_query_parameters: (NetworkDeviceWbemQueryParameters | None) = Field(default=None, alias='NetworkDeviceWbemQueryParameters')
-    get_plugin_command_result_parameters: (GetPluginCommandResultParameters | None) = Field(default=None, alias='GetPluginCommandResultParameters')
-    file_or_directory_query_parameters: (FileOrDirectoryQueryParameters | None) = Field(default=None, alias='FileOrDirectoryQueryParameters')
-    service_name: (str | None) = Field(default=None, alias='ServiceName')
-    volume_mountpoint: (str | None) = Field(default=None, alias='VolumeMountpoint')
-    registry_value_query_parameters: (RegistryValueQueryParameters | None) = Field(default=None, alias='RegistryValueQueryParameters')
-    process_name: (str | None) = Field(default=None, alias='ProcessName')
-    event_log_listener_parameters: (EventLogQueryParameters | None) = Field(default=None, alias='EventLogListenerParameters')
-    get_executable_result_parameters: (GetExecutableResultParameters | None) = Field(default=None, alias='GetExecutableResultParameters')
-    wmi_query: (str | None) = Field(default=None, alias='WmiQuery')
diff --git a/src/pyconnectwise/models/automate/LabTech/Models/Monitors/__init__.py b/src/pyconnectwise/models/automate/LabTech/Models/Monitors/__init__.py
deleted file mode 100644
index 408ca2921..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Models/Monitors/__init__.py
+++ /dev/null
@@ -1,168 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class MonitorAlertTarget(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    comp_id: (int | None) = Field(default=None, alias='CompId')
-
-class MonitorState(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorRoutine(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorAlertMessages(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    success_subject: (str | None) = Field(default=None, alias='SuccessSubject')
-    success_message: (str | None) = Field(default=None, alias='SuccessMessage')
-    failure_subject: (str | None) = Field(default=None, alias='FailureSubject')
-    failure_message: (str | None) = Field(default=None, alias='FailureMessage')
-
-class InternalMonitorAlertStyle(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class RemoteMonitorAlertStyle(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorComparer(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorComparerSettingsFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorComparerSettingsSmoothingStyle(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorComparerSettingsResultFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorPluginOwner(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    control_guid: (str | None) = Field(default=None, alias='ControlGUID')
-    plugin_name: (str | None) = Field(default=None, alias='PluginName')
-    alteration_instructions: (str | None) = Field(default=None, alias='AlterationInstructions')
-
-class MonitorComparerValueFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorComparerMultiValueFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    values: (list[str] | None) = Field(default=None, alias='Values')
-
-class MonitorComparerSingleValueFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    value: (str | None) = Field(default=None, alias='Value')
-
-class MonitorAlertStyle(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    internal_monitor_alert_style: (InternalMonitorAlertStyle | None) = Field(default=None, alias='InternalMonitorAlertStyle')
-    remote_monitor_alert_style: (RemoteMonitorAlertStyle | None) = Field(default=None, alias='RemoteMonitorAlertStyle')
-
-class Monitor(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    alert_action: (AlertAction | None) = Field(default=None, alias='AlertAction')
-    alert_style: (MonitorAlertStyle | None) = Field(default=None, alias='AlertStyle')
-    comparer_settings: (MonitorComparerSettings | None) = Field(default=None, alias='ComparerSettings')
-    control_guid: (str | None) = Field(default=None, alias='ControlGuid')
-    failure_count: (int | None) = Field(default=None, alias='FailureCount')
-    id_field: (str | None) = Field(default=None, alias='IdField')
-    interval: (int | None) = Field(default=None, alias='Interval')
-    installed: (bool | None) = Field(default=None, alias='Installed')
-    is_internal_monitor: (bool | None) = Field(default=None, alias='IsInternalMonitor')
-    is_network_device_monitor: (bool | None) = Field(default=None, alias='IsNetworkDeviceMonitor')
-    last_checked: (datetime | None) = Field(default=None, alias='LastChecked')
-    last_failed: (datetime | None) = Field(default=None, alias='LastFailed')
-    last_status: (str | None) = Field(default=None, alias='LastStatus')
-    guid: (str | None) = Field(default=None, alias='Guid')
-    monitor_alert_target: (MonitorAlertTarget | None) = Field(default=None, alias='MonitorAlertTarget')
-    monitor_id: (int | None) = Field(default=None, alias='MonitorId')
-    monitor_owner: (MonitorOwner | None) = Field(default=None, alias='MonitorOwner')
-    monitor_state: (MonitorState | None) = Field(default=None, alias='MonitorState')
-    local_state: (MonitorState | None) = Field(default=None, alias='LocalState')
-    name: (str | None) = Field(default=None, alias='Name')
-    pending_update: (bool | None) = Field(default=None, alias='PendingUpdate')
-    report_category: (ReportCategory | None) = Field(default=None, alias='ReportCategory')
-    ticket_category: (TicketCategory | None) = Field(default=None, alias='TicketCategory')
-    warning_count: (int | None) = Field(default=None, alias='WarningCount')
-    script: (Script | None) = Field(default=None, alias='Script')
-    version: (int | None) = Field(default=None, alias='Version')
-    routine_parameters: (RoutineParameters.MonitorRoutineParameters | None) = Field(default=None, alias='RoutineParameters')
-    routine: (MonitorRoutine | None) = Field(default=None, alias='Routine')
-    alert_messages: (MonitorAlertMessages | None) = Field(default=None, alias='AlertMessages')
-    targets: (MonitorTarget | None) = Field(default=None, alias='Targets')
-    is_global_monitor: (bool | None) = Field(default=None, alias='IsGlobalMonitor')
-    is_overridden: (bool | None) = Field(default=None, alias='IsOverridden')
-    is_collecting_data: (bool | None) = Field(default=None, alias='IsCollectingData')
-    affected_entities: (MonitorAffectedEntities | None) = Field(default=None, alias='AffectedEntities')
-
-class MonitorComparerSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    comparer: (MonitorComparer | None) = Field(default=None, alias='Comparer')
-    format: (MonitorComparerSettingsFormat | None) = Field(default=None, alias='Format')
-    value: (MonitorComparerValue | None) = Field(default=None, alias='Value')
-    smoothing_coefficient: (float | None) = Field(default=None, alias='SmoothingCoefficient')
-    is_expression: (bool | None) = Field(default=None, alias='IsExpression')
-    smoothing_style: (MonitorComparerSettingsSmoothingStyle | None) = Field(default=None, alias='SmoothingStyle')
-    language_overrides: (dict[(str, str)] | None) = Field(default=None, alias='LanguageOverrides')
-    result_format: (MonitorComparerSettingsResultFormat | None) = Field(default=None, alias='ResultFormat')
-
-class MonitorOwner(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    owner_type: (int | None) = Field(default=None, alias='OwnerType')
-    description: (str | None) = Field(default=None, alias='Description')
-    owning_group: (Group | None) = Field(default=None, alias='OwningGroup')
-    owning_script: (Script | None) = Field(default=None, alias='OwningScript')
-    owning_plugin: (MonitorPluginOwner | None) = Field(default=None, alias='OwningPlugin')
-
-class MonitorTarget(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    location: (Location | None) = Field(default=None, alias='Location')
-    client: (Client | None) = Field(default=None, alias='Client')
-    computer: (Computer | None) = Field(default=None, alias='Computer')
-    network_device: (NetworkDevice | None) = Field(default=None, alias='NetworkDevice')
-    group_ids: (list[int] | None) = Field(default=None, alias='GroupIds')
-
-class MonitorAffectedEntities(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    remote_monitor_affected_location: (Location | None) = Field(default=None, alias='RemoteMonitorAffectedLocation')
-    remote_monitor_affected_client: (Client | None) = Field(default=None, alias='RemoteMonitorAffectedClient')
-    internal_monitor_affected_locations: (list[Location] | None) = Field(default=None, alias='InternalMonitorAffectedLocations')
-    internal_monitor_affected_clients: (list[Client] | None) = Field(default=None, alias='InternalMonitorAffectedClients')
-
-class MonitorComparerValue(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    format: (MonitorComparerValueFormat | None) = Field(default=None, alias='Format')
-    multi_value_format: (MonitorComparerMultiValueFormat | None) = Field(default=None, alias='MultiValueFormat')
-    state_based_value_format: (MonitorComparerStateBasedValueFormat | None) = Field(default=None, alias='StateBasedValueFormat')
-    single_value_format: (MonitorComparerSingleValueFormat | None) = Field(default=None, alias='SingleValueFormat')
-
-class MonitorComparerStateBasedValueFormat(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    normal_comparer: (MonitorComparerSettings | None) = Field(default=None, alias='NormalComparer')
-    warning_comparer: (MonitorComparerSettings | None) = Field(default=None, alias='WarningComparer')
-    error_comparer: (MonitorComparerSettings | None) = Field(default=None, alias='ErrorComparer')
-from .. import AlertAction, Client, Computer, Group, Location, NetworkDevice, ReportCategory, Script, TicketCategory
-from . import RoutineParameters
diff --git a/src/pyconnectwise/models/automate/LabTech/Models/TemporaryApiContracts.py b/src/pyconnectwise/models/automate/LabTech/Models/TemporaryApiContracts.py
deleted file mode 100644
index 4e6860668..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Models/TemporaryApiContracts.py
+++ /dev/null
@@ -1,26 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class MaintenanceWindowDefinition(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    maintenance_window_definition_id: (int | None) = Field(default=None, alias='MaintenanceWindowDefinitionId')
-    name: (str | None) = Field(default=None, alias='Name')
-    comment: (str | None) = Field(default=None, alias='Comment')
-
-class DeploymentLogin(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    deployment_login_id: (int | None) = Field(default=None, alias='DeploymentLoginId')
-    title: (str | None) = Field(default=None, alias='Title')
-
-class AgentDeploymentReadinessCheck(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    agent_deployment_readiness_check_id: (int | None) = Field(default=None, alias='AgentDeploymentReadinessCheckId')
-    network_device_id: (int | None) = Field(default=None, alias='NetworkDeviceId')
-    agent_deployment_readiness_check_status_id: (int | None) = Field(default=None, alias='AgentDeploymentReadinessCheckStatusId')
-    readiness_check_status: (str | None) = Field(default=None, alias='ReadinessCheckStatus')
-    deployment_attempt_count: (int | None) = Field(default=None, alias='DeploymentAttemptCount')
-    date_last_checked_for_readiness: (datetime | None) = Field(default=None, alias='DateLastCheckedForReadiness')
-    date_last_deployment_attempted: (datetime | None) = Field(default=None, alias='DateLastDeploymentAttempted')
diff --git a/src/pyconnectwise/models/automate/LabTech/Models/__init__.py b/src/pyconnectwise/models/automate/LabTech/Models/__init__.py
deleted file mode 100644
index fdfa88d8d..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Models/__init__.py
+++ /dev/null
@@ -1,1563 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AVTemplatePolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    template_policy_id: (str | None) = Field(default=None, alias='TemplatePolicyId')
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-    guid: (str | None) = Field(default=None, alias='GUID')
-
-class AVTemplatePolicyData(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    template_policy_id: (str | None) = Field(default=None, alias='TemplatePolicyId')
-    plugin_guid: (str | None) = Field(default=None, alias='PluginGUID')
-    data: (str | None) = Field(default=None, alias='Data')
-
-class CacheControl(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    cache_id: (str | None) = Field(default=None, alias='CacheId')
-    custom_commands: (datetime | None) = Field(default=None, alias='CustomCommands')
-    custom_menus: (datetime | None) = Field(default=None, alias='CustomMenus')
-    huds: (datetime | None) = Field(default=None, alias='Huds')
-    apps: (datetime | None) = Field(default=None, alias='Apps')
-    user_folders: (datetime | None) = Field(default=None, alias='UserFolders')
-    users: (datetime | None) = Field(default=None, alias='Users')
-    schedules: (datetime | None) = Field(default=None, alias='Schedules')
-    templates: (datetime | None) = Field(default=None, alias='Templates')
-    data_view_folders: (datetime | None) = Field(default=None, alias='DataViewFolders')
-    dataviews: (datetime | None) = Field(default=None, alias='Dataviews')
-    report_folders: (datetime | None) = Field(default=None, alias='ReportFolders')
-    reports: (datetime | None) = Field(default=None, alias='Reports')
-    links: (datetime | None) = Field(default=None, alias='Links')
-    script_folders: (datetime | None) = Field(default=None, alias='ScriptFolders')
-    scripts: (datetime | None) = Field(default=None, alias='Scripts')
-    sensor_checks: (datetime | None) = Field(default=None, alias='SensorChecks')
-    audit_actions: (datetime | None) = Field(default=None, alias='AuditActions')
-    remote_commands: (datetime | None) = Field(default=None, alias='RemoteCommands')
-    contacts: (datetime | None) = Field(default=None, alias='Contacts')
-    time_category: (datetime | None) = Field(default=None, alias='TimeCategory')
-    ticket_data: (datetime | None) = Field(default=None, alias='TicketData')
-    ticket_category: (datetime | None) = Field(default=None, alias='TicketCategory')
-    functions: (datetime | None) = Field(default=None, alias='Functions')
-    redirectors: (datetime | None) = Field(default=None, alias='Redirectors')
-    virus_scanners: (datetime | None) = Field(default=None, alias='VirusScanners')
-    control_center_config: (datetime | None) = Field(default=None, alias='ControlCenterConfig')
-    properties: (datetime | None) = Field(default=None, alias='Properties')
-    config: (datetime | None) = Field(default=None, alias='Config')
-    regions: (datetime | None) = Field(default=None, alias='Regions')
-    config_outlook: (datetime | None) = Field(default=None, alias='ConfigOutlook')
-    computers: (datetime | None) = Field(default=None, alias='Computers')
-    locations: (datetime | None) = Field(default=None, alias='Locations')
-    clients: (datetime | None) = Field(default=None, alias='Clients')
-    groups: (datetime | None) = Field(default=None, alias='Groups')
-    agents: (datetime | None) = Field(default=None, alias='Agents')
-    permissions: (datetime | None) = Field(default=None, alias='Permissions')
-    write_config_control: (datetime | None) = Field(default=None, alias='WriteConfigControl')
-    alert_templates: (datetime | None) = Field(default=None, alias='AlertTemplates')
-    role_definitions: (datetime | None) = Field(default=None, alias='RoleDefinitions')
-
-class ComputerChassis(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    manufacturer: (str | None) = Field(default=None, alias='Manufacturer')
-    product_name: (str | None) = Field(default=None, alias='ProductName')
-    version: (str | None) = Field(default=None, alias='Version')
-    serial_number: (str | None) = Field(default=None, alias='SerialNumber')
-    uuid: (str | None) = Field(default=None, alias='UUID')
-    sku_number: (str | None) = Field(default=None, alias='SkuNumber')
-    family: (str | None) = Field(default=None, alias='Family')
-    chassis_type: (str | None) = Field(default=None, alias='ChassisType')
-    chassis_lock: (bool | None) = Field(default=None, alias='ChassisLock')
-    asset_tag: (str | None) = Field(default=None, alias='AssetTag')
-    height_units: (int | None) = Field(default=None, alias='HeightUnits')
-    system_boot_state: (int | None) = Field(default=None, alias='SystemBootState')
-    power_supply_boot_state: (int | None) = Field(default=None, alias='PowerSupplyBootState')
-    thermal_boot_state: (int | None) = Field(default=None, alias='ThermalBootState')
-    main_board_product: (str | None) = Field(default=None, alias='MainBoardProduct')
-    main_board_serial_number: (str | None) = Field(default=None, alias='MainBoardSerialNumber')
-    main_board_version: (str | None) = Field(default=None, alias='MainBoardVersion')
-    main_board_manufacturer: (str | None) = Field(default=None, alias='MainBoardManufacturer')
-    last_update: (datetime | None) = Field(default=None, alias='LastUpdate')
-
-class Router(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    manufacturer_name: (str | None) = Field(default=None, alias='ManufacturerName')
-    model: (str | None) = Field(default=None, alias='Model')
-    version: (str | None) = Field(default=None, alias='Version')
-    port_type: (str | None) = Field(default=None, alias='PortType')
-    username: (str | None) = Field(default=None, alias='Username')
-    password: (str | None) = Field(default=None, alias='Password')
-    guid: (str | None) = Field(default=None, alias='Guid')
-
-class EventLogInventoryMode(Enum):
-    INVENTORY_ONLY_USES_SCHEDULE = 'InventoryOnlyUsesSchedule'
-    IMMEDIATELY_SEND_ERRORS = 'ImmediatelySendErrors'
-    IMMEDIATELY_SEND_ERRORS_AND_WARNINGS = 'ImmediatelySendErrorsAndWarnings'
-    IMMEDIATELY_SEND_ALL_BUT_SECURITY = 'ImmediatelySendAllButSecurity'
-    IMMEDIATELY_SEND_ALL = 'ImmediatelySendAll'
-
-class WindowsUpdate(Enum):
-    DO_NOTHING = 'DoNothing'
-    ENABLE_WINDOWS_UPDATE_DEFAULTS = 'EnableWindowsUpdateDefaults'
-    SET_TO_DOWNLOAD_ONLY = 'SetToDownloadOnly'
-    DISABLE_WINDOWS_UPDATE = 'DisableWindowsUpdate'
-    LABTECH_MODE_LABTECH_MODE_UI_ACCESS_DISABLED = 'LabtechModeLabtechModeUIAccessDisabled'
-
-class AgentRebootMode(Enum):
-    NOW = 'Now'
-    ASK = 'Ask'
-    ASK_THEN_ALLOW = 'AskThenAllow'
-    ASK_THEN_DENY = 'AskThenDeny'
-    DENY = 'Deny'
-
-class RemoteAccessMode(Enum):
-    SILENT = 'Silent'
-    ASK = 'Ask'
-    ASK_THEN_ALLOW = 'AskThenAllow'
-    ASK_THEN_DENY = 'AskThenDeny'
-    DENY = 'Deny'
-
-class FileExplorerAccessMode(Enum):
-    NOW = 'Now'
-    ASK = 'Ask'
-    ASK_THEN_ALLOW = 'AskThenAllow'
-    ASK_THEN_DENY = 'AskThenDeny'
-    DENY = 'Deny'
-
-class RegistryEditorAccessMode(Enum):
-    NOW = 'Now'
-    ASK = 'Ask'
-    ASK_THEN_ALLOW = 'AskThenAllow'
-    ASK_THEN_DENY = 'AskThenDeny'
-    DENY = 'Deny'
-
-class ScreenCaptureAccessMode(Enum):
-    NOW = 'Now'
-    ASK = 'Ask'
-    ASK_THEN_ALLOW = 'AskThenAllow'
-    ASK_THEN_DENY = 'AskThenDeny'
-    DENY = 'Deny'
-
-class ContactWebPermissions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    tickets: (bool | None) = Field(default=None, alias='Tickets')
-    remote_access: (bool | None) = Field(default=None, alias='RemoteAccess')
-    install_agent: (bool | None) = Field(default=None, alias='InstallAgent')
-    reboot: (bool | None) = Field(default=None, alias='Reboot')
-    shutdown: (bool | None) = Field(default=None, alias='Shutdown')
-    wake_on_lan: (bool | None) = Field(default=None, alias='WakeOnLAN')
-    multi_factor_required: (bool | None) = Field(default=None, alias='MultiFactorRequired')
-
-class DayId(Enum):
-    EVERYDAY = 'Everyday'
-    SUNDAY = 'Sunday'
-    MONDAY = 'Monday'
-    TUESDAY = 'Tuesday'
-    WEDNESDAY = 'Wednesday'
-    THURSDAY = 'Thursday'
-    FRIDAY = 'Friday'
-    SATURDAY = 'Saturday'
-
-class Schedule(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    day_id: (DayId | None) = Field(default=None, alias='DayId')
-    day_name: (str | None) = Field(default=None, alias='DayName')
-    repeat_every_hour: (int | None) = Field(default=None, alias='RepeatEveryHour')
-    date: (datetime | None) = Field(default=None, alias='Date')
-
-class ComputerMenu(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    menu_id: (str | None) = Field(default=None, alias='MenuID')
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-    text: (str | None) = Field(default=None, alias='Text')
-    image_url: (str | None) = Field(default=None, alias='ImageURL')
-    root_only: (int | None) = Field(default=None, alias='RootOnly')
-    action: (str | None) = Field(default=None, alias='Action')
-    msg_title: (str | None) = Field(default=None, alias='MsgTitle')
-    msg_body: (str | None) = Field(default=None, alias='MsgBody')
-    msg_height: (int | None) = Field(default=None, alias='MsgHeight')
-    msg_width: (int | None) = Field(default=None, alias='MsgWidth')
-    ur_lor_exe: (str | None) = Field(default=None, alias='URLorEXE')
-    script_id: (int | None) = Field(default=None, alias='ScriptID')
-    parameters: (str | None) = Field(default=None, alias='Parameters')
-
-class TemplateProperty(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    template_id: (str | None) = Field(default=None, alias='TemplateID')
-    property_name: (str | None) = Field(default=None, alias='PropertyName')
-    property_value: (str | None) = Field(default=None, alias='PropertyValue')
-    property_description: (str | None) = Field(default=None, alias='PropertyDescription')
-
-class GroupPartial(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='ID')
-    parent_id: (int | None) = Field(default=None, alias='ParentId')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class SearchType(Enum):
-    ADVANCED_COMPUTERS = 'AdvancedComputers'
-    ADVANCED_NET_DEVICES = 'AdvancedNetDevices'
-    ADVANCED_CONTACTS = 'AdvancedContacts'
-    ADVANCED_MOBILE_DEVICES = 'AdvancedMobileDevices'
-
-class MaintenanceWindow(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-
-class LoggedInUser(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    logged_in_user_name: (str | None) = Field(default=None, alias='LoggedInUserName')
-    console_id: (int | None) = Field(default=None, alias='ConsoleId')
-
-class VirusScannerDef(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class CommentPriority(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class SearchFolder(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ComputerPermissions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    edit_config: (bool | None) = Field(default=None, alias='EditConfig')
-    edit_info: (bool | None) = Field(default=None, alias='EditInfo')
-    send_commands: (bool | None) = Field(default=None, alias='SendCommands')
-    allow_remote_control: (bool | None) = Field(default=None, alias='AllowRemoteControl')
-    allow_redir: (bool | None) = Field(default=None, alias='AllowRedir')
-    allow_file_explorer: (bool | None) = Field(default=None, alias='AllowFileExplorer')
-    allow_registry_edit: (bool | None) = Field(default=None, alias='AllowRegistryEdit')
-    command_prompt: (bool | None) = Field(default=None, alias='CommandPrompt')
-    sniff_network: (bool | None) = Field(default=None, alias='SniffNetwork')
-    install: (bool | None) = Field(default=None, alias='Install')
-    history: (bool | None) = Field(default=None, alias='History')
-    view_commands: (bool | None) = Field(default=None, alias='ViewCommands')
-    monitor_delete: (bool | None) = Field(default=None, alias='MonitorDelete')
-    monitor_add: (bool | None) = Field(default=None, alias='MonitorAdd')
-    monitor_edit: (bool | None) = Field(default=None, alias='MonitorEdit')
-    clear_alerts: (bool | None) = Field(default=None, alias='ClearAlerts')
-    schedule_scripts: (bool | None) = Field(default=None, alias='ScheduleScripts')
-    delete_schedule_scripts: (bool | None) = Field(default=None, alias='DeleteScheduleScripts')
-
-class NetworkDeviceType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class AlertAction(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    comment: (str | None) = Field(default=None, alias='Comment')
-
-class ExternalSystemCredentials(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    credentials_id: (int | None) = Field(default=None, alias='CredentialsId')
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    title: (str | None) = Field(default=None, alias='Title')
-    expiration_date: (datetime | None) = Field(default=None, alias='ExpirationDate')
-    is_active: (bool | None) = Field(default=None, alias='IsActive')
-
-class TicketStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TicketPriority(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class TicketCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    parent_category_id: (int | None) = Field(default=None, alias='ParentCategoryId')
-    keywords: (str | None) = Field(default=None, alias='Keywords')
-    description: (str | None) = Field(default=None, alias='Description')
-    image: (str | None) = Field(default=None, alias='Image')
-    is_visible_in_list: (bool | None) = Field(default=None, alias='IsVisibleInList')
-
-class UserPermissions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    super_admin: (bool | None) = Field(default=None, alias='SuperAdmin')
-    system_config: (bool | None) = Field(default=None, alias='SystemConfig')
-    class_config: (bool | None) = Field(default=None, alias='ClassConfig')
-    create_tickets: (bool | None) = Field(default=None, alias='CreateTickets')
-    shared_links: (bool | None) = Field(default=None, alias='SharedLinks')
-    template_read: (bool | None) = Field(default=None, alias='TemplateRead')
-    template_edit: (bool | None) = Field(default=None, alias='TemplateEdit')
-    template_delete: (bool | None) = Field(default=None, alias='TemplateDelete')
-    client_read: (bool | None) = Field(default=None, alias='ClientRead')
-    client_edit: (bool | None) = Field(default=None, alias='ClientEdit')
-    client_delete: (bool | None) = Field(default=None, alias='ClientDelete')
-    report_read: (bool | None) = Field(default=None, alias='ReportRead')
-    report_edit: (bool | None) = Field(default=None, alias='ReportEdit')
-    report_delete: (bool | None) = Field(default=None, alias='ReportDelete')
-    contact_read: (bool | None) = Field(default=None, alias='ContactRead')
-    contact_edit: (bool | None) = Field(default=None, alias='ContactEdit')
-    contact_delete: (bool | None) = Field(default=None, alias='ContactDelete')
-    user_read: (bool | None) = Field(default=None, alias='UserRead')
-    user_edit: (bool | None) = Field(default=None, alias='UserEdit')
-    user_delete: (bool | None) = Field(default=None, alias='UserDelete')
-    tool_read: (bool | None) = Field(default=None, alias='ToolRead')
-    tool_edit: (bool | None) = Field(default=None, alias='ToolEdit')
-    tool_delete: (bool | None) = Field(default=None, alias='ToolDelete')
-    script_read: (bool | None) = Field(default=None, alias='ScriptRead')
-    script_edit: (bool | None) = Field(default=None, alias='ScriptEdit')
-    script_delete: (bool | None) = Field(default=None, alias='ScriptDelete')
-    manage_groups: (bool | None) = Field(default=None, alias='ManageGroups')
-    dash_ticketing: (bool | None) = Field(default=None, alias='DashTicketing')
-    dash_time: (bool | None) = Field(default=None, alias='DashTime')
-    dash_manage: (bool | None) = Field(default=None, alias='DashManage')
-    dash_trending: (bool | None) = Field(default=None, alias='DashTrending')
-    dash_overview: (bool | None) = Field(default=None, alias='DashOverview')
-    hud_update: (bool | None) = Field(default=None, alias='HUDUpdate')
-    hud_show_all: (bool | None) = Field(default=None, alias='HUDShowAll')
-    data_view_update: (bool | None) = Field(default=None, alias='DataViewUpdate')
-    data_view_delete: (bool | None) = Field(default=None, alias='DataViewDelete')
-    data_view_show_all: (bool | None) = Field(default=None, alias='DataViewShowAll')
-    users_show_all: (bool | None) = Field(default=None, alias='UsersShowAll')
-    user_class_create: (bool | None) = Field(default=None, alias='UserClassCreate')
-    user_class_update: (bool | None) = Field(default=None, alias='UserClassUpdate')
-    patch_manager_config: (bool | None) = Field(default=None, alias='PatchManagerConfig')
-    reports_create: (bool | None) = Field(default=None, alias='ReportsCreate')
-    probe_template_execute: (bool | None) = Field(default=None, alias='ProbeTemplateExecute')
-    scheduled_scripts_update: (bool | None) = Field(default=None, alias='ScheduledScriptsUpdate')
-    clients_show_all: (bool | None) = Field(default=None, alias='ClientsShowAll')
-    show_passwords: (bool | None) = Field(default=None, alias='ShowPasswords')
-    locations_show_all: (bool | None) = Field(default=None, alias='LocationsShowAll')
-    computers_create: (bool | None) = Field(default=None, alias='ComputersCreate')
-    computers_update: (bool | None) = Field(default=None, alias='ComputersUpdate')
-    computers_delete: (bool | None) = Field(default=None, alias='ComputersDelete')
-    computers_show_all: (bool | None) = Field(default=None, alias='ComputersShowAll')
-    computers_force_update: (bool | None) = Field(default=None, alias='ComputersForceUpdate')
-    network_device_update: (bool | None) = Field(default=None, alias='NetworkDeviceUpdate')
-    network_device_delete: (bool | None) = Field(default=None, alias='NetworkDeviceDelete')
-    network_device_show_all: (bool | None) = Field(default=None, alias='NetworkDeviceShowAll')
-    retired_assets_delete: (bool | None) = Field(default=None, alias='RetiredAssetsDelete')
-    groups_create: (bool | None) = Field(default=None, alias='GroupsCreate')
-    groups_delete: (bool | None) = Field(default=None, alias='GroupsDelete')
-    groups_show_all: (bool | None) = Field(default=None, alias='GroupsShowAll')
-    groups_schedule_script: (bool | None) = Field(default=None, alias='GroupsScheduleScript')
-    group_monitors_update: (bool | None) = Field(default=None, alias='GroupMonitorsUpdate')
-    group_info_update: (bool | None) = Field(default=None, alias='GroupInfoUpdate')
-    group_managed_services: (bool | None) = Field(default=None, alias='GroupManagedServices')
-    remote_monitors_create: (bool | None) = Field(default=None, alias='RemoteMonitorsCreate')
-    remote_monitors_delete: (bool | None) = Field(default=None, alias='RemoteMonitorsDelete')
-    internal_monitors_create: (bool | None) = Field(default=None, alias='InternalMonitorsCreate')
-    internal_monitors_update: (bool | None) = Field(default=None, alias='InternalMonitorsUpdate')
-    internal_monitors_delete: (bool | None) = Field(default=None, alias='InternalMonitorsDelete')
-    alerts_update: (bool | None) = Field(default=None, alias='AlertsUpdate')
-    alerts_delete_all: (bool | None) = Field(default=None, alias='AlertsDeleteAll')
-    tickets_read: (bool | None) = Field(default=None, alias='TicketsRead')
-    tickets_update: (bool | None) = Field(default=None, alias='TicketsUpdate')
-    tickets_delete: (bool | None) = Field(default=None, alias='TicketsDelete')
-    tickets_request: (bool | None) = Field(default=None, alias='TicketsRequest')
-    searches_read: (bool | None) = Field(default=None, alias='SearchesRead')
-    searches_update: (bool | None) = Field(default=None, alias='SearchesUpdate')
-    searches_delete: (bool | None) = Field(default=None, alias='SearchesDelete')
-    patch_manager_read: (bool | None) = Field(default=None, alias='PatchManagerRead')
-    patch_manager_update: (bool | None) = Field(default=None, alias='PatchManagerUpdate')
-    language_pack_editor: (bool | None) = Field(default=None, alias='LanguagePackEditor')
-    managed_service_catalog: (bool | None) = Field(default=None, alias='ManagedServiceCatalog')
-    navigation_menu_update: (bool | None) = Field(default=None, alias='NavigationMenuUpdate')
-    rss_feed_read: (bool | None) = Field(default=None, alias='RSSFeedRead')
-    rss_feed_update: (bool | None) = Field(default=None, alias='RSSFeedUpdate')
-    links_delete: (bool | None) = Field(default=None, alias='LinksDelete')
-    plugin_manager: (bool | None) = Field(default=None, alias='PluginManager')
-    solution_center: (bool | None) = Field(default=None, alias='SolutionCenter')
-    database_execute: (bool | None) = Field(default=None, alias='DatabaseExecute')
-    server_status: (bool | None) = Field(default=None, alias='ServerStatus')
-    manage_audits: (bool | None) = Field(default=None, alias='ManageAudits')
-    manage_remote_commands: (bool | None) = Field(default=None, alias='ManageRemoteCommands')
-    manage_service_logs: (bool | None) = Field(default=None, alias='ManageServiceLogs')
-    manage_outdated: (bool | None) = Field(default=None, alias='ManageOutdated')
-    manage_offline_computers: (bool | None) = Field(default=None, alias='ManageOfflineComputers')
-    manage_schedule_client_scripts: (bool | None) = Field(default=None, alias='ManageScheduleClientScripts')
-    dashboard_config: (bool | None) = Field(default=None, alias='DashboardConfig')
-    config_application_list: (bool | None) = Field(default=None, alias='ConfigApplicationList')
-    config_event_black_list: (bool | None) = Field(default=None, alias='ConfigEventBlackList')
-    quick_connect: (bool | None) = Field(default=None, alias='QuickConnect')
-    permissions_update: (bool | None) = Field(default=None, alias='PermissionsUpdate')
-    user_class_read: (bool | None) = Field(default=None, alias='UserClassRead')
-    user_class_delete: (bool | None) = Field(default=None, alias='UserClassDelete')
-
-class UserFolder(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_folder_id: (str | None) = Field(default=None, alias='UserFolderId')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_sso_enabled: (bool | None) = Field(default=None, alias='IsSsoEnabled')
-
-class UserSingleSignOnStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    sso_status_id: (int | None) = Field(default=None, alias='SsoStatusId')
-    status_name: (str | None) = Field(default=None, alias='StatusName')
-
-class ComputerMonitorHistory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    failure_rate: (float | None) = Field(default=None, alias='FailureRate')
-    last_success_data: (str | None) = Field(default=None, alias='LastSuccessData')
-    last_warning_data: (str | None) = Field(default=None, alias='LastWarningData')
-    last_fail_data: (str | None) = Field(default=None, alias='LastFailData')
-
-class Command(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-    level: (int | None) = Field(default=None, alias='Level')
-
-class ComputerBios(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    vendor: (str | None) = Field(default=None, alias='Vendor')
-    version: (str | None) = Field(default=None, alias='Version')
-    date: (datetime | None) = Field(default=None, alias='Date')
-    size: (int | None) = Field(default=None, alias='Size')
-    system_bios_version: (float | None) = Field(default=None, alias='SystemBiosVersion')
-    embctl_version: (float | None) = Field(default=None, alias='EMBCTLVersion')
-    sm_bios_version: (float | None) = Field(default=None, alias='SmBiosVersion')
-    dmi_version: (int | None) = Field(default=None, alias='DmiVersion')
-    supports_acpi: (bool | None) = Field(default=None, alias='SupportsAcpi')
-    supports_apm: (bool | None) = Field(default=None, alias='SupportsApm')
-    supports_agp: (bool | None) = Field(default=None, alias='SupportsAgp')
-    supports_pcmcia: (bool | None) = Field(default=None, alias='SupportsPcmcia')
-    has_smart_battery: (bool | None) = Field(default=None, alias='HasSmartBattery')
-    supports_uefi: (bool | None) = Field(default=None, alias='SupportsUefi')
-    supports_legacy_usb: (bool | None) = Field(default=None, alias='SupportsLegacyUsb')
-    supports_pci: (bool | None) = Field(default=None, alias='SupportsPci')
-    supports_vlvesa: (bool | None) = Field(default=None, alias='SupportsVlvesa')
-    supports_escd: (bool | None) = Field(default=None, alias='SupportsEscd')
-    supports_net_boot: (bool | None) = Field(default=None, alias='SupportsNetBoot')
-    supports_i2_o_boot: (bool | None) = Field(default=None, alias='SupportsI2OBoot')
-    is_virtual_machine: (bool | None) = Field(default=None, alias='IsVirtualMachine')
-    power_on_reason: (str | None) = Field(default=None, alias='PowerOnReason')
-    bios_char: (int | None) = Field(default=None, alias='BiosChar')
-    is_portable: (bool | None) = Field(default=None, alias='IsPortable')
-    vm_host: (str | None) = Field(default=None, alias='VmHost')
-    vm_type: (str | None) = Field(default=None, alias='VmType')
-    vm_name: (str | None) = Field(default=None, alias='VmName')
-    date_updated: (datetime | None) = Field(default=None, alias='DateUpdated')
-
-class ComputerDrive(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    drive_id: (int | None) = Field(default=None, alias='DriveId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    letter: (str | None) = Field(default=None, alias='Letter')
-    size: (int | None) = Field(default=None, alias='Size')
-    free_space: (int | None) = Field(default=None, alias='FreeSpace')
-    file_system: (str | None) = Field(default=None, alias='FileSystem')
-    model: (str | None) = Field(default=None, alias='Model')
-    smart_status: (str | None) = Field(default=None, alias='SmartStatus')
-    is_missing: (bool | None) = Field(default=None, alias='IsMissing')
-    date_last_inventoried: (datetime | None) = Field(default=None, alias='DateLastInventoried')
-    volume_name: (str | None) = Field(default=None, alias='VolumeName')
-    backup_flag: (int | None) = Field(default=None, alias='BackupFlag')
-    is_solid_state: (bool | None) = Field(default=None, alias='IsSolidState')
-    is_internal: (bool | None) = Field(default=None, alias='IsInternal')
-    maximum_history_days_available: (int | None) = Field(default=None, alias='MaximumHistoryDaysAvailable')
-
-class SmartAttribute(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class ComputerEffectivePatchingPolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    approval_policy_count: (int | None) = Field(default=None, alias='ApprovalPolicyCount')
-    microsoft_update_policy_name: (str | None) = Field(default=None, alias='MicrosoftUpdatePolicyName')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    reboot_policy_name: (str | None) = Field(default=None, alias='RebootPolicyName')
-    third_party_update_policy_name: (str | None) = Field(default=None, alias='ThirdPartyUpdatePolicyName')
-
-class PolicyApprovalSetting(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ComputerOperatingSystem(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    name: (str | None) = Field(default=None, alias='Name')
-    major_version: (int | None) = Field(default=None, alias='MajorVersion')
-    minor_version: (int | None) = Field(default=None, alias='MinorVersion')
-    version: (str | None) = Field(default=None, alias='Version')
-    dot_net_version: (str | None) = Field(default=None, alias='DotNetVersion')
-    service_pack: (str | None) = Field(default=None, alias='ServicePack')
-    service_pack_name: (str | None) = Field(default=None, alias='ServicePackName')
-    product_type: (int | None) = Field(default=None, alias='ProductType')
-    suite: (int | None) = Field(default=None, alias='Suite')
-    product_info: (int | None) = Field(default=None, alias='ProductInfo')
-    is_licensed: (bool | None) = Field(default=None, alias='IsLicensed')
-    is_tablet: (bool | None) = Field(default=None, alias='IsTablet')
-    is_starter: (bool | None) = Field(default=None, alias='IsStarter')
-    is_media_center: (bool | None) = Field(default=None, alias='IsMediaCenter')
-    base_folder: (str | None) = Field(default=None, alias='BaseFolder')
-    system_drive: (str | None) = Field(default=None, alias='SystemDrive')
-    has_gui: (bool | None) = Field(default=None, alias='HasGui')
-    is64_bit: (bool | None) = Field(default=None, alias='Is64Bit')
-    domain: (str | None) = Field(default=None, alias='Domain')
-    is_domain_controller: (bool | None) = Field(default=None, alias='IsDomainController')
-    is_server: (bool | None) = Field(default=None, alias='IsServer')
-    install_date: (datetime | None) = Field(default=None, alias='InstallDate')
-    date_updated: (datetime | None) = Field(default=None, alias='DateUpdated')
-    release_id: (int | None) = Field(default=None, alias='ReleaseId')
-    edition: (str | None) = Field(default=None, alias='Edition')
-    branch_readiness_level: (int | None) = Field(default=None, alias='BranchReadinessLevel')
-
-class ComputerPatchingPolicy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    approval_policy_count: (int | None) = Field(default=None, alias='ApprovalPolicyCount')
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    microsoft_update_policy_name: (str | None) = Field(default=None, alias='MicrosoftUpdatePolicyName')
-    name: (str | None) = Field(default=None, alias='Name')
-    override_id: (int | None) = Field(default=None, alias='OverrideId')
-    priority: (int | None) = Field(default=None, alias='Priority')
-    reboot_policy_name: (str | None) = Field(default=None, alias='RebootPolicyName')
-    third_party_update_policy_name: (str | None) = Field(default=None, alias='ThirdPartyUpdatePolicyName')
-
-class ComputerPrinter(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    name: (str | None) = Field(default=None, alias='Name')
-    port_name: (str | None) = Field(default=None, alias='PortName')
-    resolution: (str | None) = Field(default=None, alias='Resolution')
-    paper_types: (list[str] | None) = Field(default=None, alias='PaperTypes')
-    features: (list[str] | None) = Field(default=None, alias='Features')
-
-class Status(Enum):
-    RUNNING = 'Running'
-    COMPLETED = 'Completed'
-
-class ComputerRunningScript(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    script_id: (int | None) = Field(default=None, alias='ScriptId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    name: (str | None) = Field(default=None, alias='Name')
-    status: (Status | None) = Field(default=None, alias='Status')
-    start_date: (datetime | None) = Field(default=None, alias='StartDate')
-
-class ComputerDevice(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    pnp_device_id: (str | None) = Field(default=None, alias='PnpDeviceId')
-    device_name: (str | None) = Field(default=None, alias='DeviceName')
-    device_type: (str | None) = Field(default=None, alias='DeviceType')
-    driver_version: (str | None) = Field(default=None, alias='DriverVersion')
-    driver_date: (datetime | None) = Field(default=None, alias='DriverDate')
-    driver_name: (str | None) = Field(default=None, alias='DriverName')
-    driver_file: (str | None) = Field(default=None, alias='DriverFile')
-    manufacturer: (str | None) = Field(default=None, alias='Manufacturer')
-    update_date: (datetime | None) = Field(default=None, alias='UpdateDate')
-
-class MaintenanceMode(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerID')
-    time_start: (datetime | None) = Field(default=None, alias='TimeStart')
-    duration: (int | None) = Field(default=None, alias='Duration')
-    mode: (int | None) = Field(default=None, alias='Mode')
-    user_id: (int | None) = Field(default=None, alias='UserID')
-
-class MemoryFormFactor(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MemoryType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ProcessorSocket(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ProcessorFamily(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ComputerProcessorCache(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    size: (int | None) = Field(default=None, alias='Size')
-
-class ServiceClassification(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class SoftwareClassification(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class VideoCardArchitecture(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class VideoCardMemory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ComputerScheduledTask(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    command: (str | None) = Field(default=None, alias='Command')
-    is_interactive: (bool | None) = Field(default=None, alias='IsInteractive')
-    start_time: (str | None) = Field(default=None, alias='StartTime')
-    does_repeat: (bool | None) = Field(default=None, alias='DoesRepeat')
-    days_of_week: (list[str] | None) = Field(default=None, alias='DaysOfWeek')
-
-class State(Enum):
-    FAILURE = 'Failure'
-    INFORMATION = 'Information'
-    SUCCESS = 'Success'
-
-class ComputerScriptHistory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    script_id: (int | None) = Field(default=None, alias='ScriptId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    name: (str | None) = Field(default=None, alias='Name')
-    user: (str | None) = Field(default=None, alias='User')
-    status: (Status | None) = Field(default=None, alias='Status')
-    state: (State | None) = Field(default=None, alias='State')
-    history_date: (datetime | None) = Field(default=None, alias='HistoryDate')
-    diagnostic_message: (str | None) = Field(default=None, alias='DiagnosticMessage')
-
-class SensorDeviceType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    device_type: (int | None) = Field(default=None, alias='DeviceType')
-    name: (str | None) = Field(default=None, alias='Name')
-    indicator: (str | None) = Field(default=None, alias='Indicator')
-
-class ComputerSystemSlot(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    id: (int | None) = Field(default=None, alias='Id')
-    slot_handle: (int | None) = Field(default=None, alias='SlotHandle')
-    slot_name: (str | None) = Field(default=None, alias='SlotName')
-    slot_type: (str | None) = Field(default=None, alias='SlotType')
-    bus_width: (str | None) = Field(default=None, alias='BusWidth')
-    in_use: (str | None) = Field(default=None, alias='InUse')
-    length: (str | None) = Field(default=None, alias='Length')
-    supports3_volts: (bool | None) = Field(default=None, alias='Supports3Volts')
-    supports5_volts: (bool | None) = Field(default=None, alias='Supports5Volts')
-    is_hot_pluggable: (bool | None) = Field(default=None, alias='IsHotPluggable')
-    supports_power_management: (bool | None) = Field(default=None, alias='SupportsPowerManagement')
-
-class PatchComplianceState(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ThirdParyInstallAction(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ThirdPartyPolicyApproval(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ComputerUps(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    ups_id: (int | None) = Field(default=None, alias='UpsId')
-    ups_name: (str | None) = Field(default=None, alias='UpsName')
-    charge_remaining: (int | None) = Field(default=None, alias='ChargeRemaining')
-    remaining_run_time: (int | None) = Field(default=None, alias='RemainingRunTime')
-
-class DataViewFolder(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class DataView(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    folder_id: (int | None) = Field(default=None, alias='FolderId')
-
-class Document(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    name: (str | None) = Field(default=None, alias='Name')
-    size: (int | None) = Field(default=None, alias='Size')
-    data: (str | None) = Field(default=None, alias='Data')
-    last_user: (str | None) = Field(default=None, alias='LastUser')
-    last_edit_date: (datetime | None) = Field(default=None, alias='LastEditDate')
-
-class EventLogType(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class FeatureFlag(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    is_enabled: (bool | None) = Field(default=None, alias='IsEnabled')
-
-class GroupComputer(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    group_id: (str | None) = Field(default=None, alias='GroupId')
-    computer_id: (str | None) = Field(default=None, alias='ComputerId')
-
-class GroupContact(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    group_id: (str | None) = Field(default=None, alias='GroupId')
-    contact_id: (str | None) = Field(default=None, alias='ContactId')
-
-class GroupNetworkDevice(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    group_id: (str | None) = Field(default=None, alias='GroupId')
-    device_id: (str | None) = Field(default=None, alias='DeviceId')
-
-class LicensedProduct(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    cd_key: (str | None) = Field(default=None, alias='CdKey')
-    current_license_usage: (int | None) = Field(default=None, alias='CurrentLicenseUsage')
-    data: (str | None) = Field(default=None, alias='Data')
-    is_license_active: (bool | None) = Field(default=None, alias='IsLicenseActive')
-    license_file: (str | None) = Field(default=None, alias='LicenseFile')
-    max_license_usage: (int | None) = Field(default=None, alias='MaxLicenseUsage')
-    product_id: (int | None) = Field(default=None, alias='ProductId')
-    product_sku: (str | None) = Field(default=None, alias='ProductSku')
-
-class Link(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    url: (str | None) = Field(default=None, alias='URL')
-    category: (str | None) = Field(default=None, alias='Category')
-
-class ProductKey(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    product_name: (str | None) = Field(default=None, alias='ProductName')
-    serial_number: (str | None) = Field(default=None, alias='SerialNumber')
-    license_key: (str | None) = Field(default=None, alias='LicenseKey')
-    does_expire: (bool | None) = Field(default=None, alias='DoesExpire')
-    expiration_date: (datetime | None) = Field(default=None, alias='ExpirationDate')
-    notes: (str | None) = Field(default=None, alias='Notes')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    computer_name: (str | None) = Field(default=None, alias='ComputerName')
-
-class ReportCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    icon: (str | None) = Field(default=None, alias='Icon')
-    title_text: (str | None) = Field(default=None, alias='TitleText')
-
-class ScriptFolder(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    parent_id: (str | None) = Field(default=None, alias='ParentId')
-    name: (str | None) = Field(default=None, alias='Name')
-    guid: (str | None) = Field(default=None, alias='GUID')
-    sub_folders: (list[ScriptFolder] | None) = Field(default=None, alias='SubFolders')
-    parent_folder: (ScriptFolder | None) = Field(default=None, alias='ParentFolder')
-
-class ScriptMetadata(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    extra_data_fields: (str | None) = Field(default=None, alias='ExtraDataFields')
-    parameters: (str | None) = Field(default=None, alias='Parameters')
-    globals: (str | None) = Field(default=None, alias='Globals')
-    script_version: (int | None) = Field(default=None, alias='ScriptVersion')
-    script_guid: (str | None) = Field(default=None, alias='ScriptGuid')
-
-class ScriptStep(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_section: (int | None) = Field(default=None, alias='ScriptSection')
-    function_id: (int | None) = Field(default=None, alias='FunctionId')
-    param1: (str | None) = Field(default=None, alias='Param1')
-    param2: (str | None) = Field(default=None, alias='Param2')
-    param3: (str | None) = Field(default=None, alias='Param3')
-    param4: (str | None) = Field(default=None, alias='Param4')
-    param5: (str | None) = Field(default=None, alias='Param5')
-    sort: (int | None) = Field(default=None, alias='Sort')
-    continue_: (int | None) = Field(default=None, alias='Continue')
-    os_limit: (int | None) = Field(default=None, alias='OsLimit')
-    indentation: (int | None) = Field(default=None, alias='Indentation')
-
-class PatchActionArgs(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    entity_type: (int | None) = Field(default=None, alias='EntityType')
-    entity_id: (int | None) = Field(default=None, alias='EntityId')
-
-class PatchInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    web_server_patch_version: (str | None) = Field(default=None, alias='WebServerPatchVersion')
-    db_agent_server_patch_version: (str | None) = Field(default=None, alias='DBAgentServerPatchVersion')
-    control_center_patch_version: (str | None) = Field(default=None, alias='ControlCenterPatchVersion')
-    remote_agent_patch_version: (str | None) = Field(default=None, alias='RemoteAgentPatchVersion')
-    linux_agent_patch_version: (str | None) = Field(default=None, alias='LinuxAgentPatchVersion')
-    mac_agent_patch_version: (str | None) = Field(default=None, alias='MacAgentPatchVersion')
-    last_patched_date: (datetime | None) = Field(default=None, alias='LastPatchedDate')
-
-class ScheduledScript(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    script_id: (int | None) = Field(default=None, alias='ScriptId')
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    location_id: (int | None) = Field(default=None, alias='LocationId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    group_id: (int | None) = Field(default=None, alias='GroupId')
-    include_subgroups: (bool | None) = Field(default=None, alias='IncludeSubgroups')
-    search_id: (int | None) = Field(default=None, alias='SearchId')
-    disabled: (bool | None) = Field(default=None, alias='Disabled')
-    effective_start_date: (datetime | None) = Field(default=None, alias='EffectiveStartDate')
-    effective_end_date: (datetime | None) = Field(default=None, alias='EffectiveEndDate')
-    effective_occurrences: (int | None) = Field(default=None, alias='EffectiveOccurrences')
-    distribution_window_type: (int | None) = Field(default=None, alias='DistributionWindowType')
-    distribution_window_amount: (int | None) = Field(default=None, alias='DistributionWindowAmount')
-    next_run: (datetime | None) = Field(default=None, alias='NextRun')
-    next_schedule: (datetime | None) = Field(default=None, alias='NextSchedule')
-    schedule_type: (int | None) = Field(default=None, alias='ScheduleType')
-    exclude_time_start: (str | None) = Field(default=None, alias='ExcludeTimeStart')
-    exclude_time_end: (str | None) = Field(default=None, alias='ExcludeTimeEnd')
-    interval: (int | None) = Field(default=None, alias='Interval')
-    schedule_week_of_month: (int | None) = Field(default=None, alias='ScheduleWeekOfMonth')
-    schedule_day_of_week: (int | None) = Field(default=None, alias='ScheduleDayOfWeek')
-    repeat_type: (int | None) = Field(default=None, alias='RepeatType')
-    repeat_amount: (int | None) = Field(default=None, alias='RepeatAmount')
-    repeat_stop_after: (int | None) = Field(default=None, alias='RepeatStopAfter')
-    skip_offline: (bool | None) = Field(default=None, alias='SkipOffline')
-    offline_only: (bool | None) = Field(default=None, alias='OfflineOnly')
-    wake_offline: (bool | None) = Field(default=None, alias='WakeOffline')
-    wake_script: (bool | None) = Field(default=None, alias='WakeScript')
-    disable_time_zone: (bool | None) = Field(default=None, alias='DisableTimeZone')
-    run_script_on_probe: (bool | None) = Field(default=None, alias='RunScriptOnProbe')
-    parameters: (str | None) = Field(default=None, alias='Parameters')
-    priority: (int | None) = Field(default=None, alias='Priority')
-    time_zone_add: (float | None) = Field(default=None, alias='TimeZoneAdd')
-    user: (str | None) = Field(default=None, alias='User')
-    last_update: (datetime | None) = Field(default=None, alias='LastUpdate')
-
-class SensorCheckType(Enum):
-    SYSTEM_AVERAGES = 'SystemAverages'
-    SYSTEM_COUNTS = 'SystemCounts'
-    TRENDS = 'Trends'
-    PER_DAY_COUNTS = 'PerDayCounts'
-
-class SensorCheck(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    sensor_check_type: (SensorCheckType | None) = Field(default=None, alias='SensorCheckType')
-
-class TemplateAvailableProperty(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    property_id: (str | None) = Field(default=None, alias='PropertyId')
-    property_name: (str | None) = Field(default=None, alias='PropertyName')
-    property_description: (str | None) = Field(default=None, alias='PropertyDescription')
-    property_guid: (str | None) = Field(default=None, alias='PropertyGuid')
-
-class AuditAction(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    level: (int | None) = Field(default=None, alias='Level')
-    extension_name: (str | None) = Field(default=None, alias='ExtensionName')
-
-class AuditSource(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class UserFavorite(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    user_id: (int | None) = Field(default=None, alias='UserId')
-    additional_identifier: (str | None) = Field(default=None, alias='AdditionalIdentifier')
-    order: (int | None) = Field(default=None, alias='Order')
-    item_guid: (str | None) = Field(default=None, alias='ItemGUID')
-
-class UserSetting(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_id: (int | None) = Field(default=None, alias='UserId')
-    name: (str | None) = Field(default=None, alias='Name')
-    value: (str | None) = Field(default=None, alias='Value')
-
-class RemoteAgentSchedule(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    update_config: (Schedule | None) = Field(default=None, alias='UpdateConfig')
-    hardware_inventory: (Schedule | None) = Field(default=None, alias='HardwareInventory')
-    system_inventory: (Schedule | None) = Field(default=None, alias='SystemInventory')
-    drive_inventory: (Schedule | None) = Field(default=None, alias='DriveInventory')
-    process_inventory: (Schedule | None) = Field(default=None, alias='ProcessInventory')
-    maleware_inventory: (Schedule | None) = Field(default=None, alias='MalewareInventory')
-    software_inventory: (Schedule | None) = Field(default=None, alias='SoftwareInventory')
-    event_inventory: (Schedule | None) = Field(default=None, alias='EventInventory')
-    printer_inventory: (Schedule | None) = Field(default=None, alias='PrinterInventory')
-    network_inventory: (Schedule | None) = Field(default=None, alias='NetworkInventory')
-    network_analysis: (Schedule | None) = Field(default=None, alias='NetworkAnalysis')
-    hotfix_inventory: (Schedule | None) = Field(default=None, alias='HotfixInventory')
-    service_inventory: (Schedule | None) = Field(default=None, alias='ServiceInventory')
-    network_probe_inventory: (Schedule | None) = Field(default=None, alias='NetworkProbeInventory')
-    last_update: (datetime | None) = Field(default=None, alias='LastUpdate')
-    last_user: (str | None) = Field(default=None, alias='LastUser')
-
-class Search(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    search_folder: (SearchFolder | None) = Field(default=None, alias='SearchFolder')
-    is_read_only: (bool | None) = Field(default=None, alias='IsReadOnly')
-    search_type: (SearchType | None) = Field(default=None, alias='SearchType')
-
-class UserClass(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    permissions: (UserPermissions | None) = Field(default=None, alias='Permissions')
-
-class User(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    user_id: (str | None) = Field(default=None, alias='UserId')
-    folder: (UserFolder | None) = Field(default=None, alias='Folder')
-    name: (str | None) = Field(default=None, alias='Name')
-    email_address: (str | None) = Field(default=None, alias='EmailAddress')
-    sso_status: (UserSingleSignOnStatus | None) = Field(default=None, alias='SsoStatus')
-
-class ComputerMonitor(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monitor_id: (int | None) = Field(default=None, alias='MonitorId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    device_id: (int | None) = Field(default=None, alias='DeviceId')
-    name: (str | None) = Field(default=None, alias='Name')
-    state: (str | None) = Field(default=None, alias='State')
-    last_scanned: (datetime | None) = Field(default=None, alias='LastScanned')
-    last_failed: (datetime | None) = Field(default=None, alias='LastFailed')
-    last_inventory_date: (datetime | None) = Field(default=None, alias='LastInventoryDate')
-    alert_action: (AlertAction | None) = Field(default=None, alias='AlertAction')
-    monitor_history: (ComputerMonitorHistory | None) = Field(default=None, alias='MonitorHistory')
-
-class TicketComment(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    body: (str | None) = Field(default=None, alias='Body')
-    created_date: (datetime | None) = Field(default=None, alias='CreatedDate')
-    from_: (str | None) = Field(default=None, alias='From')
-    user: (User | None) = Field(default=None, alias='User')
-
-class CommandExecute(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    command: (Command | None) = Field(default=None, alias='Command')
-    status: (str | None) = Field(default=None, alias='Status')
-    parameters: (list[str] | None) = Field(default=None, alias='Parameters')
-    output: (str | None) = Field(default=None, alias='Output')
-    fastalk: (bool | None) = Field(default=None, alias='Fastalk')
-    date_last_inventoried: (datetime | None) = Field(default=None, alias='DateLastInventoried')
-
-class SmartData(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    drive_id: (int | None) = Field(default=None, alias='DriveId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    attribute: (SmartAttribute | None) = Field(default=None, alias='Attribute')
-    value: (int | None) = Field(default=None, alias='Value')
-    worst: (int | None) = Field(default=None, alias='Worst')
-    threshold: (int | None) = Field(default=None, alias='Threshold')
-    raw_value: (int | None) = Field(default=None, alias='RawValue')
-
-class ComputerMicrosoftUpdateData(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    category: (str | None) = Field(default=None, alias='Category')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    install_date: (datetime | None) = Field(default=None, alias='InstallDate')
-    install_state: (str | None) = Field(default=None, alias='InstallState')
-    is_compliant: (bool | None) = Field(default=None, alias='IsCompliant')
-    is_failed: (bool | None) = Field(default=None, alias='IsFailed')
-    is_installed: (bool | None) = Field(default=None, alias='IsInstalled')
-    is_non_compliant: (bool | None) = Field(default=None, alias='IsNonCompliant')
-    knowledge_base_id: (int | None) = Field(default=None, alias='KnowledgeBaseId')
-    microsoft_update_id: (str | None) = Field(default=None, alias='MicrosoftUpdateId')
-    policy_approval: (PolicyApprovalSetting | None) = Field(default=None, alias='PolicyApproval')
-    release_date: (datetime | None) = Field(default=None, alias='ReleaseDate')
-    severity: (str | None) = Field(default=None, alias='Severity')
-    title: (str | None) = Field(default=None, alias='Title')
-    cvss: (float | None) = Field(default=None, alias='Cvss')
-
-class ComputerMemorySlot(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    slot_handle: (int | None) = Field(default=None, alias='SlotHandle')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    slot_name: (str | None) = Field(default=None, alias='SlotName')
-    bank: (str | None) = Field(default=None, alias='Bank')
-    form_factor: (MemoryFormFactor | None) = Field(default=None, alias='FormFactor')
-    total_width: (int | None) = Field(default=None, alias='TotalWidth')
-    data_width: (int | None) = Field(default=None, alias='DataWidth')
-    size: (int | None) = Field(default=None, alias='Size')
-    type: (MemoryType | None) = Field(default=None, alias='Type')
-    speed: (int | None) = Field(default=None, alias='Speed')
-    manufacturer: (str | None) = Field(default=None, alias='Manufacturer')
-    serial_number: (str | None) = Field(default=None, alias='SerialNumber')
-    part_number: (str | None) = Field(default=None, alias='PartNumber')
-    asset_tag: (str | None) = Field(default=None, alias='AssetTag')
-    update_date: (datetime | None) = Field(default=None, alias='UpdateDate')
-
-class ComputerProcessor(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    processor_handle: (int | None) = Field(default=None, alias='ProcessorHandle')
-    socket: (ProcessorSocket | None) = Field(default=None, alias='Socket')
-    is_enabled: (bool | None) = Field(default=None, alias='IsEnabled')
-    family: (ProcessorFamily | None) = Field(default=None, alias='Family')
-    manufacturer: (str | None) = Field(default=None, alias='Manufacturer')
-    speed: (int | None) = Field(default=None, alias='Speed')
-    cache_list: (list[ComputerProcessorCache] | None) = Field(default=None, alias='CacheList')
-    serial_number: (str | None) = Field(default=None, alias='SerialNumber')
-    part_number: (str | None) = Field(default=None, alias='PartNumber')
-    cores: (int | None) = Field(default=None, alias='Cores')
-    threads: (int | None) = Field(default=None, alias='Threads')
-    is64_bit: (bool | None) = Field(default=None, alias='Is64Bit')
-    dep: (bool | None) = Field(default=None, alias='DEP')
-    is_virtualized: (bool | None) = Field(default=None, alias='IsVirtualized')
-    has_power_control: (bool | None) = Field(default=None, alias='HasPowerControl')
-    has_hardware_thread: (bool | None) = Field(default=None, alias='HasHardwareThread')
-    processor_name: (str | None) = Field(default=None, alias='ProcessorName')
-    update_date: (datetime | None) = Field(default=None, alias='UpdateDate')
-
-class ComputerService(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_service_id: (int | None) = Field(default=None, alias='ComputerServiceId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-    state: (str | None) = Field(default=None, alias='State')
-    startup: (str | None) = Field(default=None, alias='Startup')
-    path_name: (str | None) = Field(default=None, alias='PathName')
-    service_type: (str | None) = Field(default=None, alias='ServiceType')
-    username: (str | None) = Field(default=None, alias='Username')
-    date_last_inventoried: (datetime | None) = Field(default=None, alias='DateLastInventoried')
-    run_levels: (str | None) = Field(default=None, alias='RunLevels')
-    classification: (ServiceClassification | None) = Field(default=None, alias='Classification')
-
-class ComputerSoftware(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    application_id: (int | None) = Field(default=None, alias='ApplicationId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    name: (str | None) = Field(default=None, alias='Name')
-    installation_path: (str | None) = Field(default=None, alias='InstallationPath')
-    date_installed: (datetime | None) = Field(default=None, alias='DateInstalled')
-    size: (int | None) = Field(default=None, alias='Size')
-    uninstaller_path: (str | None) = Field(default=None, alias='UninstallerPath')
-    version: (str | None) = Field(default=None, alias='Version')
-    classification: (SoftwareClassification | None) = Field(default=None, alias='Classification')
-    date_last_inventoried: (datetime | None) = Field(default=None, alias='DateLastInventoried')
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    computer_name: (str | None) = Field(default=None, alias='ComputerName')
-
-class ComputerVideoCard(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    pnp_device_id: (str | None) = Field(default=None, alias='PnpDeviceId')
-    video_processor: (str | None) = Field(default=None, alias='VideoProcessor')
-    mode: (str | None) = Field(default=None, alias='Mode')
-    memory: (str | None) = Field(default=None, alias='Memory')
-    architecture: (VideoCardArchitecture | None) = Field(default=None, alias='Architecture')
-    memory_type: (VideoCardMemory | None) = Field(default=None, alias='MemoryType')
-    dac_adapter: (str | None) = Field(default=None, alias='DACAdapter')
-    bits_per_pixel: (int | None) = Field(default=None, alias='BitsPerPixel')
-    update_date: (datetime | None) = Field(default=None, alias='UpdateDate')
-
-class ComputerSensor(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    sensor_id: (int | None) = Field(default=None, alias='SensorId')
-    sensor_name: (str | None) = Field(default=None, alias='SensorName')
-    device_type: (SensorDeviceType | None) = Field(default=None, alias='DeviceType')
-    monitor: (str | None) = Field(default=None, alias='Monitor')
-    value: (float | None) = Field(default=None, alias='Value')
-    max_value: (float | None) = Field(default=None, alias='MaxValue')
-
-class ComputerThirdPartyPatch(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    approved_version: (str | None) = Field(default=None, alias='ApprovedVersion')
-    available_version: (str | None) = Field(default=None, alias='AvailableVersion')
-    compliance_state: (PatchComplianceState | None) = Field(default=None, alias='ComplianceState')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    display_title: (str | None) = Field(default=None, alias='DisplayTitle')
-    install_action: (ThirdParyInstallAction | None) = Field(default=None, alias='InstallAction')
-    install_date: (datetime | None) = Field(default=None, alias='InstallDate')
-    install_state: (str | None) = Field(default=None, alias='InstallState')
-    installed_version: (str | None) = Field(default=None, alias='InstalledVersion')
-    is64_bit: (bool | None) = Field(default=None, alias='Is64Bit')
-    is_compliant: (bool | None) = Field(default=None, alias='IsCompliant')
-    is_failed: (bool | None) = Field(default=None, alias='IsFailed')
-    is_installed: (bool | None) = Field(default=None, alias='IsInstalled')
-    is_non_compliant: (bool | None) = Field(default=None, alias='IsNonCompliant')
-    manufacturer: (str | None) = Field(default=None, alias='Manufacturer')
-    patch_id: (str | None) = Field(default=None, alias='PatchId')
-    policy_approval: (ThirdPartyPolicyApproval | None) = Field(default=None, alias='PolicyApproval')
-    software_id: (str | None) = Field(default=None, alias='SoftwareId')
-    title: (str | None) = Field(default=None, alias='Title')
-
-class EventLog(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    blacklist_id: (int | None) = Field(default=None, alias='BlacklistId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    event_id: (int | None) = Field(default=None, alias='EventId')
-    last_date: (datetime | None) = Field(default=None, alias='LastDate')
-    log_name: (str | None) = Field(default=None, alias='LogName')
-    log_type: (EventLogType | None) = Field(default=None, alias='LogType')
-    message: (str | None) = Field(default=None, alias='Message')
-    source: (str | None) = Field(default=None, alias='Source')
-    time_generated: (datetime | None) = Field(default=None, alias='TimeGenerated')
-
-class ManagedLicense(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    client_id: (int | None) = Field(default=None, alias='ClientId')
-    name: (str | None) = Field(default=None, alias='Name')
-    search_string: (str | None) = Field(default=None, alias='SearchString')
-    license_count: (int | None) = Field(default=None, alias='LicenseCount')
-    installed_count: (int | None) = Field(default=None, alias='InstalledCount')
-    product_key: (ProductKey | None) = Field(default=None, alias='ProductKey')
-
-class ScriptData(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    script_metadata: (ScriptMetadata | None) = Field(default=None, alias='ScriptMetadata')
-    script_steps: (list[ScriptStep] | None) = Field(default=None, alias='ScriptSteps')
-
-class UserAudit(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    user: (User | None) = Field(default=None, alias='User')
-    message: (str | None) = Field(default=None, alias='Message')
-    date_created: (datetime | None) = Field(default=None, alias='DateCreated')
-    external_id: (int | None) = Field(default=None, alias='ExternalId')
-    audit_action: (AuditAction | None) = Field(default=None, alias='AuditAction')
-    source: (AuditSource | None) = Field(default=None, alias='Source')
-    secondary_identifier: (str | None) = Field(default=None, alias='SecondaryIdentifier')
-
-class RemoteAgentTemplate(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    template_guid: (str | None) = Field(default=None, alias='TemplateGUID')
-    server_address: (str | None) = Field(default=None, alias='ServerAddress')
-    event_log_inventory_mode: (EventLogInventoryMode | None) = Field(default=None, alias='EventLogInventoryMode')
-    windows_update: (WindowsUpdate | None) = Field(default=None, alias='WindowsUpdate')
-    ssl_accept_expired_certificates: (bool | None) = Field(default=None, alias='SSLAcceptExpiredCertificates')
-    ssl_access_untrusted_certificate_authorities: (bool | None) = Field(default=None, alias='SSLAccessUntrustedCertificateAuthorities')
-    ssl_accept_mismatched_names: (bool | None) = Field(default=None, alias='SSLAcceptMismatchedNames')
-    ssl_accept_revoked_certificates: (bool | None) = Field(default=None, alias='SSLAcceptRevokedCertificates')
-    ssl_accept_all: (bool | None) = Field(default=None, alias='SSLAcceptAll')
-    default_language_pack: (str | None) = Field(default=None, alias='DefaultLanguagePack')
-    heartbeat_enabled: (bool | None) = Field(default=None, alias='HeartbeatEnabled')
-    heartbeat_frequency: (int | None) = Field(default=None, alias='HeartbeatFrequency')
-    remote_agent_log_debug: (bool | None) = Field(default=None, alias='RemoteAgentLogDebug')
-    schedule: (RemoteAgentSchedule | None) = Field(default=None, alias='Schedule')
-    agent_update_window: (Schedule | None) = Field(default=None, alias='AgentUpdateWindow')
-    temp_directory: (str | None) = Field(default=None, alias='TempDirectory')
-    cache_directory: (str | None) = Field(default=None, alias='CacheDirectory')
-    cache_username: (str | None) = Field(default=None, alias='CacheUsername')
-    cache_password: (str | None) = Field(default=None, alias='CachePassword')
-    cache_patch: (bool | None) = Field(default=None, alias='CachePatch')
-    cache_software: (bool | None) = Field(default=None, alias='CacheSoftware')
-    cache_update: (bool | None) = Field(default=None, alias='CacheUpdate')
-    tray_title: (str | None) = Field(default=None, alias='TrayTitle')
-    remote_agent_name: (str | None) = Field(default=None, alias='RemoteAgentName')
-    show_tray: (bool | None) = Field(default=None, alias='ShowTray')
-    tray_disable_powered_by: (bool | None) = Field(default=None, alias='TrayDisablePoweredBy')
-    tray_icon: (str | None) = Field(default=None, alias='TrayIcon')
-    agent_reboot_mode: (AgentRebootMode | None) = Field(default=None, alias='AgentRebootMode')
-    remote_access_mode: (RemoteAccessMode | None) = Field(default=None, alias='RemoteAccessMode')
-    file_explorer_access_mode: (FileExplorerAccessMode | None) = Field(default=None, alias='FileExplorerAccessMode')
-    registry_editor_access_mode: (RegistryEditorAccessMode | None) = Field(default=None, alias='RegistryEditorAccessMode')
-    screen_capture_access_mode: (ScreenCaptureAccessMode | None) = Field(default=None, alias='ScreenCaptureAccessMode')
-    disallow_user_close_tray: (bool | None) = Field(default=None, alias='DisallowUserCloseTray')
-    allow_user_disable_remote_access: (bool | None) = Field(default=None, alias='AllowUserDisableRemoteAccess')
-    tray_help_url: (str | None) = Field(default=None, alias='TrayHelpURL')
-    tray_custom_menu_title: (str | None) = Field(default=None, alias='TrayCustomMenuTitle')
-    tray_custom_menu_url: (str | None) = Field(default=None, alias='TrayCustomMenuURL')
-    tray_show_custom_menu: (bool | None) = Field(default=None, alias='TrayShowCustomMenu')
-    tray_show_help: (bool | None) = Field(default=None, alias='TrayShowHelp')
-    tray_menus: (list[ComputerMenu] | None) = Field(default=None, alias='TrayMenus')
-    tray_reboot_log_off_notification_text: (str | None) = Field(default=None, alias='TrayRebootLogOffNotificationText')
-    tray_shutdown_notification_text: (str | None) = Field(default=None, alias='TrayShutdownNotificationText')
-    tray_remote_access_notification_text: (str | None) = Field(default=None, alias='TrayRemoteAccessNotificationText')
-    tray_file_explorer_access_notification_text: (str | None) = Field(default=None, alias='TrayFileExplorerAccessNotificationText')
-    tray_registry_editor_access_notification_text: (str | None) = Field(default=None, alias='TrayRegistryEditorAccessNotificationText')
-    tray_screen_capture_access_notification_text: (str | None) = Field(default=None, alias='TrayScreenCaptureAccessNotificationText')
-    service_ticket_title: (str | None) = Field(default=None, alias='ServiceTicketTitle')
-    tray_ticket_from_label_text: (str | None) = Field(default=None, alias='TrayTicketFromLabelText')
-    tray_ticket_subject_label_text: (str | None) = Field(default=None, alias='TrayTicketSubjectLabelText')
-    tray_show_service_ticket_menu: (bool | None) = Field(default=None, alias='TrayShowServiceTicketMenu')
-    tray_show_messages_and_tickets: (bool | None) = Field(default=None, alias='TrayShowMessagesAndTickets')
-    tray_ticket_verify_email: (bool | None) = Field(default=None, alias='TrayTicketVerifyEmail')
-    support_url: (str | None) = Field(default=None, alias='SupportURL')
-    rss_feed_address1: (str | None) = Field(default=None, alias='RSSFeedAddress1')
-    rss_feed_address2: (str | None) = Field(default=None, alias='RSSFeedAddress2')
-    rss_feed_address3: (str | None) = Field(default=None, alias='RSSFeedAddress3')
-    rss_feed_address4: (str | None) = Field(default=None, alias='RSSFeedAddress4')
-    enable_rss: (bool | None) = Field(default=None, alias='EnableRSS')
-    tray_chat_notification_text: (str | None) = Field(default=None, alias='TrayChatNotificationText')
-    tray_chat_notification_title: (str | None) = Field(default=None, alias='TrayChatNotificationTitle')
-    tray_interrupt_user_with_chat: (bool | None) = Field(default=None, alias='TrayInterruptUserWithChat')
-    proxy_server_url: (str | None) = Field(default=None, alias='ProxyServerURL')
-    proxy_server_user: (str | None) = Field(default=None, alias='ProxyServerUser')
-    proxy_server_password: (str | None) = Field(default=None, alias='ProxyServerPassword')
-    tray_notification_title: (str | None) = Field(default=None, alias='TrayNotificationTitle')
-    tray_new_message_notification_text: (str | None) = Field(default=None, alias='TrayNewMessageNotificationText')
-    tray_new_rss_feed_notification_text: (str | None) = Field(default=None, alias='TrayNewRSSFeedNotificationText')
-    tray_remote_access_notification_title: (str | None) = Field(default=None, alias='TrayRemoteAccessNotificationTitle')
-    tray_system_message_notification_title: (str | None) = Field(default=None, alias='TraySystemMessageNotificationTitle')
-    backup_server_url: (str | None) = Field(default=None, alias='BackupServerURL')
-    backup_server_user: (str | None) = Field(default=None, alias='BackupServerUser')
-    backup_server_password: (str | None) = Field(default=None, alias='BackupServerPassword')
-    network_access_storage_path: (str | None) = Field(default=None, alias='NetworkAccessStoragePath')
-    template_properties: (list[TemplateProperty] | None) = Field(default=None, alias='TemplateProperties')
-    antivirus_template: (AVTemplatePolicy | None) = Field(default=None, alias='AntivirusTemplate')
-
-class UserClassComputerPermissions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    user_class: (UserClass | None) = Field(default=None, alias='UserClass')
-    permissions: (ComputerPermissions | None) = Field(default=None, alias='Permissions')
-
-class Script(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    folder: (ScriptFolder | None) = Field(default=None, alias='Folder')
-    name: (str | None) = Field(default=None, alias='Name')
-    comments: (str | None) = Field(default=None, alias='Comments')
-    is_computer_script: (bool | None) = Field(default=None, alias='IsComputerScript')
-    is_location_script: (bool | None) = Field(default=None, alias='IsLocationScript')
-    is_maintenance_script: (bool | None) = Field(default=None, alias='IsMaintenanceScript')
-    is_function_script: (bool | None) = Field(default=None, alias='IsFunctionScript')
-    is_offline: (bool | None) = Field(default=None, alias='IsOffline')
-    ignore_for_mobile_devices: (bool | None) = Field(default=None, alias='IgnoreForMobileDevices')
-    is_public_sharable: (bool | None) = Field(default=None, alias='IsPublicSharable')
-    is_user_response: (bool | None) = Field(default=None, alias='IsUserResponse')
-    is_system_script: (bool | None) = Field(default=None, alias='IsSystemScript')
-    is_mobile_device_script: (bool | None) = Field(default=None, alias='IsMobileDeviceScript')
-    is_network_device_script: (bool | None) = Field(default=None, alias='IsNetworkDeviceScript')
-    is_contact_script: (bool | None) = Field(default=None, alias='IsContactScript')
-    version: (int | None) = Field(default=None, alias='Version')
-    guid: (str | None) = Field(default=None, alias='GUID')
-    parameters: (list[str] | None) = Field(default=None, alias='Parameters')
-    edit_permission: (list[int] | None) = Field(default=None, alias='EditPermission')
-    permission: (list[int] | None) = Field(default=None, alias='Permission')
-    automation_time: (int | None) = Field(default=None, alias='AutomationTime')
-    update_date: (datetime | None) = Field(default=None, alias='UpdateDate')
-    updated_by: (str | None) = Field(default=None, alias='UpdatedBy')
-    full_folder_path: (str | None) = Field(default=None, alias='FullFolderPath')
-    script_data: (ScriptData | None) = Field(default=None, alias='ScriptData')
-
-class Client(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-    company: (str | None) = Field(default=None, alias='Company')
-    first_name: (str | None) = Field(default=None, alias='FirstName')
-    last_name: (str | None) = Field(default=None, alias='LastName')
-    address1: (str | None) = Field(default=None, alias='Address1')
-    address2: (str | None) = Field(default=None, alias='Address2')
-    city: (str | None) = Field(default=None, alias='City')
-    state: (str | None) = Field(default=None, alias='State')
-    zip_code: (str | None) = Field(default=None, alias='ZipCode')
-    phone_number: (str | None) = Field(default=None, alias='PhoneNumber')
-    fax_number: (str | None) = Field(default=None, alias='FaxNumber')
-    comment: (str | None) = Field(default=None, alias='Comment')
-    country: (str | None) = Field(default=None, alias='Country')
-    external_id: (str | None) = Field(default=None, alias='ExternalId')
-    uses_in_house_support_staff: (bool | None) = Field(default=None, alias='UsesInHouseSupportStaff')
-    new_ticket_notification_email: (str | None) = Field(default=None, alias='NewTicketNotificationEmail')
-    is_hidden_from_all_inclusive_group: (bool | None) = Field(default=None, alias='IsHiddenFromAllInclusiveGroup')
-    locations: (list[Location] | None) = Field(default=None, alias='Locations')
-
-class Location(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    client: (Client | None) = Field(default=None, alias='Client')
-    name: (str | None) = Field(default=None, alias='Name')
-    address1: (str | None) = Field(default=None, alias='Address1')
-    address2: (str | None) = Field(default=None, alias='Address2')
-    city: (str | None) = Field(default=None, alias='City')
-    state: (str | None) = Field(default=None, alias='State')
-    zip_code: (str | None) = Field(default=None, alias='ZipCode')
-    country: (str | None) = Field(default=None, alias='Country')
-    phone_number: (str | None) = Field(default=None, alias='PhoneNumber')
-    fax_number: (str | None) = Field(default=None, alias='FaxNumber')
-    contact: (Contact | None) = Field(default=None, alias='Contact')
-    comments: (str | None) = Field(default=None, alias='Comments')
-    router_port: (int | None) = Field(default=None, alias='RouterPort')
-    script_drive: (str | None) = Field(default=None, alias='ScriptDrive')
-    script_username: (str | None) = Field(default=None, alias='ScriptUsername')
-    script_password: (str | None) = Field(default=None, alias='ScriptPassword')
-    script_router_address: (str | None) = Field(default=None, alias='ScriptRouterAddress')
-    script_extra1: (str | None) = Field(default=None, alias='ScriptExtra1')
-    script_extra2: (str | None) = Field(default=None, alias='ScriptExtra2')
-    probe_id: (int | None) = Field(default=None, alias='ProbeId')
-    external_id: (int | None) = Field(default=None, alias='ExternalId')
-    router: (Router | None) = Field(default=None, alias='Router')
-    deployment_template: (RemoteAgentTemplate | None) = Field(default=None, alias='DeploymentTemplate')
-    maintenance_window: (TemporaryApiContracts.MaintenanceWindowDefinition | None) = Field(default=None, alias='MaintenanceWindow')
-    default_deployment_group: (Group | None) = Field(default=None, alias='DefaultDeploymentGroup')
-    default_deployment_login: (TemporaryApiContracts.DeploymentLogin | None) = Field(default=None, alias='DefaultDeploymentLogin')
-
-class Contact(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    location: (Location | None) = Field(default=None, alias='Location')
-    client: (Client | None) = Field(default=None, alias='Client')
-    first_name: (str | None) = Field(default=None, alias='FirstName')
-    last_name: (str | None) = Field(default=None, alias='LastName')
-    address1: (str | None) = Field(default=None, alias='Address1')
-    address2: (str | None) = Field(default=None, alias='Address2')
-    city: (str | None) = Field(default=None, alias='City')
-    state: (str | None) = Field(default=None, alias='State')
-    zip_code: (str | None) = Field(default=None, alias='ZipCode')
-    phone_number: (str | None) = Field(default=None, alias='PhoneNumber')
-    mobile_number: (str | None) = Field(default=None, alias='MobileNumber')
-    fax_number: (str | None) = Field(default=None, alias='FaxNumber')
-    pager_number: (str | None) = Field(default=None, alias='PagerNumber')
-    email: (str | None) = Field(default=None, alias='Email')
-    external_id: (str | None) = Field(default=None, alias='ExternalId')
-    web_permissions: (ContactWebPermissions | None) = Field(default=None, alias='WebPermissions')
-    created_date: (datetime | None) = Field(default=None, alias='CreatedDate')
-    associated_computers: (list[Computer] | None) = Field(default=None, alias='AssociatedComputers')
-
-class Group(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    parent_id: (str | None) = Field(default=None, alias='ParentId')
-    sub_groups: (list[int] | None) = Field(default=None, alias='SubGroups')
-    parent_groups: (list[int] | None) = Field(default=None, alias='ParentGroups')
-    parents: (list[GroupPartial] | None) = Field(default=None, alias='Parents')
-    depth: (int | None) = Field(default=None, alias='Depth')
-    name: (str | None) = Field(default=None, alias='Name')
-    full_name: (str | None) = Field(default=None, alias='FullName')
-    type_id: (int | None) = Field(default=None, alias='TypeId')
-    type_name: (str | None) = Field(default=None, alias='TypeName')
-    template_priority: (int | None) = Field(default=None, alias='TemplatePriority')
-    guid: (str | None) = Field(default=None, alias='GUID')
-    computers_auto_join_search: (Search | None) = Field(default=None, alias='ComputersAutoJoinSearch')
-    network_devices_auto_join_search: (Search | None) = Field(default=None, alias='NetworkDevicesAutoJoinSearch')
-    contacts_auto_join_search: (Search | None) = Field(default=None, alias='ContactsAutoJoinSearch')
-    maintenance_window: (MaintenanceWindow | None) = Field(default=None, alias='MaintenanceWindow')
-    maintenance_window_last_applied: (datetime | None) = Field(default=None, alias='MaintenanceWindowLastApplied')
-    computers_limit_to_search: (bool | None) = Field(default=None, alias='ComputersLimitToSearch')
-    network_devices_limit_to_search: (bool | None) = Field(default=None, alias='NetworkDevicesLimitToSearch')
-    contacts_limit_to_search: (bool | None) = Field(default=None, alias='ContactsLimitToSearch')
-    contacts_join_computers: (bool | None) = Field(default=None, alias='ContactsJoinComputers')
-    remote_agent_template: (RemoteAgentTemplate | None) = Field(default=None, alias='RemoteAgentTemplate')
-    client_to_sync: (Client | None) = Field(default=None, alias='ClientToSync')
-    location_to_sync: (Location | None) = Field(default=None, alias='LocationToSync')
-    comments: (str | None) = Field(default=None, alias='Comments')
-    computer_permissions: (list[UserClassComputerPermissions] | None) = Field(default=None, alias='ComputerPermissions')
-    computers: (list[Computer] | None) = Field(default=None, alias='Computers')
-    network_devices: (list[NetworkDevice] | None) = Field(default=None, alias='NetworkDevices')
-    contacts: (list[Contact] | None) = Field(default=None, alias='Contacts')
-
-class Computer(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    location: (Location | None) = Field(default=None, alias='Location')
-    client: (Client | None) = Field(default=None, alias='Client')
-    contact: (Contact | None) = Field(default=None, alias='Contact')
-    is_fas_talk: (bool | None) = Field(default=None, alias='IsFasTalk')
-    is_master: (bool | None) = Field(default=None, alias='IsMaster')
-    is_network_probe: (bool | None) = Field(default=None, alias='IsNetworkProbe')
-    is_heartbeat_enabled: (bool | None) = Field(default=None, alias='IsHeartbeatEnabled')
-    is_maintenance_mode_enabled: (bool | None) = Field(default=None, alias='IsMaintenanceModeEnabled')
-    is_tunnel_supported: (bool | None) = Field(default=None, alias='IsTunnelSupported')
-    is_virtual_machine: (bool | None) = Field(default=None, alias='IsVirtualMachine')
-    computer_name: (str | None) = Field(default=None, alias='ComputerName')
-    operating_system_name: (str | None) = Field(default=None, alias='OperatingSystemName')
-    operating_system_version: (str | None) = Field(default=None, alias='OperatingSystemVersion')
-    domain_name: (str | None) = Field(default=None, alias='DomainName')
-    remote_agent_last_inventory: (datetime | None) = Field(default=None, alias='RemoteAgentLastInventory')
-    utc_offset: (int | None) = Field(default=None, alias='UTCOffset')
-    open_ports_tcp: (list[int] | None) = Field(default=None, alias='OpenPortsTCP')
-    open_ports_udp: (list[int] | None) = Field(default=None, alias='OpenPortsUDP')
-    comment: (str | None) = Field(default=None, alias='Comment')
-    remote_agent_version: (str | None) = Field(default=None, alias='RemoteAgentVersion')
-    remote_agent_last_contact: (datetime | None) = Field(default=None, alias='RemoteAgentLastContact')
-    domain_name_servers: (list[str] | None) = Field(default=None, alias='DomainNameServers')
-    last_inventory_received: (datetime | None) = Field(default=None, alias='LastInventoryReceived')
-    windows_update_date: (datetime | None) = Field(default=None, alias='WindowsUpdateDate')
-    antivirus_definition_date: (datetime | None) = Field(default=None, alias='AntivirusDefinitionDate')
-    last_heartbeat: (datetime | None) = Field(default=None, alias='LastHeartbeat')
-    total_memory: (int | None) = Field(default=None, alias='TotalMemory')
-    free_memory: (int | None) = Field(default=None, alias='FreeMemory')
-    cpu_usage: (int | None) = Field(default=None, alias='CpuUsage')
-    local_ip_address: (str | None) = Field(default=None, alias='LocalIPAddress')
-    gateway_ip_address: (str | None) = Field(default=None, alias='GatewayIPAddress')
-    system_uptime: (int | None) = Field(default=None, alias='SystemUptime')
-    last_startup: (datetime | None) = Field(default=None, alias='LastStartup')
-    mac_address: (str | None) = Field(default=None, alias='MACAddress')
-    date_added: (datetime | None) = Field(default=None, alias='DateAdded')
-    user_idle_time: (int | None) = Field(default=None, alias='UserIdleTime')
-    logged_in_users: (list[LoggedInUser] | None) = Field(default=None, alias='LoggedInUsers')
-    last_user_name: (str | None) = Field(default=None, alias='LastUserName')
-    tickets: (list[Ticket] | None) = Field(default=None, alias='Tickets')
-    groups: (list[Group] | None) = Field(default=None, alias='Groups')
-    bandwidth: (int | None) = Field(default=None, alias='Bandwidth')
-    bandwidth_display: (str | None) = Field(default=None, alias='BandwidthDisplay')
-    asset_date: (datetime | None) = Field(default=None, alias='AssetDate')
-    asset_tag: (str | None) = Field(default=None, alias='AssetTag')
-    warranty_end_date: (datetime | None) = Field(default=None, alias='WarrantyEndDate')
-    type: (str | None) = Field(default=None, alias='Type')
-    status: (str | None) = Field(default=None, alias='Status')
-    master_mode: (str | None) = Field(default=None, alias='MasterMode')
-    virus_scanner: (VirusScannerDef | None) = Field(default=None, alias='VirusScanner')
-    friendly_name: (str | None) = Field(default=None, alias='FriendlyName')
-    is_locked_down: (bool | None) = Field(default=None, alias='IsLockedDown')
-    is_system_account: (bool | None) = Field(default=None, alias='IsSystemAccount')
-    is_reboot_needed: (bool | None) = Field(default=None, alias='IsRebootNeeded')
-    is_virtual_host: (bool | None) = Field(default=None, alias='IsVirtualHost')
-    is_heartbeat_running: (bool | None) = Field(default=None, alias='IsHeartbeatRunning')
-    has_intel_vpro: (bool | None) = Field(default=None, alias='HasIntelVPRO')
-    has_intel_amt: (bool | None) = Field(default=None, alias='HasIntelAMT')
-    has_h_pi_lo: (bool | None) = Field(default=None, alias='HasHPiLO')
-    temp_files: (str | None) = Field(default=None, alias='TempFiles')
-    serial_number: (str | None) = Field(default=None, alias='SerialNumber')
-    cpu_score: (float | None) = Field(default=None, alias='CpuScore')
-    d3_d_score: (float | None) = Field(default=None, alias='D3DScore')
-    disk_score: (float | None) = Field(default=None, alias='DiskScore')
-    graphics_score: (float | None) = Field(default=None, alias='GraphicsScore')
-    memory_score: (float | None) = Field(default=None, alias='MemoryScore')
-    power_profiles: (list[str] | None) = Field(default=None, alias='PowerProfiles')
-    current_power_profile: (str | None) = Field(default=None, alias='CurrentPowerProfile')
-    bios_manufacturer: (str | None) = Field(default=None, alias='BiosManufacturer')
-    bios_flash: (str | None) = Field(default=None, alias='BiosFlash')
-    primary_contact_name: (str | None) = Field(default=None, alias='PrimaryContactName')
-    comment_priority: (CommentPriority | None) = Field(default=None, alias='CommentPriority')
-    irq: (list[int] | None) = Field(default=None, alias='IRQ')
-    address: (list[int] | None) = Field(default=None, alias='Address')
-    dma: (list[int] | None) = Field(default=None, alias='DMA')
-    hardware_ports: (list[str] | None) = Field(default=None, alias='HardwarePorts')
-    user_accounts: (list[str] | None) = Field(default=None, alias='UserAccounts')
-
-class NetworkDevice(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    location: (Location | None) = Field(default=None, alias='Location')
-    local_ip_address: (str | None) = Field(default=None, alias='LocalIPAddress')
-    name: (str | None) = Field(default=None, alias='Name')
-    friendly_name: (str | None) = Field(default=None, alias='FriendlyName')
-    open_ports_tcp: (list[int] | None) = Field(default=None, alias='OpenPortsTCP')
-    device_type: (NetworkDeviceType | None) = Field(default=None, alias='DeviceType')
-    detection_template_name: (str | None) = Field(default=None, alias='DetectionTemplateName')
-    last_updated: (datetime | None) = Field(default=None, alias='LastUpdated')
-    mac_address: (str | None) = Field(default=None, alias='MACAddress')
-    status: (str | None) = Field(default=None, alias='Status')
-    contact: (Contact | None) = Field(default=None, alias='Contact')
-    alert_action: (AlertAction | None) = Field(default=None, alias='AlertAction')
-    alert_message: (str | None) = Field(default=None, alias='AlertMessage')
-    alert_when_offline: (bool | None) = Field(default=None, alias='AlertWhenOffline')
-    date_added: (datetime | None) = Field(default=None, alias='DateAdded')
-    snmp_community_get: (str | None) = Field(default=None, alias='SNMPCommunityGet')
-    snmp_community_set: (str | None) = Field(default=None, alias='SNMPCommunitySet')
-    is_snm_pv1_supported: (bool | None) = Field(default=None, alias='IsSNMPv1Supported')
-    is_snm_pv2c_supported: (bool | None) = Field(default=None, alias='IsSNMPv2cSupported')
-    is_snm_pv3_supported: (bool | None) = Field(default=None, alias='IsSNMPv3Supported')
-    is_low_on_toner: (bool | None) = Field(default=None, alias='IsLowOnToner')
-    is_low_on_paper: (bool | None) = Field(default=None, alias='IsLowOnPaper')
-    is_high_bandwidth: (bool | None) = Field(default=None, alias='IsHighBandwidth')
-    flags_display: (str | None) = Field(default=None, alias='FlagsDisplay')
-    manufacturer_name: (str | None) = Field(default=None, alias='ManufacturerName')
-    model_name: (str | None) = Field(default=None, alias='ModelName')
-    description: (str | None) = Field(default=None, alias='Description')
-    uptime: (int | None) = Field(default=None, alias='Uptime')
-    uptime_display: (str | None) = Field(default=None, alias='UptimeDisplay')
-    data_out: (int | None) = Field(default=None, alias='DataOut')
-    data_out_display: (str | None) = Field(default=None, alias='DataOutDisplay')
-    data_in: (int | None) = Field(default=None, alias='DataIn')
-    data_in_display: (str | None) = Field(default=None, alias='DataInDisplay')
-    asset_date: (datetime | None) = Field(default=None, alias='AssetDate')
-    last_contact: (datetime | None) = Field(default=None, alias='LastContact')
-    nas_percent: (str | None) = Field(default=None, alias='NasPercent')
-    groups: (list[Group] | None) = Field(default=None, alias='Groups')
-    client: (Client | None) = Field(default=None, alias='Client')
-    is_synced_to_manage: (bool | None) = Field(default=None, alias='IsSyncedToManage')
-    snmp_tree: (list[int] | None) = Field(default=None, alias='SnmpTree')
-    external_system_credentials: (ExternalSystemCredentials | None) = Field(default=None, alias='ExternalSystemCredentials')
-    interface_count: (int | None) = Field(default=None, alias='InterfaceCount')
-    probe_id: (int | None) = Field(default=None, alias='ProbeId')
-    probe_name: (str | None) = Field(default=None, alias='ProbeName')
-    agent_deployment_readiness_check: (TemporaryApiContracts.AgentDeploymentReadinessCheck | None) = Field(default=None, alias='AgentDeploymentReadinessCheck')
-
-class Ticket(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    ticket_id: (int | None) = Field(default=None, alias='TicketId')
-    client: (Client | None) = Field(default=None, alias='Client')
-    computer: (Computer | None) = Field(default=None, alias='Computer')
-    status: (TicketStatus | None) = Field(default=None, alias='Status')
-    subject: (str | None) = Field(default=None, alias='Subject')
-    priority: (TicketPriority | None) = Field(default=None, alias='Priority')
-    user: (User | None) = Field(default=None, alias='User')
-    due_date: (datetime | None) = Field(default=None, alias='DueDate')
-    start_date: (datetime | None) = Field(default=None, alias='StartDate')
-    contact_date: (datetime | None) = Field(default=None, alias='ContactDate')
-    update_date: (datetime | None) = Field(default=None, alias='UpdateDate')
-    from_: (str | None) = Field(default=None, alias='From')
-    cc: (str | None) = Field(default=None, alias='CC')
-    support_level: (int | None) = Field(default=None, alias='SupportLevel')
-    category: (TicketCategory | None) = Field(default=None, alias='Category')
-    category_id: (int | None) = Field(default=None, alias='CategoryId')
-    category_name: (str | None) = Field(default=None, alias='CategoryName')
-    location: (Location | None) = Field(default=None, alias='Location')
-    external_id: (int | None) = Field(default=None, alias='ExternalId')
-    monitor_id: (int | None) = Field(default=None, alias='MonitorId')
-    guid: (str | None) = Field(default=None, alias='Guid')
-    agent: (ComputerMonitor | None) = Field(default=None, alias='Agent')
-    network_device: (NetworkDevice | None) = Field(default=None, alias='NetworkDevice')
-    comments: (list[TicketComment] | None) = Field(default=None, alias='Comments')
-
-class RetiredAsset(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (str | None) = Field(default=None, alias='Id')
-    client: (Client | None) = Field(default=None, alias='Client')
-    location: (Location | None) = Field(default=None, alias='Location')
-    computer_name: (str | None) = Field(default=None, alias='ComputerName')
-    operating_system_name: (str | None) = Field(default=None, alias='OperatingSystemName')
-    operating_system_version: (str | None) = Field(default=None, alias='OperatingSystemVersion')
-    comment: (str | None) = Field(default=None, alias='Comment')
-    local_ip_address: (str | None) = Field(default=None, alias='LocalIPAddress')
-    gateway_ip_address: (str | None) = Field(default=None, alias='GatewayIPAddress')
-    asset_tag: (str | None) = Field(default=None, alias='AssetTag')
-    asset_date: (datetime | None) = Field(default=None, alias='AssetDate')
-    retired_date: (datetime | None) = Field(default=None, alias='RetiredDate')
-    retire_comment: (str | None) = Field(default=None, alias='RetireComment')
-    computer_id: (str | None) = Field(default=None, alias='ComputerId')
-from . import TemporaryApiContracts
diff --git a/src/pyconnectwise/models/automate/LabTech/RESTApi/Models.py b/src/pyconnectwise/models/automate/LabTech/RESTApi/Models.py
deleted file mode 100644
index 7f4eea8b9..000000000
--- a/src/pyconnectwise/models/automate/LabTech/RESTApi/Models.py
+++ /dev/null
@@ -1,11 +0,0 @@
-
-from __future__ import annotations
-from typing import Any
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class PatchOperation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    op: (str | None) = Field(default=None, alias='Op')
-    path: (str | None) = Field(default=None, alias='Path')
-    value: (dict[(str, Any)] | None) = Field(default=None, alias='Value')
diff --git a/src/pyconnectwise/models/automate/LabTech/RESTApi/RpcContracts.py b/src/pyconnectwise/models/automate/LabTech/RESTApi/RpcContracts.py
deleted file mode 100644
index 3bddcd630..000000000
--- a/src/pyconnectwise/models/automate/LabTech/RESTApi/RpcContracts.py
+++ /dev/null
@@ -1,23 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class SoftwareUninstallInfo(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    uninstall_path: (str | None) = Field(default=None, alias='UninstallPath')
-
-class SoftwareClassificationInfo(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    software_names: (list[str] | None) = Field(default=None, alias='SoftwareNames')
-
-class NewProbeConfiguration(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_agent_push_enabled: (bool | None) = Field(default=None, alias='IsAgentPushEnabled')
-    is_automated_deployment_enabled: (bool | None) = Field(default=None, alias='IsAutomatedDeploymentEnabled')
-    is_data_collection_enabled: (bool | None) = Field(default=None, alias='IsDataCollectionEnabled')
-    is_snmp_trap_server_enabled: (bool | None) = Field(default=None, alias='IsSnmpTrapServerEnabled')
-    is_syslog_server_enabled: (bool | None) = Field(default=None, alias='IsSyslogServerEnabled')
-    is_tftp_server_enabled: (bool | None) = Field(default=None, alias='IsTftpServerEnabled')
-    credentials_list: (list[NetworkProbe.ProbeConfigurationCredentials] | None) = Field(default=None, alias='CredentialsList')
-from ..Repositories.MySQL.Domain.Models import NetworkProbe
diff --git a/src/pyconnectwise/models/automate/LabTech/RESTApi/Security.py b/src/pyconnectwise/models/automate/LabTech/RESTApi/Security.py
deleted file mode 100644
index c6b4f5a28..000000000
--- a/src/pyconnectwise/models/automate/LabTech/RESTApi/Security.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class AuthServiceCredentials(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    service_id: (int | None) = Field(default=None, alias='ServiceId')
-    service_token: (str | None) = Field(default=None, alias='ServiceToken')
-
-class APIAuthLinkInformation(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    nonce: (str | None) = Field(default=None, alias='Nonce')
diff --git a/src/pyconnectwise/models/automate/LabTech/RESTApi/__init__.py b/src/pyconnectwise/models/automate/LabTech/RESTApi/__init__.py
deleted file mode 100644
index 5e3696989..000000000
--- a/src/pyconnectwise/models/automate/LabTech/RESTApi/__init__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-
-from __future__ import annotations
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class Type(Enum):
-    UNDEFINED = 'Undefined'
-    ASCENDING = 'Ascending'
-    DESCENDING = 'Descending'
-
-class QueryOptionOrderBy(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    name: (str | None) = Field(default=None, alias='Name')
-    type: (Type | None) = Field(default=None, alias='Type')
-
-class QueryOptionExpand(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    field_name: (str | None) = Field(default=None, alias='FieldName')
-    page: (int | None) = Field(default=None, alias='Page')
-    page_size: (int | None) = Field(default=None, alias='PageSize')
-    condition: (str | None) = Field(default=None, alias='Condition')
-    expands: (dict[(str, QueryOptionExpand)] | None) = Field(default=None, alias='Expands')
-    order_by: (QueryOptionOrderBy | None) = Field(default=None, alias='OrderBy')
-    included_fields: (list[str] | None) = Field(default=None, alias='IncludedFields')
-    excluded_fields: (list[str] | None) = Field(default=None, alias='ExcludedFields')
-
-class QueryOptions(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    order_by: (QueryOptionOrderBy | None) = Field(default=None, alias='OrderBy')
-    page: (int | None) = Field(default=None, alias='Page')
-    page_size: (int | None) = Field(default=None, alias='PageSize')
-    condition: (str | None) = Field(default=None, alias='Condition')
-    expands: (dict[(str, QueryOptionExpand)] | None) = Field(default=None, alias='Expands')
-    included_fields: (list[str] | None) = Field(default=None, alias='IncludedFields')
-    excluded_fields: (list[str] | None) = Field(default=None, alias='ExcludedFields')
-    ids: (list[str] | None) = Field(default=None, alias='Ids')
-    timeout: (int | None) = Field(default=None, alias='Timeout')
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/DatabaseEntities.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/DatabaseEntities.py
deleted file mode 100644
index 126228092..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/DatabaseEntities.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ProbeCommand(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_command_id: (int | None) = Field(default=None, alias='ProbeCommandId')
-    probe_id: (int | None) = Field(default=None, alias='ProbeId')
-    command: (Contracts.ProbeRemoteCommand | None) = Field(default=None, alias='Command')
-    status: (Contracts.ProbeCommandStatus | None) = Field(default=None, alias='Status')
-    parameters: (list[str] | None) = Field(default=None, alias='Parameters')
-    output: (str | None) = Field(default=None, alias='Output')
-    is_fastalk: (bool | None) = Field(default=None, alias='IsFastalk')
-    date_updated: (datetime | None) = Field(default=None, alias='DateUpdated')
-from .....Automate.Api.Domain import Contracts
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/Alerting.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/Alerting.py
deleted file mode 100644
index 0ea787f75..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/Alerting.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class MonitorAlertSuspension(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    monitor: (Monitors.Monitor | None) = Field(default=None, alias='Monitor')
-    suspension_date: (datetime | None) = Field(default=None, alias='SuspensionDate')
-from .....Models import Monitors
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/AuthLink.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/AuthLink.py
deleted file mode 100644
index 84528e471..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/AuthLink.py
+++ /dev/null
@@ -1,12 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class UserAuthLinkStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    service_id: (int | None) = Field(default=None, alias='ServiceId')
-    is_sso_enabled: (bool | None) = Field(default=None, alias='IsSsoEnabled')
-    is_local_login_enabled: (bool | None) = Field(default=None, alias='IsLocalLoginEnabled')
-    is_eligible_for_sso: (bool | None) = Field(default=None, alias='IsEligibleForSso')
-    is_account_linked: (bool | None) = Field(default=None, alias='IsAccountLinked')
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/NetworkProbe.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/NetworkProbe.py
deleted file mode 100644
index 217eda57f..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/NetworkProbe.py
+++ /dev/null
@@ -1,169 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class EncryptionMethod(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class HashMethod(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class ScanFrequencyCategory(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    category_id: (int | None) = Field(default=None, alias='CategoryId')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class StatusScanNetworkPortOption(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    status_scan_network_port_option_id: (int | None) = Field(default=None, alias='StatusScanNetworkPortOptionId')
-    description: (str | None) = Field(default=None, alias='Description')
-
-class ProbeConfigurationCredentials(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_configuration_credentials_id: (int | None) = Field(default=None, alias='ProbeConfigurationCredentialsId')
-    probe_configuration_id: (int | None) = Field(default=None, alias='ProbeConfigurationId')
-    credential_id: (int | None) = Field(default=None, alias='CredentialId')
-    attempt_sequence: (int | None) = Field(default=None, alias='AttemptSequence')
-    credentials_alias: (str | None) = Field(default=None, alias='CredentialsAlias')
-    credential_details: (Models.ExternalSystemCredentials | None) = Field(default=None, alias='CredentialDetails')
-
-class SnmpSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    community_strings_get: (str | None) = Field(default=None, alias='CommunityStringsGet')
-    timeout_in_seconds: (int | None) = Field(default=None, alias='TimeoutInSeconds')
-
-class SyslogServerSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    syslog_server_listening_port: (int | None) = Field(default=None, alias='SyslogServerListeningPort')
-    syslog_server_ip_filter: (str | None) = Field(default=None, alias='SyslogServerIpFilter')
-
-class TftpServerSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    tftp_server_ip_filter: (str | None) = Field(default=None, alias='TftpServerIpFilter')
-    tftp_server_listening_port: (int | None) = Field(default=None, alias='TftpServerListeningPort')
-    allow_tftp_uploads: (bool | None) = Field(default=None, alias='AllowTftpUploads')
-
-class ProbeSubnet(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_subnet_id: (int | None) = Field(default=None, alias='ProbeSubnetId')
-    probe_configuration_id: (int | None) = Field(default=None, alias='ProbeConfigurationId')
-    network: (str | None) = Field(default=None, alias='Network')
-    subnet_mask: (str | None) = Field(default=None, alias='SubnetMask')
-    label: (str | None) = Field(default=None, alias='Label')
-
-class ProbeExcludedIpAddressRange(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    excluded_ip_range_id: (int | None) = Field(default=None, alias='ExcludedIpRangeId')
-    probe_subnet_id: (int | None) = Field(default=None, alias='ProbeSubnetId')
-    excluded_ip_range: (str | None) = Field(default=None, alias='ExcludedIpRange')
-
-class ProbeSnmpAuthentication(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    snmp_authentication_id: (int | None) = Field(default=None, alias='SnmpAuthenticationId')
-    probe_snmp_configuration_id: (int | None) = Field(default=None, alias='ProbeSnmpConfigurationId')
-    authentication_secret: (str | None) = Field(default=None, alias='AuthenticationSecret')
-    hash_method: (HashMethod | None) = Field(default=None, alias='HashMethod')
-
-class ProbeSnmpEncryption(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    snmp_encryption_id: (int | None) = Field(default=None, alias='SnmpEncryptionId')
-    probe_snmp_configuration_id: (int | None) = Field(default=None, alias='ProbeSnmpConfigurationId')
-    encryption_password: (str | None) = Field(default=None, alias='EncryptionPassword')
-    encryption_method: (EncryptionMethod | None) = Field(default=None, alias='EncryptionMethod')
-
-class NetMapPluginStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    is_net_map_plugin_enabled: (bool | None) = Field(default=None, alias='IsNetMapPluginEnabled')
-
-class ProbeDiscoveryScanStatus(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_discovery_scan_status_id: (int | None) = Field(default=None, alias='ProbeDiscoveryScanStatusId')
-    location_id: (int | None) = Field(default=None, alias='LocationId')
-    probe_id: (int | None) = Field(default=None, alias='ProbeId')
-    is_discovery_scan_running: (bool | None) = Field(default=None, alias='IsDiscoveryScanRunning')
-    discovery_scan_start: (datetime | None) = Field(default=None, alias='DiscoveryScanStart')
-    last_discovery_scan: (datetime | None) = Field(default=None, alias='LastDiscoveryScan')
-
-class ProbeSummary(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    current_probe_id: (int | None) = Field(default=None, alias='CurrentProbeId')
-    total_devices: (int | None) = Field(default=None, alias='TotalDevices')
-    offline_devices: (int | None) = Field(default=None, alias='OfflineDevices')
-    missing_agents: (int | None) = Field(default=None, alias='MissingAgents')
-    last_discovery_scan: (datetime | None) = Field(default=None, alias='LastDiscoveryScan')
-    agent_deployment_enabled: (bool | None) = Field(default=None, alias='AgentDeploymentEnabled')
-    has_max_tile_permissions: (bool | None) = Field(default=None, alias='HasMaxTilePermissions')
-    is_generation_two: (bool | None) = Field(default=None, alias='IsGenerationTwo')
-
-class ScanFrequency(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    scan_frequency_id: (int | None) = Field(default=None, alias='ScanFrequencyId')
-    frequency_in_minutes: (int | None) = Field(default=None, alias='FrequencyInMinutes')
-    display_name: (str | None) = Field(default=None, alias='DisplayName')
-    frequency_category: (ScanFrequencyCategory | None) = Field(default=None, alias='FrequencyCategory')
-
-class DiscoveryScanSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    discovery_scan_frequency: (ScanFrequency | None) = Field(default=None, alias='DiscoveryScanFrequency')
-    limit_discovery_to_scan_window: (bool | None) = Field(default=None, alias='LimitDiscoveryToScanWindow')
-    discovery_window_start: (str | None) = Field(default=None, alias='DiscoveryWindowStart')
-    discovery_window_end: (str | None) = Field(default=None, alias='DiscoveryWindowEnd')
-    is_mac_addres_scanning_enabled: (bool | None) = Field(default=None, alias='IsMacAddresScanningEnabled')
-    concurrent_thread_count: (int | None) = Field(default=None, alias='ConcurrentThreadCount')
-
-class StatusScanSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    status_scan_frequency: (ScanFrequency | None) = Field(default=None, alias='StatusScanFrequency')
-    status_scan_network_port_list: (str | None) = Field(default=None, alias='StatusScanNetworkPortList')
-    network_port_option: (StatusScanNetworkPortOption | None) = Field(default=None, alias='NetworkPortOption')
-
-class ProbeConfigurationDefaults(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_default_setting_id: (int | None) = Field(default=None, alias='ProbeDefaultSettingId')
-    community_string_get_list: (str | None) = Field(default=None, alias='CommunityStringGetList')
-    snmp_timeout_in_seconds: (int | None) = Field(default=None, alias='SnmpTimeoutInSeconds')
-    agent_deployment_attempt_maximum: (int | None) = Field(default=None, alias='AgentDeploymentAttemptMaximum')
-    discovery_settings: (DiscoveryScanSettings | None) = Field(default=None, alias='DiscoverySettings')
-    status_settings: (StatusScanSettings | None) = Field(default=None, alias='StatusSettings')
-    snmp_settings: (SnmpSettings | None) = Field(default=None, alias='SnmpSettings')
-    is_data_collection_enabled: (bool | None) = Field(default=None, alias='IsDataCollectionEnabled')
-    snmp_trap_server_listening_port: (int | None) = Field(default=None, alias='SnmpTrapServerListeningPort')
-    syslog_settings: (SyslogServerSettings | None) = Field(default=None, alias='SyslogSettings')
-    tftp_settings: (TftpServerSettings | None) = Field(default=None, alias='TftpSettings')
-
-class ProbeSnmpV3Configuration(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_snmp_configuration_id: (int | None) = Field(default=None, alias='ProbeSnmpConfigurationId')
-    snmp_v3_username: (str | None) = Field(default=None, alias='SnmpV3Username')
-    authentication: (ProbeSnmpAuthentication | None) = Field(default=None, alias='Authentication')
-    encryption: (ProbeSnmpEncryption | None) = Field(default=None, alias='Encryption')
-
-class ProbeConfiguration(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_configuration_id: (int | None) = Field(default=None, alias='ProbeConfigurationId')
-    location_id: (int | None) = Field(default=None, alias='LocationId')
-    agent_deployment_attempt_maximum: (int | None) = Field(default=None, alias='AgentDeploymentAttemptMaximum')
-    automated_deployment_enabled: (bool | None) = Field(default=None, alias='AutomatedDeploymentEnabled')
-    discovery_settings: (DiscoveryScanSettings | None) = Field(default=None, alias='DiscoverySettings')
-    status_settings: (StatusScanSettings | None) = Field(default=None, alias='StatusSettings')
-    snmp_settings: (SnmpSettings | None) = Field(default=None, alias='SnmpSettings')
-    is_data_collection_enabled: (bool | None) = Field(default=None, alias='IsDataCollectionEnabled')
-    snmp_trap_server_listening_port: (int | None) = Field(default=None, alias='SnmpTrapServerListeningPort')
-    syslog_settings: (SyslogServerSettings | None) = Field(default=None, alias='SyslogSettings')
-    tftp_settings: (TftpServerSettings | None) = Field(default=None, alias='TftpSettings')
-
-class ProbeSnmpConfiguration(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_snmp_configuration_id: (int | None) = Field(default=None, alias='ProbeSnmpConfigurationId')
-    probe_configuration_id: (int | None) = Field(default=None, alias='ProbeConfigurationId')
-    snmp_timeout_in_seconds: (int | None) = Field(default=None, alias='SnmpTimeoutInSeconds')
-    community_string_get_list: (str | None) = Field(default=None, alias='CommunityStringGetList')
-    snmp_v3_settings: (ProbeSnmpV3Configuration | None) = Field(default=None, alias='SnmpV3Settings')
-from ..... import Models
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/Patching.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/Patching.py
deleted file mode 100644
index 433ee8a61..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/Patching.py
+++ /dev/null
@@ -1,55 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class PatchesSummaryData(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    entity_id: (int | None) = Field(default=None, alias='EntityId')
-    entity_name: (str | None) = Field(default=None, alias='EntityName')
-    test_stage_failed_patches_count: (int | None) = Field(default=None, alias='TestStageFailedPatchesCount')
-    test_stage_not_attempted_patches_count: (int | None) = Field(default=None, alias='TestStageNotAttemptedPatchesCount')
-    test_stage_installed_patches_count: (int | None) = Field(default=None, alias='TestStageInstalledPatchesCount')
-    pilot_stage_failed_patches_count: (int | None) = Field(default=None, alias='PilotStageFailedPatchesCount')
-    pilot_stage_not_attempted_patches_count: (int | None) = Field(default=None, alias='PilotStageNotAttemptedPatchesCount')
-    pilot_stage_installed_patches_count: (int | None) = Field(default=None, alias='PilotStageInstalledPatchesCount')
-    production_stage_failed_patches_count: (int | None) = Field(default=None, alias='ProductionStageFailedPatchesCount')
-    production_stage_not_attempted_patches_count: (int | None) = Field(default=None, alias='ProductionStageNotAttemptedPatchesCount')
-    production_stage_installed_patches_count: (int | None) = Field(default=None, alias='ProductionStageInstalledPatchesCount')
-
-class PatchStage(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class PatchManagerDevice(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    computer_name: (str | None) = Field(default=None, alias='ComputerName')
-    stage: (PatchStage | None) = Field(default=None, alias='Stage')
-    operating_system_name: (str | None) = Field(default=None, alias='OperatingSystemName')
-    normalized_operating_system_name: (str | None) = Field(default=None, alias='NormalizedOperatingSystemName')
-    company: (Models.Client | None) = Field(default=None, alias='Company')
-    site: (Models.Location | None) = Field(default=None, alias='Site')
-    last_microsoft_window: (datetime | None) = Field(default=None, alias='LastMicrosoftWindow')
-    last_third_party_window: (datetime | None) = Field(default=None, alias='LastThirdPartyWindow')
-    next_microsoft_window: (datetime | None) = Field(default=None, alias='NextMicrosoftWindow')
-    next_third_party_window: (datetime | None) = Field(default=None, alias='NextThirdPartyWindow')
-    did_last_patch_job_fail: (bool | None) = Field(default=None, alias='DidLastPatchJobFail')
-    is_daytime_patching_enabled: (bool | None) = Field(default=None, alias='IsDaytimePatchingEnabled')
-    is_missing_baseline: (bool | None) = Field(default=None, alias='IsMissingBaseline')
-    is_missing_patch_inventory: (bool | None) = Field(default=None, alias='IsMissingPatchInventory')
-    is_patch_job_running: (bool | None) = Field(default=None, alias='IsPatchJobRunning')
-    is_pending_update: (bool | None) = Field(default=None, alias='IsPendingUpdate')
-    is_reboot_pending: (bool | None) = Field(default=None, alias='IsRebootPending')
-    is_wsus_enabled: (bool | None) = Field(default=None, alias='IsWsusEnabled')
-    is_wua_out_of_date: (bool | None) = Field(default=None, alias='IsWuaOutOfDate')
-    missing_patch_count: (int | None) = Field(default=None, alias='MissingPatchCount')
-    microsoft_compliance_percent: (float | None) = Field(default=None, alias='MicrosoftCompliancePercent')
-    third_party_compliance_percent: (float | None) = Field(default=None, alias='ThirdPartyCompliancePercent')
-    has_approved_patches: (bool | None) = Field(default=None, alias='HasApprovedPatches')
-    has_approved_microsoft_patches: (bool | None) = Field(default=None, alias='HasApprovedMicrosoftPatches')
-    has_approved_third_party_patches: (bool | None) = Field(default=None, alias='HasApprovedThirdPartyPatches')
-    release_id: (int | None) = Field(default=None, alias='ReleaseId')
-from ..... import Models
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/PresentationLayer.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/PresentationLayer.py
deleted file mode 100644
index b3a2bbb8c..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/PresentationLayer.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class UserProfile(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_super_admin: (bool | None) = Field(default=None, alias='IsSuperAdmin')
-    is_folder_limited: (bool | None) = Field(default=None, alias='IsFolderLimited')
-    user_class_id_list: (list[int] | None) = Field(default=None, alias='UserClassIdList')
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/__init__.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/__init__.py
deleted file mode 100644
index 6d3cf0892..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/Models/__init__.py
+++ /dev/null
@@ -1,107 +0,0 @@
-
-from __future__ import annotations
-from datetime import datetime
-from enum import Enum
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class ComputerDriver(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    name: (str | None) = Field(default=None, alias='Name')
-    description: (str | None) = Field(default=None, alias='Description')
-    state: (str | None) = Field(default=None, alias='State')
-    startup: (str | None) = Field(default=None, alias='Startup')
-    path_name: (str | None) = Field(default=None, alias='PathName')
-    service_type: (str | None) = Field(default=None, alias='ServiceType')
-    username: (str | None) = Field(default=None, alias='Username')
-    date_last_inventoried: (datetime | None) = Field(default=None, alias='DateLastInventoried')
-    run_levels: (str | None) = Field(default=None, alias='RunLevels')
-
-class DriveStats(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    drive_id: (int | None) = Field(default=None, alias='DriveId')
-    free_space_percentage: (int | None) = Field(default=None, alias='FreeSpacePercentage')
-    fragmented_space_percentage: (int | None) = Field(default=None, alias='FragmentedSpacePercentage')
-    event_date: (datetime | None) = Field(default=None, alias='EventDate')
-    sample_count: (int | None) = Field(default=None, alias='SampleCount')
-    week: (int | None) = Field(default=None, alias='Week')
-    month: (int | None) = Field(default=None, alias='Month')
-    year: (int | None) = Field(default=None, alias='Year')
-
-class DeviceClassification(Enum):
-    UNKNOWN = 'Unknown'
-    COMPUTER = 'Computer'
-    NETWORK_DEVICE = 'NetworkDevice'
-    INTERNET_CONNECTION = 'InternetConnection'
-    BLACK_BOX = 'BlackBox'
-
-class NetworkMapNode(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    device_id: (int | None) = Field(default=None, alias='DeviceId')
-    device_name: (str | None) = Field(default=None, alias='DeviceName')
-    device_friendly_name: (str | None) = Field(default=None, alias='DeviceFriendlyName')
-    description: (str | None) = Field(default=None, alias='Description')
-    device_type: (str | None) = Field(default=None, alias='DeviceType')
-    child_node_list: (list[NetworkMapNode] | None) = Field(default=None, alias='ChildNodeList')
-    device_mac_address: (str | None) = Field(default=None, alias='DeviceMacAddress')
-    ip_address: (str | None) = Field(default=None, alias='IpAddress')
-    status: (str | None) = Field(default=None, alias='Status')
-    device_classification: (DeviceClassification | None) = Field(default=None, alias='DeviceClassification')
-
-class NetworkMapNodeDetails(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    device_id: (int | None) = Field(default=None, alias='DeviceId')
-    device_type: (str | None) = Field(default=None, alias='DeviceType')
-    uptime: (int | None) = Field(default=None, alias='Uptime')
-    ignore_device_scan: (bool | None) = Field(default=None, alias='IgnoreDeviceScan')
-    asset_date: (datetime | None) = Field(default=None, alias='AssetDate')
-    date_last_inventoried: (datetime | None) = Field(default=None, alias='DateLastInventoried')
-    last_contact_date: (datetime | None) = Field(default=None, alias='LastContactDate')
-    ip_address: (str | None) = Field(default=None, alias='IpAddress')
-    device_mac_address: (str | None) = Field(default=None, alias='DeviceMacAddress')
-    operating_system: (str | None) = Field(default=None, alias='OperatingSystem')
-    model: (str | None) = Field(default=None, alias='Model')
-    location_probe: (str | None) = Field(default=None, alias='LocationProbe')
-    manufacturer: (str | None) = Field(default=None, alias='Manufacturer')
-    uplink_port: (str | None) = Field(default=None, alias='UplinkPort')
-    uplink_name: (str | None) = Field(default=None, alias='UplinkName')
-    uplink_ip_address: (str | None) = Field(default=None, alias='UplinkIpAddress')
-
-class ProbeEventLevel(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    id: (int | None) = Field(default=None, alias='Id')
-    name: (str | None) = Field(default=None, alias='Name')
-
-class MonitorDataCollectionSettings(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monitor_id: (int | None) = Field(default=None, alias='MonitorId')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-    unit_label: (str | None) = Field(default=None, alias='UnitLabel')
-    graph_title: (str | None) = Field(default=None, alias='GraphTitle')
-    graph_vertical_limit: (int | None) = Field(default=None, alias='GraphVerticalLimit')
-
-class MonitorStatistic(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    monitor_id: (int | None) = Field(default=None, alias='MonitorId')
-    last_fail_time: (datetime | None) = Field(default=None, alias='LastFailTime')
-    last_fail_message: (str | None) = Field(default=None, alias='LastFailMessage')
-    last_success_time: (datetime | None) = Field(default=None, alias='LastSuccessTime')
-    last_success_message: (str | None) = Field(default=None, alias='LastSuccessMessage')
-    last_warning_time: (datetime | None) = Field(default=None, alias='LastWarningTime')
-    last_warning_message: (str | None) = Field(default=None, alias='LastWarningMessage')
-    monitor_start_time: (datetime | None) = Field(default=None, alias='MonitorStartTime')
-    computer_id: (int | None) = Field(default=None, alias='ComputerId')
-
-class ProbeEvent(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    probe_id: (int | None) = Field(default=None, alias='ProbeId')
-    event_level: (ProbeEventLevel | None) = Field(default=None, alias='EventLevel')
-    message: (str | None) = Field(default=None, alias='Message')
-    event_time: (datetime | None) = Field(default=None, alias='EventTime')
-
-class DriveStatistics(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    drive_id: (int | None) = Field(default=None, alias='DriveId')
-    percentage_used_difference: (float | None) = Field(default=None, alias='PercentageUsedDifference')
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/__init__.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/__init__.py
deleted file mode 100644
index e8a581fb3..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/Domain/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from __future__ import annotations
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/__init__.py b/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/LabTech/Repositories/MySQL/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/LabTech/Repositories/__init__.py b/src/pyconnectwise/models/automate/LabTech/Repositories/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/LabTech/__init__.py b/src/pyconnectwise/models/automate/LabTech/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/LabTech/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Microsoft/Win32/SafeHandles.py b/src/pyconnectwise/models/automate/Microsoft/Win32/SafeHandles.py
deleted file mode 100644
index 6a8a3fbeb..000000000
--- a/src/pyconnectwise/models/automate/Microsoft/Win32/SafeHandles.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class SafeWaitHandle(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_invalid: (bool | None) = Field(default=None, alias='IsInvalid')
-    is_closed: (bool | None) = Field(default=None, alias='IsClosed')
diff --git a/src/pyconnectwise/models/automate/Microsoft/Win32/__init__.py b/src/pyconnectwise/models/automate/Microsoft/Win32/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/Microsoft/Win32/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/Microsoft/__init__.py b/src/pyconnectwise/models/automate/Microsoft/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/System/Collections/Generic/KeyValuePair_System/String_System.py b/src/pyconnectwise/models/automate/System/Collections/Generic/KeyValuePair_System/String_System.py
deleted file mode 100644
index 1aa585a3c..000000000
--- a/src/pyconnectwise/models/automate/System/Collections/Generic/KeyValuePair_System/String_System.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class String(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    key: (str | None) = Field(default=None, alias='Key')
-    value: (str | None) = Field(default=None, alias='Value')
diff --git a/src/pyconnectwise/models/automate/System/Collections/Generic/KeyValuePair_System/__init__.py b/src/pyconnectwise/models/automate/System/Collections/Generic/KeyValuePair_System/__init__.py
deleted file mode 100644
index e8a581fb3..000000000
--- a/src/pyconnectwise/models/automate/System/Collections/Generic/KeyValuePair_System/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from __future__ import annotations
diff --git a/src/pyconnectwise/models/automate/System/Collections/Generic/__init__.py b/src/pyconnectwise/models/automate/System/Collections/Generic/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/System/Collections/Generic/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/System/Collections/__init__.py b/src/pyconnectwise/models/automate/System/Collections/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pyconnectwise/models/automate/System/Threading.py b/src/pyconnectwise/models/automate/System/Threading.py
deleted file mode 100644
index 5a7acedf4..000000000
--- a/src/pyconnectwise/models/automate/System/Threading.py
+++ /dev/null
@@ -1,15 +0,0 @@
-
-from __future__ import annotations
-from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
-from pydantic import ConfigDict, Field
-
-class WaitHandle(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    safe_wait_handle: (SafeHandles.SafeWaitHandle | None) = Field(default=None, alias='SafeWaitHandle')
-
-class CancellationToken(ConnectWiseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    is_cancellation_requested: (bool | None) = Field(default=None, alias='IsCancellationRequested')
-    can_be_canceled: (bool | None) = Field(default=None, alias='CanBeCanceled')
-    wait_handle: (WaitHandle | None) = Field(default=None, alias='WaitHandle')
-from ..Microsoft.Win32 import SafeHandles
diff --git a/src/pyconnectwise/models/automate/System/__init__.py b/src/pyconnectwise/models/automate/System/__init__.py
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pyconnectwise/models/automate/System/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pyconnectwise/models/automate/__init__.py b/src/pyconnectwise/models/automate/__init__.py
index 8b1378917..ffa735341 100644
--- a/src/pyconnectwise/models/automate/__init__.py
+++ b/src/pyconnectwise/models/automate/__init__.py
@@ -1 +1,6660 @@
+# generated by datamodel-codegen:
+#   filename:  merged_spec.json
 
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Any, Literal
+from uuid import UUID
+
+from pydantic import Field
+
+from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
+
+
+class LabTechQueryOptionOrderBy(ConnectWiseModel):
+    name: str | None = Field(default=None, alias='Name')
+    type: Literal['Undefined', 'Ascending', 'Descending'] | None = Field(
+        default=None, alias='Type'
+    )
+
+
+class LabTechQueryOptionExpand(ConnectWiseModel):
+    field_name: str | None = Field(default=None, alias='FieldName')
+    page: int | None = Field(default=None, alias='Page')
+    page_size: int | None = Field(default=None, alias='PageSize')
+    condition: str | None = Field(default=None, alias='Condition')
+    expands: dict[str, LabTechQueryOptionExpand] | None = Field(
+        default=None, alias='Expands'
+    )
+    order_by: LabTechQueryOptionOrderBy | None = Field(default=None, alias='OrderBy')
+    included_fields: list[str] | None = Field(default=None, alias='IncludedFields')
+    excluded_fields: list[str] | None = Field(default=None, alias='ExcludedFields')
+
+
+class AutomateAccountInformation(ConnectWiseModel):
+    is_trial_account: bool | None = Field(default=None, alias='IsTrialAccount')
+
+
+class AutomateAlertClient(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateAlertComputer(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    computer_status: str | None = Field(default=None, alias='ComputerStatus')
+
+
+class AutomateAlertDevice(AutomateAlertClient):
+    pass
+
+
+class AutomateAlertLocation(AutomateAlertClient):
+    pass
+
+
+class AutomateAlertMonitor(AutomateAlertClient):
+    pass
+
+
+class AutomateAlertSeverityItem(AutomateAlertClient):
+    pass
+
+
+class AutomateAlertTemplate(ConnectWiseModel):
+    template_id: int | None = Field(default=None, alias='TemplateId')
+    template_name: str | None = Field(default=None, alias='TemplateName')
+
+
+class AutomateAuthService(ConnectWiseModel):
+    service_id: int | None = Field(default=None, alias='ServiceId')
+    service_name: str | None = Field(default=None, alias='ServiceName')
+    service_uri: str | None = Field(default=None, alias='ServiceURI')
+    service_type: int | None = Field(default=None, alias='ServiceType')
+    client_id: str | None = Field(default=None, alias='ClientId')
+    is_default: bool | None = Field(default=None, alias='IsDefault')
+    is_automatic: bool | None = Field(default=None, alias='IsAutomatic')
+    service_guid: str | None = Field(default=None, alias='ServiceGuid')
+    is_enabled: bool | None = Field(default=None, alias='IsEnabled')
+    is_local_login_enabled: bool | None = Field(
+        default=None, alias='IsLocalLoginEnabled'
+    )
+    authentication_type: int | None = Field(default=None, alias='AuthenticationType')
+
+
+class AutomateTokenCredentials(ConnectWiseModel):
+    username: str | None = Field(default=None, alias='Username')
+    password: str | None = Field(default=None, alias='Password')
+    two_factor_passcode: str | None = Field(default=None, alias='TwoFactorPasscode')
+
+
+class AutomateTokenResult(ConnectWiseModel):
+    access_token: str | None = Field(default=None, alias='AccessToken')
+    token_type: str | None = Field(default=None, alias='TokenType')
+    expiration_date: datetime | None = Field(default=None, alias='ExpirationDate')
+    absolute_expiration_date: datetime | None = Field(
+        default=None, alias='AbsoluteExpirationDate'
+    )
+    user_id: str | None = Field(default=None, alias='UserId')
+    internal_user_name: str | None = Field(default=None, alias='InternalUserName')
+    is_two_factor_required: bool | None = Field(
+        default=None, alias='IsTwoFactorRequired'
+    )
+    is_internal_two_factor_required: bool | None = Field(
+        default=None, alias='IsInternalTwoFactorRequired'
+    )
+    sso_access_token: str | None = Field(default=None, alias='SSOAccessToken')
+
+
+class AutomatePkceRequest(ConnectWiseModel):
+    authorization_code: str | None = Field(default=None, alias='AuthorizationCode')
+    code_verifier: str | None = Field(default=None, alias='CodeVerifier')
+    client_id: str | None = Field(default=None, alias='ClientId')
+    redirect_uri: str | None = Field(default=None, alias='RedirectUri')
+
+
+class AutomateDisableTokenRequest(ConnectWiseModel):
+    security_token: str | None = Field(default=None, alias='SecurityToken')
+
+
+class LabTechAuthServiceCredentials(ConnectWiseModel):
+    service_id: int | None = Field(default=None, alias='ServiceId')
+    service_token: str | None = Field(default=None, alias='ServiceToken')
+
+
+class AutomateWindowsUpdateCategory(ConnectWiseModel):
+    category_id: int | None = Field(default=None, alias='CategoryId')
+    category_name: str | None = Field(default=None, alias='CategoryName')
+
+
+class LabTechPatchOperation(ConnectWiseModel):
+    op: str | None = Field(default=None, alias='Op')
+    path: str | None = Field(default=None, alias='Path')
+    value: dict[str, Any] | None = Field(default=None, alias='Value')
+
+
+class AutomateApprovalPolicyStats(ConnectWiseModel):
+    approval_policy_id: int | None = Field(default=None, alias='ApprovalPolicyId')
+    approval_policy_name: str | None = Field(default=None, alias='ApprovalPolicyName')
+    pending_approval_count: int | None = Field(
+        default=None, alias='PendingApprovalCount'
+    )
+
+
+class AutomateContactAssociatedComputer(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    computer_name: str | None = Field(default=None, alias='ComputerName')
+    has_primary_contact: bool | None = Field(default=None, alias='HasPrimaryContact')
+    is_primary_contact: bool | None = Field(default=None, alias='IsPrimaryContact')
+    can_user_set_primary_status: bool | None = Field(
+        default=None, alias='CanUserSetPrimaryStatus'
+    )
+    client_name: str | None = Field(default=None, alias='ClientName')
+    location_name: str | None = Field(default=None, alias='LocationName')
+
+
+class AutomateSetComputerPrimaryContactRequest(ConnectWiseModel):
+    is_primary_contact: bool | None = Field(default=None, alias='IsPrimaryContact')
+
+
+class LabTechUserAuthLinkStatus(ConnectWiseModel):
+    service_id: int | None = Field(default=None, alias='ServiceId')
+    is_sso_enabled: bool | None = Field(default=None, alias='IsSsoEnabled')
+    is_local_login_enabled: bool | None = Field(
+        default=None, alias='IsLocalLoginEnabled'
+    )
+    is_eligible_for_sso: bool | None = Field(default=None, alias='IsEligibleForSso')
+    is_account_linked: bool | None = Field(default=None, alias='IsAccountLinked')
+
+
+class AutomateComputerServiceItem(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateComputerProcessItem(AutomateComputerServiceItem):
+    pass
+
+
+class AutomateServerFileItem(AutomateComputerServiceItem):
+    pass
+
+
+class LabTechAVTemplatePolicy(ConnectWiseModel):
+    template_policy_id: str | None = Field(default=None, alias='TemplatePolicyId')
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+    guid: str | None = Field(default=None, alias='GUID')
+
+
+class LabTechAVTemplatePolicyData(ConnectWiseModel):
+    template_policy_id: str | None = Field(default=None, alias='TemplatePolicyId')
+    plugin_guid: str | None = Field(default=None, alias='PluginGUID')
+    data: str | None = Field(default=None, alias='Data')
+
+
+class AutomateAiAssistSettingBatchRequest(ConnectWiseModel):
+    ai_assist_setting_guids: list[UUID] | None = Field(
+        default=None, alias='AiAssistSettingGuids'
+    )
+
+
+class AutomateHotfixOperatingSystemCombination(ConnectWiseModel):
+    hotfix_id: UUID | None = Field(
+        default=None, alias='HotfixId', example='00000000-0000-0000-0000-000000000000'
+    )
+    operating_system: str | None = Field(default=None, alias='OperatingSystem')
+
+
+class AutomateWindowsApprovalPolicyPatch(ConnectWiseModel):
+    approval_action_id: int | None = Field(default=None, alias='ApprovalActionId')
+    hotfix_id: UUID | None = Field(
+        default=None, alias='HotfixId', example='00000000-0000-0000-0000-000000000000'
+    )
+    operating_system: str | None = Field(default=None, alias='OperatingSystem')
+
+
+class AutomateApprovalPolicyThirdPartyPatchSetting(ConnectWiseModel):
+    patch_approval: int | None = Field(default=None, alias='PatchApproval')
+    lt_product_key: UUID | None = Field(
+        default=None,
+        alias='LTProductKey',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    version: str | None = Field(default=None, alias='Version')
+
+
+class AutomateBinaryExtensionBatchRequest(ConnectWiseModel):
+    binary_extension_ids: list[int] | None = Field(
+        default=None, alias='BinaryExtensionIds'
+    )
+
+
+class AutomateWebClientAccessBatchRequest(ConnectWiseModel):
+    request_type: Literal['Invite', 'Reset'] | None = Field(
+        default=None, alias='RequestType'
+    )
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+
+
+class AutomateResponseResult(ConnectWiseModel):
+    result_status: int | None = Field(default=None, alias='ResultStatus')
+    reason_code: int | None = Field(default=None, alias='ReasonCode')
+    message: str | None = Field(default=None, alias='Message')
+
+
+class AutomateContactPermissionBatchRequest(ConnectWiseModel):
+    request_type: Literal['Add', 'Remove'] | None = Field(
+        default=None, alias='RequestType'
+    )
+    contact_ids: list[int] | None = Field(default=None, alias='ContactIds')
+    permissions: list[str] | None = Field(default=None, alias='Permissions')
+
+
+class AutomateContactPermissionBatchResult(ConnectWiseModel):
+    contact_id: int | None = Field(default=None, alias='ContactId')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateGeneratePasswordResetTokenBatchRequest(ConnectWiseModel):
+    user_ids: list[int] | None = Field(default=None, alias='UserIds')
+
+
+class AutomateExecuteResendInventoryCommandBatchRequest(ConnectWiseModel):
+    inventory_types: list[int] | None = Field(default=None, alias='InventoryTypes')
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+
+
+class AutomateDeleteIpRestrictionsBatchRequest(ConnectWiseModel):
+    ip_restrictions_ids: list[UUID] | None = Field(
+        default=None, alias='IpRestrictionsIds'
+    )
+
+
+class AutomateDeleteIpRestrictionsBatchResult(ConnectWiseModel):
+    ip_restrictions_id: UUID | None = Field(
+        default=None,
+        alias='IpRestrictionsId',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateIpRestrictionRule(ConnectWiseModel):
+    ip_address_guid: UUID | None = Field(
+        default=None,
+        alias='IpAddressGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    name: str | None = Field(default=None, alias='Name')
+    ip_address: str | None = Field(default=None, alias='IpAddress')
+    windows_client_access: bool | None = Field(
+        default=None, alias='WindowsClientAccess'
+    )
+    web_client_access: bool | None = Field(default=None, alias='WebClientAccess')
+    created_by: str | None = Field(default=None, alias='CreatedBy')
+    create_date: datetime | None = Field(default=None, alias='CreateDate')
+    updated_by: str | None = Field(default=None, alias='UpdatedBy')
+    update_date: datetime | None = Field(default=None, alias='UpdateDate')
+
+
+class AutomateAddIpRestrictionsBatchResult(ConnectWiseModel):
+    ip_address_guid: UUID | None = Field(
+        default=None,
+        alias='IpAddressGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    name: str | None = Field(default=None, alias='Name')
+    ip_address: str | None = Field(default=None, alias='IpAddress')
+    windows_client_access: bool | None = Field(
+        default=None, alias='WindowsClientAccess'
+    )
+    web_client_access: bool | None = Field(default=None, alias='WebClientAccess')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateMaintenanceModeQueueBatchRequest(ConnectWiseModel):
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+    start_date: datetime | None = Field(default=None, alias='StartDate')
+    duration_in_minutes: int | None = Field(default=None, alias='DurationInMinutes')
+    mode: str | None = Field(default=None, alias='Mode')
+    comments: str | None = Field(default=None, alias='Comments')
+
+
+class AutomateSetMasterModeBatchRequest(ConnectWiseModel):
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+    master_mode_type: str | None = Field(default=None, alias='MasterModeType')
+
+
+class AutomateExecuteProbeBatchRequest(ConnectWiseModel):
+    probe_ids: list[int] | None = Field(default=None, alias='ProbeIds')
+
+
+class AutomateExecuteProbeCommandResult(ConnectWiseModel):
+    probe_id: int | None = Field(default=None, alias='ProbeId')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateDeleteRemoteMonitorsBatchRequest(ConnectWiseModel):
+    group_id: int | None = Field(default=None, alias='GroupId')
+    remote_monitor_ids: list[int] | None = Field(default=None, alias='RemoteMonitorIds')
+
+
+class AutomateDeleteRemoteMonitorBatchResult(ConnectWiseModel):
+    remote_monitor_id: int | None = Field(default=None, alias='RemoteMonitorId')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateScheduledScriptOfflineActionFlags(ConnectWiseModel):
+    skips_offline_agents: bool | None = Field(default=None, alias='SkipsOfflineAgents')
+    wakes_offline_agents: bool | None = Field(default=None, alias='WakesOfflineAgents')
+    only_runs_on_offline_agents: bool | None = Field(
+        default=None, alias='OnlyRunsOnOfflineAgents'
+    )
+
+
+class AutomateScriptScheduleFrequency(ConnectWiseModel):
+    script_schedule_frequency_id: int | None = Field(
+        default=None, alias='ScriptScheduleFrequencyId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateMinutelyScheduleFrequency(ConnectWiseModel):
+    minutely_interval: int | None = Field(default=None, alias='MinutelyInterval')
+    exclusion_start_time: str | None = Field(default=None, alias='ExclusionStartTime')
+    exclusion_end_time: str | None = Field(default=None, alias='ExclusionEndTime')
+
+
+class AutomateHourlyScheduleFrequency(ConnectWiseModel):
+    hourly_interval: int | None = Field(default=None, alias='HourlyInterval')
+    exclusion_start_time: str | None = Field(default=None, alias='ExclusionStartTime')
+    exclusion_end_time: str | None = Field(default=None, alias='ExclusionEndTime')
+
+
+class AutomateMonthlyScheduleFrequency(ConnectWiseModel):
+    runs_at: str | None = Field(default=None, alias='RunsAt')
+    monthly_interval: int | None = Field(default=None, alias='MonthlyInterval')
+    day: int | None = Field(default=None, alias='Day')
+
+
+class AutomateDistributionWindowType(ConnectWiseModel):
+    distribution_window_type_id: int | None = Field(
+        default=None, alias='DistributionWindowTypeId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateDaysOfWeekSettings(ConnectWiseModel):
+    sunday: bool | None = Field(default=None, alias='Sunday')
+    monday: bool | None = Field(default=None, alias='Monday')
+    tuesday: bool | None = Field(default=None, alias='Tuesday')
+    wednesday: bool | None = Field(default=None, alias='Wednesday')
+    thursday: bool | None = Field(default=None, alias='Thursday')
+    friday: bool | None = Field(default=None, alias='Friday')
+    saturday: bool | None = Field(default=None, alias='Saturday')
+
+
+class AutomateWeeksOfMonthSettings(ConnectWiseModel):
+    first: bool | None = Field(default=None, alias='First')
+    second: bool | None = Field(default=None, alias='Second')
+    third: bool | None = Field(default=None, alias='Third')
+    fourth: bool | None = Field(default=None, alias='Fourth')
+    last: bool | None = Field(default=None, alias='Last')
+
+
+class AutomateDailyScriptRepeatFrequency(ConnectWiseModel):
+    daily_script_repeat_frequency_id: int | None = Field(
+        default=None, alias='DailyScriptRepeatFrequencyId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateScheduleScriptBatchResult(ConnectWiseModel):
+    entity_id: int | None = Field(default=None, alias='EntityId')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateDeleteScriptBatchRequest(ConnectWiseModel):
+    script_ids: list[int] | None = Field(default=None, alias='ScriptIds')
+
+
+class AutomateDeleteScriptBatchResult(ConnectWiseModel):
+    script_id: int | None = Field(default=None, alias='ScriptId')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateDeleteSearchesBatchRequest(ConnectWiseModel):
+    search_ids: list[int] | None = Field(default=None, alias='SearchIds')
+
+
+class AutomateDeleteSearchesBatchResult(ConnectWiseModel):
+    search_id: int | None = Field(default=None, alias='SearchId')
+    search_name: str | None = Field(default=None, alias='SearchName')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateSendToSearchesBatchRequest(ConnectWiseModel):
+    search_ids: list[int] | None = Field(default=None, alias='SearchIds')
+    folder_id: int | None = Field(default=None, alias='FolderId')
+
+
+class AutomateSendToBatchResult(ConnectWiseModel):
+    search_id: int | None = Field(default=None, alias='SearchId')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateSendToCommandBatchRequest(ConnectWiseModel):
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+    target_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='TargetType')
+    target_id: int | None = Field(default=None, alias='TargetId')
+
+
+class AutomateExecuteComputersBatchRequest(ConnectWiseModel):
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+
+
+class AutomateExecuteRebootCommandBatchRequest(ConnectWiseModel):
+    reboot_type: int | None = Field(default=None, alias='RebootType')
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+
+
+class AutomateExecuteComputerCommandResult(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    command_id: int | None = Field(default=None, alias='CommandId')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateExecuteToggleProbeCommandBatchRequest(ConnectWiseModel):
+    computer_ids: list[int] | None = Field(default=None, alias='ComputerIds')
+    enable_probe: bool | None = Field(default=None, alias='EnableProbe')
+
+
+class AutomateToggleServiceUserLocalAccountCredentials(ConnectWiseModel):
+    username: str | None = Field(default=None, alias='Username')
+    password: str | None = Field(default=None, alias='Password')
+
+
+class AutomateUserClassMembershipRequest(ConnectWiseModel):
+    user_ids: list[int] | None = Field(default=None, alias='UserIds')
+    user_class_ids: list[int] | None = Field(default=None, alias='UserClassIds')
+
+
+class AutomateUsersGroupMembershipBatchRequest(ConnectWiseModel):
+    user_ids: list[int] | None = Field(default=None, alias='UserIds')
+    group_ids: list[int] | None = Field(default=None, alias='GroupIds')
+
+
+class AutomateUsersUnlockRequest(AutomateGeneratePasswordResetTokenBatchRequest):
+    pass
+
+
+class AutomateWebExtensionBatchRequest(ConnectWiseModel):
+    web_extension_ids: list[int] | None = Field(default=None, alias='WebExtensionIds')
+
+
+class AutomateRunStyle(ConnectWiseModel):
+    run_style_id: int | None = Field(default=None, alias='RunStyleId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class LabTechCacheControl(ConnectWiseModel):
+    cache_id: str | None = Field(default=None, alias='CacheId')
+    custom_commands: datetime | None = Field(default=None, alias='CustomCommands')
+    custom_menus: datetime | None = Field(default=None, alias='CustomMenus')
+    huds: datetime | None = Field(default=None, alias='Huds')
+    apps: datetime | None = Field(default=None, alias='Apps')
+    user_folders: datetime | None = Field(default=None, alias='UserFolders')
+    users: datetime | None = Field(default=None, alias='Users')
+    schedules: datetime | None = Field(default=None, alias='Schedules')
+    templates: datetime | None = Field(default=None, alias='Templates')
+    data_view_folders: datetime | None = Field(default=None, alias='DataViewFolders')
+    dataviews: datetime | None = Field(default=None, alias='Dataviews')
+    report_folders: datetime | None = Field(default=None, alias='ReportFolders')
+    reports: datetime | None = Field(default=None, alias='Reports')
+    links: datetime | None = Field(default=None, alias='Links')
+    script_folders: datetime | None = Field(default=None, alias='ScriptFolders')
+    scripts: datetime | None = Field(default=None, alias='Scripts')
+    sensor_checks: datetime | None = Field(default=None, alias='SensorChecks')
+    audit_actions: datetime | None = Field(default=None, alias='AuditActions')
+    remote_commands: datetime | None = Field(default=None, alias='RemoteCommands')
+    contacts: datetime | None = Field(default=None, alias='Contacts')
+    time_category: datetime | None = Field(default=None, alias='TimeCategory')
+    ticket_data: datetime | None = Field(default=None, alias='TicketData')
+    ticket_category: datetime | None = Field(default=None, alias='TicketCategory')
+    functions: datetime | None = Field(default=None, alias='Functions')
+    redirectors: datetime | None = Field(default=None, alias='Redirectors')
+    virus_scanners: datetime | None = Field(default=None, alias='VirusScanners')
+    control_center_config: datetime | None = Field(
+        default=None, alias='ControlCenterConfig'
+    )
+    properties: datetime | None = Field(default=None, alias='Properties')
+    config: datetime | None = Field(default=None, alias='Config')
+    regions: datetime | None = Field(default=None, alias='Regions')
+    config_outlook: datetime | None = Field(default=None, alias='ConfigOutlook')
+    computers: datetime | None = Field(default=None, alias='Computers')
+    locations: datetime | None = Field(default=None, alias='Locations')
+    clients: datetime | None = Field(default=None, alias='Clients')
+    groups: datetime | None = Field(default=None, alias='Groups')
+    agents: datetime | None = Field(default=None, alias='Agents')
+    permissions: datetime | None = Field(default=None, alias='Permissions')
+    write_config_control: datetime | None = Field(
+        default=None, alias='WriteConfigControl'
+    )
+    alert_templates: datetime | None = Field(default=None, alias='AlertTemplates')
+    role_definitions: datetime | None = Field(default=None, alias='RoleDefinitions')
+
+
+class LabTechComputerChassis(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    manufacturer: str | None = Field(default=None, alias='Manufacturer')
+    product_name: str | None = Field(default=None, alias='ProductName')
+    version: str | None = Field(default=None, alias='Version')
+    serial_number: str | None = Field(default=None, alias='SerialNumber')
+    uuid: str | None = Field(default=None, alias='UUID')
+    sku_number: str | None = Field(default=None, alias='SkuNumber')
+    family: str | None = Field(default=None, alias='Family')
+    chassis_type: str | None = Field(default=None, alias='ChassisType')
+    chassis_lock: bool | None = Field(default=None, alias='ChassisLock')
+    asset_tag: str | None = Field(default=None, alias='AssetTag')
+    height_units: int | None = Field(default=None, alias='HeightUnits')
+    system_boot_state: int | None = Field(default=None, alias='SystemBootState')
+    power_supply_boot_state: int | None = Field(
+        default=None, alias='PowerSupplyBootState'
+    )
+    thermal_boot_state: int | None = Field(default=None, alias='ThermalBootState')
+    main_board_product: str | None = Field(default=None, alias='MainBoardProduct')
+    main_board_serial_number: str | None = Field(
+        default=None, alias='MainBoardSerialNumber'
+    )
+    main_board_version: str | None = Field(default=None, alias='MainBoardVersion')
+    main_board_manufacturer: str | None = Field(
+        default=None, alias='MainBoardManufacturer'
+    )
+    last_update: datetime | None = Field(default=None, alias='LastUpdate')
+
+
+class AutomateFilterByComputerPermissionsRequest(ConnectWiseModel):
+    computer_permissions: list[str] | None = Field(
+        default=None, alias='ComputerPermissions'
+    )
+
+
+class LabTechRouter(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    manufacturer_name: str | None = Field(default=None, alias='ManufacturerName')
+    model: str | None = Field(default=None, alias='Model')
+    version: str | None = Field(default=None, alias='Version')
+    port_type: str | None = Field(default=None, alias='PortType')
+    username: str | None = Field(default=None, alias='Username')
+    password: str | None = Field(default=None, alias='Password')
+    guid: str | None = Field(default=None, alias='Guid')
+
+
+class LabTechMaintenanceWindowDefinition(ConnectWiseModel):
+    maintenance_window_definition_id: int | None = Field(
+        default=None, alias='MaintenanceWindowDefinitionId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+    comment: str | None = Field(default=None, alias='Comment')
+
+
+class LabTechDeploymentLogin(ConnectWiseModel):
+    deployment_login_id: int | None = Field(default=None, alias='DeploymentLoginId')
+    title: str | None = Field(default=None, alias='Title')
+
+
+class LabTechContactWebPermissions(ConnectWiseModel):
+    tickets: bool | None = Field(default=None, alias='Tickets')
+    remote_access: bool | None = Field(default=None, alias='RemoteAccess')
+    install_agent: bool | None = Field(default=None, alias='InstallAgent')
+    reboot: bool | None = Field(default=None, alias='Reboot')
+    shutdown: bool | None = Field(default=None, alias='Shutdown')
+    wake_on_lan: bool | None = Field(default=None, alias='WakeOnLAN')
+    multi_factor_required: bool | None = Field(
+        default=None, alias='MultiFactorRequired'
+    )
+
+
+class LabTechSchedule(ConnectWiseModel):
+    day_id: Literal[
+        'Everyday',
+        'Sunday',
+        'Monday',
+        'Tuesday',
+        'Wednesday',
+        'Thursday',
+        'Friday',
+        'Saturday',
+    ] | None = Field(default=None, alias='DayId')
+    day_name: str | None = Field(default=None, alias='DayName')
+    repeat_every_hour: int | None = Field(default=None, alias='RepeatEveryHour')
+    date: datetime | None = Field(default=None, alias='Date')
+
+
+class LabTechComputerMenu(ConnectWiseModel):
+    menu_id: str | None = Field(default=None, alias='MenuID')
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+    text: str | None = Field(default=None, alias='Text')
+    image_url: str | None = Field(default=None, alias='ImageURL')
+    root_only: int | None = Field(default=None, alias='RootOnly')
+    action: str | None = Field(default=None, alias='Action')
+    msg_title: str | None = Field(default=None, alias='MsgTitle')
+    msg_body: str | None = Field(default=None, alias='MsgBody')
+    msg_height: int | None = Field(default=None, alias='MsgHeight')
+    msg_width: int | None = Field(default=None, alias='MsgWidth')
+    ur_lor_exe: str | None = Field(default=None, alias='URLorEXE')
+    script_id: int | None = Field(default=None, alias='ScriptID')
+    parameters: str | None = Field(default=None, alias='Parameters')
+
+
+class LabTechTemplateProperty(ConnectWiseModel):
+    template_id: str | None = Field(default=None, alias='TemplateID')
+    property_name: str | None = Field(default=None, alias='PropertyName')
+    property_value: str | None = Field(default=None, alias='PropertyValue')
+    property_description: str | None = Field(default=None, alias='PropertyDescription')
+
+
+class LabTechGroupPartial(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='ID')
+    parent_id: int | None = Field(default=None, alias='ParentId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class LabTechMaintenanceWindow(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+
+
+class LabTechLoggedInUser(ConnectWiseModel):
+    logged_in_user_name: str | None = Field(default=None, alias='LoggedInUserName')
+    console_id: int | None = Field(default=None, alias='ConsoleId')
+
+
+class LabTechVirusScannerDef(AutomateComputerServiceItem):
+    pass
+
+
+class LabTechCommentPriority(AutomateAlertClient):
+    pass
+
+
+class LabTechSearchFolder(AutomateComputerServiceItem):
+    pass
+
+
+class LabTechComputerPermissions(ConnectWiseModel):
+    edit_config: bool | None = Field(default=None, alias='EditConfig')
+    edit_info: bool | None = Field(default=None, alias='EditInfo')
+    send_commands: bool | None = Field(default=None, alias='SendCommands')
+    allow_remote_control: bool | None = Field(default=None, alias='AllowRemoteControl')
+    allow_redir: bool | None = Field(default=None, alias='AllowRedir')
+    allow_file_explorer: bool | None = Field(default=None, alias='AllowFileExplorer')
+    allow_registry_edit: bool | None = Field(default=None, alias='AllowRegistryEdit')
+    command_prompt: bool | None = Field(default=None, alias='CommandPrompt')
+    sniff_network: bool | None = Field(default=None, alias='SniffNetwork')
+    install: bool | None = Field(default=None, alias='Install')
+    history: bool | None = Field(default=None, alias='History')
+    view_commands: bool | None = Field(default=None, alias='ViewCommands')
+    monitor_delete: bool | None = Field(default=None, alias='MonitorDelete')
+    monitor_add: bool | None = Field(default=None, alias='MonitorAdd')
+    monitor_edit: bool | None = Field(default=None, alias='MonitorEdit')
+    clear_alerts: bool | None = Field(default=None, alias='ClearAlerts')
+    schedule_scripts: bool | None = Field(default=None, alias='ScheduleScripts')
+    delete_schedule_scripts: bool | None = Field(
+        default=None, alias='DeleteScheduleScripts'
+    )
+
+
+class LabTechNetworkDeviceType(AutomateAlertClient):
+    pass
+
+
+class LabTechAlertAction(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    comment: str | None = Field(default=None, alias='Comment')
+
+
+class LabTechExternalSystemCredentials(ConnectWiseModel):
+    credentials_id: int | None = Field(default=None, alias='CredentialsId')
+    client_id: int | None = Field(default=None, alias='ClientId')
+    title: str | None = Field(default=None, alias='Title')
+    expiration_date: datetime | None = Field(default=None, alias='ExpirationDate')
+    is_active: bool | None = Field(default=None, alias='IsActive')
+
+
+class LabTechAgentDeploymentReadinessCheck(ConnectWiseModel):
+    agent_deployment_readiness_check_id: int | None = Field(
+        default=None, alias='AgentDeploymentReadinessCheckId'
+    )
+    network_device_id: int | None = Field(default=None, alias='NetworkDeviceId')
+    agent_deployment_readiness_check_status_id: int | None = Field(
+        default=None, alias='AgentDeploymentReadinessCheckStatusId'
+    )
+    readiness_check_status: str | None = Field(
+        default=None, alias='ReadinessCheckStatus'
+    )
+    deployment_attempt_count: int | None = Field(
+        default=None, alias='DeploymentAttemptCount'
+    )
+    date_last_checked_for_readiness: datetime | None = Field(
+        default=None, alias='DateLastCheckedForReadiness'
+    )
+    date_last_deployment_attempted: datetime | None = Field(
+        default=None, alias='DateLastDeploymentAttempted'
+    )
+
+
+class LabTechTicketStatus(AutomateAlertClient):
+    pass
+
+
+class LabTechTicketPriority(AutomateAlertClient):
+    pass
+
+
+class LabTechTicketCategory(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    parent_category_id: int | None = Field(default=None, alias='ParentCategoryId')
+    keywords: str | None = Field(default=None, alias='Keywords')
+    description: str | None = Field(default=None, alias='Description')
+    image: str | None = Field(default=None, alias='Image')
+    is_visible_in_list: bool | None = Field(default=None, alias='IsVisibleInList')
+
+
+class LabTechUserPermissions(ConnectWiseModel):
+    super_admin: bool | None = Field(default=None, alias='SuperAdmin')
+    system_config: bool | None = Field(default=None, alias='SystemConfig')
+    class_config: bool | None = Field(default=None, alias='ClassConfig')
+    create_tickets: bool | None = Field(default=None, alias='CreateTickets')
+    shared_links: bool | None = Field(default=None, alias='SharedLinks')
+    template_read: bool | None = Field(default=None, alias='TemplateRead')
+    template_edit: bool | None = Field(default=None, alias='TemplateEdit')
+    template_delete: bool | None = Field(default=None, alias='TemplateDelete')
+    client_read: bool | None = Field(default=None, alias='ClientRead')
+    client_edit: bool | None = Field(default=None, alias='ClientEdit')
+    client_delete: bool | None = Field(default=None, alias='ClientDelete')
+    report_read: bool | None = Field(default=None, alias='ReportRead')
+    report_edit: bool | None = Field(default=None, alias='ReportEdit')
+    report_delete: bool | None = Field(default=None, alias='ReportDelete')
+    contact_read: bool | None = Field(default=None, alias='ContactRead')
+    contact_edit: bool | None = Field(default=None, alias='ContactEdit')
+    contact_delete: bool | None = Field(default=None, alias='ContactDelete')
+    user_read: bool | None = Field(default=None, alias='UserRead')
+    user_edit: bool | None = Field(default=None, alias='UserEdit')
+    user_delete: bool | None = Field(default=None, alias='UserDelete')
+    tool_read: bool | None = Field(default=None, alias='ToolRead')
+    tool_edit: bool | None = Field(default=None, alias='ToolEdit')
+    tool_delete: bool | None = Field(default=None, alias='ToolDelete')
+    script_read: bool | None = Field(default=None, alias='ScriptRead')
+    script_edit: bool | None = Field(default=None, alias='ScriptEdit')
+    script_delete: bool | None = Field(default=None, alias='ScriptDelete')
+    manage_groups: bool | None = Field(default=None, alias='ManageGroups')
+    dash_ticketing: bool | None = Field(default=None, alias='DashTicketing')
+    dash_time: bool | None = Field(default=None, alias='DashTime')
+    dash_manage: bool | None = Field(default=None, alias='DashManage')
+    dash_trending: bool | None = Field(default=None, alias='DashTrending')
+    dash_overview: bool | None = Field(default=None, alias='DashOverview')
+    hud_update: bool | None = Field(default=None, alias='HUDUpdate')
+    hud_show_all: bool | None = Field(default=None, alias='HUDShowAll')
+    data_view_update: bool | None = Field(default=None, alias='DataViewUpdate')
+    data_view_delete: bool | None = Field(default=None, alias='DataViewDelete')
+    data_view_show_all: bool | None = Field(default=None, alias='DataViewShowAll')
+    users_show_all: bool | None = Field(default=None, alias='UsersShowAll')
+    user_class_create: bool | None = Field(default=None, alias='UserClassCreate')
+    user_class_update: bool | None = Field(default=None, alias='UserClassUpdate')
+    patch_manager_config: bool | None = Field(default=None, alias='PatchManagerConfig')
+    reports_create: bool | None = Field(default=None, alias='ReportsCreate')
+    probe_template_execute: bool | None = Field(
+        default=None, alias='ProbeTemplateExecute'
+    )
+    scheduled_scripts_update: bool | None = Field(
+        default=None, alias='ScheduledScriptsUpdate'
+    )
+    clients_show_all: bool | None = Field(default=None, alias='ClientsShowAll')
+    show_passwords: bool | None = Field(default=None, alias='ShowPasswords')
+    locations_show_all: bool | None = Field(default=None, alias='LocationsShowAll')
+    computers_create: bool | None = Field(default=None, alias='ComputersCreate')
+    computers_update: bool | None = Field(default=None, alias='ComputersUpdate')
+    computers_delete: bool | None = Field(default=None, alias='ComputersDelete')
+    computers_show_all: bool | None = Field(default=None, alias='ComputersShowAll')
+    computers_force_update: bool | None = Field(
+        default=None, alias='ComputersForceUpdate'
+    )
+    network_device_update: bool | None = Field(
+        default=None, alias='NetworkDeviceUpdate'
+    )
+    network_device_delete: bool | None = Field(
+        default=None, alias='NetworkDeviceDelete'
+    )
+    network_device_show_all: bool | None = Field(
+        default=None, alias='NetworkDeviceShowAll'
+    )
+    retired_assets_delete: bool | None = Field(
+        default=None, alias='RetiredAssetsDelete'
+    )
+    groups_create: bool | None = Field(default=None, alias='GroupsCreate')
+    groups_delete: bool | None = Field(default=None, alias='GroupsDelete')
+    groups_show_all: bool | None = Field(default=None, alias='GroupsShowAll')
+    groups_schedule_script: bool | None = Field(
+        default=None, alias='GroupsScheduleScript'
+    )
+    group_monitors_update: bool | None = Field(
+        default=None, alias='GroupMonitorsUpdate'
+    )
+    group_info_update: bool | None = Field(default=None, alias='GroupInfoUpdate')
+    group_managed_services: bool | None = Field(
+        default=None, alias='GroupManagedServices'
+    )
+    remote_monitors_create: bool | None = Field(
+        default=None, alias='RemoteMonitorsCreate'
+    )
+    remote_monitors_delete: bool | None = Field(
+        default=None, alias='RemoteMonitorsDelete'
+    )
+    internal_monitors_create: bool | None = Field(
+        default=None, alias='InternalMonitorsCreate'
+    )
+    internal_monitors_update: bool | None = Field(
+        default=None, alias='InternalMonitorsUpdate'
+    )
+    internal_monitors_delete: bool | None = Field(
+        default=None, alias='InternalMonitorsDelete'
+    )
+    alerts_update: bool | None = Field(default=None, alias='AlertsUpdate')
+    alerts_delete_all: bool | None = Field(default=None, alias='AlertsDeleteAll')
+    tickets_read: bool | None = Field(default=None, alias='TicketsRead')
+    tickets_update: bool | None = Field(default=None, alias='TicketsUpdate')
+    tickets_delete: bool | None = Field(default=None, alias='TicketsDelete')
+    tickets_request: bool | None = Field(default=None, alias='TicketsRequest')
+    searches_read: bool | None = Field(default=None, alias='SearchesRead')
+    searches_update: bool | None = Field(default=None, alias='SearchesUpdate')
+    searches_delete: bool | None = Field(default=None, alias='SearchesDelete')
+    patch_manager_read: bool | None = Field(default=None, alias='PatchManagerRead')
+    patch_manager_update: bool | None = Field(default=None, alias='PatchManagerUpdate')
+    language_pack_editor: bool | None = Field(default=None, alias='LanguagePackEditor')
+    managed_service_catalog: bool | None = Field(
+        default=None, alias='ManagedServiceCatalog'
+    )
+    navigation_menu_update: bool | None = Field(
+        default=None, alias='NavigationMenuUpdate'
+    )
+    rss_feed_read: bool | None = Field(default=None, alias='RSSFeedRead')
+    rss_feed_update: bool | None = Field(default=None, alias='RSSFeedUpdate')
+    links_delete: bool | None = Field(default=None, alias='LinksDelete')
+    plugin_manager: bool | None = Field(default=None, alias='PluginManager')
+    solution_center: bool | None = Field(default=None, alias='SolutionCenter')
+    database_execute: bool | None = Field(default=None, alias='DatabaseExecute')
+    server_status: bool | None = Field(default=None, alias='ServerStatus')
+    manage_audits: bool | None = Field(default=None, alias='ManageAudits')
+    manage_remote_commands: bool | None = Field(
+        default=None, alias='ManageRemoteCommands'
+    )
+    manage_service_logs: bool | None = Field(default=None, alias='ManageServiceLogs')
+    manage_outdated: bool | None = Field(default=None, alias='ManageOutdated')
+    manage_offline_computers: bool | None = Field(
+        default=None, alias='ManageOfflineComputers'
+    )
+    manage_schedule_client_scripts: bool | None = Field(
+        default=None, alias='ManageScheduleClientScripts'
+    )
+    dashboard_config: bool | None = Field(default=None, alias='DashboardConfig')
+    config_application_list: bool | None = Field(
+        default=None, alias='ConfigApplicationList'
+    )
+    config_event_black_list: bool | None = Field(
+        default=None, alias='ConfigEventBlackList'
+    )
+    quick_connect: bool | None = Field(default=None, alias='QuickConnect')
+    permissions_update: bool | None = Field(default=None, alias='PermissionsUpdate')
+    user_class_read: bool | None = Field(default=None, alias='UserClassRead')
+    user_class_delete: bool | None = Field(default=None, alias='UserClassDelete')
+
+
+class LabTechUserFolder(ConnectWiseModel):
+    user_folder_id: str | None = Field(default=None, alias='UserFolderId')
+    name: str | None = Field(default=None, alias='Name')
+    is_sso_enabled: bool | None = Field(default=None, alias='IsSsoEnabled')
+
+
+class LabTechUserSingleSignOnStatus(ConnectWiseModel):
+    sso_status_id: int | None = Field(default=None, alias='SsoStatusId')
+    status_name: str | None = Field(default=None, alias='StatusName')
+
+
+class LabTechComputerMonitorHistory(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    failure_rate: float | None = Field(default=None, alias='FailureRate')
+    last_success_data: str | None = Field(default=None, alias='LastSuccessData')
+    last_warning_data: str | None = Field(default=None, alias='LastWarningData')
+    last_fail_data: str | None = Field(default=None, alias='LastFailData')
+
+
+class LabTechCommand(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+    level: int | None = Field(default=None, alias='Level')
+
+
+class AutomateCommandHistory(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    date_executed: datetime | None = Field(default=None, alias='DateExecuted')
+    command_id: int | None = Field(default=None, alias='CommandId')
+    command: str | None = Field(default=None, alias='Command')
+    status: str | None = Field(default=None, alias='Status')
+    output: str | None = Field(default=None, alias='Output')
+    parameters: str | None = Field(default=None, alias='Parameters')
+    user: str | None = Field(default=None, alias='User')
+    date_finished: datetime | None = Field(default=None, alias='DateFinished')
+
+
+class AutomateCommandPromptCommand(ConnectWiseModel):
+    run_as_admin: bool | None = Field(default=None, alias='RunAsAdmin')
+    use_power_shell: bool | None = Field(default=None, alias='UsePowerShell')
+    command_text: str | None = Field(default=None, alias='CommandText')
+    directory: str | None = Field(default=None, alias='Directory')
+
+
+class AutomateClientPermissionsResult(ConnectWiseModel):
+    client_id: int | None = Field(default=None, alias='ClientId')
+    permissions: list[str] | None = Field(default=None, alias='Permissions')
+
+
+class LabTechComputerBios(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    vendor: str | None = Field(default=None, alias='Vendor')
+    version: str | None = Field(default=None, alias='Version')
+    date: datetime | None = Field(default=None, alias='Date')
+    size: int | None = Field(default=None, alias='Size')
+    system_bios_version: float | None = Field(default=None, alias='SystemBiosVersion')
+    embctl_version: float | None = Field(default=None, alias='EMBCTLVersion')
+    sm_bios_version: float | None = Field(default=None, alias='SmBiosVersion')
+    dmi_version: int | None = Field(default=None, alias='DmiVersion')
+    supports_acpi: bool | None = Field(default=None, alias='SupportsAcpi')
+    supports_apm: bool | None = Field(default=None, alias='SupportsApm')
+    supports_agp: bool | None = Field(default=None, alias='SupportsAgp')
+    supports_pcmcia: bool | None = Field(default=None, alias='SupportsPcmcia')
+    has_smart_battery: bool | None = Field(default=None, alias='HasSmartBattery')
+    supports_uefi: bool | None = Field(default=None, alias='SupportsUefi')
+    supports_legacy_usb: bool | None = Field(default=None, alias='SupportsLegacyUsb')
+    supports_pci: bool | None = Field(default=None, alias='SupportsPci')
+    supports_vlvesa: bool | None = Field(default=None, alias='SupportsVlvesa')
+    supports_escd: bool | None = Field(default=None, alias='SupportsEscd')
+    supports_net_boot: bool | None = Field(default=None, alias='SupportsNetBoot')
+    supports_i2_o_boot: bool | None = Field(default=None, alias='SupportsI2OBoot')
+    is_virtual_machine: bool | None = Field(default=None, alias='IsVirtualMachine')
+    power_on_reason: str | None = Field(default=None, alias='PowerOnReason')
+    bios_char: int | None = Field(default=None, alias='BiosChar')
+    is_portable: bool | None = Field(default=None, alias='IsPortable')
+    vm_host: str | None = Field(default=None, alias='VmHost')
+    vm_type: str | None = Field(default=None, alias='VmType')
+    vm_name: str | None = Field(default=None, alias='VmName')
+    date_updated: datetime | None = Field(default=None, alias='DateUpdated')
+
+
+class LabTechComputerDriver(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+    state: str | None = Field(default=None, alias='State')
+    startup: str | None = Field(default=None, alias='Startup')
+    path_name: str | None = Field(default=None, alias='PathName')
+    service_type: str | None = Field(default=None, alias='ServiceType')
+    username: str | None = Field(default=None, alias='Username')
+    date_last_inventoried: datetime | None = Field(
+        default=None, alias='DateLastInventoried'
+    )
+    run_levels: str | None = Field(default=None, alias='RunLevels')
+
+
+class LabTechComputerDrive(ConnectWiseModel):
+    drive_id: int | None = Field(default=None, alias='DriveId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    letter: str | None = Field(default=None, alias='Letter')
+    size: int | None = Field(default=None, alias='Size')
+    free_space: int | None = Field(default=None, alias='FreeSpace')
+    file_system: str | None = Field(default=None, alias='FileSystem')
+    model: str | None = Field(default=None, alias='Model')
+    smart_status: str | None = Field(default=None, alias='SmartStatus')
+    is_missing: bool | None = Field(default=None, alias='IsMissing')
+    date_last_inventoried: datetime | None = Field(
+        default=None, alias='DateLastInventoried'
+    )
+    volume_name: str | None = Field(default=None, alias='VolumeName')
+    backup_flag: int | None = Field(default=None, alias='BackupFlag')
+    is_solid_state: bool | None = Field(default=None, alias='IsSolidState')
+    is_internal: bool | None = Field(default=None, alias='IsInternal')
+    maximum_history_days_available: int | None = Field(
+        default=None, alias='MaximumHistoryDaysAvailable'
+    )
+
+
+class LabTechSmartAttribute(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class LabTechComputerEffectivePatchingPolicy(ConnectWiseModel):
+    approval_policy_count: int | None = Field(default=None, alias='ApprovalPolicyCount')
+    microsoft_update_policy_name: str | None = Field(
+        default=None, alias='MicrosoftUpdatePolicyName'
+    )
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    reboot_policy_name: str | None = Field(default=None, alias='RebootPolicyName')
+    third_party_update_policy_name: str | None = Field(
+        default=None, alias='ThirdPartyUpdatePolicyName'
+    )
+
+
+class AutomateMaintenanceModeQueueEntry(ConnectWiseModel):
+    maintenance_mode_queue_id: int | None = Field(
+        default=None, alias='MaintenanceModeQueueId'
+    )
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    start_date: datetime | None = Field(default=None, alias='StartDate')
+    duration_in_minutes: int | None = Field(default=None, alias='DurationInMinutes')
+    mode: str | None = Field(default=None, alias='Mode')
+    user_id: int | None = Field(default=None, alias='UserId')
+    comments: str | None = Field(default=None, alias='Comments')
+
+
+class LabTechPolicyApprovalSetting(AutomateAlertClient):
+    pass
+
+
+class MicrosoftSafeWaitHandle(ConnectWiseModel):
+    is_invalid: bool | None = Field(default=None, alias='IsInvalid')
+    is_closed: bool | None = Field(default=None, alias='IsClosed')
+
+
+class LabTechComputerOperatingSystem(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    name: str | None = Field(default=None, alias='Name')
+    major_version: int | None = Field(default=None, alias='MajorVersion')
+    minor_version: int | None = Field(default=None, alias='MinorVersion')
+    version: str | None = Field(default=None, alias='Version')
+    dot_net_version: str | None = Field(default=None, alias='DotNetVersion')
+    service_pack: str | None = Field(default=None, alias='ServicePack')
+    service_pack_name: str | None = Field(default=None, alias='ServicePackName')
+    product_type: int | None = Field(default=None, alias='ProductType')
+    suite: int | None = Field(default=None, alias='Suite')
+    product_info: int | None = Field(default=None, alias='ProductInfo')
+    is_licensed: bool | None = Field(default=None, alias='IsLicensed')
+    is_tablet: bool | None = Field(default=None, alias='IsTablet')
+    is_starter: bool | None = Field(default=None, alias='IsStarter')
+    is_media_center: bool | None = Field(default=None, alias='IsMediaCenter')
+    base_folder: str | None = Field(default=None, alias='BaseFolder')
+    system_drive: str | None = Field(default=None, alias='SystemDrive')
+    has_gui: bool | None = Field(default=None, alias='HasGui')
+    is64_bit: bool | None = Field(default=None, alias='Is64Bit')
+    domain: str | None = Field(default=None, alias='Domain')
+    is_domain_controller: bool | None = Field(default=None, alias='IsDomainController')
+    is_server: bool | None = Field(default=None, alias='IsServer')
+    install_date: datetime | None = Field(default=None, alias='InstallDate')
+    date_updated: datetime | None = Field(default=None, alias='DateUpdated')
+    release_id: int | None = Field(default=None, alias='ReleaseId')
+    edition: str | None = Field(default=None, alias='Edition')
+    branch_readiness_level: int | None = Field(
+        default=None, alias='BranchReadinessLevel'
+    )
+
+
+class LabTechComputerPatchingPolicy(ConnectWiseModel):
+    approval_policy_count: int | None = Field(default=None, alias='ApprovalPolicyCount')
+    group_id: int | None = Field(default=None, alias='GroupId')
+    microsoft_update_policy_name: str | None = Field(
+        default=None, alias='MicrosoftUpdatePolicyName'
+    )
+    name: str | None = Field(default=None, alias='Name')
+    override_id: int | None = Field(default=None, alias='OverrideId')
+    priority: int | None = Field(default=None, alias='Priority')
+    reboot_policy_name: str | None = Field(default=None, alias='RebootPolicyName')
+    third_party_update_policy_name: str | None = Field(
+        default=None, alias='ThirdPartyUpdatePolicyName'
+    )
+
+
+class LabTechComputerPrinter(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    name: str | None = Field(default=None, alias='Name')
+    port_name: str | None = Field(default=None, alias='PortName')
+    resolution: str | None = Field(default=None, alias='Resolution')
+    paper_types: list[str] | None = Field(default=None, alias='PaperTypes')
+    features: list[str] | None = Field(default=None, alias='Features')
+
+
+class LabTechComputerRunningScript(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    script_id: int | None = Field(default=None, alias='ScriptId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    name: str | None = Field(default=None, alias='Name')
+    status: Literal['Running', 'Completed'] | None = Field(default=None, alias='Status')
+    start_date: datetime | None = Field(default=None, alias='StartDate')
+
+
+class LabTechComputerDevice(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    pnp_device_id: str | None = Field(default=None, alias='PnpDeviceId')
+    device_name: str | None = Field(default=None, alias='DeviceName')
+    device_type: str | None = Field(default=None, alias='DeviceType')
+    driver_version: str | None = Field(default=None, alias='DriverVersion')
+    driver_date: datetime | None = Field(default=None, alias='DriverDate')
+    driver_name: str | None = Field(default=None, alias='DriverName')
+    driver_file: str | None = Field(default=None, alias='DriverFile')
+    manufacturer: str | None = Field(default=None, alias='Manufacturer')
+    update_date: datetime | None = Field(default=None, alias='UpdateDate')
+
+
+class LabTechMaintenanceMode(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerID')
+    time_start: datetime | None = Field(default=None, alias='TimeStart')
+    duration: int | None = Field(default=None, alias='Duration')
+    mode: int | None = Field(default=None, alias='Mode')
+    user_id: int | None = Field(default=None, alias='UserID')
+
+
+class LabTechMemoryFormFactor(AutomateAlertClient):
+    pass
+
+
+class LabTechMemoryType(AutomateAlertClient):
+    pass
+
+
+class LabTechProcessorSocket(AutomateAlertClient):
+    pass
+
+
+class LabTechProcessorFamily(AutomateAlertClient):
+    pass
+
+
+class LabTechComputerProcessorCache(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    size: int | None = Field(default=None, alias='Size')
+
+
+class LabTechServiceClassification(AutomateAlertClient):
+    pass
+
+
+class LabTechSoftwareClassification(AutomateAlertClient):
+    pass
+
+
+class LabTechVideoCardArchitecture(AutomateAlertClient):
+    pass
+
+
+class LabTechVideoCardMemory(AutomateAlertClient):
+    pass
+
+
+class LabTechComputerScheduledTask(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    command: str | None = Field(default=None, alias='Command')
+    is_interactive: bool | None = Field(default=None, alias='IsInteractive')
+    start_time: str | None = Field(default=None, alias='StartTime')
+    does_repeat: bool | None = Field(default=None, alias='DoesRepeat')
+    days_of_week: list[str] | None = Field(default=None, alias='DaysOfWeek')
+
+
+class LabTechComputerScriptHistory(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    script_id: int | None = Field(default=None, alias='ScriptId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    name: str | None = Field(default=None, alias='Name')
+    user: str | None = Field(default=None, alias='User')
+    status: Literal['Running', 'Completed'] | None = Field(default=None, alias='Status')
+    state: Literal['Failure', 'Information', 'Success'] | None = Field(
+        default=None, alias='State'
+    )
+    history_date: datetime | None = Field(default=None, alias='HistoryDate')
+    diagnostic_message: str | None = Field(default=None, alias='DiagnosticMessage')
+
+
+class LabTechSensorDeviceType(ConnectWiseModel):
+    device_type: int | None = Field(default=None, alias='DeviceType')
+    name: str | None = Field(default=None, alias='Name')
+    indicator: str | None = Field(default=None, alias='Indicator')
+
+
+class LabTechSoftwareUninstallInfo(ConnectWiseModel):
+    uninstall_path: str | None = Field(default=None, alias='UninstallPath')
+
+
+class LabTechSoftwareClassificationInfo(ConnectWiseModel):
+    software_names: list[str] | None = Field(default=None, alias='SoftwareNames')
+
+
+class LabTechComputerSystemSlot(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    id: int | None = Field(default=None, alias='Id')
+    slot_handle: int | None = Field(default=None, alias='SlotHandle')
+    slot_name: str | None = Field(default=None, alias='SlotName')
+    slot_type: str | None = Field(default=None, alias='SlotType')
+    bus_width: str | None = Field(default=None, alias='BusWidth')
+    in_use: str | None = Field(default=None, alias='InUse')
+    length: str | None = Field(default=None, alias='Length')
+    supports3_volts: bool | None = Field(default=None, alias='Supports3Volts')
+    supports5_volts: bool | None = Field(default=None, alias='Supports5Volts')
+    is_hot_pluggable: bool | None = Field(default=None, alias='IsHotPluggable')
+    supports_power_management: bool | None = Field(
+        default=None, alias='SupportsPowerManagement'
+    )
+
+
+class LabTechPatchComplianceState(AutomateAlertClient):
+    pass
+
+
+class LabTechThirdParyInstallAction(AutomateAlertClient):
+    pass
+
+
+class LabTechThirdPartyPolicyApproval(AutomateAlertClient):
+    pass
+
+
+class LabTechComputerUps(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    ups_id: int | None = Field(default=None, alias='UpsId')
+    ups_name: str | None = Field(default=None, alias='UpsName')
+    charge_remaining: int | None = Field(default=None, alias='ChargeRemaining')
+    remaining_run_time: int | None = Field(default=None, alias='RemainingRunTime')
+
+
+class AutomateDatabaseInformation(ConnectWiseModel):
+    database_id: int | None = Field(default=None, alias='DatabaseId')
+    database_version: str | None = Field(default=None, alias='DatabaseVersion')
+    uptime: str | None = Field(default=None, alias='Uptime')
+    current_connections: int | None = Field(default=None, alias='CurrentConnections')
+    max_connections: int | None = Field(default=None, alias='MaxConnections')
+    peak_connections: int | None = Field(default=None, alias='PeakConnections')
+    running_queries: int | None = Field(default=None, alias='RunningQueries')
+    last_backup_file_path: str | None = Field(default=None, alias='LastBackupFilePath')
+    last_backup_date: datetime | None = Field(default=None, alias='LastBackupDate')
+    last_backup_size: str | None = Field(default=None, alias='LastBackupSize')
+    last_backup_status: int | None = Field(default=None, alias='LastBackupStatus')
+
+
+class LabTechDataViewFolder(AutomateComputerServiceItem):
+    pass
+
+
+class LabTechDataView(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    folder_id: int | None = Field(default=None, alias='FolderId')
+
+
+class AutomateClient(ConnectWiseModel):
+    client_id: int | None = Field(default=None, alias='ClientId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateLocation(ConnectWiseModel):
+    location_id: int | None = Field(default=None, alias='LocationId')
+    name: str | None = Field(default=None, alias='Name')
+    client: AutomateClient | None = Field(default=None, alias='Client')
+
+
+class AutomateExtraFieldDisplayFormat(ConnectWiseModel):
+    extra_field_display_format_id: int | None = Field(
+        default=None, alias='ExtraFieldDisplayFormatId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateExtraFieldLocation(ConnectWiseModel):
+    extra_field_location_id: int | None = Field(
+        default=None, alias='ExtraFieldLocationId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateExtraFieldTitleFormat(ConnectWiseModel):
+    extra_field_title_format_id: int | None = Field(
+        default=None, alias='ExtraFieldTitleFormatId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateTextFieldSettings(ConnectWiseModel):
+    is_masked: bool | None = Field(default=None, alias='IsMasked')
+    value: str | None = Field(default=None, alias='Value')
+    default_value: str | None = Field(default=None, alias='DefaultValue')
+
+
+class AutomateDropdownSettings(ConnectWiseModel):
+    available_options: dict[str, str] | None = Field(
+        default=None, alias='AvailableOptions'
+    )
+    selected_value: str | None = Field(default=None, alias='SelectedValue')
+    default_value: str | None = Field(default=None, alias='DefaultValue')
+
+
+class AutomateCheckboxSettings(ConnectWiseModel):
+    is_checked: bool | None = Field(default=None, alias='IsChecked')
+    default_value: bool | None = Field(default=None, alias='DefaultValue')
+
+
+class AutomateExecuteDeviceCommandsRequest(ConnectWiseModel):
+    device_id_list: list[int] | None = Field(default=None, alias='DeviceIdList')
+
+
+class AutomateExecuteDeviceCommandResult(ConnectWiseModel):
+    device_id: int | None = Field(default=None, alias='DeviceId')
+    result_details: AutomateResponseResult | None = Field(
+        default=None, alias='ResultDetails'
+    )
+
+
+class AutomateComputerPatchingStats(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    overall_compliance: float | None = Field(default=None, alias='OverallCompliance')
+    installed_patch_count: int | None = Field(default=None, alias='InstalledPatchCount')
+    missing_patch_count: int | None = Field(default=None, alias='MissingPatchCount')
+    failed_patch_count: int | None = Field(default=None, alias='FailedPatchCount')
+    compliant_software_count: int | None = Field(
+        default=None, alias='CompliantSoftwareCount'
+    )
+    non_compliant_software_count: int | None = Field(
+        default=None, alias='NonCompliantSoftwareCount'
+    )
+    failed_software_count: int | None = Field(default=None, alias='FailedSoftwareCount')
+    incorrect_software_count: int | None = Field(
+        default=None, alias='IncorrectSoftwareCount'
+    )
+    stage: str | None = Field(default=None, alias='Stage')
+    no_patch_inventory: bool | None = Field(default=None, alias='NoPatchInventory')
+    wsus_enabled: bool | None = Field(default=None, alias='WSUSEnabled')
+    patch_job_running: bool | None = Field(default=None, alias='PatchJobRunning')
+    daytime_patching_enabled: bool | None = Field(
+        default=None, alias='DaytimePatchingEnabled'
+    )
+    wua_out_of_date: bool | None = Field(default=None, alias='WUAOutOfDate')
+    missing_baseline_patches: bool | None = Field(
+        default=None, alias='MissingBaselinePatches'
+    )
+    wua_version: str | None = Field(default=None, alias='WUAVersion')
+    last_install_window: datetime | None = Field(
+        default=None, alias='LastInstallWindow'
+    )
+    next_install_window: datetime | None = Field(
+        default=None, alias='NextInstallWindow'
+    )
+    last_software_window: datetime | None = Field(
+        default=None, alias='LastSoftwareWindow'
+    )
+    next_software_window: datetime | None = Field(
+        default=None, alias='NextSoftwareWindow'
+    )
+    last_patched_date: datetime | None = Field(default=None, alias='LastPatchedDate')
+    last_microsoft_patched_date: datetime | None = Field(
+        default=None, alias='LastMicrosoftPatchedDate'
+    )
+    last_third_party_patched_date: datetime | None = Field(
+        default=None, alias='LastThirdPartyPatchedDate'
+    )
+    last_patch_inventory: datetime | None = Field(
+        default=None, alias='LastPatchInventory'
+    )
+    is_microsoft_managed: bool | None = Field(default=None, alias='IsMicrosoftManaged')
+    is_third_party_managed: bool | None = Field(
+        default=None, alias='IsThirdPartyManaged'
+    )
+
+
+class AutomateExecuteDeviceScriptRequest(ConnectWiseModel):
+    script_id: int | None = Field(default=None, alias='ScriptId')
+    parameter_list: list[str] | None = Field(default=None, alias='ParameterList')
+    device_id_list: list[int] | None = Field(default=None, alias='DeviceIdList')
+
+
+class AutomateExecuteDeviceScriptResult(AutomateExecuteDeviceCommandResult):
+    pass
+
+
+class AutomateDevicesSummaryData(ConnectWiseModel):
+    compliance_score: float | None = Field(default=None, alias='ComplianceScore')
+    devices_affecting_compliance_count: int | None = Field(
+        default=None, alias='DevicesAffectingComplianceCount'
+    )
+    devices_affecting_pilot_stage_compliance_count: int | None = Field(
+        default=None, alias='DevicesAffectingPilotStageComplianceCount'
+    )
+    devices_affecting_production_stage_compliance_count: int | None = Field(
+        default=None, alias='DevicesAffectingProductionStageComplianceCount'
+    )
+    devices_affecting_test_stage_compliance_count: int | None = Field(
+        default=None, alias='DevicesAffectingTestStageComplianceCount'
+    )
+    devices_needing_attention_count: int | None = Field(
+        default=None, alias='DevicesNeedingAttentionCount'
+    )
+    enabled_wsus_count: int | None = Field(default=None, alias='EnabledWsusCount')
+    entity_id: int | None = Field(default=None, alias='EntityId')
+    entity_name: str | None = Field(default=None, alias='EntityName')
+    in_daytime_patching_count: int | None = Field(
+        default=None, alias='InDaytimePatchingCount'
+    )
+    last_patch_job_failed_count: int | None = Field(
+        default=None, alias='LastPatchJobFailedCount'
+    )
+    missing_baseline_patches_count: int | None = Field(
+        default=None, alias='MissingBaselinePatchesCount'
+    )
+    missing_patch_inventory_count: int | None = Field(
+        default=None, alias='MissingPatchInventoryCount'
+    )
+    out_of_date_wua_count: int | None = Field(default=None, alias='OutOfDateWuaCount')
+    pending_reboot_count: int | None = Field(default=None, alias='PendingRebootCount')
+    pending_update_count: int | None = Field(default=None, alias='PendingUpdateCount')
+    pilot_stage_compliance_score: float | None = Field(
+        default=None, alias='PilotStageComplianceScore'
+    )
+    production_stage_compliance_score: float | None = Field(
+        default=None, alias='ProductionStageComplianceScore'
+    )
+    running_patch_installation_count: int | None = Field(
+        default=None, alias='RunningPatchInstallationCount'
+    )
+    servers_affecting_compliance_count: int | None = Field(
+        default=None, alias='ServersAffectingComplianceCount'
+    )
+    servers_compliance_score: float | None = Field(
+        default=None, alias='ServersComplianceScore'
+    )
+    test_stage_compliance_score: float | None = Field(
+        default=None, alias='TestStageComplianceScore'
+    )
+    workstations_affecting_compliance_count: int | None = Field(
+        default=None, alias='WorkstationsAffectingComplianceCount'
+    )
+    workstations_compliance_score: float | None = Field(
+        default=None, alias='WorkstationsComplianceScore'
+    )
+
+
+class LabTechDocument(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    client_id: int | None = Field(default=None, alias='ClientId')
+    name: str | None = Field(default=None, alias='Name')
+    size: int | None = Field(default=None, alias='Size')
+    data: str | None = Field(default=None, alias='Data')
+    last_user: str | None = Field(default=None, alias='LastUser')
+    last_edit_date: datetime | None = Field(default=None, alias='LastEditDate')
+
+
+class LabTechDriveStats(ConnectWiseModel):
+    drive_id: int | None = Field(default=None, alias='DriveId')
+    free_space_percentage: int | None = Field(default=None, alias='FreeSpacePercentage')
+    fragmented_space_percentage: int | None = Field(
+        default=None, alias='FragmentedSpacePercentage'
+    )
+    event_date: datetime | None = Field(default=None, alias='EventDate')
+    sample_count: int | None = Field(default=None, alias='SampleCount')
+    week: int | None = Field(default=None, alias='Week')
+    month: int | None = Field(default=None, alias='Month')
+    year: int | None = Field(default=None, alias='Year')
+
+
+class LabTechEventLogType(AutomateAlertClient):
+    pass
+
+
+class AutomateSessionViewerUser(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    permissions: str | None = Field(default=None, alias='Permissions')
+
+
+class AutomateUserClass(ConnectWiseModel):
+    user_class_id: int | None = Field(default=None, alias='UserClassId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateUserClassUserPermissions(LabTechUserPermissions):
+    pass
+
+
+class AutomateBinaryExtensionPermission(ConnectWiseModel):
+    extension_permission_id: int | None = Field(
+        default=None, alias='ExtensionPermissionId'
+    )
+    extension_guid: UUID | None = Field(
+        default=None,
+        alias='ExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    extension_name: str | None = Field(default=None, alias='ExtensionName')
+    permission_id: int | None = Field(default=None, alias='PermissionId')
+    permission_name: str | None = Field(default=None, alias='PermissionName')
+
+
+class AutomateWebExtensionPermission(ConnectWiseModel):
+    web_extension_permission_id: int | None = Field(
+        default=None, alias='WebExtensionPermissionId'
+    )
+    web_extension_id: int | None = Field(default=None, alias='WebExtensionId')
+    permission_key: str | None = Field(default=None, alias='PermissionKey')
+    permission_name: str | None = Field(default=None, alias='PermissionName')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class AutomateExtraFieldSectionResetRequest(ConnectWiseModel):
+    section: str | None = Field(default=None, alias='Section')
+
+
+class LabTechFeatureFlag(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    is_enabled: bool | None = Field(default=None, alias='IsEnabled')
+
+
+class LabTechGroupComputer(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    group_id: str | None = Field(default=None, alias='GroupId')
+    computer_id: str | None = Field(default=None, alias='ComputerId')
+
+
+class LabTechGroupContact(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    group_id: str | None = Field(default=None, alias='GroupId')
+    contact_id: str | None = Field(default=None, alias='ContactId')
+
+
+class AutomateRemoveEntitiesFromGroupRequest(ConnectWiseModel):
+    group_id: int | None = Field(default=None, alias='GroupId')
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+
+
+class LabTechGroupNetworkDevice(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    group_id: str | None = Field(default=None, alias='GroupId')
+    device_id: str | None = Field(default=None, alias='DeviceId')
+
+
+class AutomateWindowsUpdateAgentMode(AutomateAlertClient):
+    pass
+
+
+class AutomateWindows10UpdatePolicySettings(ConnectWiseModel):
+    service_branch: str | None = Field(default=None, alias='ServiceBranch')
+    feature_update_deferment: int | None = Field(
+        default=None, alias='FeatureUpdateDeferment'
+    )
+    quality_update_deferment: int | None = Field(
+        default=None, alias='QualityUpdateDeferment'
+    )
+
+
+class AutomateUpdatePolicyScheduleDay(AutomateAlertClient):
+    pass
+
+
+class AutomatePatchRebootAction(AutomateAlertClient):
+    pass
+
+
+class AutomatePatchRebootMode(AutomateAlertClient):
+    pass
+
+
+class AutomateSearch(ConnectWiseModel):
+    search_id: int | None = Field(default=None, alias='SearchId')
+    name: str | None = Field(default=None, alias='Name')
+    folder_name: str | None = Field(default=None, alias='FolderName')
+
+
+class AutomatePolicyScheduleType(AutomateAlertClient):
+    pass
+
+
+class AutomateDatesScheduleSettings(ConnectWiseModel):
+    monthly_occurrence: list[str] | None = Field(
+        default=None, alias='MonthlyOccurrence'
+    )
+    dates: list[int] | None = Field(default=None, alias='Dates')
+    last_day_of_month: bool | None = Field(default=None, alias='LastDayOfMonth')
+
+
+class AutomateDaysScheduleSettings(ConnectWiseModel):
+    monthly_occurrence: list[str] | None = Field(
+        default=None, alias='MonthlyOccurrence'
+    )
+    weekly_occurrence: list[str] | None = Field(default=None, alias='WeeklyOccurrence')
+    daily_occurrence: list[str] | None = Field(default=None, alias='DailyOccurrence')
+
+
+class AutomatePatchingPolicyScript(ConnectWiseModel):
+    run_script: bool | None = Field(default=None, alias='RunScript')
+    script_guid: UUID | None = Field(
+        default=None, alias='ScriptGuid', example='00000000-0000-0000-0000-000000000000'
+    )
+    script_name: str | None = Field(default=None, alias='ScriptName')
+    cancel_action_on_script_failure: bool | None = Field(
+        default=None, alias='CancelActionOnScriptFailure'
+    )
+
+
+class AutomateSearchTargetType(ConnectWiseModel):
+    search_target_type_id: int | None = Field(default=None, alias='SearchTargetTypeId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateGroupTreeItem(ConnectWiseModel):
+    group_id: int | None = Field(default=None, alias='GroupId')
+    parent_id: int | None = Field(default=None, alias='ParentId')
+    name: str | None = Field(default=None, alias='Name')
+    full_name: str | None = Field(default=None, alias='FullName')
+    user_has_direct_access: bool | None = Field(
+        default=None, alias='UserHasDirectAccess'
+    )
+    is_limited_to_computer_auto_join_search: bool | None = Field(
+        default=None, alias='IsLimitedToComputerAutoJoinSearch'
+    )
+    is_limited_to_network_device_auto_join_search: bool | None = Field(
+        default=None, alias='IsLimitedToNetworkDeviceAutoJoinSearch'
+    )
+    is_limited_to_contact_auto_join_search: bool | None = Field(
+        default=None, alias='IsLimitedToContactAutoJoinSearch'
+    )
+    parent_groups: list[AutomateGroupTreeItem] | None = Field(
+        default=None, alias='ParentGroups'
+    )
+    child_groups: list[AutomateGroupTreeItem] | None = Field(
+        default=None, alias='ChildGroups'
+    )
+    direct_computer_membership_count: int | None = Field(
+        default=None, alias='DirectComputerMembershipCount'
+    )
+    indirect_computer_membership_count: int | None = Field(
+        default=None, alias='IndirectComputerMembershipCount'
+    )
+
+
+class AutomateComputerSearchInformation(ConnectWiseModel):
+    is_modifiable: bool | None = Field(default=None, alias='IsModifiable')
+    searches: list[AutomateSearch] | None = Field(default=None, alias='Searches')
+
+
+class AutomateMaintenanceWindow(ConnectWiseModel):
+    maintenance_window_id: int | None = Field(default=None, alias='MaintenanceWindowId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateGroupType(ConnectWiseModel):
+    group_type_id: int | None = Field(default=None, alias='GroupTypeId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateRemoteAgentTemplate(ConnectWiseModel):
+    remote_agent_template_id: int | None = Field(
+        default=None, alias='RemoteAgentTemplateId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateTicketCategory(AutomateWindowsUpdateCategory):
+    pass
+
+
+class AutomateMembershipConfiguration(ConnectWiseModel):
+    membership_type: str | None = Field(default=None, alias='MembershipType')
+    computer_search_name: str | None = Field(default=None, alias='ComputerSearchName')
+    is_limited_to_computer_search: bool | None = Field(
+        default=None, alias='IsLimitedToComputerSearch'
+    )
+    network_device_search_name: str | None = Field(
+        default=None, alias='NetworkDeviceSearchName'
+    )
+    is_limited_to_network_device_search: bool | None = Field(
+        default=None, alias='IsLimitedToNetworkDeviceSearch'
+    )
+    contact_search_name: str | None = Field(default=None, alias='ContactSearchName')
+    is_limited_to_contact_search: bool | None = Field(
+        default=None, alias='IsLimitedToContactSearch'
+    )
+    includes_contact_associated_computers: bool | None = Field(
+        default=None, alias='IncludesContactAssociatedComputers'
+    )
+
+
+class AutomateIpRestrictionStatus(ConnectWiseModel):
+    is_enabled: bool | None = Field(default=None, alias='IsEnabled')
+
+
+class LabTechLicensedProduct(ConnectWiseModel):
+    cd_key: str | None = Field(default=None, alias='CdKey')
+    current_license_usage: int | None = Field(default=None, alias='CurrentLicenseUsage')
+    data: str | None = Field(default=None, alias='Data')
+    is_license_active: bool | None = Field(default=None, alias='IsLicenseActive')
+    license_file: str | None = Field(default=None, alias='LicenseFile')
+    max_license_usage: int | None = Field(default=None, alias='MaxLicenseUsage')
+    product_id: int | None = Field(default=None, alias='ProductId')
+    product_sku: str | None = Field(default=None, alias='ProductSku')
+
+
+class LabTechLink(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    url: str | None = Field(default=None, alias='URL')
+    category: str | None = Field(default=None, alias='Category')
+
+
+class LabTechNetworkMapNode(ConnectWiseModel):
+    device_id: int | None = Field(default=None, alias='DeviceId')
+    device_name: str | None = Field(default=None, alias='DeviceName')
+    device_friendly_name: str | None = Field(default=None, alias='DeviceFriendlyName')
+    description: str | None = Field(default=None, alias='Description')
+    device_type: str | None = Field(default=None, alias='DeviceType')
+    child_node_list: list[LabTechNetworkMapNode] | None = Field(
+        default=None, alias='ChildNodeList'
+    )
+    device_mac_address: str | None = Field(default=None, alias='DeviceMacAddress')
+    ip_address: str | None = Field(default=None, alias='IpAddress')
+    status: str | None = Field(default=None, alias='Status')
+    device_classification: Literal[
+        'Unknown', 'Computer', 'NetworkDevice', 'InternetConnection', 'BlackBox'
+    ] | None = Field(default=None, alias='DeviceClassification')
+
+
+class LabTechNetworkMapNodeDetails(ConnectWiseModel):
+    device_id: int | None = Field(default=None, alias='DeviceId')
+    device_type: str | None = Field(default=None, alias='DeviceType')
+    uptime: int | None = Field(default=None, alias='Uptime')
+    ignore_device_scan: bool | None = Field(default=None, alias='IgnoreDeviceScan')
+    asset_date: datetime | None = Field(default=None, alias='AssetDate')
+    date_last_inventoried: datetime | None = Field(
+        default=None, alias='DateLastInventoried'
+    )
+    last_contact_date: datetime | None = Field(default=None, alias='LastContactDate')
+    ip_address: str | None = Field(default=None, alias='IpAddress')
+    device_mac_address: str | None = Field(default=None, alias='DeviceMacAddress')
+    operating_system: str | None = Field(default=None, alias='OperatingSystem')
+    model: str | None = Field(default=None, alias='Model')
+    location_probe: str | None = Field(default=None, alias='LocationProbe')
+    manufacturer: str | None = Field(default=None, alias='Manufacturer')
+    uplink_port: str | None = Field(default=None, alias='UplinkPort')
+    uplink_name: str | None = Field(default=None, alias='UplinkName')
+    uplink_ip_address: str | None = Field(default=None, alias='UplinkIpAddress')
+
+
+class LabTechEncryptionMethod(AutomateAlertClient):
+    pass
+
+
+class LabTechHashMethod(AutomateAlertClient):
+    pass
+
+
+class LabTechScanFrequencyCategory(ConnectWiseModel):
+    category_id: int | None = Field(default=None, alias='CategoryId')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class LabTechStatusScanNetworkPortOption(ConnectWiseModel):
+    status_scan_network_port_option_id: int | None = Field(
+        default=None, alias='StatusScanNetworkPortOptionId'
+    )
+    description: str | None = Field(default=None, alias='Description')
+
+
+class LabTechProbeEventLevel(AutomateAlertClient):
+    pass
+
+
+class AutomateMaintenanceWindowDefinition(LabTechMaintenanceWindowDefinition):
+    pass
+
+
+class LabTechProductKey(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    client_id: int | None = Field(default=None, alias='ClientId')
+    product_name: str | None = Field(default=None, alias='ProductName')
+    serial_number: str | None = Field(default=None, alias='SerialNumber')
+    license_key: str | None = Field(default=None, alias='LicenseKey')
+    does_expire: bool | None = Field(default=None, alias='DoesExpire')
+    expiration_date: datetime | None = Field(default=None, alias='ExpirationDate')
+    notes: str | None = Field(default=None, alias='Notes')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    computer_name: str | None = Field(default=None, alias='ComputerName')
+
+
+class AutomateManagementPackQuickSettingsRequest(ConnectWiseModel):
+    is_core_services_enabled: bool | None = Field(
+        default=None, alias='IsCoreServicesEnabled'
+    )
+    is_database_enabled: bool | None = Field(default=None, alias='IsDatabaseEnabled')
+    is_messaging_services_enabled: bool | None = Field(
+        default=None, alias='IsMessagingServicesEnabled'
+    )
+    is_network_ports_enabled: bool | None = Field(
+        default=None, alias='IsNetworkPortsEnabled'
+    )
+    is_websites_and_proxies_enabled: bool | None = Field(
+        default=None, alias='IsWebsitesAndProxiesEnabled'
+    )
+    alert_level: str | None = Field(default=None, alias='AlertLevel')
+
+
+class AutomateManagementPackStatus(ConnectWiseModel):
+    is_installed: bool | None = Field(default=None, alias='IsInstalled')
+    is_enabled: bool | None = Field(default=None, alias='IsEnabled')
+    alert_level: str | None = Field(default=None, alias='AlertLevel')
+
+
+class AutomateCommandMenuItemBase(ConnectWiseModel):
+    command_key: str | None = Field(default=None, alias='CommandKey')
+    display_name: str | None = Field(default=None, alias='DisplayName')
+    display_order: int | None = Field(default=None, alias='DisplayOrder')
+    route: str | None = Field(default=None, alias='Route')
+    require_confirmation: bool | None = Field(default=None, alias='RequireConfirmation')
+
+
+class AutomateWindowsUpdateAgentSettings(ConnectWiseModel):
+    use_windows_update_agent_mode: bool | None = Field(
+        default=None, alias='UseWindowsUpdateAgentMode'
+    )
+    mode: str | None = Field(default=None, alias='Mode')
+    disable_user_interface: bool | None = Field(
+        default=None, alias='DisableUserInterface'
+    )
+
+
+class AutomateMicrosoftUpdatePolicyOptions(ConnectWiseModel):
+    install_missing_baseline_patches: bool | None = Field(
+        default=None, alias='InstallMissingBaselinePatches'
+    )
+
+
+class AutomatePatchTuesdayScheduleSettings(ConnectWiseModel):
+    delay_in_days: int | None = Field(default=None, alias='DelayInDays')
+
+
+class AutomateDaytimePatchingOptions(ConnectWiseModel):
+    allow_daytime_patching: bool | None = Field(
+        default=None, alias='AllowDaytimePatching'
+    )
+    require_minimum_uptime: bool | None = Field(
+        default=None, alias='RequireMinimumUptime'
+    )
+    minimum_uptime: str | None = Field(default=None, alias='MinimumUptime')
+    update_only: bool | None = Field(default=None, alias='UpdateOnly')
+    prompt_interval: str | None = Field(default=None, alias='PromptInterval')
+    prompt_deadline: int | None = Field(default=None, alias='PromptDeadline')
+    prompt_message: str | None = Field(default=None, alias='PromptMessage')
+
+
+class AutomateServiceBranchSettings(ConnectWiseModel):
+    use_service_branch: bool | None = Field(default=None, alias='UseServiceBranch')
+    is_targeted: bool | None = Field(default=None, alias='IsTargeted')
+
+
+class AutomateUpdateDefermentSettings(ConnectWiseModel):
+    use_deferment: bool | None = Field(default=None, alias='UseDeferment')
+    deferment_period_days: int | None = Field(default=None, alias='DefermentPeriodDays')
+
+
+class AutomatePatchingGroup(ConnectWiseModel):
+    group_id: int | None = Field(default=None, alias='GroupId')
+    group_name: str | None = Field(default=None, alias='GroupName')
+
+
+class LabTechMonitorAlertTarget(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    comp_id: int | None = Field(default=None, alias='CompId')
+
+
+class LabTechMonitorState(AutomateAlertClient):
+    pass
+
+
+class LabTechReportCategory(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    icon: str | None = Field(default=None, alias='Icon')
+    title_text: str | None = Field(default=None, alias='TitleText')
+
+
+class LabTechMonitorRoutine(AutomateAlertClient):
+    pass
+
+
+class LabTechMonitorAlertMessages(ConnectWiseModel):
+    success_subject: str | None = Field(default=None, alias='SuccessSubject')
+    success_message: str | None = Field(default=None, alias='SuccessMessage')
+    failure_subject: str | None = Field(default=None, alias='FailureSubject')
+    failure_message: str | None = Field(default=None, alias='FailureMessage')
+
+
+class LabTechInternalMonitorAlertStyle(AutomateAlertClient):
+    pass
+
+
+class LabTechRemoteMonitorAlertStyle(AutomateAlertClient):
+    pass
+
+
+class LabTechMonitorComparer(AutomateAlertClient):
+    pass
+
+
+class LabTechMonitorComparerSettingsFormat(AutomateAlertClient):
+    pass
+
+
+class LabTechMonitorComparerSettingsSmoothingStyle(AutomateAlertClient):
+    pass
+
+
+class LabTechMonitorComparerSettingsResultFormat(AutomateAlertClient):
+    pass
+
+
+class LabTechMonitorPluginOwner(ConnectWiseModel):
+    control_guid: str | None = Field(default=None, alias='ControlGUID')
+    plugin_name: str | None = Field(default=None, alias='PluginName')
+    alteration_instructions: str | None = Field(
+        default=None, alias='AlterationInstructions'
+    )
+
+
+class LabTechScriptFolder(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    parent_id: str | None = Field(default=None, alias='ParentId')
+    name: str | None = Field(default=None, alias='Name')
+    guid: str | None = Field(default=None, alias='GUID')
+    sub_folders: list[LabTechScriptFolder] | None = Field(
+        default=None, alias='SubFolders'
+    )
+    parent_folder: LabTechScriptFolder | None = Field(
+        default=None, alias='ParentFolder'
+    )
+
+
+class LabTechMonitorRoutineParametersFormat(AutomateAlertClient):
+    pass
+
+
+class LabTechUnformattedMonitorRoutineParameters(ConnectWiseModel):
+    where: str | None = Field(default=None, alias='Where')
+    what: str | None = Field(default=None, alias='What')
+    data_out: str | None = Field(default=None, alias='DataOut')
+    id_field: str | None = Field(default=None, alias='IdField')
+
+
+class LabTechInternalDatabaseQueryParameters(ConnectWiseModel):
+    field_to_check: str | None = Field(default=None, alias='FieldToCheck')
+    table_or_view_to_query: str | None = Field(default=None, alias='TableOrViewToQuery')
+    additional_conditions: str | None = Field(
+        default=None, alias='AdditionalConditions'
+    )
+    identity_field: str | None = Field(default=None, alias='IdentityField')
+
+
+class LabTechGetNetworkResponseParameters(ConnectWiseModel):
+    target: str | None = Field(default=None, alias='Target')
+    port: str | None = Field(default=None, alias='Port')
+    payload: str | None = Field(default=None, alias='Payload')
+
+
+class LabTechPerformanceCounterQueryParameters(ConnectWiseModel):
+    performance_object: str | None = Field(default=None, alias='PerformanceObject')
+    performance_counter: str | None = Field(default=None, alias='PerformanceCounter')
+    instance: str | None = Field(default=None, alias='Instance')
+
+
+class LabTechNetworkDeviceWbemQueryParameters(ConnectWiseModel):
+    namespace: str | None = Field(default=None, alias='Namespace')
+    query: str | None = Field(default=None, alias='Query')
+
+
+class LabTechGetPluginCommandResultParameters(ConnectWiseModel):
+    command_number: int | None = Field(default=None, alias='CommandNumber')
+    data: str | None = Field(default=None, alias='Data')
+
+
+class LabTechFileOrDirectoryQueryParameters(ConnectWiseModel):
+    directory: str | None = Field(default=None, alias='Directory')
+    file: str | None = Field(default=None, alias='File')
+
+
+class LabTechGetExecutableResultParameters(ConnectWiseModel):
+    fully_qualified_executable_string: str | None = Field(
+        default=None, alias='FullyQualifiedExecutableString'
+    )
+    result_transform_regular_expression: str | None = Field(
+        default=None, alias='ResultTransformRegularExpression'
+    )
+
+
+class LabTechMonitorComparerValueFormat(AutomateAlertClient):
+    pass
+
+
+class LabTechMonitorComparerMultiValueFormat(ConnectWiseModel):
+    values: list[str] | None = Field(default=None, alias='Values')
+
+
+class LabTechMonitorComparerSingleValueFormat(ConnectWiseModel):
+    value: str | None = Field(default=None, alias='Value')
+
+
+class LabTechScriptMetadata(ConnectWiseModel):
+    extra_data_fields: str | None = Field(default=None, alias='ExtraDataFields')
+    parameters: str | None = Field(default=None, alias='Parameters')
+    globals: str | None = Field(default=None, alias='Globals')
+    script_version: int | None = Field(default=None, alias='ScriptVersion')
+    script_guid: str | None = Field(default=None, alias='ScriptGuid')
+
+
+class LabTechScriptStep(ConnectWiseModel):
+    script_section: int | None = Field(default=None, alias='ScriptSection')
+    function_id: int | None = Field(default=None, alias='FunctionId')
+    param1: str | None = Field(default=None, alias='Param1')
+    param2: str | None = Field(default=None, alias='Param2')
+    param3: str | None = Field(default=None, alias='Param3')
+    param4: str | None = Field(default=None, alias='Param4')
+    param5: str | None = Field(default=None, alias='Param5')
+    sort: int | None = Field(default=None, alias='Sort')
+    continue_: int | None = Field(default=None, alias='Continue')
+    os_limit: int | None = Field(default=None, alias='OsLimit')
+    indentation: int | None = Field(default=None, alias='Indentation')
+
+
+class LabTechSnmpOidQuerySnmpVersion(AutomateAlertClient):
+    pass
+
+
+class LabTechSnmpOidQueryEncryptionMethod(AutomateAlertClient):
+    pass
+
+
+class LabTechSnmpOidQueryAuthenticationMethod(AutomateAlertClient):
+    pass
+
+
+class LabTechHardwareSensorQuerySensor(AutomateAlertClient):
+    pass
+
+
+class LabTechRegistryValueQueryRegistryHive(AutomateAlertClient):
+    pass
+
+
+class LabTechEventLogQueryEventLevelFilter(ConnectWiseModel):
+    match_verbose: bool | None = Field(default=None, alias='MatchVerbose')
+    match_informational: bool | None = Field(default=None, alias='MatchInformational')
+    match_warning: bool | None = Field(default=None, alias='MatchWarning')
+    match_error: bool | None = Field(default=None, alias='MatchError')
+    match_critical: bool | None = Field(default=None, alias='MatchCritical')
+
+
+class LabTechMonitorDataCollectionSettings(ConnectWiseModel):
+    monitor_id: int | None = Field(default=None, alias='MonitorId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    unit_label: str | None = Field(default=None, alias='UnitLabel')
+    graph_title: str | None = Field(default=None, alias='GraphTitle')
+    graph_vertical_limit: int | None = Field(default=None, alias='GraphVerticalLimit')
+
+
+class AutomateMonitorCount(ConnectWiseModel):
+    internal_monitor_total_count: int | None = Field(
+        default=None, alias='InternalMonitorTotalCount'
+    )
+    internal_monitor_total_disable_count: int | None = Field(
+        default=None, alias='InternalMonitorTotalDisableCount'
+    )
+    internal_monitor_total_detected_count: int | None = Field(
+        default=None, alias='InternalMonitorTotalDetectedCount'
+    )
+    remote_monitor_total_count: int | None = Field(
+        default=None, alias='RemoteMonitorTotalCount'
+    )
+    remote_monitor_total_failure_count: int | None = Field(
+        default=None, alias='RemoteMonitorTotalFailureCount'
+    )
+    remote_monitor_total_warning_count: int | None = Field(
+        default=None, alias='RemoteMonitorTotalWarningCount'
+    )
+
+
+class LabTechMonitorStatistic(ConnectWiseModel):
+    monitor_id: int | None = Field(default=None, alias='MonitorId')
+    last_fail_time: datetime | None = Field(default=None, alias='LastFailTime')
+    last_fail_message: str | None = Field(default=None, alias='LastFailMessage')
+    last_success_time: datetime | None = Field(default=None, alias='LastSuccessTime')
+    last_success_message: str | None = Field(default=None, alias='LastSuccessMessage')
+    last_warning_time: datetime | None = Field(default=None, alias='LastWarningTime')
+    last_warning_message: str | None = Field(default=None, alias='LastWarningMessage')
+    monitor_start_time: datetime | None = Field(default=None, alias='MonitorStartTime')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+
+
+class AutomateNonCompliantSummaryData(ConnectWiseModel):
+    low_severity_count: int | None = Field(default=None, alias='LowSeverityCount')
+    moderate_severity_count: int | None = Field(
+        default=None, alias='ModerateSeverityCount'
+    )
+    important_severity_count: int | None = Field(
+        default=None, alias='ImportantSeverityCount'
+    )
+    critical_severity_count: int | None = Field(
+        default=None, alias='CriticalSeverityCount'
+    )
+    unspecified_severity_count: int | None = Field(
+        default=None, alias='UnspecifiedSeverityCount'
+    )
+    low_cvss_count: int | None = Field(default=None, alias='LowCvssCount')
+    medium_cvss_count: int | None = Field(default=None, alias='MediumCvssCount')
+    high_cvss_count: int | None = Field(default=None, alias='HighCvssCount')
+    total_non_compliant_count: int | None = Field(
+        default=None, alias='TotalNonCompliantCount'
+    )
+
+
+class AutomatePasswordResetConfigurationResponse(ConnectWiseModel):
+    can_generate_password_reset_token: bool | None = Field(
+        default=None, alias='CanGeneratePasswordResetToken'
+    )
+
+
+class AutomatePasswordResetTokenRequest(ConnectWiseModel):
+    username: str | None = Field(default=None, alias='Username')
+    password_reset_token: str | None = Field(default=None, alias='PasswordResetToken')
+
+
+class AutomatePasswordResetTokenResponse(ConnectWiseModel):
+    is_valid: bool | None = Field(default=None, alias='IsValid')
+
+
+class AutomateValidatePasswordResetRequest(ConnectWiseModel):
+    password_reset_token: str | None = Field(default=None, alias='PasswordResetToken')
+
+
+class LabTechPatchActionArgs(ConnectWiseModel):
+    entity_type: int | None = Field(default=None, alias='EntityType')
+    entity_id: int | None = Field(default=None, alias='EntityId')
+
+
+class AutomatePatchActionInformation(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    product_key_id_list: list[str] | None = Field(
+        default=None, alias='ProductKeyIdList'
+    )
+
+
+class LabTechPatchesSummaryData(ConnectWiseModel):
+    entity_id: int | None = Field(default=None, alias='EntityId')
+    entity_name: str | None = Field(default=None, alias='EntityName')
+    test_stage_failed_patches_count: int | None = Field(
+        default=None, alias='TestStageFailedPatchesCount'
+    )
+    test_stage_not_attempted_patches_count: int | None = Field(
+        default=None, alias='TestStageNotAttemptedPatchesCount'
+    )
+    test_stage_installed_patches_count: int | None = Field(
+        default=None, alias='TestStageInstalledPatchesCount'
+    )
+    pilot_stage_failed_patches_count: int | None = Field(
+        default=None, alias='PilotStageFailedPatchesCount'
+    )
+    pilot_stage_not_attempted_patches_count: int | None = Field(
+        default=None, alias='PilotStageNotAttemptedPatchesCount'
+    )
+    pilot_stage_installed_patches_count: int | None = Field(
+        default=None, alias='PilotStageInstalledPatchesCount'
+    )
+    production_stage_failed_patches_count: int | None = Field(
+        default=None, alias='ProductionStageFailedPatchesCount'
+    )
+    production_stage_not_attempted_patches_count: int | None = Field(
+        default=None, alias='ProductionStageNotAttemptedPatchesCount'
+    )
+    production_stage_installed_patches_count: int | None = Field(
+        default=None, alias='ProductionStageInstalledPatchesCount'
+    )
+
+
+class LabTechPatchInformation(ConnectWiseModel):
+    web_server_patch_version: str | None = Field(
+        default=None, alias='WebServerPatchVersion'
+    )
+    db_agent_server_patch_version: str | None = Field(
+        default=None, alias='DBAgentServerPatchVersion'
+    )
+    control_center_patch_version: str | None = Field(
+        default=None, alias='ControlCenterPatchVersion'
+    )
+    remote_agent_patch_version: str | None = Field(
+        default=None, alias='RemoteAgentPatchVersion'
+    )
+    linux_agent_patch_version: str | None = Field(
+        default=None, alias='LinuxAgentPatchVersion'
+    )
+    mac_agent_patch_version: str | None = Field(
+        default=None, alias='MacAgentPatchVersion'
+    )
+    last_patched_date: datetime | None = Field(default=None, alias='LastPatchedDate')
+
+
+class LabTechPatchStage(AutomateAlertClient):
+    pass
+
+
+class AutomateProbeRemoteCommand(LabTechSmartAttribute):
+    pass
+
+
+class AutomateProbeCommandStatus(AutomateAlertClient):
+    pass
+
+
+class AutomateProbeCommandHistoryEntry(ConnectWiseModel):
+    probe_command_history_id: int | None = Field(
+        default=None, alias='ProbeCommandHistoryId'
+    )
+    probe_id: int | None = Field(default=None, alias='ProbeId')
+    date_executed: datetime | None = Field(default=None, alias='DateExecuted')
+    status: AutomateProbeCommandStatus | None = Field(default=None, alias='Status')
+    probe_remote_command: AutomateProbeRemoteCommand | None = Field(
+        default=None, alias='ProbeRemoteCommand'
+    )
+    output: str | None = Field(default=None, alias='Output')
+    user: str | None = Field(default=None, alias='User')
+    date_finished: datetime | None = Field(default=None, alias='DateFinished')
+
+
+class LabTechProbeConfigurationCredentials(ConnectWiseModel):
+    probe_configuration_credentials_id: int | None = Field(
+        default=None, alias='ProbeConfigurationCredentialsId'
+    )
+    probe_configuration_id: int | None = Field(
+        default=None, alias='ProbeConfigurationId'
+    )
+    credential_id: int | None = Field(default=None, alias='CredentialId')
+    attempt_sequence: int | None = Field(default=None, alias='AttemptSequence')
+    credentials_alias: str | None = Field(default=None, alias='CredentialsAlias')
+    credential_details: LabTechExternalSystemCredentials | None = Field(
+        default=None, alias='CredentialDetails'
+    )
+
+
+class LabTechSnmpSettings(ConnectWiseModel):
+    community_strings_get: str | None = Field(default=None, alias='CommunityStringsGet')
+    timeout_in_seconds: int | None = Field(default=None, alias='TimeoutInSeconds')
+
+
+class LabTechSyslogServerSettings(ConnectWiseModel):
+    syslog_server_listening_port: int | None = Field(
+        default=None, alias='SyslogServerListeningPort'
+    )
+    syslog_server_ip_filter: str | None = Field(
+        default=None, alias='SyslogServerIpFilter'
+    )
+
+
+class LabTechTftpServerSettings(ConnectWiseModel):
+    tftp_server_ip_filter: str | None = Field(default=None, alias='TftpServerIpFilter')
+    tftp_server_listening_port: int | None = Field(
+        default=None, alias='TftpServerListeningPort'
+    )
+    allow_tftp_uploads: bool | None = Field(default=None, alias='AllowTftpUploads')
+
+
+class LabTechProbeSubnet(ConnectWiseModel):
+    probe_subnet_id: int | None = Field(default=None, alias='ProbeSubnetId')
+    probe_configuration_id: int | None = Field(
+        default=None, alias='ProbeConfigurationId'
+    )
+    network: str | None = Field(default=None, alias='Network')
+    subnet_mask: str | None = Field(default=None, alias='SubnetMask')
+    label: str | None = Field(default=None, alias='Label')
+
+
+class LabTechProbeExcludedIpAddressRange(ConnectWiseModel):
+    excluded_ip_range_id: int | None = Field(default=None, alias='ExcludedIpRangeId')
+    probe_subnet_id: int | None = Field(default=None, alias='ProbeSubnetId')
+    excluded_ip_range: str | None = Field(default=None, alias='ExcludedIpRange')
+
+
+class LabTechProbeSnmpAuthentication(ConnectWiseModel):
+    snmp_authentication_id: int | None = Field(
+        default=None, alias='SnmpAuthenticationId'
+    )
+    probe_snmp_configuration_id: int | None = Field(
+        default=None, alias='ProbeSnmpConfigurationId'
+    )
+    authentication_secret: str | None = Field(
+        default=None, alias='AuthenticationSecret'
+    )
+    hash_method: LabTechHashMethod | None = Field(default=None, alias='HashMethod')
+
+
+class LabTechProbeSnmpEncryption(ConnectWiseModel):
+    snmp_encryption_id: int | None = Field(default=None, alias='SnmpEncryptionId')
+    probe_snmp_configuration_id: int | None = Field(
+        default=None, alias='ProbeSnmpConfigurationId'
+    )
+    encryption_password: str | None = Field(default=None, alias='EncryptionPassword')
+    encryption_method: LabTechEncryptionMethod | None = Field(
+        default=None, alias='EncryptionMethod'
+    )
+
+
+class LabTechNetMapPluginStatus(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    is_net_map_plugin_enabled: bool | None = Field(
+        default=None, alias='IsNetMapPluginEnabled'
+    )
+
+
+class LabTechProbeDiscoveryScanStatus(ConnectWiseModel):
+    probe_discovery_scan_status_id: int | None = Field(
+        default=None, alias='ProbeDiscoveryScanStatusId'
+    )
+    location_id: int | None = Field(default=None, alias='LocationId')
+    probe_id: int | None = Field(default=None, alias='ProbeId')
+    is_discovery_scan_running: bool | None = Field(
+        default=None, alias='IsDiscoveryScanRunning'
+    )
+    discovery_scan_start: datetime | None = Field(
+        default=None, alias='DiscoveryScanStart'
+    )
+    last_discovery_scan: datetime | None = Field(
+        default=None, alias='LastDiscoveryScan'
+    )
+
+
+class LabTechProbeEvent(ConnectWiseModel):
+    probe_id: int | None = Field(default=None, alias='ProbeId')
+    event_level: LabTechProbeEventLevel | None = Field(default=None, alias='EventLevel')
+    message: str | None = Field(default=None, alias='Message')
+    event_time: datetime | None = Field(default=None, alias='EventTime')
+
+
+class LabTechProbeSummary(ConnectWiseModel):
+    current_probe_id: int | None = Field(default=None, alias='CurrentProbeId')
+    total_devices: int | None = Field(default=None, alias='TotalDevices')
+    offline_devices: int | None = Field(default=None, alias='OfflineDevices')
+    missing_agents: int | None = Field(default=None, alias='MissingAgents')
+    last_discovery_scan: datetime | None = Field(
+        default=None, alias='LastDiscoveryScan'
+    )
+    agent_deployment_enabled: bool | None = Field(
+        default=None, alias='AgentDeploymentEnabled'
+    )
+    has_max_tile_permissions: bool | None = Field(
+        default=None, alias='HasMaxTilePermissions'
+    )
+    is_generation_two: bool | None = Field(default=None, alias='IsGenerationTwo')
+
+
+class AutomateDisableServerPatchRebootWorkstationSettings(ConnectWiseModel):
+    prompt_message: str | None = Field(default=None, alias='PromptMessage')
+    prompt_interval: str | None = Field(default=None, alias='PromptInterval')
+    reboot_deadline: str | None = Field(default=None, alias='RebootDeadline')
+    reboot_deadline_prompt_message: str | None = Field(
+        default=None, alias='RebootDeadlinePromptMessage'
+    )
+    reboot_deadline_prompt_duration: str | None = Field(
+        default=None, alias='RebootDeadlinePromptDuration'
+    )
+    send_wake_on_lan_packet: bool | None = Field(
+        default=None, alias='SendWakeOnLanPacket'
+    )
+    reboot_if_no_user_logged_in: bool | None = Field(
+        default=None, alias='RebootIfNoUserLoggedIn'
+    )
+
+
+class AutomatePostPatchInstallTriggerSettings(ConnectWiseModel):
+    limit_to_microsoft_update_policy_window: bool | None = Field(
+        default=None, alias='LimitToMicrosoftUpdatePolicyWindow'
+    )
+    window_extension: str | None = Field(default=None, alias='WindowExtension')
+
+
+class AutomateRebootPolicyPromptSettings(ConnectWiseModel):
+    use_prompt: bool | None = Field(default=None, alias='UsePrompt')
+    requires_confirmation: bool | None = Field(
+        default=None, alias='RequiresConfirmation'
+    )
+    reboot_if_no_user_logged_on: bool | None = Field(
+        default=None, alias='RebootIfNoUserLoggedOn'
+    )
+
+
+class AutomateRebootPolicyMaintenanceModeOptions(ConnectWiseModel):
+    set_window: bool | None = Field(default=None, alias='SetWindow')
+    window_ignore_types: list[str] | None = Field(
+        default=None, alias='WindowIgnoreTypes'
+    )
+    window_duration: str | None = Field(default=None, alias='WindowDuration')
+
+
+class AutomateReportCategory(AutomateWindowsUpdateCategory):
+    pass
+
+
+class AutomateRecordedActionType(ConnectWiseModel):
+    recorded_action_type_id: int | None = Field(
+        default=None, alias='RecordedActionTypeId'
+    )
+
+
+class AutomateRecordedActionSource(ConnectWiseModel):
+    recorded_action_source_id: int | None = Field(
+        default=None, alias='RecordedActionSourceId'
+    )
+
+
+class AutomateInstallerRequest(ConnectWiseModel):
+    location_id: int | None = Field(default=None, alias='LocationId')
+    installer_type: int | None = Field(default=None, alias='InstallerType')
+
+
+class AutomateScriptState(ConnectWiseModel):
+    state_id: int | None = Field(default=None, alias='StateId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateRunningScriptTargetType(ConnectWiseModel):
+    target_type_id: int | None = Field(default=None, alias='TargetTypeId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateComputer(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    name: str | None = Field(default=None, alias='Name')
+    friendly_name: str | None = Field(default=None, alias='FriendlyName')
+    is_online: bool | None = Field(default=None, alias='IsOnline')
+    location: AutomateLocation | None = Field(default=None, alias='Location')
+    client: AutomateClient | None = Field(default=None, alias='Client')
+
+
+class AutomateUserClassAccess(ConnectWiseModel):
+    user_class_id: int | None = Field(default=None, alias='UserClassId')
+    name: str | None = Field(default=None, alias='Name')
+    can_execute: bool | None = Field(default=None, alias='CanExecute')
+    can_edit: bool | None = Field(default=None, alias='CanEdit')
+
+
+class AutomateScriptFolder(ConnectWiseModel):
+    script_folder_id: int | None = Field(default=None, alias='ScriptFolderId')
+    name: str | None = Field(default=None, alias='Name')
+    child_folders: list[AutomateScriptFolder] | None = Field(
+        default=None, alias='ChildFolders'
+    )
+
+
+class AutomateScriptTarget(ConnectWiseModel):
+    script_target_type_id: int | None = Field(default=None, alias='ScriptTargetTypeId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateScriptOptions(ConnectWiseModel):
+    is_isolated_script: bool | None = Field(default=None, alias='IsIsolatedScript')
+    is_maintenance_script: bool | None = Field(
+        default=None, alias='IsMaintenanceScript'
+    )
+    is_function_script: bool | None = Field(default=None, alias='IsFunctionScript')
+    is_offline_script: bool | None = Field(default=None, alias='IsOfflineScript')
+    is_system_script: bool | None = Field(default=None, alias='IsSystemScript')
+
+
+class AutomateSourceType(ConnectWiseModel):
+    source_type_id: int | None = Field(default=None, alias='SourceTypeId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateTicketEntryCategory(ConnectWiseModel):
+    ticket_category_id: int | None = Field(default=None, alias='TicketCategoryId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateCloseTicketTrigger(ConnectWiseModel):
+    close_ticket_trigger_type_id: int | None = Field(
+        default=None, alias='CloseTicketTriggerTypeId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateTimeEntryCategory(ConnectWiseModel):
+    time_category_id: int | None = Field(default=None, alias='TimeCategoryId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateStopTimerTrigger(ConnectWiseModel):
+    stop_timer_trigger_type_id: int | None = Field(
+        default=None, alias='StopTimerTriggerTypeId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateTimeEntryTechnician(ConnectWiseModel):
+    user_id: int | None = Field(default=None, alias='UserId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateScriptFunctionBase(ConnectWiseModel):
+    script_function_id: int | None = Field(default=None, alias='ScriptFunctionId')
+
+
+class LabTechScheduledScript(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    script_id: int | None = Field(default=None, alias='ScriptId')
+    client_id: int | None = Field(default=None, alias='ClientId')
+    location_id: int | None = Field(default=None, alias='LocationId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    group_id: int | None = Field(default=None, alias='GroupId')
+    include_subgroups: bool | None = Field(default=None, alias='IncludeSubgroups')
+    search_id: int | None = Field(default=None, alias='SearchId')
+    disabled: bool | None = Field(default=None, alias='Disabled')
+    effective_start_date: datetime | None = Field(
+        default=None, alias='EffectiveStartDate'
+    )
+    effective_end_date: datetime | None = Field(default=None, alias='EffectiveEndDate')
+    effective_occurrences: int | None = Field(
+        default=None, alias='EffectiveOccurrences'
+    )
+    distribution_window_type: int | None = Field(
+        default=None, alias='DistributionWindowType'
+    )
+    distribution_window_amount: int | None = Field(
+        default=None, alias='DistributionWindowAmount'
+    )
+    next_run: datetime | None = Field(default=None, alias='NextRun')
+    next_schedule: datetime | None = Field(default=None, alias='NextSchedule')
+    schedule_type: int | None = Field(default=None, alias='ScheduleType')
+    exclude_time_start: str | None = Field(default=None, alias='ExcludeTimeStart')
+    exclude_time_end: str | None = Field(default=None, alias='ExcludeTimeEnd')
+    interval: int | None = Field(default=None, alias='Interval')
+    schedule_week_of_month: int | None = Field(
+        default=None, alias='ScheduleWeekOfMonth'
+    )
+    schedule_day_of_week: int | None = Field(default=None, alias='ScheduleDayOfWeek')
+    repeat_type: int | None = Field(default=None, alias='RepeatType')
+    repeat_amount: int | None = Field(default=None, alias='RepeatAmount')
+    repeat_stop_after: int | None = Field(default=None, alias='RepeatStopAfter')
+    skip_offline: bool | None = Field(default=None, alias='SkipOffline')
+    offline_only: bool | None = Field(default=None, alias='OfflineOnly')
+    wake_offline: bool | None = Field(default=None, alias='WakeOffline')
+    wake_script: bool | None = Field(default=None, alias='WakeScript')
+    disable_time_zone: bool | None = Field(default=None, alias='DisableTimeZone')
+    run_script_on_probe: bool | None = Field(default=None, alias='RunScriptOnProbe')
+    parameters: str | None = Field(default=None, alias='Parameters')
+    priority: int | None = Field(default=None, alias='Priority')
+    time_zone_add: float | None = Field(default=None, alias='TimeZoneAdd')
+    user: str | None = Field(default=None, alias='User')
+    last_update: datetime | None = Field(default=None, alias='LastUpdate')
+
+
+class AutomateScheduleTargetType(ConnectWiseModel):
+    schedule_target_type_id: int | None = Field(
+        default=None, alias='ScheduleTargetTypeId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateNetworkDevice(ConnectWiseModel):
+    network_device_id: int | None = Field(default=None, alias='NetworkDeviceId')
+    name: str | None = Field(default=None, alias='Name')
+    friendly_name: str | None = Field(default=None, alias='FriendlyName')
+
+
+class AutomateTemplateSettings(ConnectWiseModel):
+    remote_agent_template: AutomateRemoteAgentTemplate | None = Field(
+        default=None, alias='RemoteAgentTemplate'
+    )
+    priority: int | None = Field(default=None, alias='Priority')
+
+
+class AutomateLinkingSettings(ConnectWiseModel):
+    group_link_type_id: int | None = Field(default=None, alias='GroupLinkTypeId')
+    group_link_type_name: str | None = Field(default=None, alias='GroupLinkTypeName')
+    linked_entity_id: int | None = Field(default=None, alias='LinkedEntityId')
+    linked_entity_name: str | None = Field(default=None, alias='LinkedEntityName')
+    is_synchronized: bool | None = Field(default=None, alias='IsSynchronized')
+
+
+class AutomateMasterStatus(ConnectWiseModel):
+    master_status_type_id: int | None = Field(default=None, alias='MasterStatusTypeId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateMaintenanceWindowSettings(AutomateMaintenanceWindow):
+    pass
+
+
+class AutomateContactSource(ConnectWiseModel):
+    contact_source_type_id: int | None = Field(
+        default=None, alias='ContactSourceTypeId'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateSearchSettings(ConnectWiseModel):
+    auto_join_search_id: int | None = Field(default=None, alias='AutoJoinSearchId')
+    name: str | None = Field(default=None, alias='Name')
+    is_limited_to_search: bool | None = Field(default=None, alias='IsLimitedToSearch')
+
+
+class AutomateContactSearchSettings(ConnectWiseModel):
+    should_include_associated_computers: bool | None = Field(
+        default=None, alias='ShouldIncludeAssociatedComputers'
+    )
+    auto_join_search_id: int | None = Field(default=None, alias='AutoJoinSearchId')
+    name: str | None = Field(default=None, alias='Name')
+    is_limited_to_search: bool | None = Field(default=None, alias='IsLimitedToSearch')
+
+
+class AutomateScriptFunctionTarget(AutomateRunningScriptTargetType):
+    pass
+
+
+class AutomateScriptFunctionParameter(ConnectWiseModel):
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+    type: str | None = Field(default=None, alias='Type')
+
+
+class AutomateGroupItem(AutomateAlertClient):
+    pass
+
+
+class AutomateTicketPriorityItem(AutomateAlertClient):
+    pass
+
+
+class AutomateRoleDefinitionItem(AutomateComputerServiceItem):
+    pass
+
+
+class AutomateReportItem(AutomateAlertClient):
+    pass
+
+
+class AutomateTemplatePropertyItem(AutomateComputerServiceItem):
+    pass
+
+
+class AutomateUserItem(AutomateAlertClient):
+    pass
+
+
+class AutomateHotfixDataItem(AutomateComputerServiceItem):
+    pass
+
+
+class AutomateStartupDefinitionItem(AutomateAlertClient):
+    pass
+
+
+class AutomateSmartAttributeItem(AutomateAlertClient):
+    pass
+
+
+class AutomateLicenseTypeItem(AutomateAlertClient):
+    pass
+
+
+class AutomateExtraFieldDefinitionItem(AutomateAlertClient):
+    pass
+
+
+class AutomateSearchValueLookUp(AutomateComputerServiceItem):
+    pass
+
+
+class AutomateAdvancedSearchDataLookup(AutomateComputerServiceItem):
+    pass
+
+
+class AutomateFilterCriteria(ConnectWiseModel):
+    left_operand: str | None = Field(default=None, alias='LeftOperand')
+    operator: Literal[
+        'IsTrue',
+        'IsFalse',
+        'Equals',
+        'GreaterThan',
+        'GreaterThanEqual',
+        'LessThan',
+        'LessThanEqual',
+        'TextLike',
+        'NotEqual',
+        'NotTextLike',
+        'Contains',
+        'NotContains',
+        'IsAssigned',
+        'IsNotAssigned',
+        'HasRole',
+        'NotHasRole',
+    ] | None = Field(default=None, alias='Operator')
+    right_operand: dict[str, Any] | None = Field(default=None, alias='RightOperand')
+
+
+class LabTechSensorCheck(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    sensor_check_type: Literal[
+        'SystemAverages', 'SystemCounts', 'Trends', 'PerDayCounts'
+    ] | None = Field(default=None, alias='SensorCheckType')
+
+
+class AutomateServerInformation(ConnectWiseModel):
+    server_id: int | None = Field(default=None, alias='ServerId')
+    operating_system: str | None = Field(default=None, alias='OperatingSystem')
+    mac_address: str | None = Field(default=None, alias='MacAddress')
+    machine_name: str | None = Field(default=None, alias='MachineName')
+    cpu_name: str | None = Field(default=None, alias='CPUName')
+    cpu_sockets: int | None = Field(default=None, alias='CPUSockets')
+    cpu_cores: int | None = Field(default=None, alias='CPUCores')
+    logical_processors: int | None = Field(default=None, alias='LogicalProcessors')
+    memory_total: int | None = Field(default=None, alias='MemoryTotal')
+    is_database_server: bool | None = Field(default=None, alias='IsDatabaseServer')
+    is_web_server: bool | None = Field(default=None, alias='IsWebServer')
+
+
+class AutomateImplicitClientUpgradeRequest(ConnectWiseModel):
+    implicit_token: str | None = Field(default=None, alias='ImplicitToken')
+
+
+class AutomateRegisterSsoRequest(ConnectWiseModel):
+    registration_token: str | None = Field(default=None, alias='RegistrationToken')
+    enabled_user_folders: list[int] | None = Field(
+        default=None, alias='EnabledUserFolders'
+    )
+
+
+class AutomateUnregisterSsoRequest(ConnectWiseModel):
+    client_id: str | None = Field(default=None, alias='ClientId')
+
+
+class LabTechDriveStatistics(ConnectWiseModel):
+    drive_id: int | None = Field(default=None, alias='DriveId')
+    percentage_used_difference: float | None = Field(
+        default=None, alias='PercentageUsedDifference'
+    )
+
+
+class AutomateAgentStatistics(ConnectWiseModel):
+    total_agents_purchased: int | None = Field(
+        default=None, alias='TotalAgentsPurchased'
+    )
+    total_agents_deployed: int | None = Field(default=None, alias='TotalAgentsDeployed')
+
+
+class AutomateScriptAutomationTimeResult(ConnectWiseModel):
+    successful_scripts: int | None = Field(default=None, alias='SuccessfulScripts')
+    automation_time_minutes: int | None = Field(
+        default=None, alias='AutomationTimeMinutes'
+    )
+    automation_value: int | None = Field(default=None, alias='AutomationValue')
+
+
+class AutomateScriptAutomationTimeUserResult(ConnectWiseModel):
+    name: str | None = Field(default=None, alias='Name')
+    successful_scripts: int | None = Field(default=None, alias='SuccessfulScripts')
+    automation_time_minutes: int | None = Field(
+        default=None, alias='AutomationTimeMinutes'
+    )
+    automation_value: int | None = Field(default=None, alias='AutomationValue')
+
+
+class AutomateGetComputerStatisticsRequest(ConnectWiseModel):
+    number_of_days: int | None = Field(default=None, alias='NumberOfDays')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+    entity_type: str | None = Field(default=None, alias='EntityType')
+
+
+class AutomateGetScriptStatisticsResponse(ConnectWiseModel):
+    script_history_count: int | None = Field(default=None, alias='ScriptHistoryCount')
+    script_pending_count: int | None = Field(default=None, alias='ScriptPendingCount')
+    script_running_count: int | None = Field(default=None, alias='ScriptRunningCount')
+    script_failure_count: int | None = Field(default=None, alias='ScriptFailureCount')
+    script_success_count: int | None = Field(default=None, alias='ScriptSuccessCount')
+
+
+class AutomateGetCommandStatisticsResponse(ConnectWiseModel):
+    command_pending_count: int | None = Field(default=None, alias='CommandPendingCount')
+    command_failure_count: int | None = Field(default=None, alias='CommandFailureCount')
+
+
+class AutomateIndividualScriptStatisticsResponse(ConnectWiseModel):
+    success_count: int | None = Field(default=None, alias='SuccessCount')
+    total_run_count: int | None = Field(default=None, alias='TotalRunCount')
+    last_run_target: str | None = Field(default=None, alias='LastRunTarget')
+    last_run_date: datetime | None = Field(default=None, alias='LastRunDate')
+    total_value: int | None = Field(default=None, alias='TotalValue')
+    last_history_date_available: datetime | None = Field(
+        default=None, alias='LastHistoryDateAvailable'
+    )
+    last_run_status: str | None = Field(default=None, alias='LastRunStatus')
+
+
+class AutomateWorkflowStep(ConnectWiseModel):
+    workflow_step_id: int | None = Field(default=None, alias='WorkflowStepId')
+    description: str | None = Field(default=None, alias='Description')
+    is_required: bool | None = Field(default=None, alias='IsRequired')
+    prerequisite_id: int | None = Field(default=None, alias='PrerequisiteId')
+
+
+class AutomateWorkflowStatus(ConnectWiseModel):
+    workflow_status_id: int | None = Field(default=None, alias='WorkflowStatusId')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class AutomateWorkflowMetadata(ConnectWiseModel):
+    system_workflow_progress_metadata_id: int | None = Field(
+        default=None, alias='SystemWorkflowProgressMetadataId'
+    )
+    metadata_key: str | None = Field(default=None, alias='MetadataKey')
+    metadata_value: str | None = Field(default=None, alias='MetadataValue')
+
+
+class LabTechTemplateAvailableProperty(ConnectWiseModel):
+    property_id: str | None = Field(default=None, alias='PropertyId')
+    property_name: str | None = Field(default=None, alias='PropertyName')
+    property_description: str | None = Field(default=None, alias='PropertyDescription')
+    property_guid: str | None = Field(default=None, alias='PropertyGuid')
+
+
+class AutomateThirdPartyPatchesSummaryData(ConnectWiseModel):
+    third_party_compliance_score: float | None = Field(
+        default=None, alias='ThirdPartyComplianceScore'
+    )
+    third_party_server_compliance_score: float | None = Field(
+        default=None, alias='ThirdPartyServerComplianceScore'
+    )
+    third_party_workstation_compliance_score: float | None = Field(
+        default=None, alias='ThirdPartyWorkstationComplianceScore'
+    )
+    devices_affecting_compliance_count: int | None = Field(
+        default=None, alias='DevicesAffectingComplianceCount'
+    )
+    servers_affecting_compliance_count: int | None = Field(
+        default=None, alias='ServersAffectingComplianceCount'
+    )
+    workstations_affecting_compliance_count: int | None = Field(
+        default=None, alias='WorkstationsAffectingComplianceCount'
+    )
+    approved_count: int | None = Field(default=None, alias='ApprovedCount')
+    compliant_count: int | None = Field(default=None, alias='CompliantCount')
+    failed_count: int | None = Field(default=None, alias='FailedCount')
+    incorrect_version_count: int | None = Field(
+        default=None, alias='IncorrectVersionCount'
+    )
+    non_compliant_count: int | None = Field(default=None, alias='NonCompliantCount')
+    not_attempted_count: int | None = Field(default=None, alias='NotAttemptedCount')
+
+
+class AutomateThirdPartyPatchVersion(ConnectWiseModel):
+    lt_product_key: UUID | None = Field(
+        default=None,
+        alias='LTProductKey',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    versions: list[str] | None = Field(default=None, alias='Versions')
+
+
+class AutomateUserBinaryExtensionPermission(ConnectWiseModel):
+    has_permission: bool | None = Field(default=None, alias='HasPermission')
+    extension_permission_id: int | None = Field(
+        default=None, alias='ExtensionPermissionId'
+    )
+    extension_guid: UUID | None = Field(
+        default=None,
+        alias='ExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    extension_name: str | None = Field(default=None, alias='ExtensionName')
+    permission_id: int | None = Field(default=None, alias='PermissionId')
+    permission_name: str | None = Field(default=None, alias='PermissionName')
+
+
+class AutomateUserExtensionClaimType(ConnectWiseModel):
+    has_claim: bool | None = Field(default=None, alias='HasClaim')
+    extension_claim_type_id: int | None = Field(
+        default=None, alias='ExtensionClaimTypeId'
+    )
+    web_extension_id: int | None = Field(default=None, alias='WebExtensionId')
+    display_name: str | None = Field(default=None, alias='DisplayName')
+    claim_key: str | None = Field(default=None, alias='ClaimKey')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class AutomateSsoUser(ConnectWiseModel):
+    partner_id: str | None = Field(default=None, alias='PartnerId')
+    id: str | None = Field(default=None, alias='Id')
+    user_name: str | None = Field(default=None, alias='UserName')
+    email: str | None = Field(default=None, alias='Email')
+    first_name: str | None = Field(default=None, alias='FirstName')
+    last_name: str | None = Field(default=None, alias='LastName')
+    login_scheme: str | None = Field(default=None, alias='LoginScheme')
+    email_confirmed: bool | None = Field(default=None, alias='EmailConfirmed')
+    is_disabled: bool | None = Field(default=None, alias='IsDisabled')
+    created: int | None = Field(default=None, alias='Created')
+    updated: int | None = Field(default=None, alias='Updated')
+
+
+class AutomateLinkToSsoRequest(ConnectWiseModel):
+    service_identifier: str | None = Field(default=None, alias='ServiceIdentifier')
+
+
+class AutomateChangePasswordRequest(ConnectWiseModel):
+    old_password: str | None = Field(default=None, alias='OldPassword')
+    new_password: str | None = Field(default=None, alias='NewPassword')
+
+
+class AutomateUserPasswordResetRequest(ConnectWiseModel):
+    username: str | None = Field(default=None, alias='Username')
+    password_reset_token: str | None = Field(default=None, alias='PasswordResetToken')
+    new_password: str | None = Field(default=None, alias='NewPassword')
+
+
+class LabTechAuditAction(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    level: int | None = Field(default=None, alias='Level')
+    extension_name: str | None = Field(default=None, alias='ExtensionName')
+
+
+class LabTechAuditSource(AutomateAlertClient):
+    pass
+
+
+class LabTechAPIAuthLinkInformation(ConnectWiseModel):
+    nonce: str | None = Field(default=None, alias='Nonce')
+
+
+class AutomateUserAvatar(ConnectWiseModel):
+    file_data: str | None = Field(default=None, alias='FileData')
+
+
+class AutomateExtensionClaimViewModel(ConnectWiseModel):
+    extension_claim_type_id: int | None = Field(
+        default=None, alias='ExtensionClaimTypeId'
+    )
+    display_name: str | None = Field(default=None, alias='DisplayName')
+    description: str | None = Field(default=None, alias='Description')
+    is_assigned: bool | None = Field(default=None, alias='IsAssigned')
+    is_default_claim: bool | None = Field(default=None, alias='IsDefaultClaim')
+
+
+class AutomateAssignedWebExtension(ConnectWiseModel):
+    web_extension_id: int | None = Field(default=None, alias='WebExtensionId')
+    assigned_claims: list[int] | None = Field(default=None, alias='AssignedClaims')
+
+
+class LabTechUserFavorite(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    user_id: int | None = Field(default=None, alias='UserId')
+    additional_identifier: str | None = Field(
+        default=None, alias='AdditionalIdentifier'
+    )
+    order: int | None = Field(default=None, alias='Order')
+    item_guid: str | None = Field(default=None, alias='ItemGUID')
+
+
+class AutomateUserFolder(ConnectWiseModel):
+    user_folder_id: int | None = Field(default=None, alias='UserFolderId')
+    name: str | None = Field(default=None, alias='Name')
+    is_sso_enabled: bool | None = Field(default=None, alias='IsSsoEnabled')
+
+
+class LabTechUserProfile(ConnectWiseModel):
+    is_super_admin: bool | None = Field(default=None, alias='IsSuperAdmin')
+    is_folder_limited: bool | None = Field(default=None, alias='IsFolderLimited')
+    user_class_id_list: list[int] | None = Field(default=None, alias='UserClassIdList')
+
+
+class AutomateTicketLevel(ConnectWiseModel):
+    ticket_level_id: int | None = Field(default=None, alias='TicketLevelId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateUserSingleSignOnStatus(LabTechUserSingleSignOnStatus):
+    pass
+
+
+class LabTechUserSetting(ConnectWiseModel):
+    user_id: int | None = Field(default=None, alias='UserId')
+    name: str | None = Field(default=None, alias='Name')
+    value: str | None = Field(default=None, alias='Value')
+
+
+class AutomateUserLockoutInfo(ConnectWiseModel):
+    user_name: str | None = Field(default=None, alias='UserName')
+    user_id: int | None = Field(default=None, alias='UserId')
+    last_ip_address: str | None = Field(default=None, alias='LastIPAddress')
+    is_locked: bool | None = Field(default=None, alias='IsLocked')
+    failed_login_count: int | None = Field(default=None, alias='FailedLoginCount')
+    last_fail_date_utc: datetime | None = Field(default=None, alias='LastFailDateUtc')
+    lock_out_expiration_date_utc: datetime | None = Field(
+        default=None, alias='LockOutExpirationDateUtc'
+    )
+
+
+class AutomateGroupPermissionSettings(ConnectWiseModel):
+    is_inherited: bool | None = Field(default=None, alias='IsInherited')
+    computer_permission_settings: dict[str, list[str]] | None = Field(
+        default=None, alias='ComputerPermissionSettings'
+    )
+
+
+class AutomateMonitorAlertPolicy(ConnectWiseModel):
+    effective_policy_type_id: int | None = Field(
+        default=None, alias='EffectivePolicyTypeId'
+    )
+    effective_policy_type_name: str | None = Field(
+        default=None, alias='EffectivePolicyTypeName'
+    )
+    is_alert_template_overridden: bool | None = Field(
+        default=None, alias='IsAlertTemplateOverridden'
+    )
+    alert_template_id: int | None = Field(default=None, alias='AlertTemplateId')
+    alert_template_name: str | None = Field(default=None, alias='AlertTemplateName')
+    alert_template_description: str | None = Field(
+        default=None, alias='AlertTemplateDescription'
+    )
+    is_ticket_category_overridden: bool | None = Field(
+        default=None, alias='IsTicketCategoryOverridden'
+    )
+    ticket_category_id: int | None = Field(default=None, alias='TicketCategoryId')
+    ticket_category_name: str | None = Field(default=None, alias='TicketCategoryName')
+    inheritance_source_name: str | None = Field(
+        default=None, alias='InheritanceSourceName'
+    )
+
+
+class AutomateAlertingOverride(ConnectWiseModel):
+    alert_template: AutomateAlertTemplate | None = Field(
+        default=None, alias='AlertTemplate'
+    )
+    ticket_category: AutomateTicketCategory | None = Field(
+        default=None, alias='TicketCategory'
+    )
+
+
+class AutomateTargetType(AutomateRunningScriptTargetType):
+    pass
+
+
+class AutomateAlertStyleType(ConnectWiseModel):
+    alert_style_type_id: int | None = Field(default=None, alias='AlertStyleTypeId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateAlertScript(ConnectWiseModel):
+    alert_script_id: int | None = Field(default=None, alias='AlertScriptId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateCheckType(ConnectWiseModel):
+    check_type_id: int | None = Field(default=None, alias='CheckTypeId')
+    legacy_check_type_id: int | None = Field(default=None, alias='LegacyCheckTypeId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateCheckInterval(ConnectWiseModel):
+    interval_in_seconds: int | None = Field(default=None, alias='IntervalInSeconds')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomatePingSettings(ConnectWiseModel):
+    server_address: str | None = Field(default=None, alias='ServerAddress')
+
+
+class AutomateLatencySettings(AutomatePingSettings):
+    pass
+
+
+class AutomateTcpSettings(ConnectWiseModel):
+    server_address: str | None = Field(default=None, alias='ServerAddress')
+    port: int | None = Field(default=None, alias='Port')
+    data_to_send: str | None = Field(default=None, alias='DataToSend')
+
+
+class AutomateUdpSettings(AutomateTcpSettings):
+    pass
+
+
+class AutomateSnmpSettings(ConnectWiseModel):
+    server_address: str | None = Field(default=None, alias='ServerAddress')
+    community_string: str | None = Field(default=None, alias='CommunityString')
+    oid: str | None = Field(default=None, alias='Oid')
+    should_use_snmp_v2: bool | None = Field(default=None, alias='ShouldUseSnmpV2')
+
+
+class AutomatePerformanceCounterSettings(LabTechPerformanceCounterQueryParameters):
+    pass
+
+
+class AutomateFileOrDirectorySettings(ConnectWiseModel):
+    path: str | None = Field(default=None, alias='Path')
+
+
+class AutomateServiceSettings(ConnectWiseModel):
+    service_name: str | None = Field(default=None, alias='ServiceName')
+
+
+class AutomateDiskSpaceSettings(ConnectWiseModel):
+    drive_letter: str | None = Field(default=None, alias='DriveLetter')
+
+
+class AutomateRegistrySettings(ConnectWiseModel):
+    registry_hive_type_id: int | None = Field(default=None, alias='RegistryHiveTypeId')
+    registry_key: str | None = Field(default=None, alias='RegistryKey')
+    value_name: str | None = Field(default=None, alias='ValueName')
+
+
+class AutomateProcessSettings(ConnectWiseModel):
+    process_name: str | None = Field(default=None, alias='ProcessName')
+
+
+class AutomateEventLogSettings(ConnectWiseModel):
+    log_file_name: str | None = Field(default=None, alias='LogFileName')
+    event_type_id: int | None = Field(default=None, alias='EventTypeId')
+    source: str | None = Field(default=None, alias='Source')
+    event_id: str | None = Field(default=None, alias='EventId')
+    message_regex: str | None = Field(default=None, alias='MessageRegex')
+
+
+class AutomateExecutableSettings(ConnectWiseModel):
+    executable_invocation: str | None = Field(
+        default=None, alias='ExecutableInvocation'
+    )
+
+
+class AutomateWmiSettings(ConnectWiseModel):
+    wmi_query: str | None = Field(default=None, alias='WmiQuery')
+
+
+class AutomateBandwidthSettings(ConnectWiseModel):
+    ip_address: str | None = Field(default=None, alias='IpAddress')
+    snmp_version_id: int | None = Field(default=None, alias='SnmpVersionId')
+    community_string: str | None = Field(default=None, alias='CommunityString')
+    data_to_watch_id: int | None = Field(default=None, alias='DataToWatchId')
+    index_to_watch: str | None = Field(default=None, alias='IndexToWatch')
+    snmp_v3_user_name: str | None = Field(default=None, alias='SnmpV3UserName')
+    snmp_v3_auth_password: str | None = Field(default=None, alias='SnmpV3AuthPassword')
+    snmp_v3_auth_method_id: int | None = Field(default=None, alias='SnmpV3AuthMethodId')
+    snmp_v3_encryption_password: str | None = Field(
+        default=None, alias='SnmpV3EncryptionPassword'
+    )
+    snmp_v3_encryption_method_id: int | None = Field(
+        default=None, alias='SnmpV3EncryptionMethodId'
+    )
+
+
+class AutomateSensorSettings(ConnectWiseModel):
+    sensor_number: int | None = Field(default=None, alias='SensorNumber')
+    sensor_type_id: int | None = Field(default=None, alias='SensorTypeId')
+
+
+class AutomateStateCondition(ConnectWiseModel):
+    conditional_type_id: int | None = Field(default=None, alias='ConditionalTypeId')
+    comparand: str | None = Field(default=None, alias='Comparand')
+
+
+class AutomateSubmittableScriptFolder(ConnectWiseModel):
+    script_folder_id: int | None = Field(default=None, alias='ScriptFolderId')
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateScriptSettingsViewModel(ConnectWiseModel):
+    user_classes: list[AutomateUserClass] | None = Field(
+        default=None, alias='UserClasses'
+    )
+    ticket_categories: list[AutomateTicketEntryCategory] | None = Field(
+        default=None, alias='TicketCategories'
+    )
+    close_ticket_triggers: list[AutomateCloseTicketTrigger] | None = Field(
+        default=None, alias='CloseTicketTriggers'
+    )
+    users: list[AutomateTimeEntryTechnician] | None = Field(default=None, alias='Users')
+    stop_timer_triggers: list[AutomateStopTimerTrigger] | None = Field(
+        default=None, alias='StopTimerTriggers'
+    )
+    ticket_time_categories: list[AutomateTimeEntryCategory] | None = Field(
+        default=None, alias='TicketTimeCategories'
+    )
+
+
+class AutomateScriptStepsViewModel(ConnectWiseModel):
+    disallowed_script_function_ids: list[int] | None = Field(
+        default=None, alias='DisallowedScriptFunctionIds'
+    )
+
+
+class AutomateScriptSummary(ConnectWiseModel):
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+    folder: AutomateScriptFolder | None = Field(default=None, alias='Folder')
+    script_target_type: AutomateScriptTarget | None = Field(
+        default=None, alias='ScriptTargetType'
+    )
+    script_options: AutomateScriptOptions | None = Field(
+        default=None, alias='ScriptOptions'
+    )
+    automation_minutes: int | None = Field(default=None, alias='AutomationMinutes')
+
+
+class AutomateRemoteCommand(ConnectWiseModel):
+    remote_command_id: int | None = Field(default=None, alias='RemoteCommandId')
+    parameters: str | None = Field(default=None, alias='Parameters')
+
+
+class AutomateWebExtensionArea(ConnectWiseModel):
+    web_extension_area_id: int | None = Field(default=None, alias='WebExtensionAreaId')
+    web_extension_area_name: str | None = Field(
+        default=None, alias='WebExtensionAreaName'
+    )
+    web_extension_screen_id: int | None = Field(
+        default=None, alias='WebExtensionScreenId'
+    )
+
+
+class AutomateExtensionClaimType(ConnectWiseModel):
+    extension_claim_type_id: int | None = Field(
+        default=None, alias='ExtensionClaimTypeId'
+    )
+    web_extension_id: int | None = Field(default=None, alias='WebExtensionId')
+    display_name: str | None = Field(default=None, alias='DisplayName')
+    claim_key: str | None = Field(default=None, alias='ClaimKey')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class AutomateWebExtensionTileSize(ConnectWiseModel):
+    tile_size_id: int | None = Field(default=None, alias='TileSizeId')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class AutomateWebExtensionUrlOpenType(ConnectWiseModel):
+    url_open_type_id: int | None = Field(default=None, alias='UrlOpenTypeId')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class AutomateExtensionSolution(ConnectWiseModel):
+    extension_solution_id: int | None = Field(default=None, alias='ExtensionSolutionId')
+    solution_guid: UUID | None = Field(
+        default=None,
+        alias='SolutionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    solution_name: str | None = Field(default=None, alias='SolutionName')
+    is_installed: bool | None = Field(default=None, alias='IsInstalled')
+    installed_version: str | None = Field(default=None, alias='InstalledVersion')
+    latest_version: str | None = Field(default=None, alias='LatestVersion')
+
+
+class AutomateExtensionStatus(ConnectWiseModel):
+    extension_status_id: int | None = Field(default=None, alias='ExtensionStatusId')
+    description: str | None = Field(default=None, alias='Description')
+
+
+class AutomateWindowsReleaseStats(ConnectWiseModel):
+    release_id: int | None = Field(default=None, alias='ReleaseId')
+    release_count: int | None = Field(default=None, alias='ReleaseCount')
+
+
+class SystemString(ConnectWiseModel):
+    key: str | None = Field(default=None, alias='Key')
+    value: str | None = Field(default=None, alias='Value')
+
+
+class AutomateCommandMenuItemBase1(ConnectWiseModel):
+    display_name: str | None = Field(default=None, alias='DisplayName')
+    display_order: int | None = Field(default=None, alias='DisplayOrder')
+    menu_key: str | None = Field(default=None, alias='MenuKey')
+    sub_menus: list[AutomateCommandMenuItemBase1] | None = Field(
+        default=None, alias='SubMenus'
+    )
+    menu_items: list[AutomateCommandMenuItemBase] | None = Field(
+        default=None, alias='MenuItems'
+    )
+
+
+class LabTechProbeCommandHistoryEntry(ConnectWiseModel):
+    result_set: list[AutomateProbeCommandHistoryEntry] | None = Field(
+        default=None, alias='ResultSet'
+    )
+    total_record_count: int | None = Field(default=None, alias='TotalRecordCount')
+
+
+class AutomateString(AutomateComputerServiceItem):
+    pass
+
+
+class AutomateGuid(ConnectWiseModel):
+    id: UUID | None = Field(
+        default=None, alias='Id', example='00000000-0000-0000-0000-000000000000'
+    )
+    name: str | None = Field(default=None, alias='Name')
+
+
+class AutomateInt32(AutomateAlertClient):
+    pass
+
+
+class LabTechQueryOptions(ConnectWiseModel):
+    order_by: LabTechQueryOptionOrderBy | None = Field(default=None, alias='OrderBy')
+    page: int | None = Field(default=None, alias='Page')
+    page_size: int | None = Field(default=None, alias='PageSize')
+    condition: str | None = Field(default=None, alias='Condition')
+    expands: dict[str, LabTechQueryOptionExpand] | None = Field(
+        default=None, alias='Expands'
+    )
+    included_fields: list[str] | None = Field(default=None, alias='IncludedFields')
+    excluded_fields: list[str] | None = Field(default=None, alias='ExcludedFields')
+    ids: list[str] | None = Field(default=None, alias='Ids')
+    timeout: int | None = Field(default=None, alias='Timeout')
+
+
+class AutomateAlert(ConnectWiseModel):
+    alert_id: int | None = Field(default=None, alias='AlertId')
+    client: AutomateAlertClient | None = Field(default=None, alias='Client')
+    computer: AutomateAlertComputer | None = Field(default=None, alias='Computer')
+    device: AutomateAlertDevice | None = Field(default=None, alias='Device')
+    location: AutomateAlertLocation | None = Field(default=None, alias='Location')
+    monitor: AutomateAlertMonitor | None = Field(default=None, alias='Monitor')
+    alert_date: datetime | None = Field(default=None, alias='AlertDate')
+    severity: AutomateAlertSeverityItem | None = Field(default=None, alias='Severity')
+    source: str | None = Field(default=None, alias='Source')
+    message: str | None = Field(default=None, alias='Message')
+    field_name: str | None = Field(default=None, alias='FieldName')
+    alert_age: str | None = Field(default=None, alias='AlertAge')
+
+
+class AutomateAuthInformation(ConnectWiseModel):
+    allow_direct: bool | None = Field(default=None, alias='AllowDirect')
+    allow_service_registration: bool | None = Field(
+        default=None, alias='AllowServiceRegistration'
+    )
+    automate_redirect_uri: str | None = Field(default=None, alias='AutomateRedirectUri')
+    services: list[AutomateAuthService] | None = Field(default=None, alias='Services')
+
+
+class AutomateAutomaticApprovalSettings(ConnectWiseModel):
+    cvss_lower_bound: int | None = Field(default=None, alias='CvssLowerBound')
+    severities: list[str] | None = Field(default=None, alias='Severities')
+    categories: list[AutomateWindowsUpdateCategory] | None = Field(
+        default=None, alias='Categories'
+    )
+    titles: list[str] | None = Field(default=None, alias='Titles')
+
+
+class AutomateAutomaticPolicySettings(ConnectWiseModel):
+    severities: list[str] | None = Field(default=None, alias='Severities')
+    categories: list[AutomateWindowsUpdateCategory] | None = Field(
+        default=None, alias='Categories'
+    )
+    titles: list[str] | None = Field(default=None, alias='Titles')
+
+
+class AutomateAuditAnalyticsBundle(ConnectWiseModel):
+    audit_action_id: int | None = Field(default=None, alias='AuditActionId')
+    external_id: int | None = Field(default=None, alias='ExternalId')
+    secondary_identifier: str | None = Field(default=None, alias='SecondaryIdentifier')
+    unsanitized_base_message: str | None = Field(
+        default=None, alias='UnsanitizedBaseMessage'
+    )
+    extra_log_values: list[SystemString] | None = Field(
+        default=None, alias='ExtraLogValues'
+    )
+    sanitized_analytics_description: str | None = Field(
+        default=None, alias='SanitizedAnalyticsDescription'
+    )
+
+
+class AutomateAdvanceStageRequest(ConnectWiseModel):
+    hotfixes_to_advance: list[AutomateHotfixOperatingSystemCombination] | None = Field(
+        default=None, alias='HotfixesToAdvance'
+    )
+
+
+class AutomateWindowsApprovalPolicyPatchBatchRequest(ConnectWiseModel):
+    patch_policies: list[AutomateWindowsApprovalPolicyPatch] | None = Field(
+        default=None, alias='PatchPolicies'
+    )
+
+
+class AutomateApprovalPolicyThirdPartyPatchRequest(ConnectWiseModel):
+    patch_policies: list[AutomateApprovalPolicyThirdPartyPatchSetting] | None = Field(
+        default=None, alias='PatchPolicies'
+    )
+
+
+class AutomateWebClientAccessBatchResult(AutomateContactPermissionBatchResult):
+    pass
+
+
+class AutomateContactPermissionBatchResponse(ConnectWiseModel):
+    contact_permission_results: list[
+        AutomateContactPermissionBatchResult
+    ] | None = Field(default=None, alias='ContactPermissionResults')
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateDeleteIpRestrictionsBatchResponse(ConnectWiseModel):
+    ip_restrictions_results: list[
+        AutomateDeleteIpRestrictionsBatchResult
+    ] | None = Field(default=None, alias='IpRestrictionsResults')
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateAddIpRestrictionsBatchRequest(ConnectWiseModel):
+    ip_restriction_rules: list[AutomateIpRestrictionRule] | None = Field(
+        default=None, alias='IpRestrictionRules'
+    )
+
+
+class AutomateAddIpRestrictionsBatchResponse(ConnectWiseModel):
+    ip_restrictions_results: list[AutomateAddIpRestrictionsBatchResult] | None = Field(
+        default=None, alias='IpRestrictionsResults'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateExecuteProbeBatchResponse(ConnectWiseModel):
+    probe_command_results: list[AutomateExecuteProbeCommandResult] | None = Field(
+        default=None, alias='ProbeCommandResults'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateDeleteRemoteMonitorBatchResponse(ConnectWiseModel):
+    remote_monitor_results: list[AutomateDeleteRemoteMonitorBatchResult] | None = Field(
+        default=None, alias='RemoteMonitorResults'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateDistributionWindow(ConnectWiseModel):
+    distribution_window_type: AutomateDistributionWindowType | None = Field(
+        default=None, alias='DistributionWindowType'
+    )
+    amount: int | None = Field(default=None, alias='Amount')
+
+
+class AutomateWeeklyScheduleFrequency(ConnectWiseModel):
+    runs_at: str | None = Field(default=None, alias='RunsAt')
+    weeks_of_month_settings: AutomateWeeksOfMonthSettings | None = Field(
+        default=None, alias='WeeksOfMonthSettings'
+    )
+    days_of_week_settings: AutomateDaysOfWeekSettings | None = Field(
+        default=None, alias='DaysOfWeekSettings'
+    )
+
+
+class AutomateDailyRepeatSettings(ConnectWiseModel):
+    daily_script_repeat_frequency: AutomateDailyScriptRepeatFrequency | None = Field(
+        default=None, alias='DailyScriptRepeatFrequency'
+    )
+    daily_repeat_interval: int | None = Field(default=None, alias='DailyRepeatInterval')
+    maximum_repetitions: int | None = Field(default=None, alias='MaximumRepetitions')
+
+
+class AutomateScheduleScriptBatchResponse(ConnectWiseModel):
+    script_results: list[AutomateScheduleScriptBatchResult] | None = Field(
+        default=None, alias='ScriptResults'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateDeleteScriptBatchResponse(ConnectWiseModel):
+    script_results: list[AutomateDeleteScriptBatchResult] | None = Field(
+        default=None, alias='ScriptResults'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateSearchesBatchResponse(ConnectWiseModel):
+    searches_results: list[AutomateDeleteSearchesBatchResult] | None = Field(
+        default=None, alias='SearchesResults'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateSendToSearchesBatchResponse(ConnectWiseModel):
+    search_results: list[AutomateSendToBatchResult] | None = Field(
+        default=None, alias='SearchResults'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateExecuteComputersBatchResponse(ConnectWiseModel):
+    computer_command_result_list: list[
+        AutomateExecuteComputerCommandResult
+    ] | None = Field(default=None, alias='ComputerCommandResultList')
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateExecuteToggleServiceUserCommandBatchRequest(ConnectWiseModel):
+    use_local_account: bool | None = Field(default=None, alias='UseLocalAccount')
+    local_account_credentials: AutomateToggleServiceUserLocalAccountCredentials | None = Field(
+        default=None, alias='LocalAccountCredentials'
+    )
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+
+
+class AutomateBinaryExtension(ConnectWiseModel):
+    category: str | None = Field(default=None, alias='Category')
+    description: str | None = Field(default=None, alias='Description')
+    file_data: str | None = Field(default=None, alias='FileData')
+    is_enabled: bool | None = Field(default=None, alias='IsEnabled')
+    is_loaded_in_automation_server: bool | None = Field(
+        default=None, alias='IsLoadedInAutomationServer'
+    )
+    is_loaded_in_iis: bool | None = Field(default=None, alias='IsLoadedInIIS')
+    is_remote_agent_extension: bool | None = Field(
+        default=None, alias='IsRemoteAgentExtension'
+    )
+    release_date: datetime | None = Field(default=None, alias='ReleaseDate')
+    run_style: AutomateRunStyle | None = Field(default=None, alias='RunStyle')
+    author: str | None = Field(default=None, alias='Author')
+    file_checksum: str | None = Field(default=None, alias='FileChecksum')
+    file_name: str | None = Field(default=None, alias='FileName')
+    extension_name: str | None = Field(default=None, alias='ExtensionName')
+    extension_guid: UUID | None = Field(
+        default=None,
+        alias='ExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    extension_id: int | None = Field(default=None, alias='ExtensionId')
+    version: str | None = Field(default=None, alias='Version')
+
+
+class LabTechRemoteAgentSchedule(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    update_config: LabTechSchedule | None = Field(default=None, alias='UpdateConfig')
+    hardware_inventory: LabTechSchedule | None = Field(
+        default=None, alias='HardwareInventory'
+    )
+    system_inventory: LabTechSchedule | None = Field(
+        default=None, alias='SystemInventory'
+    )
+    drive_inventory: LabTechSchedule | None = Field(
+        default=None, alias='DriveInventory'
+    )
+    process_inventory: LabTechSchedule | None = Field(
+        default=None, alias='ProcessInventory'
+    )
+    maleware_inventory: LabTechSchedule | None = Field(
+        default=None, alias='MalewareInventory'
+    )
+    software_inventory: LabTechSchedule | None = Field(
+        default=None, alias='SoftwareInventory'
+    )
+    event_inventory: LabTechSchedule | None = Field(
+        default=None, alias='EventInventory'
+    )
+    printer_inventory: LabTechSchedule | None = Field(
+        default=None, alias='PrinterInventory'
+    )
+    network_inventory: LabTechSchedule | None = Field(
+        default=None, alias='NetworkInventory'
+    )
+    network_analysis: LabTechSchedule | None = Field(
+        default=None, alias='NetworkAnalysis'
+    )
+    hotfix_inventory: LabTechSchedule | None = Field(
+        default=None, alias='HotfixInventory'
+    )
+    service_inventory: LabTechSchedule | None = Field(
+        default=None, alias='ServiceInventory'
+    )
+    network_probe_inventory: LabTechSchedule | None = Field(
+        default=None, alias='NetworkProbeInventory'
+    )
+    last_update: datetime | None = Field(default=None, alias='LastUpdate')
+    last_user: str | None = Field(default=None, alias='LastUser')
+
+
+class LabTechSearch(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    search_folder: LabTechSearchFolder | None = Field(
+        default=None, alias='SearchFolder'
+    )
+    is_read_only: bool | None = Field(default=None, alias='IsReadOnly')
+    search_type: Literal[
+        'AdvancedComputers',
+        'AdvancedNetDevices',
+        'AdvancedContacts',
+        'AdvancedMobileDevices',
+    ] | None = Field(default=None, alias='SearchType')
+
+
+class LabTechUserClass(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    permissions: LabTechUserPermissions | None = Field(
+        default=None, alias='Permissions'
+    )
+
+
+class LabTechUser(ConnectWiseModel):
+    user_id: str | None = Field(default=None, alias='UserId')
+    folder: LabTechUserFolder | None = Field(default=None, alias='Folder')
+    name: str | None = Field(default=None, alias='Name')
+    email_address: str | None = Field(default=None, alias='EmailAddress')
+    sso_status: LabTechUserSingleSignOnStatus | None = Field(
+        default=None, alias='SsoStatus'
+    )
+
+
+class LabTechComputerMonitor(ConnectWiseModel):
+    monitor_id: int | None = Field(default=None, alias='MonitorId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    device_id: int | None = Field(default=None, alias='DeviceId')
+    name: str | None = Field(default=None, alias='Name')
+    state: str | None = Field(default=None, alias='State')
+    last_scanned: datetime | None = Field(default=None, alias='LastScanned')
+    last_failed: datetime | None = Field(default=None, alias='LastFailed')
+    last_inventory_date: datetime | None = Field(
+        default=None, alias='LastInventoryDate'
+    )
+    alert_action: LabTechAlertAction | None = Field(default=None, alias='AlertAction')
+    monitor_history: LabTechComputerMonitorHistory | None = Field(
+        default=None, alias='MonitorHistory'
+    )
+
+
+class LabTechTicketComment(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    body: str | None = Field(default=None, alias='Body')
+    created_date: datetime | None = Field(default=None, alias='CreatedDate')
+    from_: str | None = Field(default=None, alias='From')
+    user: LabTechUser | None = Field(default=None, alias='User')
+
+
+class LabTechCommandExecute(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    command: LabTechCommand | None = Field(default=None, alias='Command')
+    status: str | None = Field(default=None, alias='Status')
+    parameters: list[str] | None = Field(default=None, alias='Parameters')
+    output: str | None = Field(default=None, alias='Output')
+    fastalk: bool | None = Field(default=None, alias='Fastalk')
+    date_last_inventoried: datetime | None = Field(
+        default=None, alias='DateLastInventoried'
+    )
+
+
+class LabTechSmartData(ConnectWiseModel):
+    drive_id: int | None = Field(default=None, alias='DriveId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    attribute: LabTechSmartAttribute | None = Field(default=None, alias='Attribute')
+    value: int | None = Field(default=None, alias='Value')
+    worst: int | None = Field(default=None, alias='Worst')
+    threshold: int | None = Field(default=None, alias='Threshold')
+    raw_value: int | None = Field(default=None, alias='RawValue')
+
+
+class LabTechComputerMicrosoftUpdateData(ConnectWiseModel):
+    category: str | None = Field(default=None, alias='Category')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    install_date: datetime | None = Field(default=None, alias='InstallDate')
+    install_state: str | None = Field(default=None, alias='InstallState')
+    is_compliant: bool | None = Field(default=None, alias='IsCompliant')
+    is_failed: bool | None = Field(default=None, alias='IsFailed')
+    is_installed: bool | None = Field(default=None, alias='IsInstalled')
+    is_non_compliant: bool | None = Field(default=None, alias='IsNonCompliant')
+    knowledge_base_id: int | None = Field(default=None, alias='KnowledgeBaseId')
+    microsoft_update_id: str | None = Field(default=None, alias='MicrosoftUpdateId')
+    policy_approval: LabTechPolicyApprovalSetting | None = Field(
+        default=None, alias='PolicyApproval'
+    )
+    release_date: datetime | None = Field(default=None, alias='ReleaseDate')
+    severity: str | None = Field(default=None, alias='Severity')
+    title: str | None = Field(default=None, alias='Title')
+    cvss: float | None = Field(default=None, alias='Cvss')
+
+
+class SystemWaitHandle(ConnectWiseModel):
+    safe_wait_handle: MicrosoftSafeWaitHandle | None = Field(
+        default=None, alias='SafeWaitHandle'
+    )
+
+
+class LabTechComputerMemorySlot(ConnectWiseModel):
+    slot_handle: int | None = Field(default=None, alias='SlotHandle')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    slot_name: str | None = Field(default=None, alias='SlotName')
+    bank: str | None = Field(default=None, alias='Bank')
+    form_factor: LabTechMemoryFormFactor | None = Field(
+        default=None, alias='FormFactor'
+    )
+    total_width: int | None = Field(default=None, alias='TotalWidth')
+    data_width: int | None = Field(default=None, alias='DataWidth')
+    size: int | None = Field(default=None, alias='Size')
+    type: LabTechMemoryType | None = Field(default=None, alias='Type')
+    speed: int | None = Field(default=None, alias='Speed')
+    manufacturer: str | None = Field(default=None, alias='Manufacturer')
+    serial_number: str | None = Field(default=None, alias='SerialNumber')
+    part_number: str | None = Field(default=None, alias='PartNumber')
+    asset_tag: str | None = Field(default=None, alias='AssetTag')
+    update_date: datetime | None = Field(default=None, alias='UpdateDate')
+
+
+class LabTechComputerProcessor(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    processor_handle: int | None = Field(default=None, alias='ProcessorHandle')
+    socket: LabTechProcessorSocket | None = Field(default=None, alias='Socket')
+    is_enabled: bool | None = Field(default=None, alias='IsEnabled')
+    family: LabTechProcessorFamily | None = Field(default=None, alias='Family')
+    manufacturer: str | None = Field(default=None, alias='Manufacturer')
+    speed: int | None = Field(default=None, alias='Speed')
+    cache_list: list[LabTechComputerProcessorCache] | None = Field(
+        default=None, alias='CacheList'
+    )
+    serial_number: str | None = Field(default=None, alias='SerialNumber')
+    part_number: str | None = Field(default=None, alias='PartNumber')
+    cores: int | None = Field(default=None, alias='Cores')
+    threads: int | None = Field(default=None, alias='Threads')
+    is64_bit: bool | None = Field(default=None, alias='Is64Bit')
+    dep: bool | None = Field(default=None, alias='DEP')
+    is_virtualized: bool | None = Field(default=None, alias='IsVirtualized')
+    has_power_control: bool | None = Field(default=None, alias='HasPowerControl')
+    has_hardware_thread: bool | None = Field(default=None, alias='HasHardwareThread')
+    processor_name: str | None = Field(default=None, alias='ProcessorName')
+    update_date: datetime | None = Field(default=None, alias='UpdateDate')
+
+
+class LabTechComputerService(ConnectWiseModel):
+    computer_service_id: int | None = Field(default=None, alias='ComputerServiceId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+    state: str | None = Field(default=None, alias='State')
+    startup: str | None = Field(default=None, alias='Startup')
+    path_name: str | None = Field(default=None, alias='PathName')
+    service_type: str | None = Field(default=None, alias='ServiceType')
+    username: str | None = Field(default=None, alias='Username')
+    date_last_inventoried: datetime | None = Field(
+        default=None, alias='DateLastInventoried'
+    )
+    run_levels: str | None = Field(default=None, alias='RunLevels')
+    classification: LabTechServiceClassification | None = Field(
+        default=None, alias='Classification'
+    )
+
+
+class LabTechComputerSoftware(ConnectWiseModel):
+    application_id: int | None = Field(default=None, alias='ApplicationId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    name: str | None = Field(default=None, alias='Name')
+    installation_path: str | None = Field(default=None, alias='InstallationPath')
+    date_installed: datetime | None = Field(default=None, alias='DateInstalled')
+    size: int | None = Field(default=None, alias='Size')
+    uninstaller_path: str | None = Field(default=None, alias='UninstallerPath')
+    version: str | None = Field(default=None, alias='Version')
+    classification: LabTechSoftwareClassification | None = Field(
+        default=None, alias='Classification'
+    )
+    date_last_inventoried: datetime | None = Field(
+        default=None, alias='DateLastInventoried'
+    )
+    client_id: int | None = Field(default=None, alias='ClientId')
+    computer_name: str | None = Field(default=None, alias='ComputerName')
+
+
+class LabTechComputerVideoCard(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    pnp_device_id: str | None = Field(default=None, alias='PnpDeviceId')
+    video_processor: str | None = Field(default=None, alias='VideoProcessor')
+    mode: str | None = Field(default=None, alias='Mode')
+    memory: str | None = Field(default=None, alias='Memory')
+    architecture: LabTechVideoCardArchitecture | None = Field(
+        default=None, alias='Architecture'
+    )
+    memory_type: LabTechVideoCardMemory | None = Field(default=None, alias='MemoryType')
+    dac_adapter: str | None = Field(default=None, alias='DACAdapter')
+    bits_per_pixel: int | None = Field(default=None, alias='BitsPerPixel')
+    update_date: datetime | None = Field(default=None, alias='UpdateDate')
+
+
+class LabTechComputerSensor(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    sensor_id: int | None = Field(default=None, alias='SensorId')
+    sensor_name: str | None = Field(default=None, alias='SensorName')
+    device_type: LabTechSensorDeviceType | None = Field(
+        default=None, alias='DeviceType'
+    )
+    monitor: str | None = Field(default=None, alias='Monitor')
+    value: float | None = Field(default=None, alias='Value')
+    max_value: float | None = Field(default=None, alias='MaxValue')
+
+
+class LabTechComputerThirdPartyPatch(ConnectWiseModel):
+    approved_version: str | None = Field(default=None, alias='ApprovedVersion')
+    available_version: str | None = Field(default=None, alias='AvailableVersion')
+    compliance_state: LabTechPatchComplianceState | None = Field(
+        default=None, alias='ComplianceState'
+    )
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    display_title: str | None = Field(default=None, alias='DisplayTitle')
+    install_action: LabTechThirdParyInstallAction | None = Field(
+        default=None, alias='InstallAction'
+    )
+    install_date: datetime | None = Field(default=None, alias='InstallDate')
+    install_state: str | None = Field(default=None, alias='InstallState')
+    installed_version: str | None = Field(default=None, alias='InstalledVersion')
+    is64_bit: bool | None = Field(default=None, alias='Is64Bit')
+    is_compliant: bool | None = Field(default=None, alias='IsCompliant')
+    is_failed: bool | None = Field(default=None, alias='IsFailed')
+    is_installed: bool | None = Field(default=None, alias='IsInstalled')
+    is_non_compliant: bool | None = Field(default=None, alias='IsNonCompliant')
+    manufacturer: str | None = Field(default=None, alias='Manufacturer')
+    patch_id: str | None = Field(default=None, alias='PatchId')
+    policy_approval: LabTechThirdPartyPolicyApproval | None = Field(
+        default=None, alias='PolicyApproval'
+    )
+    software_id: str | None = Field(default=None, alias='SoftwareId')
+    title: str | None = Field(default=None, alias='Title')
+
+
+class AutomateDeploymentLogin(ConnectWiseModel):
+    deployment_login_id: int | None = Field(default=None, alias='DeploymentLoginId')
+    client: AutomateClient | None = Field(default=None, alias='Client')
+    location: AutomateLocation | None = Field(default=None, alias='Location')
+    title: str | None = Field(default=None, alias='Title')
+    username: str | None = Field(default=None, alias='Username')
+    password: str | None = Field(default=None, alias='Password')
+    url: str | None = Field(default=None, alias='Url')
+    notes: str | None = Field(default=None, alias='Notes')
+
+
+class AutomateExtraField(ConnectWiseModel):
+    target_id: int | None = Field(default=None, alias='TargetId')
+    extra_field_definition_id: int | None = Field(
+        default=None, alias='ExtraFieldDefinitionId'
+    )
+    title: str | None = Field(default=None, alias='Title')
+    display_format: AutomateExtraFieldDisplayFormat | None = Field(
+        default=None, alias='DisplayFormat'
+    )
+    location: AutomateExtraFieldLocation | None = Field(default=None, alias='Location')
+    title_format: AutomateExtraFieldTitleFormat | None = Field(
+        default=None, alias='TitleFormat'
+    )
+    section: str | None = Field(default=None, alias='Section')
+    tooltip: str | None = Field(default=None, alias='Tooltip')
+    is_read_only: bool | None = Field(default=None, alias='IsReadOnly')
+    text_field_settings: AutomateTextFieldSettings | None = Field(
+        default=None, alias='TextFieldSettings'
+    )
+    dropdown_settings: AutomateDropdownSettings | None = Field(
+        default=None, alias='DropdownSettings'
+    )
+    checkbox_settings: AutomateCheckboxSettings | None = Field(
+        default=None, alias='CheckboxSettings'
+    )
+
+
+class AutomateExecuteDeviceCommandResponse(ConnectWiseModel):
+    command_result_list: list[AutomateExecuteDeviceCommandResult] | None = Field(
+        default=None, alias='CommandResultList'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateExecuteDeviceScriptResponse(ConnectWiseModel):
+    script_result_list: list[AutomateExecuteDeviceScriptResult] | None = Field(
+        default=None, alias='ScriptResultList'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class LabTechEventLog(ConnectWiseModel):
+    blacklist_id: int | None = Field(default=None, alias='BlacklistId')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    event_id: int | None = Field(default=None, alias='EventId')
+    last_date: datetime | None = Field(default=None, alias='LastDate')
+    log_name: str | None = Field(default=None, alias='LogName')
+    log_type: LabTechEventLogType | None = Field(default=None, alias='LogType')
+    message: str | None = Field(default=None, alias='Message')
+    source: str | None = Field(default=None, alias='Source')
+    time_generated: datetime | None = Field(default=None, alias='TimeGenerated')
+
+
+class AutomateSessionViewerSettings(ConnectWiseModel):
+    domain: str | None = Field(default=None, alias='Domain')
+    port: int | None = Field(default=None, alias='Port')
+    api_token: str | None = Field(default=None, alias='ApiToken')
+    instance_id: str | None = Field(default=None, alias='InstanceId')
+    extension_id: str | None = Field(default=None, alias='ExtensionId')
+    enable_wcc_element: bool | None = Field(default=None, alias='EnableWccElement')
+    user: AutomateSessionViewerUser | None = Field(default=None, alias='User')
+
+
+class AutomateExtraFieldDefinition(ConnectWiseModel):
+    sort_oder: int | None = Field(default=None, alias='SortOder')
+    is_encrypted: bool | None = Field(default=None, alias='IsEncrypted')
+    is_restricted: bool | None = Field(default=None, alias='IsRestricted')
+    read_user_classes: list[AutomateUserClass] | None = Field(
+        default=None, alias='ReadUserClasses'
+    )
+    edit_user_classes: list[AutomateUserClass] | None = Field(
+        default=None, alias='EditUserClasses'
+    )
+    extra_field_definition_id: int | None = Field(
+        default=None, alias='ExtraFieldDefinitionId'
+    )
+    title: str | None = Field(default=None, alias='Title')
+    display_format: AutomateExtraFieldDisplayFormat | None = Field(
+        default=None, alias='DisplayFormat'
+    )
+    location: AutomateExtraFieldLocation | None = Field(default=None, alias='Location')
+    title_format: AutomateExtraFieldTitleFormat | None = Field(
+        default=None, alias='TitleFormat'
+    )
+    section: str | None = Field(default=None, alias='Section')
+    tooltip: str | None = Field(default=None, alias='Tooltip')
+    is_read_only: bool | None = Field(default=None, alias='IsReadOnly')
+    text_field_settings: AutomateTextFieldSettings | None = Field(
+        default=None, alias='TextFieldSettings'
+    )
+    dropdown_settings: AutomateDropdownSettings | None = Field(
+        default=None, alias='DropdownSettings'
+    )
+    checkbox_settings: AutomateCheckboxSettings | None = Field(
+        default=None, alias='CheckboxSettings'
+    )
+
+
+class AutomateGroupAutoJoinSettings(ConnectWiseModel):
+    computer_auto_join_search: AutomateSearch | None = Field(
+        default=None, alias='ComputerAutoJoinSearch'
+    )
+    is_limited_to_computer_auto_join: bool | None = Field(
+        default=None, alias='IsLimitedToComputerAutoJoin'
+    )
+
+
+class AutomatePatchingPolicySchedule(ConnectWiseModel):
+    use_schedule: bool | None = Field(default=None, alias='UseSchedule')
+    window_start: str | None = Field(default=None, alias='WindowStart')
+    window_duration: str | None = Field(default=None, alias='WindowDuration')
+    policy_schedule_type: str | None = Field(default=None, alias='PolicyScheduleType')
+    dates_settings: AutomateDatesScheduleSettings | None = Field(
+        default=None, alias='DatesSettings'
+    )
+    days_settings: AutomateDaysScheduleSettings | None = Field(
+        default=None, alias='DaysSettings'
+    )
+    patch_tuesday_settings: AutomatePatchTuesdayScheduleSettings | None = Field(
+        default=None, alias='PatchTuesdaySettings'
+    )
+
+
+class AutomatePatchingPolicyScriptOptions(ConnectWiseModel):
+    before_script_options: AutomatePatchingPolicyScript | None = Field(
+        default=None, alias='BeforeScriptOptions'
+    )
+    after_script_options: AutomatePatchingPolicyScript | None = Field(
+        default=None, alias='AfterScriptOptions'
+    )
+
+
+class AutomateGroupTypeInformation(ConnectWiseModel):
+    inherited_group_type_id: int | None = Field(
+        default=None, alias='InheritedGroupTypeId'
+    )
+    is_modifiable: bool | None = Field(default=None, alias='IsModifiable')
+    group_types: list[AutomateGroupType] | None = Field(
+        default=None, alias='GroupTypes'
+    )
+
+
+class AutomateRemoteAgentTemplateInformation(ConnectWiseModel):
+    inherited_remote_agent_template_id: int | None = Field(
+        default=None, alias='InheritedRemoteAgentTemplateId'
+    )
+    is_modifiable: bool | None = Field(default=None, alias='IsModifiable')
+    remote_agent_templates: list[AutomateRemoteAgentTemplate] | None = Field(
+        default=None, alias='RemoteAgentTemplates'
+    )
+
+
+class AutomateInternalMonitorSubscriptionViewModel(ConnectWiseModel):
+    alert_templates: list[AutomateAlertTemplate] | None = Field(
+        default=None, alias='AlertTemplates'
+    )
+    ticket_categories: list[AutomateTicketCategory] | None = Field(
+        default=None, alias='TicketCategories'
+    )
+    is_group_subscribed: bool | None = Field(default=None, alias='IsGroupSubscribed')
+    is_subscription_inherited: bool | None = Field(
+        default=None, alias='IsSubscriptionInherited'
+    )
+    is_override_applied: bool | None = Field(default=None, alias='IsOverrideApplied')
+    monitor_alert_template_id: int | None = Field(
+        default=None, alias='MonitorAlertTemplateId'
+    )
+    monitor_ticket_category_id: int | None = Field(
+        default=None, alias='MonitorTicketCategoryId'
+    )
+    overridden_alert_template_id: int | None = Field(
+        default=None, alias='OverriddenAlertTemplateId'
+    )
+    overridden_ticket_category_id: int | None = Field(
+        default=None, alias='OverriddenTicketCategoryId'
+    )
+
+
+class LabTechScanFrequency(ConnectWiseModel):
+    scan_frequency_id: int | None = Field(default=None, alias='ScanFrequencyId')
+    frequency_in_minutes: int | None = Field(default=None, alias='FrequencyInMinutes')
+    display_name: str | None = Field(default=None, alias='DisplayName')
+    frequency_category: LabTechScanFrequencyCategory | None = Field(
+        default=None, alias='FrequencyCategory'
+    )
+
+
+class LabTechManagedLicense(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    client_id: int | None = Field(default=None, alias='ClientId')
+    name: str | None = Field(default=None, alias='Name')
+    search_string: str | None = Field(default=None, alias='SearchString')
+    license_count: int | None = Field(default=None, alias='LicenseCount')
+    installed_count: int | None = Field(default=None, alias='InstalledCount')
+    product_key: LabTechProductKey | None = Field(default=None, alias='ProductKey')
+
+
+class AutomateManagementPackQuickSettingsResponse(ConnectWiseModel):
+    core_services_status: AutomateManagementPackStatus | None = Field(
+        default=None, alias='CoreServicesStatus'
+    )
+    database_status: AutomateManagementPackStatus | None = Field(
+        default=None, alias='DatabaseStatus'
+    )
+    messaging_services_status: AutomateManagementPackStatus | None = Field(
+        default=None, alias='MessagingServicesStatus'
+    )
+    network_port_status: AutomateManagementPackStatus | None = Field(
+        default=None, alias='NetworkPortStatus'
+    )
+    websites_and_proxies_status: AutomateManagementPackStatus | None = Field(
+        default=None, alias='WebsitesAndProxiesStatus'
+    )
+
+
+class AutomatePatchingPolicyWorkstationOptions(ConnectWiseModel):
+    send_wake_on_lan_packet: bool | None = Field(
+        default=None, alias='SendWakeOnLanPacket'
+    )
+    create_windows_restore_point: bool | None = Field(
+        default=None, alias='CreateWindowsRestorePoint'
+    )
+    daytime_patching_options: AutomateDaytimePatchingOptions | None = Field(
+        default=None, alias='DaytimePatchingOptions'
+    )
+
+
+class AutomateMicrosoftUpdatePolicyWindows10Options(ConnectWiseModel):
+    service_branch_settings: AutomateServiceBranchSettings | None = Field(
+        default=None, alias='ServiceBranchSettings'
+    )
+    feature_update_deferment_settings: AutomateUpdateDefermentSettings | None = Field(
+        default=None, alias='FeatureUpdateDefermentSettings'
+    )
+    quality_update_deferment_settings: AutomateUpdateDefermentSettings | None = Field(
+        default=None, alias='QualityUpdateDefermentSettings'
+    )
+
+
+class LabTechMonitorAlertStyle(ConnectWiseModel):
+    internal_monitor_alert_style: LabTechInternalMonitorAlertStyle | None = Field(
+        default=None, alias='InternalMonitorAlertStyle'
+    )
+    remote_monitor_alert_style: LabTechRemoteMonitorAlertStyle | None = Field(
+        default=None, alias='RemoteMonitorAlertStyle'
+    )
+
+
+class LabTechScriptData(ConnectWiseModel):
+    script_metadata: LabTechScriptMetadata | None = Field(
+        default=None, alias='ScriptMetadata'
+    )
+    script_steps: list[LabTechScriptStep] | None = Field(
+        default=None, alias='ScriptSteps'
+    )
+
+
+class LabTechSnmpOidQueryParameters(ConnectWiseModel):
+    ip_address: str | None = Field(default=None, alias='IpAddress')
+    snmp_version: LabTechSnmpOidQuerySnmpVersion | None = Field(
+        default=None, alias='SnmpVersion'
+    )
+    community: str | None = Field(default=None, alias='Community')
+    username: str | None = Field(default=None, alias='Username')
+    encryption_method: LabTechSnmpOidQueryEncryptionMethod | None = Field(
+        default=None, alias='EncryptionMethod'
+    )
+    encryption_password: str | None = Field(default=None, alias='EncryptionPassword')
+    authentication_method: LabTechSnmpOidQueryAuthenticationMethod | None = Field(
+        default=None, alias='AuthenticationMethod'
+    )
+    authentication_password: str | None = Field(
+        default=None, alias='AuthenticationPassword'
+    )
+    object_identifier: str | None = Field(default=None, alias='ObjectIdentifier')
+
+
+class LabTechHardwareSensorQueryParameters(ConnectWiseModel):
+    sensor: LabTechHardwareSensorQuerySensor | None = Field(
+        default=None, alias='Sensor'
+    )
+    sensor_number: str | None = Field(default=None, alias='SensorNumber')
+
+
+class LabTechRegistryValueQueryParameters(ConnectWiseModel):
+    hive: LabTechRegistryValueQueryRegistryHive | None = Field(
+        default=None, alias='Hive'
+    )
+    key: str | None = Field(default=None, alias='Key')
+    value: str | None = Field(default=None, alias='Value')
+
+
+class LabTechEventLogQueryParameters(ConnectWiseModel):
+    log: str | None = Field(default=None, alias='Log')
+    level_filter: LabTechEventLogQueryEventLevelFilter | None = Field(
+        default=None, alias='LevelFilter'
+    )
+    keywords: int | None = Field(default=None, alias='Keywords')
+    source: str | None = Field(default=None, alias='Source')
+    event_id: int | None = Field(default=None, alias='EventId')
+    regular_expression_filter: str | None = Field(
+        default=None, alias='RegularExpressionFilter'
+    )
+
+
+class AutomateExecutePatchActionRequest(ConnectWiseModel):
+    patch_action_detail_list: list[AutomatePatchActionInformation] | None = Field(
+        default=None, alias='PatchActionDetailList'
+    )
+
+
+class LabTechProbeCommand(ConnectWiseModel):
+    probe_command_id: int | None = Field(default=None, alias='ProbeCommandId')
+    probe_id: int | None = Field(default=None, alias='ProbeId')
+    command: AutomateProbeRemoteCommand | None = Field(default=None, alias='Command')
+    status: AutomateProbeCommandStatus | None = Field(default=None, alias='Status')
+    parameters: list[str] | None = Field(default=None, alias='Parameters')
+    output: str | None = Field(default=None, alias='Output')
+    is_fastalk: bool | None = Field(default=None, alias='IsFastalk')
+    date_updated: datetime | None = Field(default=None, alias='DateUpdated')
+
+
+class LabTechNewProbeConfiguration(ConnectWiseModel):
+    is_agent_push_enabled: bool | None = Field(default=None, alias='IsAgentPushEnabled')
+    is_automated_deployment_enabled: bool | None = Field(
+        default=None, alias='IsAutomatedDeploymentEnabled'
+    )
+    is_data_collection_enabled: bool | None = Field(
+        default=None, alias='IsDataCollectionEnabled'
+    )
+    is_snmp_trap_server_enabled: bool | None = Field(
+        default=None, alias='IsSnmpTrapServerEnabled'
+    )
+    is_syslog_server_enabled: bool | None = Field(
+        default=None, alias='IsSyslogServerEnabled'
+    )
+    is_tftp_server_enabled: bool | None = Field(
+        default=None, alias='IsTftpServerEnabled'
+    )
+    credentials_list: list[LabTechProbeConfigurationCredentials] | None = Field(
+        default=None, alias='CredentialsList'
+    )
+
+
+class LabTechDiscoveryScanSettings(ConnectWiseModel):
+    discovery_scan_frequency: LabTechScanFrequency | None = Field(
+        default=None, alias='DiscoveryScanFrequency'
+    )
+    limit_discovery_to_scan_window: bool | None = Field(
+        default=None, alias='LimitDiscoveryToScanWindow'
+    )
+    discovery_window_start: str | None = Field(
+        default=None, alias='DiscoveryWindowStart'
+    )
+    discovery_window_end: str | None = Field(default=None, alias='DiscoveryWindowEnd')
+    is_mac_addres_scanning_enabled: bool | None = Field(
+        default=None, alias='IsMacAddresScanningEnabled'
+    )
+    concurrent_thread_count: int | None = Field(
+        default=None, alias='ConcurrentThreadCount'
+    )
+
+
+class LabTechStatusScanSettings(ConnectWiseModel):
+    status_scan_frequency: LabTechScanFrequency | None = Field(
+        default=None, alias='StatusScanFrequency'
+    )
+    status_scan_network_port_list: str | None = Field(
+        default=None, alias='StatusScanNetworkPortList'
+    )
+    network_port_option: LabTechStatusScanNetworkPortOption | None = Field(
+        default=None, alias='NetworkPortOption'
+    )
+
+
+class LabTechProbeConfigurationDefaults(ConnectWiseModel):
+    probe_default_setting_id: int | None = Field(
+        default=None, alias='ProbeDefaultSettingId'
+    )
+    community_string_get_list: str | None = Field(
+        default=None, alias='CommunityStringGetList'
+    )
+    snmp_timeout_in_seconds: int | None = Field(
+        default=None, alias='SnmpTimeoutInSeconds'
+    )
+    agent_deployment_attempt_maximum: int | None = Field(
+        default=None, alias='AgentDeploymentAttemptMaximum'
+    )
+    discovery_settings: LabTechDiscoveryScanSettings | None = Field(
+        default=None, alias='DiscoverySettings'
+    )
+    status_settings: LabTechStatusScanSettings | None = Field(
+        default=None, alias='StatusSettings'
+    )
+    snmp_settings: LabTechSnmpSettings | None = Field(
+        default=None, alias='SnmpSettings'
+    )
+    is_data_collection_enabled: bool | None = Field(
+        default=None, alias='IsDataCollectionEnabled'
+    )
+    snmp_trap_server_listening_port: int | None = Field(
+        default=None, alias='SnmpTrapServerListeningPort'
+    )
+    syslog_settings: LabTechSyslogServerSettings | None = Field(
+        default=None, alias='SyslogSettings'
+    )
+    tftp_settings: LabTechTftpServerSettings | None = Field(
+        default=None, alias='TftpSettings'
+    )
+
+
+class LabTechProbeSnmpV3Configuration(ConnectWiseModel):
+    probe_snmp_configuration_id: int | None = Field(
+        default=None, alias='ProbeSnmpConfigurationId'
+    )
+    snmp_v3_username: str | None = Field(default=None, alias='SnmpV3Username')
+    authentication: LabTechProbeSnmpAuthentication | None = Field(
+        default=None, alias='Authentication'
+    )
+    encryption: LabTechProbeSnmpEncryption | None = Field(
+        default=None, alias='Encryption'
+    )
+
+
+class AutomatePromptWithoutDeadlineSettings(ConnectWiseModel):
+    reboot_trigger_type: str | None = Field(default=None, alias='RebootTriggerType')
+    post_patch_install_trigger_settings: AutomatePostPatchInstallTriggerSettings | None = Field(
+        default=None, alias='PostPatchInstallTriggerSettings'
+    )
+    schedule_trigger_settings: AutomatePatchingPolicySchedule | None = Field(
+        default=None, alias='ScheduleTriggerSettings'
+    )
+    prompt_settings: AutomateRebootPolicyPromptSettings | None = Field(
+        default=None, alias='PromptSettings'
+    )
+    reboot_prior_to_patch_job_installs: bool | None = Field(
+        default=None, alias='RebootPriorToPatchJobInstalls'
+    )
+    maintenance_mode_options: AutomateRebootPolicyMaintenanceModeOptions | None = Field(
+        default=None, alias='MaintenanceModeOptions'
+    )
+    script_options: AutomatePatchingPolicyScriptOptions | None = Field(
+        default=None, alias='ScriptOptions'
+    )
+
+
+class AutomateDisableServerPatchRebootServerSettings(ConnectWiseModel):
+    alert_template: AutomateAlertTemplate | None = Field(
+        default=None, alias='AlertTemplate'
+    )
+    alert_message: str | None = Field(default=None, alias='AlertMessage')
+    ticket_category: AutomateTicketCategory | None = Field(
+        default=None, alias='TicketCategory'
+    )
+    report_category: AutomateReportCategory | None = Field(
+        default=None, alias='ReportCategory'
+    )
+
+
+class AutomateRecordedAction(ConnectWiseModel):
+    type: AutomateRecordedActionType | None = Field(default=None, alias='Type')
+    object_id: int | None = Field(default=None, alias='ObjectId')
+    secondary_identifier: str | None = Field(default=None, alias='SecondaryIdentifier')
+    description: str | None = Field(default=None, alias='Description')
+    source: AutomateRecordedActionSource | None = Field(default=None, alias='Source')
+
+
+class AutomateRunningScriptTarget(ConnectWiseModel):
+    target_type: AutomateRunningScriptTargetType | None = Field(
+        default=None, alias='TargetType'
+    )
+    computer: AutomateComputer | None = Field(default=None, alias='Computer')
+    client: AutomateClient | None = Field(default=None, alias='Client')
+
+
+class AutomateScriptSource(ConnectWiseModel):
+    source_type: AutomateSourceType | None = Field(default=None, alias='SourceType')
+    name: str | None = Field(default=None, alias='Name')
+    alternative_name: str | None = Field(default=None, alias='AlternativeName')
+
+
+class AutomateTicketEntrySettings(ConnectWiseModel):
+    ticket_subject: str | None = Field(default=None, alias='TicketSubject')
+    ticket_requestor: str | None = Field(default=None, alias='TicketRequestor')
+    ticket_category: AutomateTicketEntryCategory | None = Field(
+        default=None, alias='TicketCategory'
+    )
+    close_ticket_trigger: AutomateCloseTicketTrigger | None = Field(
+        default=None, alias='CloseTicketTrigger'
+    )
+
+
+class AutomateTimeEntrySettings(ConnectWiseModel):
+    ticket_id: str | None = Field(default=None, alias='TicketId')
+    minutes_to_log: str | None = Field(default=None, alias='MinutesToLog')
+    time_category: AutomateTimeEntryCategory | None = Field(
+        default=None, alias='TimeCategory'
+    )
+    stop_timer_trigger: AutomateStopTimerTrigger | None = Field(
+        default=None, alias='StopTimerTrigger'
+    )
+    notes: str | None = Field(default=None, alias='Notes')
+    technician: AutomateTimeEntryTechnician | None = Field(
+        default=None, alias='Technician'
+    )
+
+
+class AutomateScriptStep(ConnectWiseModel):
+    operating_system: int | None = Field(default=None, alias='OperatingSystem')
+    is_enabled: bool | None = Field(default=None, alias='IsEnabled')
+    should_continue_on_failure: bool | None = Field(
+        default=None, alias='ShouldContinueOnFailure'
+    )
+    indentation_level: int | None = Field(default=None, alias='IndentationLevel')
+    function: AutomateScriptFunctionBase | None = Field(default=None, alias='Function')
+
+
+class AutomateContact(ConnectWiseModel):
+    contact_id: int | None = Field(default=None, alias='ContactId')
+    first_name: str | None = Field(default=None, alias='FirstName')
+    last_name: str | None = Field(default=None, alias='LastName')
+    email_address: str | None = Field(default=None, alias='EmailAddress')
+    phone_number: str | None = Field(default=None, alias='PhoneNumber')
+    mobile_number: str | None = Field(default=None, alias='MobileNumber')
+    pager_number: str | None = Field(default=None, alias='PagerNumber')
+    fax_number: str | None = Field(default=None, alias='FaxNumber')
+    address1: str | None = Field(default=None, alias='Address1')
+    address2: str | None = Field(default=None, alias='Address2')
+    city: str | None = Field(default=None, alias='City')
+    state: str | None = Field(default=None, alias='State')
+    zip_code: str | None = Field(default=None, alias='ZipCode')
+    client: AutomateClient | None = Field(default=None, alias='Client')
+    location: AutomateLocation | None = Field(default=None, alias='Location')
+    password: str | None = Field(default=None, alias='Password')
+    permissions: list[str] | None = Field(default=None, alias='Permissions')
+    is_managed: bool | None = Field(default=None, alias='IsManaged')
+    is_activated: bool | None = Field(default=None, alias='IsActivated')
+    date_created: datetime | None = Field(default=None, alias='DateCreated')
+    last_update_date: datetime | None = Field(default=None, alias='LastUpdateDate')
+    plugin_data: dict[str, dict[str, dict[str, Any]]] | None = Field(
+        default=None, alias='PluginData'
+    )
+    source: AutomateContactSource | None = Field(default=None, alias='Source')
+
+
+class AutomateAutoJoinSettings(ConnectWiseModel):
+    computer_search_settings: AutomateSearchSettings | None = Field(
+        default=None, alias='ComputerSearchSettings'
+    )
+    network_device_search_settings: AutomateSearchSettings | None = Field(
+        default=None, alias='NetworkDeviceSearchSettings'
+    )
+    contact_search_settings: AutomateContactSearchSettings | None = Field(
+        default=None, alias='ContactSearchSettings'
+    )
+
+
+class AutomateScriptFunction(ConnectWiseModel):
+    function_id: int | None = Field(default=None, alias='FunctionId')
+    name: str | None = Field(default=None, alias='Name')
+    is_conditional_function: bool | None = Field(
+        default=None, alias='IsConditionalFunction'
+    )
+    description: str | None = Field(default=None, alias='Description')
+    target_type: AutomateScriptFunctionTarget | None = Field(
+        default=None, alias='TargetType'
+    )
+    parameters: list[AutomateScriptFunctionParameter] | None = Field(
+        default=None, alias='Parameters'
+    )
+
+
+class AutomateSearchAttributes(ConnectWiseModel):
+    key: str | None = Field(default=None, alias='Key')
+    text: str | None = Field(default=None, alias='Text')
+    description: str | None = Field(default=None, alias='Description')
+    data_type: Literal[
+        'TypeBoolean',
+        'TypeNumber',
+        'TypeText',
+        'TypeVersion',
+        'TypeDate',
+        'TypeAssigned',
+        'TypeEquality',
+        'TypeRole',
+    ] | None = Field(default=None, alias='DataType')
+    data_look_up_type: Literal['None', 'Static', 'Dynamic'] | None = Field(
+        default=None, alias='DataLookUpType'
+    )
+    data_lookup: list[AutomateSearchValueLookUp] | None = Field(
+        default=None, alias='DataLookup'
+    )
+    collection_node: str | None = Field(default=None, alias='CollectionNode')
+
+
+class AutomateAdvancedSearchDynamicLookup(ConnectWiseModel):
+    search_key: str | None = Field(default=None, alias='SearchKey')
+    advanced_search_data_lookups: list[AutomateAdvancedSearchDataLookup] | None = Field(
+        default=None, alias='AdvancedSearchDataLookups'
+    )
+
+
+class AutomateAdvancedSearchFilter(ConnectWiseModel):
+    node_type: Literal[
+        'AndNode', 'OrNode', 'ComparisonNode', 'AnyMeetsNode', 'NotNode'
+    ] | None = Field(default=None, alias='NodeType')
+    node_name: str | None = Field(default=None, alias='NodeName')
+    filter_criterias: list[AutomateFilterCriteria] | None = Field(
+        default=None, alias='FilterCriterias'
+    )
+    child_nodes: list[AutomateAdvancedSearchFilter] | None = Field(
+        default=None, alias='ChildNodes'
+    )
+
+
+class AutomateAdvancedSearchDetails(ConnectWiseModel):
+    search: AutomateSearch | None = Field(default=None, alias='Search')
+    advanced_search_filter: AutomateAdvancedSearchFilter | None = Field(
+        default=None, alias='AdvancedSearchFilter'
+    )
+
+
+class AutomateScriptAutomationTimeCategoryResponse(ConnectWiseModel):
+    total: AutomateScriptAutomationTimeResult | None = Field(
+        default=None, alias='Total'
+    )
+    system: AutomateScriptAutomationTimeResult | None = Field(
+        default=None, alias='System'
+    )
+    users: AutomateScriptAutomationTimeResult | None = Field(
+        default=None, alias='Users'
+    )
+    maximum_history_days_available: int | None = Field(
+        default=None, alias='MaximumHistoryDaysAvailable'
+    )
+
+
+class AutomateScriptAutomationTimeUserResponse(ConnectWiseModel):
+    user_list: list[AutomateScriptAutomationTimeUserResult] | None = Field(
+        default=None, alias='UserList'
+    )
+    maximum_history_days_available: int | None = Field(
+        default=None, alias='MaximumHistoryDaysAvailable'
+    )
+
+
+class AutomateSystemWorkflowProgressEntry(ConnectWiseModel):
+    system_workflow_progress_id: int | None = Field(
+        default=None, alias='SystemWorkflowProgressId'
+    )
+    description: str | None = Field(default=None, alias='Description')
+    workflow_step: AutomateWorkflowStep | None = Field(
+        default=None, alias='WorkflowStep'
+    )
+    workflow_status: AutomateWorkflowStatus | None = Field(
+        default=None, alias='WorkflowStatus'
+    )
+    workflow_metadata: list[AutomateWorkflowMetadata] | None = Field(
+        default=None, alias='WorkflowMetadata'
+    )
+
+
+class AutomateUserAccess(ConnectWiseModel):
+    user_id: int | None = Field(default=None, alias='UserId')
+    user_permissions: list[str] | None = Field(default=None, alias='UserPermissions')
+    plugin_permissions: list[AutomateUserBinaryExtensionPermission] | None = Field(
+        default=None, alias='PluginPermissions'
+    )
+    web_extension_claims: list[AutomateUserExtensionClaimType] | None = Field(
+        default=None, alias='WebExtensionClaims'
+    )
+
+
+class LabTechUserAudit(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    user: LabTechUser | None = Field(default=None, alias='User')
+    message: str | None = Field(default=None, alias='Message')
+    date_created: datetime | None = Field(default=None, alias='DateCreated')
+    external_id: int | None = Field(default=None, alias='ExternalId')
+    audit_action: LabTechAuditAction | None = Field(default=None, alias='AuditAction')
+    source: LabTechAuditSource | None = Field(default=None, alias='Source')
+    secondary_identifier: str | None = Field(default=None, alias='SecondaryIdentifier')
+
+
+class AutomateUserClassWebExtensionViewModel(ConnectWiseModel):
+    web_extension_id: int | None = Field(default=None, alias='WebExtensionId')
+    web_extension_name: str | None = Field(default=None, alias='WebExtensionName')
+    extension_claims: list[AutomateExtensionClaimViewModel] | None = Field(
+        default=None, alias='ExtensionClaims'
+    )
+
+
+class AutomateUserClassWebExtensionRequest(ConnectWiseModel):
+    assigned_extensions: list[AutomateAssignedWebExtension] | None = Field(
+        default=None, alias='AssignedExtensions'
+    )
+
+
+class AutomateGroupInternalMonitorInfo(ConnectWiseModel):
+    monitor_id: int | None = Field(default=None, alias='MonitorId')
+    monitor_name: str | None = Field(default=None, alias='MonitorName')
+    is_monitor_globally_applied: bool | None = Field(
+        default=None, alias='IsMonitorGloballyApplied'
+    )
+    is_subscription_inherited: bool | None = Field(
+        default=None, alias='IsSubscriptionInherited'
+    )
+    is_group_subscribed: bool | None = Field(default=None, alias='IsGroupSubscribed')
+    monitor_interval: str | None = Field(default=None, alias='MonitorInterval')
+    monitor_next_scan_date: datetime | None = Field(
+        default=None, alias='MonitorNextScanDate'
+    )
+    effective_alert_policy: AutomateMonitorAlertPolicy | None = Field(
+        default=None, alias='EffectiveAlertPolicy'
+    )
+
+
+class AutomateUpdateGroupMonitorSubscriptionRequest(ConnectWiseModel):
+    is_subscribed: bool | None = Field(default=None, alias='IsSubscribed')
+    overrides: AutomateAlertingOverride | None = Field(default=None, alias='Overrides')
+
+
+class AutomateAlertingSettings(ConnectWiseModel):
+    is_alerting_enabled: bool | None = Field(default=None, alias='IsAlertingEnabled')
+    alert_template: AutomateAlertTemplate | None = Field(
+        default=None, alias='AlertTemplate'
+    )
+    alert_style_type: AutomateAlertStyleType | None = Field(
+        default=None, alias='AlertStyleType'
+    )
+    alert_success_subject: str | None = Field(default=None, alias='AlertSuccessSubject')
+    alert_success_message: str | None = Field(default=None, alias='AlertSuccessMessage')
+    alert_failure_subject: str | None = Field(default=None, alias='AlertFailureSubject')
+    alert_failure_message: str | None = Field(default=None, alias='AlertFailureMessage')
+    should_run_script: bool | None = Field(default=None, alias='ShouldRunScript')
+    alert_script: AutomateAlertScript | None = Field(default=None, alias='AlertScript')
+    ticket_category: AutomateTicketCategory | None = Field(
+        default=None, alias='TicketCategory'
+    )
+    report_category: AutomateReportCategory | None = Field(
+        default=None, alias='ReportCategory'
+    )
+
+
+class AutomateCondition(ConnectWiseModel):
+    condition_type_id: int | None = Field(default=None, alias='ConditionTypeId')
+    comparand: str | None = Field(default=None, alias='Comparand')
+    normal_state_condition: AutomateStateCondition | None = Field(
+        default=None, alias='NormalStateCondition'
+    )
+    warning_state_condition: AutomateStateCondition | None = Field(
+        default=None, alias='WarningStateCondition'
+    )
+    error_state_condition: AutomateStateCondition | None = Field(
+        default=None, alias='ErrorStateCondition'
+    )
+
+
+class AutomateCreateScriptFromCommandsRequest(ConnectWiseModel):
+    script_folder_id: int | None = Field(default=None, alias='ScriptFolderId')
+    commands: list[AutomateRemoteCommand] | None = Field(default=None, alias='Commands')
+
+
+class AutomateWebExtensionTile(ConnectWiseModel):
+    tile_guid: UUID | None = Field(
+        default=None, alias='TileGuid', example='00000000-0000-0000-0000-000000000000'
+    )
+    normal_tile_source_url: str | None = Field(
+        default=None, alias='NormalTileSourceUrl'
+    )
+    normal_tile_header_url: str | None = Field(
+        default=None, alias='NormalTileHeaderUrl'
+    )
+    max_tile_source_url: str | None = Field(default=None, alias='MaxTileSourceUrl')
+    tile_title: str | None = Field(default=None, alias='TileTitle')
+    tile_size: AutomateWebExtensionTileSize | None = Field(
+        default=None, alias='TileSize'
+    )
+    web_extension_control_id: int | None = Field(
+        default=None, alias='WebExtensionControlId'
+    )
+    web_extension_control_name: str | None = Field(
+        default=None, alias='WebExtensionControlName'
+    )
+    web_extension_guid: UUID | None = Field(
+        default=None,
+        alias='WebExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    extension_claim_type: AutomateExtensionClaimType | None = Field(
+        default=None, alias='ExtensionClaimType'
+    )
+    is_core_extension: bool | None = Field(default=None, alias='IsCoreExtension')
+    web_extension_area_control_type_ids: list[int] | None = Field(
+        default=None, alias='WebExtensionAreaControlTypeIds'
+    )
+
+
+class AutomateWebExtensionRedirect(ConnectWiseModel):
+    redirect_guid: UUID | None = Field(
+        default=None,
+        alias='RedirectGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    source_url: str | None = Field(default=None, alias='SourceUrl')
+    web_extension_control_id: int | None = Field(
+        default=None, alias='WebExtensionControlId'
+    )
+    web_extension_control_name: str | None = Field(
+        default=None, alias='WebExtensionControlName'
+    )
+    web_extension_guid: UUID | None = Field(
+        default=None,
+        alias='WebExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    extension_claim_type: AutomateExtensionClaimType | None = Field(
+        default=None, alias='ExtensionClaimType'
+    )
+    is_core_extension: bool | None = Field(default=None, alias='IsCoreExtension')
+    web_extension_area_control_type_ids: list[int] | None = Field(
+        default=None, alias='WebExtensionAreaControlTypeIds'
+    )
+
+
+class AutomateWebExtensionInlineFrame(ConnectWiseModel):
+    inline_frame_guid: UUID | None = Field(
+        default=None,
+        alias='InlineFrameGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    source_url: str | None = Field(default=None, alias='SourceUrl')
+    web_extension_control_id: int | None = Field(
+        default=None, alias='WebExtensionControlId'
+    )
+    web_extension_control_name: str | None = Field(
+        default=None, alias='WebExtensionControlName'
+    )
+    web_extension_guid: UUID | None = Field(
+        default=None,
+        alias='WebExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    extension_claim_type: AutomateExtensionClaimType | None = Field(
+        default=None, alias='ExtensionClaimType'
+    )
+    is_core_extension: bool | None = Field(default=None, alias='IsCoreExtension')
+    web_extension_area_control_type_ids: list[int] | None = Field(
+        default=None, alias='WebExtensionAreaControlTypeIds'
+    )
+
+
+class AutomateWebExtensionClickAction(ConnectWiseModel):
+    click_action_id: int | None = Field(default=None, alias='ClickActionId')
+    url: str | None = Field(default=None, alias='Url')
+    url_open_type: AutomateWebExtensionUrlOpenType | None = Field(
+        default=None, alias='UrlOpenType'
+    )
+
+
+class AutomateWebExtensionMenuItem(ConnectWiseModel):
+    web_extension_menu_item_id: int | None = Field(
+        default=None, alias='WebExtensionMenuItemId'
+    )
+    web_extension_menu_item_parent_id: int | None = Field(
+        default=None, alias='WebExtensionMenuItemParentId'
+    )
+    menu_text: str | None = Field(default=None, alias='MenuText')
+    click_action: AutomateWebExtensionClickAction | None = Field(
+        default=None, alias='ClickAction'
+    )
+    menu_items: list[AutomateWebExtensionMenuItem] | None = Field(
+        default=None, alias='MenuItems'
+    )
+
+
+class AutomateWindowsServiceBranchStats(ConnectWiseModel):
+    server_release_counts: list[AutomateWindowsReleaseStats] | None = Field(
+        default=None, alias='ServerReleaseCounts'
+    )
+    server_no_channel_count: int | None = Field(
+        default=None, alias='ServerNoChannelCount'
+    )
+    server_semi_annual_channel_count: int | None = Field(
+        default=None, alias='ServerSemiAnnualChannelCount'
+    )
+    server_semi_annual_channel_targeted_count: int | None = Field(
+        default=None, alias='ServerSemiAnnualChannelTargetedCount'
+    )
+    workstation_release_counts: list[AutomateWindowsReleaseStats] | None = Field(
+        default=None, alias='WorkstationReleaseCounts'
+    )
+    workstation_no_channel_count: int | None = Field(
+        default=None, alias='WorkstationNoChannelCount'
+    )
+    workstation_semi_annual_channel_count: int | None = Field(
+        default=None, alias='WorkstationSemiAnnualChannelCount'
+    )
+    workstation_semi_annual_channel_targeted_count: int | None = Field(
+        default=None, alias='WorkstationSemiAnnualChannelTargetedCount'
+    )
+
+
+class AutomateApprovalPolicy(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    is_default_policy: bool | None = Field(default=None, alias='IsDefaultPolicy')
+    has_staging: bool | None = Field(default=None, alias='HasStaging')
+    test_duration: int | None = Field(default=None, alias='TestDuration')
+    pilot_duration: int | None = Field(default=None, alias='PilotDuration')
+    automatic_approval_settings: AutomateAutomaticApprovalSettings | None = Field(
+        default=None, alias='AutomaticApprovalSettings'
+    )
+    automatic_ignore_settings: AutomateAutomaticPolicySettings | None = Field(
+        default=None, alias='AutomaticIgnoreSettings'
+    )
+    automatic_deny_settings: AutomateAutomaticPolicySettings | None = Field(
+        default=None, alias='AutomaticDenySettings'
+    )
+
+
+class AutomateWebClientAccessBatchResponse(ConnectWiseModel):
+    web_client_access_results: list[AutomateWebClientAccessBatchResult] | None = Field(
+        default=None, alias='WebClientAccessResults'
+    )
+    contains_unsuccessful_results: bool | None = Field(
+        default=None, alias='ContainsUnsuccessfulResults'
+    )
+
+
+class AutomateDailyScheduleFrequency(ConnectWiseModel):
+    runs_at: str | None = Field(default=None, alias='RunsAt')
+    daily_interval: int | None = Field(default=None, alias='DailyInterval')
+    days_of_week_settings: AutomateDaysOfWeekSettings | None = Field(
+        default=None, alias='DaysOfWeekSettings'
+    )
+    daily_repeat_settings: AutomateDailyRepeatSettings | None = Field(
+        default=None, alias='DailyRepeatSettings'
+    )
+
+
+class LabTechRemoteAgentTemplate(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    template_guid: str | None = Field(default=None, alias='TemplateGUID')
+    server_address: str | None = Field(default=None, alias='ServerAddress')
+    event_log_inventory_mode: Literal[
+        'InventoryOnlyUsesSchedule',
+        'ImmediatelySendErrors',
+        'ImmediatelySendErrorsAndWarnings',
+        'ImmediatelySendAllButSecurity',
+        'ImmediatelySendAll',
+    ] | None = Field(default=None, alias='EventLogInventoryMode')
+    windows_update: Literal[
+        'DoNothing',
+        'EnableWindowsUpdateDefaults',
+        'SetToDownloadOnly',
+        'DisableWindowsUpdate',
+        'LabtechModeLabtechModeUIAccessDisabled',
+    ] | None = Field(default=None, alias='WindowsUpdate')
+    ssl_accept_expired_certificates: bool | None = Field(
+        default=None, alias='SSLAcceptExpiredCertificates'
+    )
+    ssl_access_untrusted_certificate_authorities: bool | None = Field(
+        default=None, alias='SSLAccessUntrustedCertificateAuthorities'
+    )
+    ssl_accept_mismatched_names: bool | None = Field(
+        default=None, alias='SSLAcceptMismatchedNames'
+    )
+    ssl_accept_revoked_certificates: bool | None = Field(
+        default=None, alias='SSLAcceptRevokedCertificates'
+    )
+    ssl_accept_all: bool | None = Field(default=None, alias='SSLAcceptAll')
+    default_language_pack: str | None = Field(default=None, alias='DefaultLanguagePack')
+    heartbeat_enabled: bool | None = Field(default=None, alias='HeartbeatEnabled')
+    heartbeat_frequency: int | None = Field(default=None, alias='HeartbeatFrequency')
+    remote_agent_log_debug: bool | None = Field(
+        default=None, alias='RemoteAgentLogDebug'
+    )
+    schedule: LabTechRemoteAgentSchedule | None = Field(default=None, alias='Schedule')
+    agent_update_window: LabTechSchedule | None = Field(
+        default=None, alias='AgentUpdateWindow'
+    )
+    temp_directory: str | None = Field(default=None, alias='TempDirectory')
+    cache_directory: str | None = Field(default=None, alias='CacheDirectory')
+    cache_username: str | None = Field(default=None, alias='CacheUsername')
+    cache_password: str | None = Field(default=None, alias='CachePassword')
+    cache_patch: bool | None = Field(default=None, alias='CachePatch')
+    cache_software: bool | None = Field(default=None, alias='CacheSoftware')
+    cache_update: bool | None = Field(default=None, alias='CacheUpdate')
+    tray_title: str | None = Field(default=None, alias='TrayTitle')
+    remote_agent_name: str | None = Field(default=None, alias='RemoteAgentName')
+    show_tray: bool | None = Field(default=None, alias='ShowTray')
+    tray_disable_powered_by: bool | None = Field(
+        default=None, alias='TrayDisablePoweredBy'
+    )
+    tray_icon: str | None = Field(default=None, alias='TrayIcon')
+    agent_reboot_mode: Literal[
+        'Now', 'Ask', 'AskThenAllow', 'AskThenDeny', 'Deny'
+    ] | None = Field(default=None, alias='AgentRebootMode')
+    remote_access_mode: Literal[
+        'Silent', 'Ask', 'AskThenAllow', 'AskThenDeny', 'Deny'
+    ] | None = Field(default=None, alias='RemoteAccessMode')
+    file_explorer_access_mode: Literal[
+        'Now', 'Ask', 'AskThenAllow', 'AskThenDeny', 'Deny'
+    ] | None = Field(default=None, alias='FileExplorerAccessMode')
+    registry_editor_access_mode: Literal[
+        'Now', 'Ask', 'AskThenAllow', 'AskThenDeny', 'Deny'
+    ] | None = Field(default=None, alias='RegistryEditorAccessMode')
+    screen_capture_access_mode: Literal[
+        'Now', 'Ask', 'AskThenAllow', 'AskThenDeny', 'Deny'
+    ] | None = Field(default=None, alias='ScreenCaptureAccessMode')
+    disallow_user_close_tray: bool | None = Field(
+        default=None, alias='DisallowUserCloseTray'
+    )
+    allow_user_disable_remote_access: bool | None = Field(
+        default=None, alias='AllowUserDisableRemoteAccess'
+    )
+    tray_help_url: str | None = Field(default=None, alias='TrayHelpURL')
+    tray_custom_menu_title: str | None = Field(
+        default=None, alias='TrayCustomMenuTitle'
+    )
+    tray_custom_menu_url: str | None = Field(default=None, alias='TrayCustomMenuURL')
+    tray_show_custom_menu: bool | None = Field(default=None, alias='TrayShowCustomMenu')
+    tray_show_help: bool | None = Field(default=None, alias='TrayShowHelp')
+    tray_menus: list[LabTechComputerMenu] | None = Field(
+        default=None, alias='TrayMenus'
+    )
+    tray_reboot_log_off_notification_text: str | None = Field(
+        default=None, alias='TrayRebootLogOffNotificationText'
+    )
+    tray_shutdown_notification_text: str | None = Field(
+        default=None, alias='TrayShutdownNotificationText'
+    )
+    tray_remote_access_notification_text: str | None = Field(
+        default=None, alias='TrayRemoteAccessNotificationText'
+    )
+    tray_file_explorer_access_notification_text: str | None = Field(
+        default=None, alias='TrayFileExplorerAccessNotificationText'
+    )
+    tray_registry_editor_access_notification_text: str | None = Field(
+        default=None, alias='TrayRegistryEditorAccessNotificationText'
+    )
+    tray_screen_capture_access_notification_text: str | None = Field(
+        default=None, alias='TrayScreenCaptureAccessNotificationText'
+    )
+    service_ticket_title: str | None = Field(default=None, alias='ServiceTicketTitle')
+    tray_ticket_from_label_text: str | None = Field(
+        default=None, alias='TrayTicketFromLabelText'
+    )
+    tray_ticket_subject_label_text: str | None = Field(
+        default=None, alias='TrayTicketSubjectLabelText'
+    )
+    tray_show_service_ticket_menu: bool | None = Field(
+        default=None, alias='TrayShowServiceTicketMenu'
+    )
+    tray_show_messages_and_tickets: bool | None = Field(
+        default=None, alias='TrayShowMessagesAndTickets'
+    )
+    tray_ticket_verify_email: bool | None = Field(
+        default=None, alias='TrayTicketVerifyEmail'
+    )
+    support_url: str | None = Field(default=None, alias='SupportURL')
+    rss_feed_address1: str | None = Field(default=None, alias='RSSFeedAddress1')
+    rss_feed_address2: str | None = Field(default=None, alias='RSSFeedAddress2')
+    rss_feed_address3: str | None = Field(default=None, alias='RSSFeedAddress3')
+    rss_feed_address4: str | None = Field(default=None, alias='RSSFeedAddress4')
+    enable_rss: bool | None = Field(default=None, alias='EnableRSS')
+    tray_chat_notification_text: str | None = Field(
+        default=None, alias='TrayChatNotificationText'
+    )
+    tray_chat_notification_title: str | None = Field(
+        default=None, alias='TrayChatNotificationTitle'
+    )
+    tray_interrupt_user_with_chat: bool | None = Field(
+        default=None, alias='TrayInterruptUserWithChat'
+    )
+    proxy_server_url: str | None = Field(default=None, alias='ProxyServerURL')
+    proxy_server_user: str | None = Field(default=None, alias='ProxyServerUser')
+    proxy_server_password: str | None = Field(default=None, alias='ProxyServerPassword')
+    tray_notification_title: str | None = Field(
+        default=None, alias='TrayNotificationTitle'
+    )
+    tray_new_message_notification_text: str | None = Field(
+        default=None, alias='TrayNewMessageNotificationText'
+    )
+    tray_new_rss_feed_notification_text: str | None = Field(
+        default=None, alias='TrayNewRSSFeedNotificationText'
+    )
+    tray_remote_access_notification_title: str | None = Field(
+        default=None, alias='TrayRemoteAccessNotificationTitle'
+    )
+    tray_system_message_notification_title: str | None = Field(
+        default=None, alias='TraySystemMessageNotificationTitle'
+    )
+    backup_server_url: str | None = Field(default=None, alias='BackupServerURL')
+    backup_server_user: str | None = Field(default=None, alias='BackupServerUser')
+    backup_server_password: str | None = Field(
+        default=None, alias='BackupServerPassword'
+    )
+    network_access_storage_path: str | None = Field(
+        default=None, alias='NetworkAccessStoragePath'
+    )
+    template_properties: list[LabTechTemplateProperty] | None = Field(
+        default=None, alias='TemplateProperties'
+    )
+    antivirus_template: LabTechAVTemplatePolicy | None = Field(
+        default=None, alias='AntivirusTemplate'
+    )
+
+
+class LabTechUserClassComputerPermissions(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    user_class: LabTechUserClass | None = Field(default=None, alias='UserClass')
+    permissions: LabTechComputerPermissions | None = Field(
+        default=None, alias='Permissions'
+    )
+
+
+class SystemCancellationToken(ConnectWiseModel):
+    is_cancellation_requested: bool | None = Field(
+        default=None, alias='IsCancellationRequested'
+    )
+    can_be_canceled: bool | None = Field(default=None, alias='CanBeCanceled')
+    wait_handle: SystemWaitHandle | None = Field(default=None, alias='WaitHandle')
+
+
+class AutomateMicrosoftUpdatePolicy(ConnectWiseModel):
+    policy_id: int | None = Field(default=None, alias='PolicyId')
+    policy_name: str | None = Field(default=None, alias='PolicyName')
+    schedule_settings: AutomatePatchingPolicySchedule | None = Field(
+        default=None, alias='ScheduleSettings'
+    )
+    windows_update_agent_settings: AutomateWindowsUpdateAgentSettings | None = Field(
+        default=None, alias='WindowsUpdateAgentSettings'
+    )
+    policy_options: AutomateMicrosoftUpdatePolicyOptions | None = Field(
+        default=None, alias='PolicyOptions'
+    )
+    workstation_options: AutomatePatchingPolicyWorkstationOptions | None = Field(
+        default=None, alias='WorkstationOptions'
+    )
+    windows10_update_options: AutomateMicrosoftUpdatePolicyWindows10Options | None = (
+        Field(default=None, alias='Windows10UpdateOptions')
+    )
+    script_options: AutomatePatchingPolicyScriptOptions | None = Field(
+        default=None, alias='ScriptOptions'
+    )
+
+
+class AutomateThirdPartyUpdatePolicy(ConnectWiseModel):
+    policy_id: int | None = Field(default=None, alias='PolicyId')
+    policy_name: str | None = Field(default=None, alias='PolicyName')
+    patching_policy_schedule: AutomatePatchingPolicySchedule | None = Field(
+        default=None, alias='PatchingPolicySchedule'
+    )
+    workstation_options: AutomatePatchingPolicyWorkstationOptions | None = Field(
+        default=None, alias='WorkstationOptions'
+    )
+    script_options: AutomatePatchingPolicyScriptOptions | None = Field(
+        default=None, alias='ScriptOptions'
+    )
+
+
+class AutomateGroupConfigurationViewModel(ConnectWiseModel):
+    group_type_information: AutomateGroupTypeInformation | None = Field(
+        default=None, alias='GroupTypeInformation'
+    )
+    remote_agent_template_information: AutomateRemoteAgentTemplateInformation | None = (
+        Field(default=None, alias='RemoteAgentTemplateInformation')
+    )
+    computer_search_information: AutomateComputerSearchInformation | None = Field(
+        default=None, alias='ComputerSearchInformation'
+    )
+    network_device_searches: list[AutomateSearch] | None = Field(
+        default=None, alias='NetworkDeviceSearches'
+    )
+    contact_searches: list[AutomateSearch] | None = Field(
+        default=None, alias='ContactSearches'
+    )
+    clients: list[AutomateClient] | None = Field(default=None, alias='Clients')
+    locations: list[AutomateLocation] | None = Field(default=None, alias='Locations')
+    maintenance_windows: list[AutomateMaintenanceWindow] | None = Field(
+        default=None, alias='MaintenanceWindows'
+    )
+    user_classes: list[AutomateUserClass] | None = Field(
+        default=None, alias='UserClasses'
+    )
+
+
+class LabTechScript(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    folder: LabTechScriptFolder | None = Field(default=None, alias='Folder')
+    name: str | None = Field(default=None, alias='Name')
+    comments: str | None = Field(default=None, alias='Comments')
+    is_computer_script: bool | None = Field(default=None, alias='IsComputerScript')
+    is_location_script: bool | None = Field(default=None, alias='IsLocationScript')
+    is_maintenance_script: bool | None = Field(
+        default=None, alias='IsMaintenanceScript'
+    )
+    is_function_script: bool | None = Field(default=None, alias='IsFunctionScript')
+    is_offline: bool | None = Field(default=None, alias='IsOffline')
+    ignore_for_mobile_devices: bool | None = Field(
+        default=None, alias='IgnoreForMobileDevices'
+    )
+    is_public_sharable: bool | None = Field(default=None, alias='IsPublicSharable')
+    is_user_response: bool | None = Field(default=None, alias='IsUserResponse')
+    is_system_script: bool | None = Field(default=None, alias='IsSystemScript')
+    is_mobile_device_script: bool | None = Field(
+        default=None, alias='IsMobileDeviceScript'
+    )
+    is_network_device_script: bool | None = Field(
+        default=None, alias='IsNetworkDeviceScript'
+    )
+    is_contact_script: bool | None = Field(default=None, alias='IsContactScript')
+    version: int | None = Field(default=None, alias='Version')
+    guid: str | None = Field(default=None, alias='GUID')
+    parameters: list[str] | None = Field(default=None, alias='Parameters')
+    edit_permission: list[int] | None = Field(default=None, alias='EditPermission')
+    permission: list[int] | None = Field(default=None, alias='Permission')
+    automation_time: int | None = Field(default=None, alias='AutomationTime')
+    update_date: datetime | None = Field(default=None, alias='UpdateDate')
+    updated_by: str | None = Field(default=None, alias='UpdatedBy')
+    full_folder_path: str | None = Field(default=None, alias='FullFolderPath')
+    script_data: LabTechScriptData | None = Field(default=None, alias='ScriptData')
+
+
+class LabTechMonitorRoutineParameters(ConnectWiseModel):
+    format: LabTechMonitorRoutineParametersFormat | None = Field(
+        default=None, alias='Format'
+    )
+    unformatted_monitor_parameters: LabTechUnformattedMonitorRoutineParameters | None = Field(
+        default=None, alias='UnformattedMonitorParameters'
+    )
+    internal_database_query_parameters: LabTechInternalDatabaseQueryParameters | None = Field(
+        default=None, alias='InternalDatabaseQueryParameters'
+    )
+    latency_target: str | None = Field(default=None, alias='LatencyTarget')
+    get_network_response_parameters: LabTechGetNetworkResponseParameters | None = Field(
+        default=None, alias='GetNetworkResponseParameters'
+    )
+    snmp_oid_query_parameters: LabTechSnmpOidQueryParameters | None = Field(
+        default=None, alias='SnmpOidQueryParameters'
+    )
+    performance_counter_query_parameters: LabTechPerformanceCounterQueryParameters | None = Field(
+        default=None, alias='PerformanceCounterQueryParameters'
+    )
+    hardware_sensor_query_parameters: LabTechHardwareSensorQueryParameters | None = (
+        Field(default=None, alias='HardwareSensorQueryParameters')
+    )
+    network_device_wbem_query_parameters: LabTechNetworkDeviceWbemQueryParameters | None = Field(
+        default=None, alias='NetworkDeviceWbemQueryParameters'
+    )
+    get_plugin_command_result_parameters: LabTechGetPluginCommandResultParameters | None = Field(
+        default=None, alias='GetPluginCommandResultParameters'
+    )
+    file_or_directory_query_parameters: LabTechFileOrDirectoryQueryParameters | None = (
+        Field(default=None, alias='FileOrDirectoryQueryParameters')
+    )
+    service_name: str | None = Field(default=None, alias='ServiceName')
+    volume_mountpoint: str | None = Field(default=None, alias='VolumeMountpoint')
+    registry_value_query_parameters: LabTechRegistryValueQueryParameters | None = Field(
+        default=None, alias='RegistryValueQueryParameters'
+    )
+    process_name: str | None = Field(default=None, alias='ProcessName')
+    event_log_listener_parameters: LabTechEventLogQueryParameters | None = Field(
+        default=None, alias='EventLogListenerParameters'
+    )
+    get_executable_result_parameters: LabTechGetExecutableResultParameters | None = (
+        Field(default=None, alias='GetExecutableResultParameters')
+    )
+    wmi_query: str | None = Field(default=None, alias='WmiQuery')
+
+
+class LabTechProbeConfiguration(ConnectWiseModel):
+    probe_configuration_id: int | None = Field(
+        default=None, alias='ProbeConfigurationId'
+    )
+    location_id: int | None = Field(default=None, alias='LocationId')
+    agent_deployment_attempt_maximum: int | None = Field(
+        default=None, alias='AgentDeploymentAttemptMaximum'
+    )
+    automated_deployment_enabled: bool | None = Field(
+        default=None, alias='AutomatedDeploymentEnabled'
+    )
+    discovery_settings: LabTechDiscoveryScanSettings | None = Field(
+        default=None, alias='DiscoverySettings'
+    )
+    status_settings: LabTechStatusScanSettings | None = Field(
+        default=None, alias='StatusSettings'
+    )
+    snmp_settings: LabTechSnmpSettings | None = Field(
+        default=None, alias='SnmpSettings'
+    )
+    is_data_collection_enabled: bool | None = Field(
+        default=None, alias='IsDataCollectionEnabled'
+    )
+    snmp_trap_server_listening_port: int | None = Field(
+        default=None, alias='SnmpTrapServerListeningPort'
+    )
+    syslog_settings: LabTechSyslogServerSettings | None = Field(
+        default=None, alias='SyslogSettings'
+    )
+    tftp_settings: LabTechTftpServerSettings | None = Field(
+        default=None, alias='TftpSettings'
+    )
+
+
+class LabTechProbeSnmpConfiguration(ConnectWiseModel):
+    probe_snmp_configuration_id: int | None = Field(
+        default=None, alias='ProbeSnmpConfigurationId'
+    )
+    probe_configuration_id: int | None = Field(
+        default=None, alias='ProbeConfigurationId'
+    )
+    snmp_timeout_in_seconds: int | None = Field(
+        default=None, alias='SnmpTimeoutInSeconds'
+    )
+    community_string_get_list: str | None = Field(
+        default=None, alias='CommunityStringGetList'
+    )
+    snmp_v3_settings: LabTechProbeSnmpV3Configuration | None = Field(
+        default=None, alias='SnmpV3Settings'
+    )
+
+
+class AutomateDisableServerPatchRebootSettings(ConnectWiseModel):
+    server_settings: AutomateDisableServerPatchRebootServerSettings | None = Field(
+        default=None, alias='ServerSettings'
+    )
+    workstation_settings: AutomateDisableServerPatchRebootWorkstationSettings | None = (
+        Field(default=None, alias='WorkstationSettings')
+    )
+
+
+class AutomateScript(ConnectWiseModel):
+    script_id: int | None = Field(default=None, alias='ScriptId')
+    ticket_entry_settings: AutomateTicketEntrySettings | None = Field(
+        default=None, alias='TicketEntrySettings'
+    )
+    time_entry_settings: AutomateTimeEntrySettings | None = Field(
+        default=None, alias='TimeEntrySettings'
+    )
+    user_class_access_settings: list[AutomateUserClassAccess] | None = Field(
+        default=None, alias='UserClassAccessSettings'
+    )
+    is_protected: bool | None = Field(default=None, alias='IsProtected')
+    uses_enhanced_logging: bool | None = Field(
+        default=None, alias='UsesEnhancedLogging'
+    )
+    steps: list[AutomateScriptStep] | None = Field(default=None, alias='Steps')
+    global_variables: dict[str, str] | None = Field(
+        default=None, alias='GlobalVariables'
+    )
+    parameters: list[str] | None = Field(default=None, alias='Parameters')
+    name: str | None = Field(default=None, alias='Name')
+    description: str | None = Field(default=None, alias='Description')
+    folder: AutomateScriptFolder | None = Field(default=None, alias='Folder')
+    script_target_type: AutomateScriptTarget | None = Field(
+        default=None, alias='ScriptTargetType'
+    )
+    script_options: AutomateScriptOptions | None = Field(
+        default=None, alias='ScriptOptions'
+    )
+    automation_minutes: int | None = Field(default=None, alias='AutomationMinutes')
+
+
+class AutomateGroup(ConnectWiseModel):
+    group_id: int | None = Field(default=None, alias='GroupId')
+    name: str | None = Field(default=None, alias='Name')
+    full_name: str | None = Field(default=None, alias='FullName')
+    description: str | None = Field(default=None, alias='Description')
+    group_type: AutomateGroupType | None = Field(default=None, alias='GroupType')
+    template_settings: AutomateTemplateSettings | None = Field(
+        default=None, alias='TemplateSettings'
+    )
+    auto_join_settings: AutomateAutoJoinSettings | None = Field(
+        default=None, alias='AutoJoinSettings'
+    )
+    linking_settings: AutomateLinkingSettings | None = Field(
+        default=None, alias='LinkingSettings'
+    )
+    master_status: AutomateMasterStatus | None = Field(
+        default=None, alias='MasterStatus'
+    )
+    maintenance_window_settings: AutomateMaintenanceWindowSettings | None = Field(
+        default=None, alias='MaintenanceWindowSettings'
+    )
+
+
+class AutomateMonitor(ConnectWiseModel):
+    monitor_id: int | None = Field(default=None, alias='MonitorId')
+    name: str | None = Field(default=None, alias='Name')
+    groups: list[AutomateGroup] | None = Field(default=None, alias='Groups')
+    target_computer: AutomateComputer | None = Field(
+        default=None, alias='TargetComputer'
+    )
+
+
+class AutomateSearchLookUpBase(ConnectWiseModel):
+    search_node: str | None = Field(default=None, alias='SearchNode')
+    is_leaf_node: bool | None = Field(default=None, alias='IsLeafNode')
+    child_nodes: list[AutomateSearchLookUpBase] | None = Field(
+        default=None, alias='ChildNodes'
+    )
+    attributes: AutomateSearchAttributes | None = Field(
+        default=None, alias='Attributes'
+    )
+
+
+class AutomateUser(ConnectWiseModel):
+    user_id: int | None = Field(default=None, alias='UserId')
+    name: str | None = Field(default=None, alias='Name')
+    first_name: str | None = Field(default=None, alias='FirstName')
+    last_name: str | None = Field(default=None, alias='LastName')
+    last_successful_login: datetime | None = Field(
+        default=None, alias='LastSuccessfulLogin'
+    )
+    password: str | None = Field(default=None, alias='Password')
+    folder: AutomateUserFolder | None = Field(default=None, alias='Folder')
+    email_address: str | None = Field(default=None, alias='EmailAddress')
+    auditing_level: int | None = Field(default=None, alias='AuditingLevel')
+    command_level: int | None = Field(default=None, alias='CommandLevel')
+    uses_ticket_based_security: bool | None = Field(
+        default=None, alias='UsesTicketBasedSecurity'
+    )
+    new_ticket_display_limit: int | None = Field(
+        default=None, alias='NewTicketDisplayLimit'
+    )
+    open_ticket_limit: int | None = Field(default=None, alias='OpenTicketLimit')
+    is_integrator: bool | None = Field(default=None, alias='IsIntegrator')
+    is_locked: bool | None = Field(default=None, alias='IsLocked')
+    is_ticket_router: bool | None = Field(default=None, alias='IsTicketRouter')
+    is_ticket_supervisor: bool | None = Field(default=None, alias='IsTicketSupervisor')
+    ticket_level: AutomateTicketLevel | None = Field(default=None, alias='TicketLevel')
+    requires_login_report: bool | None = Field(
+        default=None, alias='RequiresLoginReport'
+    )
+    requires_logout_report: bool | None = Field(
+        default=None, alias='RequiresLogoutReport'
+    )
+    last_updated: datetime | None = Field(default=None, alias='LastUpdated')
+    primary_clients: list[AutomateClient] | None = Field(
+        default=None, alias='PrimaryClients'
+    )
+    user_classes: list[AutomateUserClass] | None = Field(
+        default=None, alias='UserClasses'
+    )
+    associated_groups: list[AutomateGroup] | None = Field(
+        default=None, alias='AssociatedGroups'
+    )
+    sso_status: AutomateUserSingleSignOnStatus | None = Field(
+        default=None, alias='SsoStatus'
+    )
+    sso_email: str | None = Field(default=None, alias='SsoEmail')
+    allow_legacy_api_access: bool | None = Field(
+        default=None, alias='AllowLegacyApiAccess'
+    )
+
+
+class AutomateConfiguration(ConnectWiseModel):
+    check_type: AutomateCheckType | None = Field(default=None, alias='CheckType')
+    interval: AutomateCheckInterval | None = Field(default=None, alias='Interval')
+    condition: AutomateCondition | None = Field(default=None, alias='Condition')
+    ping_settings: AutomatePingSettings | None = Field(
+        default=None, alias='PingSettings'
+    )
+    latency_settings: AutomateLatencySettings | None = Field(
+        default=None, alias='LatencySettings'
+    )
+    tcp_settings: AutomateTcpSettings | None = Field(default=None, alias='TcpSettings')
+    udp_settings: AutomateUdpSettings | None = Field(default=None, alias='UdpSettings')
+    snmp_settings: AutomateSnmpSettings | None = Field(
+        default=None, alias='SnmpSettings'
+    )
+    performance_counter_settings: AutomatePerformanceCounterSettings | None = Field(
+        default=None, alias='PerformanceCounterSettings'
+    )
+    file_or_directory_settings: AutomateFileOrDirectorySettings | None = Field(
+        default=None, alias='FileOrDirectorySettings'
+    )
+    service_settings: AutomateServiceSettings | None = Field(
+        default=None, alias='ServiceSettings'
+    )
+    disk_space_settings: AutomateDiskSpaceSettings | None = Field(
+        default=None, alias='DiskSpaceSettings'
+    )
+    registry_settings: AutomateRegistrySettings | None = Field(
+        default=None, alias='RegistrySettings'
+    )
+    process_settings: AutomateProcessSettings | None = Field(
+        default=None, alias='ProcessSettings'
+    )
+    event_log_settings: AutomateEventLogSettings | None = Field(
+        default=None, alias='EventLogSettings'
+    )
+    executable_settings: AutomateExecutableSettings | None = Field(
+        default=None, alias='ExecutableSettings'
+    )
+    wmi_settings: AutomateWmiSettings | None = Field(default=None, alias='WmiSettings')
+    bandwidth_settings: AutomateBandwidthSettings | None = Field(
+        default=None, alias='BandwidthSettings'
+    )
+    sensor_settings: AutomateSensorSettings | None = Field(
+        default=None, alias='SensorSettings'
+    )
+
+
+class AutomateWebExtensionClickButton(ConnectWiseModel):
+    icon_url: str | None = Field(default=None, alias='IconUrl')
+    button_text: str | None = Field(default=None, alias='ButtonText')
+    click_action: AutomateWebExtensionClickAction | None = Field(
+        default=None, alias='ClickAction'
+    )
+    allows_multi_select: bool | None = Field(default=None, alias='AllowsMultiSelect')
+    web_extension_control_id: int | None = Field(
+        default=None, alias='WebExtensionControlId'
+    )
+    web_extension_control_name: str | None = Field(
+        default=None, alias='WebExtensionControlName'
+    )
+    web_extension_guid: UUID | None = Field(
+        default=None,
+        alias='WebExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    extension_claim_type: AutomateExtensionClaimType | None = Field(
+        default=None, alias='ExtensionClaimType'
+    )
+    is_core_extension: bool | None = Field(default=None, alias='IsCoreExtension')
+    web_extension_area_control_type_ids: list[int] | None = Field(
+        default=None, alias='WebExtensionAreaControlTypeIds'
+    )
+
+
+class AutomateWebExtensionMenuButton(ConnectWiseModel):
+    icon_url: str | None = Field(default=None, alias='IconUrl')
+    button_text: str | None = Field(default=None, alias='ButtonText')
+    menu_items: list[AutomateWebExtensionMenuItem] | None = Field(
+        default=None, alias='MenuItems'
+    )
+    allows_multi_select: bool | None = Field(default=None, alias='AllowsMultiSelect')
+    web_extension_control_id: int | None = Field(
+        default=None, alias='WebExtensionControlId'
+    )
+    web_extension_control_name: str | None = Field(
+        default=None, alias='WebExtensionControlName'
+    )
+    web_extension_guid: UUID | None = Field(
+        default=None,
+        alias='WebExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    extension_claim_type: AutomateExtensionClaimType | None = Field(
+        default=None, alias='ExtensionClaimType'
+    )
+    is_core_extension: bool | None = Field(default=None, alias='IsCoreExtension')
+    web_extension_area_control_type_ids: list[int] | None = Field(
+        default=None, alias='WebExtensionAreaControlTypeIds'
+    )
+
+
+class AutomateWebExtension(ConnectWiseModel):
+    web_extension_id: int | None = Field(default=None, alias='WebExtensionId')
+    extension_solution: AutomateExtensionSolution | None = Field(
+        default=None, alias='ExtensionSolution'
+    )
+    extension_status: AutomateExtensionStatus | None = Field(
+        default=None, alias='ExtensionStatus'
+    )
+    web_extension_guid: UUID | None = Field(
+        default=None,
+        alias='WebExtensionGuid',
+        example='00000000-0000-0000-0000-000000000000',
+    )
+    web_extension_name: str | None = Field(default=None, alias='WebExtensionName')
+    author: str | None = Field(default=None, alias='Author')
+    description: str | None = Field(default=None, alias='Description')
+    version: str | None = Field(default=None, alias='Version')
+    file_url: str | None = Field(default=None, alias='FileUrl')
+    filename: str | None = Field(default=None, alias='Filename')
+    file_check_sum: str | None = Field(default=None, alias='FileCheckSum')
+    has_static_files: bool | None = Field(default=None, alias='HasStaticFiles')
+    has_graph_files: bool | None = Field(default=None, alias='HasGraphFiles')
+    is_core_extension: bool | None = Field(default=None, alias='IsCoreExtension')
+    extension_claim_types: list[AutomateExtensionClaimType] | None = Field(
+        default=None, alias='ExtensionClaimTypes'
+    )
+    redirects: list[AutomateWebExtensionRedirect] | None = Field(
+        default=None, alias='Redirects'
+    )
+    tiles: list[AutomateWebExtensionTile] | None = Field(default=None, alias='Tiles')
+    inline_frames: list[AutomateWebExtensionInlineFrame] | None = Field(
+        default=None, alias='InlineFrames'
+    )
+    menu_buttons: list[AutomateWebExtensionMenuButton] | None = Field(
+        default=None, alias='MenuButtons'
+    )
+    click_buttons: list[AutomateWebExtensionClickButton] | None = Field(
+        default=None, alias='ClickButtons'
+    )
+
+
+class AutomateScriptScheduleSettings(ConnectWiseModel):
+    script_schedule_frequency: AutomateScriptScheduleFrequency | None = Field(
+        default=None, alias='ScriptScheduleFrequency'
+    )
+    minutely_settings: AutomateMinutelyScheduleFrequency | None = Field(
+        default=None, alias='MinutelySettings'
+    )
+    hourly_settings: AutomateHourlyScheduleFrequency | None = Field(
+        default=None, alias='HourlySettings'
+    )
+    daily_settings: AutomateDailyScheduleFrequency | None = Field(
+        default=None, alias='DailySettings'
+    )
+    weekly_settings: AutomateWeeklyScheduleFrequency | None = Field(
+        default=None, alias='WeeklySettings'
+    )
+    monthly_settings: AutomateMonthlyScheduleFrequency | None = Field(
+        default=None, alias='MonthlySettings'
+    )
+
+
+class AutomateRebootPolicy(ConnectWiseModel):
+    policy_id: int | None = Field(default=None, alias='PolicyId')
+    policy_name: str | None = Field(default=None, alias='PolicyName')
+    reboot_policy_type: str | None = Field(default=None, alias='RebootPolicyType')
+    disable_server_patch_reboot_settings: AutomateDisableServerPatchRebootSettings | None = Field(
+        default=None, alias='DisableServerPatchRebootSettings'
+    )
+    prompt_without_deadline_settings: AutomatePromptWithoutDeadlineSettings | None = (
+        Field(default=None, alias='PromptWithoutDeadlineSettings')
+    )
+
+
+class AutomateLocalOverridePolicy(ConnectWiseModel):
+    approval_policies: list[AutomateApprovalPolicy] | None = Field(
+        default=None, alias='ApprovalPolicies'
+    )
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    microsoft_update_policy: AutomateMicrosoftUpdatePolicy | None = Field(
+        default=None, alias='MicrosoftUpdatePolicy'
+    )
+    reboot_policy: AutomateRebootPolicy | None = Field(
+        default=None, alias='RebootPolicy'
+    )
+    third_party_update_policy: AutomateThirdPartyUpdatePolicy | None = Field(
+        default=None, alias='ThirdPartyUpdatePolicy'
+    )
+
+
+class AutomateRunningScript(ConnectWiseModel):
+    script_instance_id: int | None = Field(default=None, alias='ScriptInstanceId')
+    target: AutomateRunningScriptTarget | None = Field(default=None, alias='Target')
+    script: AutomateScript | None = Field(default=None, alias='Script')
+    source: AutomateScriptSource | None = Field(default=None, alias='Source')
+    state: AutomateScriptState | None = Field(default=None, alias='State')
+    start_date: datetime | None = Field(default=None, alias='StartDate')
+
+
+class AutomateScheduledScriptTarget(ConnectWiseModel):
+    schedule_target_type: AutomateScheduleTargetType | None = Field(
+        default=None, alias='ScheduleTargetType'
+    )
+    group: AutomateGroup | None = Field(default=None, alias='Group')
+    client: AutomateClient | None = Field(default=None, alias='Client')
+    location: AutomateLocation | None = Field(default=None, alias='Location')
+    computer: AutomateComputer | None = Field(default=None, alias='Computer')
+    network_device: AutomateNetworkDevice | None = Field(
+        default=None, alias='NetworkDevice'
+    )
+    contact: AutomateContact | None = Field(default=None, alias='Contact')
+
+
+class AutomateScriptReferences(ConnectWiseModel):
+    schedule_count: int | None = Field(default=None, alias='ScheduleCount')
+    internal_monitors: list[AutomateMonitor] | None = Field(
+        default=None, alias='InternalMonitors'
+    )
+    remote_monitors: list[AutomateMonitor] | None = Field(
+        default=None, alias='RemoteMonitors'
+    )
+    alert_templates: list[AutomateAlertTemplate] | None = Field(
+        default=None, alias='AlertTemplates'
+    )
+
+
+class AutomateAdvancedSearchLookUp(ConnectWiseModel):
+    look_up_nodes: list[AutomateSearchLookUpBase] | None = Field(
+        default=None, alias='LookUpNodes'
+    )
+    collection_nodes: list[str] | None = Field(default=None, alias='CollectionNodes')
+
+
+class AutomateRemoteMonitorTemplate(ConnectWiseModel):
+    limiting_search: AutomateSearch | None = Field(default=None, alias='LimitingSearch')
+    group_id: int | None = Field(default=None, alias='GroupId')
+    target_type: AutomateTargetType | None = Field(default=None, alias='TargetType')
+    install_count: int | None = Field(default=None, alias='InstallCount')
+    sub_type: str | None = Field(default=None, alias='SubType')
+    details: str | None = Field(default=None, alias='Details')
+    last_edited_by: str | None = Field(default=None, alias='LastEditedBy')
+    last_edited_time: datetime | None = Field(default=None, alias='LastEditedTime')
+    remote_monitor_id: int | None = Field(default=None, alias='RemoteMonitorId')
+    name: str | None = Field(default=None, alias='Name')
+    alerting_settings: AutomateAlertingSettings | None = Field(
+        default=None, alias='AlertingSettings'
+    )
+    configuration: AutomateConfiguration | None = Field(
+        default=None, alias='Configuration'
+    )
+
+
+class AutomatePatchingPolicies(ConnectWiseModel):
+    microsoft_update_policy: AutomateMicrosoftUpdatePolicy | None = Field(
+        default=None, alias='MicrosoftUpdatePolicy'
+    )
+    reboot_policy: AutomateRebootPolicy | None = Field(
+        default=None, alias='RebootPolicy'
+    )
+    third_party_update_policy: AutomateThirdPartyUpdatePolicy | None = Field(
+        default=None, alias='ThirdPartyUpdatePolicy'
+    )
+    approval_policies: list[AutomateApprovalPolicy] | None = Field(
+        default=None, alias='ApprovalPolicies'
+    )
+
+
+class AutomateWebExtensionAreaControls(ConnectWiseModel):
+    web_extension_area: AutomateWebExtensionArea | None = Field(
+        default=None, alias='WebExtensionArea'
+    )
+    click_buttons: list[AutomateWebExtensionClickButton] | None = Field(
+        default=None, alias='ClickButtons'
+    )
+    menu_buttons: list[AutomateWebExtensionMenuButton] | None = Field(
+        default=None, alias='MenuButtons'
+    )
+    tiles: list[AutomateWebExtensionTile] | None = Field(default=None, alias='Tiles')
+    redirects: list[AutomateWebExtensionRedirect] | None = Field(
+        default=None, alias='Redirects'
+    )
+    inline_frames: list[AutomateWebExtensionInlineFrame] | None = Field(
+        default=None, alias='InlineFrames'
+    )
+
+
+class AutomateScheduleScriptBatchRequest(ConnectWiseModel):
+    entity_type: Literal[
+        'System',
+        'Computer',
+        'Site',
+        'Company',
+        'Probe',
+        'NetworkDevice',
+        'Ticket',
+        'Group',
+        'MobileDevice',
+        'Vendor',
+        'VendorProduct',
+        'Possibility',
+        'Opportunity',
+        'Contact',
+        'User',
+        'Script',
+        'Plugin',
+        'Service',
+        'ServiceBundle',
+        'Search',
+        'SearchFolder',
+        'Dataview',
+        'DataviewFolder',
+        'UserFolder',
+        'UserClass',
+        'ScriptFolder',
+        'RemoteMonitorTemplate',
+        'ExtraField',
+    ] | None = Field(default=None, alias='EntityType')
+    entity_ids: list[int] | None = Field(default=None, alias='EntityIds')
+    script_id: int | None = Field(default=None, alias='ScriptId')
+    script_guid: str | None = Field(default=None, alias='ScriptGuid')
+    schedule: AutomateScriptScheduleSettings | None = Field(
+        default=None, alias='Schedule'
+    )
+    parameters: list[SystemString] | None = Field(default=None, alias='Parameters')
+    use_agent_time: bool | None = Field(default=None, alias='UseAgentTime')
+    start_date: datetime | None = Field(default=None, alias='StartDate')
+    expire_date: datetime | None = Field(default=None, alias='ExpireDate')
+    offline_action_flags: AutomateScheduledScriptOfflineActionFlags | None = Field(
+        default=None, alias='OfflineActionFlags'
+    )
+    distribution_window: AutomateDistributionWindow | None = Field(
+        default=None, alias='DistributionWindow'
+    )
+    priority: int | None = Field(default=None, alias='Priority')
+    include_sub_groups: bool | None = Field(default=None, alias='IncludeSubGroups')
+
+
+class AutomateGroupPatchingPolicy(ConnectWiseModel):
+    approval_policies: list[AutomateApprovalPolicy] | None = Field(
+        default=None, alias='ApprovalPolicies'
+    )
+    group_id: int | None = Field(default=None, alias='GroupId')
+    group_name: str | None = Field(default=None, alias='GroupName')
+    is_manual: bool | None = Field(default=None, alias='IsManual')
+    is_patching_group: bool | None = Field(default=None, alias='IsPatchingGroup')
+    microsoft_update_policy: AutomateMicrosoftUpdatePolicy | None = Field(
+        default=None, alias='MicrosoftUpdatePolicy'
+    )
+    priority: int | None = Field(default=None, alias='Priority')
+    reboot_policy: AutomateRebootPolicy | None = Field(
+        default=None, alias='RebootPolicy'
+    )
+    third_party_update_policy: AutomateThirdPartyUpdatePolicy | None = Field(
+        default=None, alias='ThirdPartyUpdatePolicy'
+    )
+    auto_join_settings: AutomateGroupAutoJoinSettings | None = Field(
+        default=None, alias='AutoJoinSettings'
+    )
+    windows_computer_count: int | None = Field(
+        default=None, alias='WindowsComputerCount'
+    )
+
+
+class AutomateScheduledScript(ConnectWiseModel):
+    scheduled_script_id: int | None = Field(default=None, alias='ScheduledScriptId')
+    script: AutomateScript | None = Field(default=None, alias='Script')
+    schedule_target: AutomateScheduledScriptTarget | None = Field(
+        default=None, alias='ScheduleTarget'
+    )
+    schedule: AutomateScriptScheduleSettings | None = Field(
+        default=None, alias='Schedule'
+    )
+    limiting_search: AutomateSearch | None = Field(default=None, alias='LimitingSearch')
+    offline_action_flags: AutomateScheduledScriptOfflineActionFlags | None = Field(
+        default=None, alias='OfflineActionFlags'
+    )
+    distribution_window: AutomateDistributionWindow | None = Field(
+        default=None, alias='DistributionWindow'
+    )
+    parameters: list[SystemString] | None = Field(default=None, alias='Parameters')
+    use_agent_time: bool | None = Field(default=None, alias='UseAgentTime')
+    scheduled_by: str | None = Field(default=None, alias='ScheduledBy')
+    occurrences: int | None = Field(default=None, alias='Occurrences')
+    start_date: datetime | None = Field(default=None, alias='StartDate')
+    expire_date: datetime | None = Field(default=None, alias='ExpireDate')
+    next_run_date: datetime | None = Field(default=None, alias='NextRunDate')
+    is_disabled: bool | None = Field(default=None, alias='IsDisabled')
+    priority: int | None = Field(default=None, alias='Priority')
+    include_sub_groups: bool | None = Field(default=None, alias='IncludeSubGroups')
+    is_inherited: bool | None = Field(default=None, alias='IsInherited')
+
+
+class LabTechClient(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    name: str | None = Field(default=None, alias='Name')
+    company: str | None = Field(default=None, alias='Company')
+    first_name: str | None = Field(default=None, alias='FirstName')
+    last_name: str | None = Field(default=None, alias='LastName')
+    address1: str | None = Field(default=None, alias='Address1')
+    address2: str | None = Field(default=None, alias='Address2')
+    city: str | None = Field(default=None, alias='City')
+    state: str | None = Field(default=None, alias='State')
+    zip_code: str | None = Field(default=None, alias='ZipCode')
+    phone_number: str | None = Field(default=None, alias='PhoneNumber')
+    fax_number: str | None = Field(default=None, alias='FaxNumber')
+    comment: str | None = Field(default=None, alias='Comment')
+    country: str | None = Field(default=None, alias='Country')
+    external_id: str | None = Field(default=None, alias='ExternalId')
+    uses_in_house_support_staff: bool | None = Field(
+        default=None, alias='UsesInHouseSupportStaff'
+    )
+    new_ticket_notification_email: str | None = Field(
+        default=None, alias='NewTicketNotificationEmail'
+    )
+    is_hidden_from_all_inclusive_group: bool | None = Field(
+        default=None, alias='IsHiddenFromAllInclusiveGroup'
+    )
+    locations: list[LabTechLocation] | None = Field(default=None, alias='Locations')
+
+
+class LabTechLocation(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    client: LabTechClient | None = Field(default=None, alias='Client')
+    name: str | None = Field(default=None, alias='Name')
+    address1: str | None = Field(default=None, alias='Address1')
+    address2: str | None = Field(default=None, alias='Address2')
+    city: str | None = Field(default=None, alias='City')
+    state: str | None = Field(default=None, alias='State')
+    zip_code: str | None = Field(default=None, alias='ZipCode')
+    country: str | None = Field(default=None, alias='Country')
+    phone_number: str | None = Field(default=None, alias='PhoneNumber')
+    fax_number: str | None = Field(default=None, alias='FaxNumber')
+    contact: LabTechContact | None = Field(default=None, alias='Contact')
+    comments: str | None = Field(default=None, alias='Comments')
+    router_port: int | None = Field(default=None, alias='RouterPort')
+    script_drive: str | None = Field(default=None, alias='ScriptDrive')
+    script_username: str | None = Field(default=None, alias='ScriptUsername')
+    script_password: str | None = Field(default=None, alias='ScriptPassword')
+    script_router_address: str | None = Field(default=None, alias='ScriptRouterAddress')
+    script_extra1: str | None = Field(default=None, alias='ScriptExtra1')
+    script_extra2: str | None = Field(default=None, alias='ScriptExtra2')
+    probe_id: int | None = Field(default=None, alias='ProbeId')
+    external_id: int | None = Field(default=None, alias='ExternalId')
+    router: LabTechRouter | None = Field(default=None, alias='Router')
+    deployment_template: LabTechRemoteAgentTemplate | None = Field(
+        default=None, alias='DeploymentTemplate'
+    )
+    maintenance_window: LabTechMaintenanceWindowDefinition | None = Field(
+        default=None, alias='MaintenanceWindow'
+    )
+    default_deployment_group: LabTechGroup | None = Field(
+        default=None, alias='DefaultDeploymentGroup'
+    )
+    default_deployment_login: LabTechDeploymentLogin | None = Field(
+        default=None, alias='DefaultDeploymentLogin'
+    )
+
+
+class LabTechContact(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    location: LabTechLocation | None = Field(default=None, alias='Location')
+    client: LabTechClient | None = Field(default=None, alias='Client')
+    first_name: str | None = Field(default=None, alias='FirstName')
+    last_name: str | None = Field(default=None, alias='LastName')
+    address1: str | None = Field(default=None, alias='Address1')
+    address2: str | None = Field(default=None, alias='Address2')
+    city: str | None = Field(default=None, alias='City')
+    state: str | None = Field(default=None, alias='State')
+    zip_code: str | None = Field(default=None, alias='ZipCode')
+    phone_number: str | None = Field(default=None, alias='PhoneNumber')
+    mobile_number: str | None = Field(default=None, alias='MobileNumber')
+    fax_number: str | None = Field(default=None, alias='FaxNumber')
+    pager_number: str | None = Field(default=None, alias='PagerNumber')
+    email: str | None = Field(default=None, alias='Email')
+    external_id: str | None = Field(default=None, alias='ExternalId')
+    web_permissions: LabTechContactWebPermissions | None = Field(
+        default=None, alias='WebPermissions'
+    )
+    created_date: datetime | None = Field(default=None, alias='CreatedDate')
+    associated_computers: list[LabTechComputer] | None = Field(
+        default=None, alias='AssociatedComputers'
+    )
+
+
+class LabTechGroup(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    parent_id: str | None = Field(default=None, alias='ParentId')
+    sub_groups: list[int] | None = Field(default=None, alias='SubGroups')
+    parent_groups: list[int] | None = Field(default=None, alias='ParentGroups')
+    parents: list[LabTechGroupPartial] | None = Field(default=None, alias='Parents')
+    depth: int | None = Field(default=None, alias='Depth')
+    name: str | None = Field(default=None, alias='Name')
+    full_name: str | None = Field(default=None, alias='FullName')
+    type_id: int | None = Field(default=None, alias='TypeId')
+    type_name: str | None = Field(default=None, alias='TypeName')
+    template_priority: int | None = Field(default=None, alias='TemplatePriority')
+    guid: str | None = Field(default=None, alias='GUID')
+    computers_auto_join_search: LabTechSearch | None = Field(
+        default=None, alias='ComputersAutoJoinSearch'
+    )
+    network_devices_auto_join_search: LabTechSearch | None = Field(
+        default=None, alias='NetworkDevicesAutoJoinSearch'
+    )
+    contacts_auto_join_search: LabTechSearch | None = Field(
+        default=None, alias='ContactsAutoJoinSearch'
+    )
+    maintenance_window: LabTechMaintenanceWindow | None = Field(
+        default=None, alias='MaintenanceWindow'
+    )
+    maintenance_window_last_applied: datetime | None = Field(
+        default=None, alias='MaintenanceWindowLastApplied'
+    )
+    computers_limit_to_search: bool | None = Field(
+        default=None, alias='ComputersLimitToSearch'
+    )
+    network_devices_limit_to_search: bool | None = Field(
+        default=None, alias='NetworkDevicesLimitToSearch'
+    )
+    contacts_limit_to_search: bool | None = Field(
+        default=None, alias='ContactsLimitToSearch'
+    )
+    contacts_join_computers: bool | None = Field(
+        default=None, alias='ContactsJoinComputers'
+    )
+    remote_agent_template: LabTechRemoteAgentTemplate | None = Field(
+        default=None, alias='RemoteAgentTemplate'
+    )
+    client_to_sync: LabTechClient | None = Field(default=None, alias='ClientToSync')
+    location_to_sync: LabTechLocation | None = Field(
+        default=None, alias='LocationToSync'
+    )
+    comments: str | None = Field(default=None, alias='Comments')
+    computer_permissions: list[LabTechUserClassComputerPermissions] | None = Field(
+        default=None, alias='ComputerPermissions'
+    )
+    computers: list[LabTechComputer] | None = Field(default=None, alias='Computers')
+    network_devices: list[LabTechNetworkDevice] | None = Field(
+        default=None, alias='NetworkDevices'
+    )
+    contacts: list[LabTechContact] | None = Field(default=None, alias='Contacts')
+
+
+class LabTechComputer(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    location: LabTechLocation | None = Field(default=None, alias='Location')
+    client: LabTechClient | None = Field(default=None, alias='Client')
+    contact: LabTechContact | None = Field(default=None, alias='Contact')
+    is_fas_talk: bool | None = Field(default=None, alias='IsFasTalk')
+    is_master: bool | None = Field(default=None, alias='IsMaster')
+    is_network_probe: bool | None = Field(default=None, alias='IsNetworkProbe')
+    is_heartbeat_enabled: bool | None = Field(default=None, alias='IsHeartbeatEnabled')
+    is_maintenance_mode_enabled: bool | None = Field(
+        default=None, alias='IsMaintenanceModeEnabled'
+    )
+    is_tunnel_supported: bool | None = Field(default=None, alias='IsTunnelSupported')
+    is_virtual_machine: bool | None = Field(default=None, alias='IsVirtualMachine')
+    computer_name: str | None = Field(default=None, alias='ComputerName')
+    operating_system_name: str | None = Field(default=None, alias='OperatingSystemName')
+    operating_system_version: str | None = Field(
+        default=None, alias='OperatingSystemVersion'
+    )
+    domain_name: str | None = Field(default=None, alias='DomainName')
+    remote_agent_last_inventory: datetime | None = Field(
+        default=None, alias='RemoteAgentLastInventory'
+    )
+    utc_offset: int | None = Field(default=None, alias='UTCOffset')
+    open_ports_tcp: list[int] | None = Field(default=None, alias='OpenPortsTCP')
+    open_ports_udp: list[int] | None = Field(default=None, alias='OpenPortsUDP')
+    comment: str | None = Field(default=None, alias='Comment')
+    remote_agent_version: str | None = Field(default=None, alias='RemoteAgentVersion')
+    remote_agent_last_contact: datetime | None = Field(
+        default=None, alias='RemoteAgentLastContact'
+    )
+    domain_name_servers: list[str] | None = Field(
+        default=None, alias='DomainNameServers'
+    )
+    last_inventory_received: datetime | None = Field(
+        default=None, alias='LastInventoryReceived'
+    )
+    windows_update_date: datetime | None = Field(
+        default=None, alias='WindowsUpdateDate'
+    )
+    antivirus_definition_date: datetime | None = Field(
+        default=None, alias='AntivirusDefinitionDate'
+    )
+    last_heartbeat: datetime | None = Field(default=None, alias='LastHeartbeat')
+    total_memory: int | None = Field(default=None, alias='TotalMemory')
+    free_memory: int | None = Field(default=None, alias='FreeMemory')
+    cpu_usage: int | None = Field(default=None, alias='CpuUsage')
+    local_ip_address: str | None = Field(default=None, alias='LocalIPAddress')
+    gateway_ip_address: str | None = Field(default=None, alias='GatewayIPAddress')
+    system_uptime: int | None = Field(default=None, alias='SystemUptime')
+    last_startup: datetime | None = Field(default=None, alias='LastStartup')
+    mac_address: str | None = Field(default=None, alias='MACAddress')
+    date_added: datetime | None = Field(default=None, alias='DateAdded')
+    user_idle_time: int | None = Field(default=None, alias='UserIdleTime')
+    logged_in_users: list[LabTechLoggedInUser] | None = Field(
+        default=None, alias='LoggedInUsers'
+    )
+    last_user_name: str | None = Field(default=None, alias='LastUserName')
+    tickets: list[LabTechTicket] | None = Field(default=None, alias='Tickets')
+    groups: list[LabTechGroup] | None = Field(default=None, alias='Groups')
+    bandwidth: int | None = Field(default=None, alias='Bandwidth')
+    bandwidth_display: str | None = Field(default=None, alias='BandwidthDisplay')
+    asset_date: datetime | None = Field(default=None, alias='AssetDate')
+    asset_tag: str | None = Field(default=None, alias='AssetTag')
+    warranty_end_date: datetime | None = Field(default=None, alias='WarrantyEndDate')
+    type: str | None = Field(default=None, alias='Type')
+    status: str | None = Field(default=None, alias='Status')
+    master_mode: str | None = Field(default=None, alias='MasterMode')
+    virus_scanner: LabTechVirusScannerDef | None = Field(
+        default=None, alias='VirusScanner'
+    )
+    friendly_name: str | None = Field(default=None, alias='FriendlyName')
+    is_locked_down: bool | None = Field(default=None, alias='IsLockedDown')
+    is_system_account: bool | None = Field(default=None, alias='IsSystemAccount')
+    is_reboot_needed: bool | None = Field(default=None, alias='IsRebootNeeded')
+    is_virtual_host: bool | None = Field(default=None, alias='IsVirtualHost')
+    is_heartbeat_running: bool | None = Field(default=None, alias='IsHeartbeatRunning')
+    has_intel_vpro: bool | None = Field(default=None, alias='HasIntelVPRO')
+    has_intel_amt: bool | None = Field(default=None, alias='HasIntelAMT')
+    has_h_pi_lo: bool | None = Field(default=None, alias='HasHPiLO')
+    temp_files: str | None = Field(default=None, alias='TempFiles')
+    serial_number: str | None = Field(default=None, alias='SerialNumber')
+    cpu_score: float | None = Field(default=None, alias='CpuScore')
+    d3_d_score: float | None = Field(default=None, alias='D3DScore')
+    disk_score: float | None = Field(default=None, alias='DiskScore')
+    graphics_score: float | None = Field(default=None, alias='GraphicsScore')
+    memory_score: float | None = Field(default=None, alias='MemoryScore')
+    power_profiles: list[str] | None = Field(default=None, alias='PowerProfiles')
+    current_power_profile: str | None = Field(default=None, alias='CurrentPowerProfile')
+    bios_manufacturer: str | None = Field(default=None, alias='BiosManufacturer')
+    bios_flash: str | None = Field(default=None, alias='BiosFlash')
+    primary_contact_name: str | None = Field(default=None, alias='PrimaryContactName')
+    comment_priority: LabTechCommentPriority | None = Field(
+        default=None, alias='CommentPriority'
+    )
+    irq: list[int] | None = Field(default=None, alias='IRQ')
+    address: list[int] | None = Field(default=None, alias='Address')
+    dma: list[int] | None = Field(default=None, alias='DMA')
+    hardware_ports: list[str] | None = Field(default=None, alias='HardwarePorts')
+    user_accounts: list[str] | None = Field(default=None, alias='UserAccounts')
+
+
+class LabTechNetworkDevice(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    location: LabTechLocation | None = Field(default=None, alias='Location')
+    local_ip_address: str | None = Field(default=None, alias='LocalIPAddress')
+    name: str | None = Field(default=None, alias='Name')
+    friendly_name: str | None = Field(default=None, alias='FriendlyName')
+    open_ports_tcp: list[int] | None = Field(default=None, alias='OpenPortsTCP')
+    device_type: LabTechNetworkDeviceType | None = Field(
+        default=None, alias='DeviceType'
+    )
+    detection_template_name: str | None = Field(
+        default=None, alias='DetectionTemplateName'
+    )
+    last_updated: datetime | None = Field(default=None, alias='LastUpdated')
+    mac_address: str | None = Field(default=None, alias='MACAddress')
+    status: str | None = Field(default=None, alias='Status')
+    contact: LabTechContact | None = Field(default=None, alias='Contact')
+    alert_action: LabTechAlertAction | None = Field(default=None, alias='AlertAction')
+    alert_message: str | None = Field(default=None, alias='AlertMessage')
+    alert_when_offline: bool | None = Field(default=None, alias='AlertWhenOffline')
+    date_added: datetime | None = Field(default=None, alias='DateAdded')
+    snmp_community_get: str | None = Field(default=None, alias='SNMPCommunityGet')
+    snmp_community_set: str | None = Field(default=None, alias='SNMPCommunitySet')
+    is_snm_pv1_supported: bool | None = Field(default=None, alias='IsSNMPv1Supported')
+    is_snm_pv2c_supported: bool | None = Field(default=None, alias='IsSNMPv2cSupported')
+    is_snm_pv3_supported: bool | None = Field(default=None, alias='IsSNMPv3Supported')
+    is_low_on_toner: bool | None = Field(default=None, alias='IsLowOnToner')
+    is_low_on_paper: bool | None = Field(default=None, alias='IsLowOnPaper')
+    is_high_bandwidth: bool | None = Field(default=None, alias='IsHighBandwidth')
+    flags_display: str | None = Field(default=None, alias='FlagsDisplay')
+    manufacturer_name: str | None = Field(default=None, alias='ManufacturerName')
+    model_name: str | None = Field(default=None, alias='ModelName')
+    description: str | None = Field(default=None, alias='Description')
+    uptime: int | None = Field(default=None, alias='Uptime')
+    uptime_display: str | None = Field(default=None, alias='UptimeDisplay')
+    data_out: int | None = Field(default=None, alias='DataOut')
+    data_out_display: str | None = Field(default=None, alias='DataOutDisplay')
+    data_in: int | None = Field(default=None, alias='DataIn')
+    data_in_display: str | None = Field(default=None, alias='DataInDisplay')
+    asset_date: datetime | None = Field(default=None, alias='AssetDate')
+    last_contact: datetime | None = Field(default=None, alias='LastContact')
+    nas_percent: str | None = Field(default=None, alias='NasPercent')
+    groups: list[LabTechGroup] | None = Field(default=None, alias='Groups')
+    client: LabTechClient | None = Field(default=None, alias='Client')
+    is_synced_to_manage: bool | None = Field(default=None, alias='IsSyncedToManage')
+    snmp_tree: list[int] | None = Field(default=None, alias='SnmpTree')
+    external_system_credentials: LabTechExternalSystemCredentials | None = Field(
+        default=None, alias='ExternalSystemCredentials'
+    )
+    interface_count: int | None = Field(default=None, alias='InterfaceCount')
+    probe_id: int | None = Field(default=None, alias='ProbeId')
+    probe_name: str | None = Field(default=None, alias='ProbeName')
+    agent_deployment_readiness_check: LabTechAgentDeploymentReadinessCheck | None = (
+        Field(default=None, alias='AgentDeploymentReadinessCheck')
+    )
+
+
+class LabTechTicket(ConnectWiseModel):
+    ticket_id: int | None = Field(default=None, alias='TicketId')
+    client: LabTechClient | None = Field(default=None, alias='Client')
+    computer: LabTechComputer | None = Field(default=None, alias='Computer')
+    status: LabTechTicketStatus | None = Field(default=None, alias='Status')
+    subject: str | None = Field(default=None, alias='Subject')
+    priority: LabTechTicketPriority | None = Field(default=None, alias='Priority')
+    user: LabTechUser | None = Field(default=None, alias='User')
+    due_date: datetime | None = Field(default=None, alias='DueDate')
+    start_date: datetime | None = Field(default=None, alias='StartDate')
+    contact_date: datetime | None = Field(default=None, alias='ContactDate')
+    update_date: datetime | None = Field(default=None, alias='UpdateDate')
+    from_: str | None = Field(default=None, alias='From')
+    cc: str | None = Field(default=None, alias='CC')
+    support_level: int | None = Field(default=None, alias='SupportLevel')
+    category: LabTechTicketCategory | None = Field(default=None, alias='Category')
+    category_id: int | None = Field(default=None, alias='CategoryId')
+    category_name: str | None = Field(default=None, alias='CategoryName')
+    location: LabTechLocation | None = Field(default=None, alias='Location')
+    external_id: int | None = Field(default=None, alias='ExternalId')
+    monitor_id: int | None = Field(default=None, alias='MonitorId')
+    guid: str | None = Field(default=None, alias='Guid')
+    agent: LabTechComputerMonitor | None = Field(default=None, alias='Agent')
+    network_device: LabTechNetworkDevice | None = Field(
+        default=None, alias='NetworkDevice'
+    )
+    comments: list[LabTechTicketComment] | None = Field(default=None, alias='Comments')
+
+
+class LabTechMonitorAlertSuspension(ConnectWiseModel):
+    id: int | None = Field(default=None, alias='Id')
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    monitor: LabTechMonitor | None = Field(default=None, alias='Monitor')
+    suspension_date: datetime | None = Field(default=None, alias='SuspensionDate')
+
+
+class LabTechMonitor(ConnectWiseModel):
+    alert_action: LabTechAlertAction | None = Field(default=None, alias='AlertAction')
+    alert_style: LabTechMonitorAlertStyle | None = Field(
+        default=None, alias='AlertStyle'
+    )
+    comparer_settings: LabTechMonitorComparerSettings | None = Field(
+        default=None, alias='ComparerSettings'
+    )
+    control_guid: str | None = Field(default=None, alias='ControlGuid')
+    failure_count: int | None = Field(default=None, alias='FailureCount')
+    id_field: str | None = Field(default=None, alias='IdField')
+    interval: int | None = Field(default=None, alias='Interval')
+    installed: bool | None = Field(default=None, alias='Installed')
+    is_internal_monitor: bool | None = Field(default=None, alias='IsInternalMonitor')
+    is_network_device_monitor: bool | None = Field(
+        default=None, alias='IsNetworkDeviceMonitor'
+    )
+    last_checked: datetime | None = Field(default=None, alias='LastChecked')
+    last_failed: datetime | None = Field(default=None, alias='LastFailed')
+    last_status: str | None = Field(default=None, alias='LastStatus')
+    guid: str | None = Field(default=None, alias='Guid')
+    monitor_alert_target: LabTechMonitorAlertTarget | None = Field(
+        default=None, alias='MonitorAlertTarget'
+    )
+    monitor_id: int | None = Field(default=None, alias='MonitorId')
+    monitor_owner: LabTechMonitorOwner | None = Field(
+        default=None, alias='MonitorOwner'
+    )
+    monitor_state: LabTechMonitorState | None = Field(
+        default=None, alias='MonitorState'
+    )
+    local_state: LabTechMonitorState | None = Field(default=None, alias='LocalState')
+    name: str | None = Field(default=None, alias='Name')
+    pending_update: bool | None = Field(default=None, alias='PendingUpdate')
+    report_category: LabTechReportCategory | None = Field(
+        default=None, alias='ReportCategory'
+    )
+    ticket_category: LabTechTicketCategory | None = Field(
+        default=None, alias='TicketCategory'
+    )
+    warning_count: int | None = Field(default=None, alias='WarningCount')
+    script: LabTechScript | None = Field(default=None, alias='Script')
+    version: int | None = Field(default=None, alias='Version')
+    routine_parameters: LabTechMonitorRoutineParameters | None = Field(
+        default=None, alias='RoutineParameters'
+    )
+    routine: LabTechMonitorRoutine | None = Field(default=None, alias='Routine')
+    alert_messages: LabTechMonitorAlertMessages | None = Field(
+        default=None, alias='AlertMessages'
+    )
+    targets: LabTechMonitorTarget | None = Field(default=None, alias='Targets')
+    is_global_monitor: bool | None = Field(default=None, alias='IsGlobalMonitor')
+    is_overridden: bool | None = Field(default=None, alias='IsOverridden')
+    is_collecting_data: bool | None = Field(default=None, alias='IsCollectingData')
+    affected_entities: LabTechMonitorAffectedEntities | None = Field(
+        default=None, alias='AffectedEntities'
+    )
+
+
+class LabTechMonitorComparerSettings(ConnectWiseModel):
+    comparer: LabTechMonitorComparer | None = Field(default=None, alias='Comparer')
+    format: LabTechMonitorComparerSettingsFormat | None = Field(
+        default=None, alias='Format'
+    )
+    value: LabTechMonitorComparerValue | None = Field(default=None, alias='Value')
+    smoothing_coefficient: float | None = Field(
+        default=None, alias='SmoothingCoefficient'
+    )
+    is_expression: bool | None = Field(default=None, alias='IsExpression')
+    smoothing_style: LabTechMonitorComparerSettingsSmoothingStyle | None = Field(
+        default=None, alias='SmoothingStyle'
+    )
+    language_overrides: dict[str, str] | None = Field(
+        default=None, alias='LanguageOverrides'
+    )
+    result_format: LabTechMonitorComparerSettingsResultFormat | None = Field(
+        default=None, alias='ResultFormat'
+    )
+
+
+class LabTechMonitorOwner(ConnectWiseModel):
+    owner_type: int | None = Field(default=None, alias='OwnerType')
+    description: str | None = Field(default=None, alias='Description')
+    owning_group: LabTechGroup | None = Field(default=None, alias='OwningGroup')
+    owning_script: LabTechScript | None = Field(default=None, alias='OwningScript')
+    owning_plugin: LabTechMonitorPluginOwner | None = Field(
+        default=None, alias='OwningPlugin'
+    )
+
+
+class LabTechMonitorTarget(ConnectWiseModel):
+    location: LabTechLocation | None = Field(default=None, alias='Location')
+    client: LabTechClient | None = Field(default=None, alias='Client')
+    computer: LabTechComputer | None = Field(default=None, alias='Computer')
+    network_device: LabTechNetworkDevice | None = Field(
+        default=None, alias='NetworkDevice'
+    )
+    group_ids: list[int] | None = Field(default=None, alias='GroupIds')
+
+
+class LabTechMonitorAffectedEntities(ConnectWiseModel):
+    remote_monitor_affected_location: LabTechLocation | None = Field(
+        default=None, alias='RemoteMonitorAffectedLocation'
+    )
+    remote_monitor_affected_client: LabTechClient | None = Field(
+        default=None, alias='RemoteMonitorAffectedClient'
+    )
+    internal_monitor_affected_locations: list[LabTechLocation] | None = Field(
+        default=None, alias='InternalMonitorAffectedLocations'
+    )
+    internal_monitor_affected_clients: list[LabTechClient] | None = Field(
+        default=None, alias='InternalMonitorAffectedClients'
+    )
+
+
+class LabTechMonitorComparerValue(ConnectWiseModel):
+    format: LabTechMonitorComparerValueFormat | None = Field(
+        default=None, alias='Format'
+    )
+    multi_value_format: LabTechMonitorComparerMultiValueFormat | None = Field(
+        default=None, alias='MultiValueFormat'
+    )
+    state_based_value_format: LabTechMonitorComparerStateBasedValueFormat | None = (
+        Field(default=None, alias='StateBasedValueFormat')
+    )
+    single_value_format: LabTechMonitorComparerSingleValueFormat | None = Field(
+        default=None, alias='SingleValueFormat'
+    )
+
+
+class LabTechMonitorComparerStateBasedValueFormat(ConnectWiseModel):
+    normal_comparer: LabTechMonitorComparerSettings | None = Field(
+        default=None, alias='NormalComparer'
+    )
+    warning_comparer: LabTechMonitorComparerSettings | None = Field(
+        default=None, alias='WarningComparer'
+    )
+    error_comparer: LabTechMonitorComparerSettings | None = Field(
+        default=None, alias='ErrorComparer'
+    )
+
+
+class LabTechPatchManagerDevice(ConnectWiseModel):
+    computer_id: int | None = Field(default=None, alias='ComputerId')
+    computer_name: str | None = Field(default=None, alias='ComputerName')
+    stage: LabTechPatchStage | None = Field(default=None, alias='Stage')
+    operating_system_name: str | None = Field(default=None, alias='OperatingSystemName')
+    normalized_operating_system_name: str | None = Field(
+        default=None, alias='NormalizedOperatingSystemName'
+    )
+    company: LabTechClient | None = Field(default=None, alias='Company')
+    site: LabTechLocation | None = Field(default=None, alias='Site')
+    last_microsoft_window: datetime | None = Field(
+        default=None, alias='LastMicrosoftWindow'
+    )
+    last_third_party_window: datetime | None = Field(
+        default=None, alias='LastThirdPartyWindow'
+    )
+    next_microsoft_window: datetime | None = Field(
+        default=None, alias='NextMicrosoftWindow'
+    )
+    next_third_party_window: datetime | None = Field(
+        default=None, alias='NextThirdPartyWindow'
+    )
+    did_last_patch_job_fail: bool | None = Field(
+        default=None, alias='DidLastPatchJobFail'
+    )
+    is_daytime_patching_enabled: bool | None = Field(
+        default=None, alias='IsDaytimePatchingEnabled'
+    )
+    is_missing_baseline: bool | None = Field(default=None, alias='IsMissingBaseline')
+    is_missing_patch_inventory: bool | None = Field(
+        default=None, alias='IsMissingPatchInventory'
+    )
+    is_patch_job_running: bool | None = Field(default=None, alias='IsPatchJobRunning')
+    is_pending_update: bool | None = Field(default=None, alias='IsPendingUpdate')
+    is_reboot_pending: bool | None = Field(default=None, alias='IsRebootPending')
+    is_wsus_enabled: bool | None = Field(default=None, alias='IsWsusEnabled')
+    is_wua_out_of_date: bool | None = Field(default=None, alias='IsWuaOutOfDate')
+    missing_patch_count: int | None = Field(default=None, alias='MissingPatchCount')
+    microsoft_compliance_percent: float | None = Field(
+        default=None, alias='MicrosoftCompliancePercent'
+    )
+    third_party_compliance_percent: float | None = Field(
+        default=None, alias='ThirdPartyCompliancePercent'
+    )
+    has_approved_patches: bool | None = Field(default=None, alias='HasApprovedPatches')
+    has_approved_microsoft_patches: bool | None = Field(
+        default=None, alias='HasApprovedMicrosoftPatches'
+    )
+    has_approved_third_party_patches: bool | None = Field(
+        default=None, alias='HasApprovedThirdPartyPatches'
+    )
+    release_id: int | None = Field(default=None, alias='ReleaseId')
+
+
+class LabTechRetiredAsset(ConnectWiseModel):
+    id: str | None = Field(default=None, alias='Id')
+    client: LabTechClient | None = Field(default=None, alias='Client')
+    location: LabTechLocation | None = Field(default=None, alias='Location')
+    computer_name: str | None = Field(default=None, alias='ComputerName')
+    operating_system_name: str | None = Field(default=None, alias='OperatingSystemName')
+    operating_system_version: str | None = Field(
+        default=None, alias='OperatingSystemVersion'
+    )
+    comment: str | None = Field(default=None, alias='Comment')
+    local_ip_address: str | None = Field(default=None, alias='LocalIPAddress')
+    gateway_ip_address: str | None = Field(default=None, alias='GatewayIPAddress')
+    asset_tag: str | None = Field(default=None, alias='AssetTag')
+    asset_date: datetime | None = Field(default=None, alias='AssetDate')
+    retired_date: datetime | None = Field(default=None, alias='RetiredDate')
+    retire_comment: str | None = Field(default=None, alias='RetireComment')
+    computer_id: str | None = Field(default=None, alias='ComputerId')
+
+
+LabTechQueryOptionExpand.model_rebuild()
+AutomateGroupTreeItem.model_rebuild()
+LabTechNetworkMapNode.model_rebuild()
+LabTechScriptFolder.model_rebuild()
+AutomateScriptFolder.model_rebuild()
+AutomateCommandMenuItemBase1.model_rebuild()
+AutomateAdvancedSearchFilter.model_rebuild()
+AutomateWebExtensionMenuItem.model_rebuild()
+AutomateSearchLookUpBase.model_rebuild()
+LabTechClient.model_rebuild()
+LabTechLocation.model_rebuild()
+LabTechContact.model_rebuild()
+LabTechGroup.model_rebuild()
+LabTechComputer.model_rebuild()
+LabTechMonitorAlertSuspension.model_rebuild()
+LabTechMonitor.model_rebuild()
+LabTechMonitorComparerSettings.model_rebuild()
+LabTechMonitorComparerValue.model_rebuild()
diff --git a/src/pyconnectwise/models/base/connectwise_model.py b/src/pyconnectwise/models/base/connectwise_model.py
index d80229b90..809bcbeae 100644
--- a/src/pyconnectwise/models/base/connectwise_model.py
+++ b/src/pyconnectwise/models/base/connectwise_model.py
@@ -1,11 +1,6 @@
 from __future__ import annotations
 from pydantic import BaseModel, ConfigDict
 from pyconnectwise.utils.naming import to_camel_case
-from typing import Type, Any, TypeVar, get_type_hints
-from typing import ForwardRef
-
-Model = TypeVar("Model", bound="BaseModel")
-
 
 class ConnectWiseModel(BaseModel):
     model_config = ConfigDict(
diff --git a/src/pyconnectwise/models/manage/Agreement.py b/src/pyconnectwise/models/manage/Agreement.py
deleted file mode 100644
index 8f441884a..000000000
--- a/src/pyconnectwise/models/manage/Agreement.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
-
-from __future__ import annotations
-
-from datetime import datetime
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from . import CustomFieldValue
-
-
-class Adjustment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    amount: float | None = None
-    description: str | None = None
-    """
-     Max length: 1000;
-    """
-    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
diff --git a/src/pyconnectwise/models/manage/Campaign/SubType.py b/src/pyconnectwise/models/manage/Campaign/SubType.py
deleted file mode 100644
index aa8121c52..000000000
--- a/src/pyconnectwise/models/manage/Campaign/SubType.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
-
-from __future__ import annotations
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from .. import CampaignTypeReference
-
-
-class CampaignSubType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: CampaignTypeReference | None = None
-    name: str
-    """
-     Max length: 100;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
diff --git a/src/pyconnectwise/models/manage/Campaign/__init__.py b/src/pyconnectwise/models/manage/Campaign/__init__.py
deleted file mode 100644
index 2b95d67d7..000000000
--- a/src/pyconnectwise/models/manage/Campaign/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
diff --git a/src/pyconnectwise/models/manage/Company.py b/src/pyconnectwise/models/manage/Company.py
deleted file mode 100644
index 5ec2ab858..000000000
--- a/src/pyconnectwise/models/manage/Company.py
+++ /dev/null
@@ -1,169 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
-
-from __future__ import annotations
-
-from datetime import datetime
-from uuid import UUID
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from . import (
-    CompanyReference,
-    CompanyTypeReference,
-    ConfigurationQuestion,
-    ConfigurationStatusReference,
-    ConfigurationTypeReference,
-    ContactReference,
-    ContactTypeReference,
-    CustomFieldValue,
-    ManufacturerReference,
-    MemberReference,
-    SiteReference,
-    SLAReference,
-)
-
-
-class CompanyTypeAssociation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: CompanyTypeReference | None = None
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Configuration(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 100;
-    """
-    type: ConfigurationTypeReference | None = None
-    status: ConfigurationStatusReference | None = None
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    site: SiteReference | None = None
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    device_identifier: str | None = Field(default=None, alias='deviceIdentifier')
-    """
-     Max length: 100;
-    """
-    serial_number: str | None = Field(default=None, alias='serialNumber')
-    """
-     Max length: 250;
-    """
-    model_number: str | None = Field(default=None, alias='modelNumber')
-    """
-     Max length: 50;
-    """
-    tag_number: str | None = Field(default=None, alias='tagNumber')
-    """
-     Max length: 50;
-    """
-    purchase_date: datetime | None = Field(default=None, alias='purchaseDate')
-    installation_date: datetime | None = Field(default=None, alias='installationDate')
-    installed_by: MemberReference | None = Field(default=None, alias='installedBy')
-    warranty_expiration_date: datetime | None = Field(
-        default=None, alias='warrantyExpirationDate'
-    )
-    vendor_notes: str | None = Field(default=None, alias='vendorNotes')
-    notes: str | None = None
-    mac_address: str | None = Field(default=None, alias='macAddress')
-    """
-     Max length: 25;
-    """
-    last_login_name: str | None = Field(default=None, alias='lastLoginName')
-    """
-     Max length: 100;
-    """
-    bill_flag: bool | None = Field(default=None, alias='billFlag')
-    backup_successes: int | None = Field(default=None, alias='backupSuccesses')
-    backup_incomplete: int | None = Field(default=None, alias='backupIncomplete')
-    backup_failed: int | None = Field(default=None, alias='backupFailed')
-    backup_restores: int | None = Field(default=None, alias='backupRestores')
-    last_backup_date: datetime | None = Field(default=None, alias='lastBackupDate')
-    backup_server_name: str | None = Field(default=None, alias='backupServerName')
-    """
-     Max length: 50;
-    """
-    backup_billable_space_gb: float | None = Field(
-        default=None, alias='backupBillableSpaceGb'
-    )
-    backup_protected_device_list: str | None = Field(
-        default=None, alias='backupProtectedDeviceList'
-    )
-    backup_year: int | None = Field(default=None, alias='backupYear')
-    backup_month: int | None = Field(default=None, alias='backupMonth')
-    ip_address: str | None = Field(default=None, alias='ipAddress')
-    """
-     Max length: 50;
-    """
-    default_gateway: str | None = Field(default=None, alias='defaultGateway')
-    """
-     Max length: 50;
-    """
-    os_type: str | None = Field(default=None, alias='osType')
-    """
-     Max length: 250;
-    """
-    os_info: str | None = Field(default=None, alias='osInfo')
-    """
-     Max length: 250;
-    """
-    cpu_speed: str | None = Field(default=None, alias='cpuSpeed')
-    """
-     Max length: 100;
-    """
-    ram: str | None = None
-    """
-     Max length: 25;
-    """
-    local_hard_drives: str | None = Field(default=None, alias='localHardDrives')
-    parent_configuration_id: int | None = Field(
-        default=None, alias='parentConfigurationId'
-    )
-    vendor: CompanyReference | None = None
-    manufacturer: ManufacturerReference | None = None
-    questions: list[ConfigurationQuestion] | None = None
-    active_flag: bool | None = Field(default=None, alias='activeFlag')
-    management_link: str | None = Field(default=None, alias='managementLink')
-    """
-     Max length: 1000;
-    """
-    remote_link: str | None = Field(default=None, alias='remoteLink')
-    """
-     Max length: 1000;
-    """
-    sla: SLAReference | None = None
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    display_vendor_flag: bool | None = Field(default=None, alias='displayVendorFlag')
-    company_location_id: int | None = Field(default=None, alias='companyLocationId')
-    show_remote_flag: bool | None = Field(default=None, alias='showRemoteFlag')
-    show_automate_flag: bool | None = Field(default=None, alias='showAutomateFlag')
-    needs_renewal_flag: bool | None = Field(default=None, alias='needsRenewalFlag')
-    manufacturer_part_number: str | None = Field(
-        default=None, alias='manufacturerPartNumber'
-    )
-    """
-     Max length: 50;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
-
-
-class ContactTypeAssociation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: ContactTypeReference | None = None
-    contact: ContactReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
diff --git a/src/pyconnectwise/models/manage/CompanyCompanyTypeAssociation.py b/src/pyconnectwise/models/manage/CompanyCompanyTypeAssociation.py
deleted file mode 100644
index c221c863b..000000000
--- a/src/pyconnectwise/models/manage/CompanyCompanyTypeAssociation.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
-
-from __future__ import annotations
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from . import CompanyReference, CompanyTypeReference
-
-
-class CompanyTypeAssociation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: CompanyTypeReference | None = None
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
diff --git a/src/pyconnectwise/models/manage/ContactContactTypeAssociation.py b/src/pyconnectwise/models/manage/ContactContactTypeAssociation.py
deleted file mode 100644
index be3914de7..000000000
--- a/src/pyconnectwise/models/manage/ContactContactTypeAssociation.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
-
-from __future__ import annotations
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from . import ContactReference, ContactTypeReference
-
-
-class ContactTypeAssociation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: ContactTypeReference | None = None
-    contact: ContactReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
diff --git a/src/pyconnectwise/models/manage/Finance.py b/src/pyconnectwise/models/manage/Finance.py
deleted file mode 100644
index fb4b3e9c4..000000000
--- a/src/pyconnectwise/models/manage/Finance.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
-
-from __future__ import annotations
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from . import CurrencyCodeReference
-
-
-class Currency(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    currency_identifier: str = Field(..., alias='currencyIdentifier')
-    """
-     Max length: 10;
-    """
-    name: str
-    """
-     Max length: 50;
-    """
-    symbol: str | None = None
-    """
-     Max length: 10;
-    """
-    display_id_flag: bool | None = Field(default=None, alias='displayIdFlag')
-    display_symbol_flag: bool | None = Field(default=None, alias='displaySymbolFlag')
-    currency_code: CurrencyCodeReference | None = Field(
-        default=None, alias='currencyCode'
-    )
-    thousands_separator: str | None = Field(default=None, alias='thousandsSeparator')
-    """
-     Max length: 1;
-    """
-    decimal_separator: str | None = Field(default=None, alias='decimalSeparator')
-    """
-     Max length: 1;
-    """
-    negative_parentheses_flag: bool | None = Field(
-        default=None, alias='negativeParenthesesFlag'
-    )
-    right_align: bool | None = Field(default=None, alias='rightAlign')
-    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
-    report_format: str | None = Field(default=None, alias='reportFormat')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
diff --git a/src/pyconnectwise/models/manage/Type/SubType.py b/src/pyconnectwise/models/manage/Type/SubType.py
deleted file mode 100644
index 8a73a95a5..000000000
--- a/src/pyconnectwise/models/manage/Type/SubType.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
-
-from __future__ import annotations
-
-from pydantic import BaseModel, ConfigDict, Field
-
-
-class CampaignSubType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type_id: int | None = Field(default=None, alias='typeId')
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
diff --git a/src/pyconnectwise/models/manage/Type/__init__.py b/src/pyconnectwise/models/manage/Type/__init__.py
deleted file mode 100644
index 2b95d67d7..000000000
--- a/src/pyconnectwise/models/manage/Type/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  All.json
diff --git a/src/pyconnectwise/models/manage/__init__.py b/src/pyconnectwise/models/manage/__init__.py
index d88870c3c..09023d229 100644
--- a/src/pyconnectwise/models/manage/__init__.py
+++ b/src/pyconnectwise/models/manage/__init__.py
@@ -4,54 +4,40 @@
 from __future__ import annotations
 
 from datetime import date, datetime
-from enum import Enum
-from typing import Any
+from typing import Any, Literal
 from uuid import UUID
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import Field
 
+from pyconnectwise.models.base.connectwise_model import ConnectWiseModel
 
-class AccountNumber(Enum):
-    FROM_ = 'From'
-    TO = 'To'
 
-
-class AccountingBatch(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AccountingBatch(ConnectWiseModel):
     id: int | None = None
     batch_identifier: str | None = Field(default=None, alias='batchIdentifier')
     export_invoices_flag: bool | None = Field(default=None, alias='exportInvoicesFlag')
     export_expenses_flag: bool | None = Field(default=None, alias='exportExpensesFlag')
     export_products_flag: bool | None = Field(default=None, alias='exportProductsFlag')
     closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AccountingPackage(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AccountingPackage(ConnectWiseModel):
     id: int | None = None
     identifier: str | None = None
     name: str | None = None
 
 
-class AccountingPackageReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AccountingPackageReference(ConnectWiseModel):
     id: int | None = None
-    identifier: Identifier | None = None
+    identifier: Literal[
+        'QB99', 'Mas200', 'GPlains', 'SBA', 'Mas200v4', 'Other'
+    ] | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AccountingPackageSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AccountingPackageSetup(ConnectWiseModel):
     id: int | None = None
     accounting_package: AccountingPackageReference | None = Field(
         default=None, alias='accountingPackage'
@@ -60,14 +46,18 @@ class AccountingPackageSetup(BaseModel):
     include_invoices_flag: bool | None = Field(
         default=None, alias='includeInvoicesFlag'
     )
-    invoice_format: InvoiceFormat | None = Field(default=None, alias='invoiceFormat')
+    invoice_format: Literal['Default', 'Condensed', 'Detailed'] | None = Field(
+        default=None, alias='invoiceFormat'
+    )
     include_expenses_flag: bool | None = Field(
         default=None, alias='includeExpensesFlag'
     )
     transfer_expenses_as_bill_flag: bool | None = Field(
         default=None, alias='transferExpensesAsBillFlag'
     )
-    expense_format: ExpenseFormat | None = Field(default=None, alias='expenseFormat')
+    expense_format: Literal['Default', 'Condensed'] | None = Field(
+        default=None, alias='expenseFormat'
+    )
     suppress_memo_flag: bool | None = Field(default=None, alias='suppressMemoFlag')
     sync_payment_info_flag: bool | None = Field(
         default=None, alias='syncPaymentInfoFlag'
@@ -99,93 +89,13 @@ class AccountingPackageSetup(BaseModel):
     )
 
 
-class AccrualType(Enum):
-    HOLIDAY = 'Holiday'
-    PTO = 'PTO'
-    SICK = 'Sick'
-    VACATION = 'Vacation'
-
-
-class AccrualType1(Enum):
-    """
-    Available types are: Holiday, PTO, Sick and Vacation.
-    """
-
-    HOLIDAY = 'Holiday'
-    PTO = 'PTO'
-    SICK = 'Sick'
-    VACATION = 'Vacation'
-
-
-class AccrualType2(Enum):
-    HOLIDAY = 'Holiday'
-    PTO = 'PTO'
-    SICK = 'Sick'
-    VACATION = 'Vacation'
-
-
-class Activities(Enum):
-    DISCARD = 'Discard'
-    MERGE = 'Merge'
-
-
-class Activity(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 100;
-    """
-    type: ActivityTypeReference | None = None
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    phone_number: str | None = Field(default=None, alias='phoneNumber')
-    """
-     Max length: 30;
-    """
-    email: str | None = None
-    """
-     Max length: 250;
-    """
-    status: ActivityStatusReference | None = None
-    opportunity: OpportunityReference | None = None
-    ticket: TicketReference | None = None
-    agreement: AgreementReference | None = None
-    campaign: CampaignReference | None = None
-    notes: str | None = None
-    date_start: datetime | None = Field(default=None, alias='dateStart')
-    date_end: datetime | None = Field(default=None, alias='dateEnd')
-    assigned_by: MemberReference | None = Field(default=None, alias='assignedBy')
-    assign_to: MemberReference | None = Field(default=None, alias='assignTo')
-    schedule_status: ScheduleStatusReference | None = Field(
-        default=None, alias='scheduleStatus'
-    )
-    reminder: ReminderReference | None = None
-    where: ServiceLocationReference | None = None
-    notify_flag: bool | None = Field(default=None, alias='notifyFlag')
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    currency: CurrencyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
-
-
-class ActivityReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ActivityReference(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ActivityStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ActivityStatus(ConnectWiseModel):
     id: int | None = None
     name: str
     """
@@ -195,62 +105,23 @@ class ActivityStatus(BaseModel):
     inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
     spawn_followup_flag: bool | None = Field(default=None, alias='spawnFollowupFlag')
     closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ActivityStatusInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ActivityStatusInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
     inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
     closed_flag: bool | None = Field(default=None, alias='closedFlag')
     default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ActivityStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ActivityStopwatch(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    activity_id: int = Field(..., alias='activityId')
-    activity_mobile_guid: UUID | None = Field(default=None, alias='activityMobileGuid')
-    agreement: AgreementReference | None = None
-    billable_option: BillableOption | None = Field(default=None, alias='billableOption')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    date_entered: datetime | None = Field(default=None, alias='dateEntered')
-    end_time: datetime | None = Field(default=None, alias='endTime')
-    id: int | None = None
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    location_id: int | None = Field(default=None, alias='locationId')
-    member: MemberReference | None = None
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    notes: str | None = None
-    """
-     Max length: 4000;
-    """
-    start_time: datetime | None = Field(default=None, alias='startTime')
-    status: Status
-    total_pause_time: int | None = Field(default=None, alias='totalPauseTime')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ActivityStatusReference(ActivityReference):
+    pass
 
 
-class ActivityType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ActivityType(ConnectWiseModel):
     id: int | None = None
     name: str
     """
@@ -262,84 +133,14 @@ class ActivityType(BaseModel):
     email_flag: bool | None = Field(default=None, alias='emailFlag')
     memo_flag: bool | None = Field(default=None, alias='memoFlag')
     history_flag: bool | None = Field(default=None, alias='historyFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ActivityTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class AddLevel(Enum):
-    NONE = 'None'
-    MY = 'My'
-    ALL = 'All'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Addition(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    product: IvItemReference | None = None
-    quantity: float | None = None
-    less_included: float | None = Field(default=None, alias='lessIncluded')
-    unit_price: float | None = Field(default=None, alias='unitPrice')
-    unit_cost: float | None = Field(default=None, alias='unitCost')
-    bill_customer: BillCustomer = Field(..., alias='billCustomer')
-    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
-    cancelled_date: datetime | None = Field(default=None, alias='cancelledDate')
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    serial_number: str | None = Field(default=None, alias='serialNumber')
-    """
-     Max length: 50;
-    """
-    invoice_description: str | None = Field(default=None, alias='invoiceDescription')
-    """
-     Max length: 6000;
-    """
-    purchase_item_flag: bool | None = Field(default=None, alias='purchaseItemFlag')
-    special_order_flag: bool | None = Field(default=None, alias='specialOrderFlag')
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    description: str | None = None
-    billed_quantity: float | None = Field(default=None, alias='billedQuantity')
-    uom: str | None = None
-    ext_price: float | None = Field(default=None, alias='extPrice')
-    ext_cost: float | None = Field(default=None, alias='extCost')
-    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
-    margin: float | None = None
-    prorate_cost: float | None = Field(default=None, alias='prorateCost')
-    prorate_price: float | None = Field(default=None, alias='proratePrice')
-    extended_prorate_cost: float | None = Field(
-        default=None, alias='extendedProrateCost'
-    )
-    extended_prorate_price: float | None = Field(
-        default=None, alias='extendedProratePrice'
-    )
-    prorate_current_period_flag: bool | None = Field(
-        default=None, alias='prorateCurrentPeriodFlag'
-    )
-    opportunity: OpportunityReference | None = None
-    agreement_status: AgreementStatus | None = Field(
-        default=None, alias='agreementStatus'
-    )
-    invoice_grouping: InvoiceGroupingReference | None = Field(
-        default=None, alias='invoiceGrouping'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
+class ActivityTypeReference(ActivityReference):
+    pass
 
 
-class AddressFormat(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AddressFormat(ConnectWiseModel):
     id: int | None = None
     name: str
     """
@@ -353,75 +154,29 @@ class AddressFormat(BaseModel):
     country_ids: list[int] | None = Field(default=None, alias='countryIds')
     add_all_countries: bool | None = Field(default=None, alias='addAllCountries')
     remove_all_countries: bool | None = Field(default=None, alias='removeAllCountries')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AddressFormatInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AddressFormatInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
     default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class AddressFormatReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AdjustmentDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
-    description: str | None = None
-    """
-     Max length: 50;
-    """
-    quantity_on_hand: float | None = Field(default=None, alias='quantityOnHand')
-    unit_cost: float | None = Field(default=None, alias='unitCost')
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
-    )
-    quantity_adjusted: int = Field(..., alias='quantityAdjusted')
-    serial_number: str | None = Field(default=None, alias='serialNumber')
-    """
-     Max length: 1000;
-    """
-    adjustment: AdjustmentReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class AddressFormatReference(ActivityReference):
+    pass
 
 
-class AdjustmentDetailReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class AdjustmentDetailReference(ActivityReference):
+    pass
 
 
-class AdjustmentReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class AdjustmentReference(ActivityReference):
+    pass
 
 
-class AdjustmentType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AdjustmentType(ConnectWiseModel):
     id: int | None = None
     identifier: str
     """
@@ -434,9839 +189,8530 @@ class AdjustmentType(BaseModel):
     audit_trail_flag: bool | None = Field(default=None, alias='auditTrailFlag')
     date_created: datetime | None = Field(default=None, alias='dateCreated')
     created_by: str | None = Field(default=None, alias='createdBy')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AdjustmentTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AdjustmentTypeInfo(ActivityReference):
+    pass
+
+
+class AdjustmentTypeReference(ConnectWiseModel):
     id: int | None = None
+    identifier: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class AgreementApplicationAviablePer(ConnectWiseModel):
+    id: int | None = None
+    tag: str | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AdjustmentTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AgreementApplicationBillingCycle(AgreementApplicationAviablePer):
+    pass
+
+
+class AgreementApplicationLimit(AgreementApplicationAviablePer):
+    pass
+
+
+class AgreementApplicationUnit(AgreementApplicationAviablePer):
+    pass
+
+
+class AgreementBatchSetup(ConnectWiseModel):
     id: int | None = None
-    identifier: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    next_run_date: datetime = Field(..., alias='nextRunDate')
+    days_in_advance: int = Field(..., alias='daysInAdvance')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class AgreementBillingInfo(ConnectWiseModel):
+    agreement_name: str | None = Field(default=None, alias='agreementName')
+    agreement_type: str | None = Field(default=None, alias='agreementType')
+    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
+    agreement_rec_id: int | None = Field(default=None, alias='agreementRecId')
+    parent_rec_id: int | None = Field(default=None, alias='parentRecId')
 
 
-class Agreement(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class AgreementRecap(ConnectWiseModel):
+    id: int | None = None
+    adjustment_amount: float | None = Field(default=None, alias='adjustmentAmount')
+    agreement_status: str | None = Field(default=None, alias='agreementStatus')
+    name: str | None = None
+    available_amount: float | None = Field(default=None, alias='availableAmount')
+    company_name: str | None = Field(default=None, alias='companyName')
+    is_unlimited: str | None = Field(default=None, alias='isUnlimited')
+    last_invoice_amount: str | None = Field(default=None, alias='lastInvoiceAmount')
+    last_invoice_date: str | None = Field(default=None, alias='lastInvoiceDate')
+    last_invoice_number: str | None = Field(default=None, alias='lastInvoiceNumber')
+    next_invoice_amount: float | None = Field(default=None, alias='nextInvoiceAmount')
+    next_invoice_date: str | None = Field(default=None, alias='nextInvoiceDate')
+    overrun_amount: float | None = Field(default=None, alias='overrunAmount')
+    remaining_amount: float | None = Field(default=None, alias='remainingAmount')
+    starting_amount: float | None = Field(default=None, alias='startingAmount')
+    unbilled_overage_amount: float | None = Field(
+        default=None, alias='unbilledOverageAmount'
     )
+    unbilled_periods: int | None = Field(default=None, alias='unbilledPeriods')
+    used_amount: float | None = Field(default=None, alias='usedAmount')
+
+
+class AgreementReference(ConnectWiseModel):
     id: int | None = None
-    name: str
-    """
-     Max length: 100;
-    """
-    type: AgreementTypeReference | None = None
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    site: SiteReference | None = None
-    sub_contract_company: CompanyReference | None = Field(
-        default=None, alias='subContractCompany'
+    name: str | None = None
+    type: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class AgreementRevenueReference(ConnectWiseModel):
+    id: int | None = None
+    revenue: float | None = None
+    cost: float | None = None
+    margin: float | None = None
+    percentage: float | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class AgreementTypeInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    application_units: Literal['Amount', 'Hours', 'Incidents'] | None = Field(
+        default=None, alias='applicationUnits'
     )
-    sub_contract_contact: ContactReference | None = Field(
-        default=None, alias='subContractContact'
-    )
-    parent_agreement: AgreementReference | None = Field(
-        default=None, alias='parentAgreement'
-    )
-    customer_po: str | None = Field(default=None, alias='customerPO')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class AgreementTypeReference(ActivityReference):
+    pass
+
+
+class AllowedFileType(ConnectWiseModel):
+    id: int | None = None
+    file_type: str = Field(..., alias='fileType')
+    size_limit: int | None = Field(default=None, alias='sizeLimit')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class AllowedOrigin(ConnectWiseModel):
+    id: int | None = None
+    origin: str
     """
-     Max length: 50;
+     Max length: 2000;
     """
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    restrict_location_flag: bool | None = Field(
-        default=None, alias='restrictLocationFlag'
-    )
-    restrict_department_flag: bool | None = Field(
-        default=None, alias='restrictDepartmentFlag'
-    )
-    start_date: datetime | None = Field(default=None, alias='startDate')
-    end_date: datetime | None = Field(default=None, alias='endDate')
-    no_ending_date_flag: bool | None = Field(default=None, alias='noEndingDateFlag')
-    opportunity: OpportunityReference | None = None
-    cancelled_flag: bool | None = Field(default=None, alias='cancelledFlag')
-    date_cancelled: datetime | None = Field(default=None, alias='dateCancelled')
-    reason_cancelled: str | None = Field(default=None, alias='reasonCancelled')
+    description: str
     """
-     Max length: 100;
+     Max length: 2000;
     """
-    sla: SLAReference | None = None
-    work_order: str | None = Field(default=None, alias='workOrder')
+    last_update_utc: datetime | None = Field(default=None, alias='lastUpdateUtc')
+    updated_by: str | None = Field(default=None, alias='updatedBy')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class AuditTrailEntry(ConnectWiseModel):
+    text: str | None = None
+    entered_date: str | None = Field(default=None, alias='enteredDate')
+    entered_by: str | None = Field(default=None, alias='enteredBy')
+    audit_type: str | None = Field(default=None, alias='auditType')
+    audit_sub_type: str | None = Field(default=None, alias='auditSubType')
+    audit_source: str | None = Field(default=None, alias='auditSource')
+
+
+class AuthAnvil(ConnectWiseModel):
+    id: int | None = None
+    server_location_url: str = Field(..., alias='serverLocationUrl')
+    site_id: int = Field(..., alias='siteId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class AutomateScriptReference(ActivityReference):
+    pass
+
+
+class BillingCycle(ConnectWiseModel):
+    id: int | None = None
+    identifier: str
     """
-     Max length: 20;
+     Max length: 5;
     """
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    application_units: ApplicationUnits | None = Field(
-        default=None, alias='applicationUnits'
-    )
-    application_limit: float | None = Field(default=None, alias='applicationLimit')
-    application_cycle: ApplicationCycle | None = Field(
-        default=None, alias='applicationCycle'
-    )
-    application_unlimited_flag: bool | None = Field(
-        default=None, alias='applicationUnlimitedFlag'
-    )
-    one_time_flag: bool | None = Field(default=None, alias='oneTimeFlag')
-    cover_agreement_time: bool | None = Field(default=None, alias='coverAgreementTime')
-    cover_agreement_product: bool | None = Field(
-        default=None, alias='coverAgreementProduct'
-    )
-    cover_agreement_expense: bool | None = Field(
-        default=None, alias='coverAgreementExpense'
-    )
-    cover_sales_tax: bool | None = Field(default=None, alias='coverSalesTax')
-    carry_over_unused: bool | None = Field(default=None, alias='carryOverUnused')
-    allow_overruns: bool | None = Field(default=None, alias='allowOverruns')
-    expired_days: int | None = Field(default=None, alias='expiredDays')
-    limit: int | None = None
-    expire_when_zero: bool | None = Field(default=None, alias='expireWhenZero')
-    charge_to_firm: bool | None = Field(default=None, alias='chargeToFirm')
-    employee_comp_rate: EmployeeCompRate | None = Field(
-        default=None, alias='employeeCompRate'
-    )
+    name: str
     """
-     Required On Updates;
+     Max length: 50;
     """
-    employee_comp_not_exceed: EmployeeCompNotExceed | None = Field(
-        default=None, alias='employeeCompNotExceed'
-    )
-    comp_hourly_rate: float | None = Field(default=None, alias='compHourlyRate')
-    comp_limit_amount: float | None = Field(default=None, alias='compLimitAmount')
-    billing_cycle: BillingCycleReference | None = Field(
-        default=None, alias='billingCycle'
-    )
-    bill_one_time_flag: bool | None = Field(default=None, alias='billOneTimeFlag')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
-    )
-    invoicing_cycle: InvoicingCycle | None = Field(default=None, alias='invoicingCycle')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    billing_options: Literal[
+        'BiMonthly',
+        'BiWeekly',
+        'Monthly',
+        'NotRecurring',
+        'Quarterly',
+        'SemiAnnual',
+        'Weekly',
+        'Yearly',
+    ] = Field(..., alias='billingOptions')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BillingCycleInfo(AddressFormatInfo):
+    pass
+
+
+class BillingCycleReference(ActivityReference):
+    pass
+
+
+class BillingDeliveryReference(ActivityReference):
+    pass
+
+
+class BillingSetupReference(ActivityReference):
+    pass
+
+
+class BillingStatus(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Required On Updates;
+     Max length: 30;
     """
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
-    )
-    bill_to_contact: ContactReference | None = Field(
-        default=None, alias='billToContact'
-    )
-    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
-    bill_amount: float | None = Field(default=None, alias='billAmount')
-    taxable: bool | None = None
-    prorate_first_bill: float | None = Field(default=None, alias='prorateFirstBill')
-    bill_start_date: datetime | None = Field(default=None, alias='billStartDate')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    restrict_down_payment: bool | None = Field(
-        default=None, alias='restrictDownPayment'
-    )
-    prorate_flag: bool | None = Field(default=None, alias='prorateFlag')
-    invoice_prorated_additions_flag: bool | None = Field(
-        default=None, alias='invoiceProratedAdditionsFlag'
-    )
-    invoice_description: str | None = Field(default=None, alias='invoiceDescription')
-    top_comment: bool | None = Field(default=None, alias='topComment')
-    bottom_comment: bool | None = Field(default=None, alias='bottomComment')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    project_type: ProjectTypeReference | None = Field(default=None, alias='projectType')
-    invoice_template: InvoiceTemplateReference | None = Field(
-        default=None, alias='invoiceTemplate'
-    )
-    bill_time: BillTime | None = Field(default=None, alias='billTime')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    sent_flag: bool | None = Field(default=None, alias='sentFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BillingStatusInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BillingStatusReference(ActivityReference):
+    pass
+
+
+class BillingTerm(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Required On Updates;
+     Max length: 50;
     """
-    bill_expenses: BillExpenses | None = Field(default=None, alias='billExpenses')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    due_days: int = Field(..., alias='dueDays')
+    terms_xref: str | None = Field(default=None, alias='termsXref')
     """
-     Required On Updates;
+     Max length: 50;
     """
-    bill_products: BillProducts | None = Field(default=None, alias='billProducts')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BillingTermInfo(ActivityReference):
+    pass
+
+
+class BillingTermsReference(ActivityReference):
+    pass
+
+
+class BoardCopy(ConnectWiseModel):
+    id: int
+    name: str
     """
-     Required On Updates;
+     Max length: 50;
     """
-    billable_time_invoice: bool | None = Field(
-        default=None, alias='billableTimeInvoice'
-    )
-    billable_expense_invoice: bool | None = Field(
-        default=None, alias='billableExpenseInvoice'
-    )
-    billable_product_invoice: bool | None = Field(
-        default=None, alias='billableProductInvoice'
-    )
-    currency: CurrencyReference | None = None
-    period_type: PeriodType | None = Field(default=None, alias='periodType')
-    auto_invoice_flag: bool | None = Field(default=None, alias='autoInvoiceFlag')
-    next_invoice_date: str | None = Field(default=None, alias='nextInvoiceDate')
-    company_location: SystemLocationReference | None = Field(
-        default=None, alias='companyLocation'
-    )
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
-    )
-    ship_to_contact: ContactReference | None = Field(
-        default=None, alias='shipToContact'
-    )
-    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
-    agreement_status: AgreementStatus | None = Field(
-        default=None, alias='agreementStatus'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
 
 
-class AgreementApplicationAviablePer(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BoardExcludedMember(ConnectWiseModel):
+    id: int | None = None
+    member_id: int | None = Field(default=None, alias='memberId')
+    board_id: int | None = Field(default=None, alias='boardId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BoardReference(ActivityReference):
+    pass
+
+
+class BoardStatusInfo(ConnectWiseModel):
     id: int | None = None
-    tag: str | None = None
     name: str | None = None
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementApplicationBillingCycle(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class BoardSubType(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 50;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    type_association_ids: list[int] | None = Field(
+        default=None, alias='typeAssociationIds'
     )
+    add_all_types_flag: bool | None = Field(default=None, alias='addAllTypesFlag')
+    remove_all_types_flag: bool | None = Field(default=None, alias='removeAllTypesFlag')
+    board: BoardReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BoardSubTypeInfo(ConnectWiseModel):
     id: int | None = None
-    tag: str | None = None
     name: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    type_association_ids: list[int] | None = Field(
+        default=None, alias='typeAssociationIds'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementApplicationLimit(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BoardTeamInfo(ActivityReference):
+    pass
+
+
+class BoardTypeInfo(ConnectWiseModel):
     id: int | None = None
-    tag: str | None = None
     name: str | None = None
+    board: BoardReference | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementApplicationParameters(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    application_unit: AgreementApplicationUnit | None = Field(
-        default=None, alias='applicationUnit'
-    )
-    application_limit: AgreementApplicationLimit | None = Field(
-        default=None, alias='applicationLimit'
-    )
-    application_limit_amount: float | None = Field(
-        default=None, alias='applicationLimitAmount'
-    )
-    available_per: AgreementApplicationAviablePer | None = Field(
-        default=None, alias='availablePer'
-    )
-    covers_time_flag: bool | None = Field(default=None, alias='coversTimeFlag')
-    covers_expenses_flag: bool | None = Field(default=None, alias='coversExpensesFlag')
-    covers_products_flag: bool | None = Field(default=None, alias='coversProductsFlag')
-    covers_tax_flag: bool | None = Field(default=None, alias='coversTaxFlag')
-    carryover_unused_flag: bool | None = Field(
-        default=None, alias='carryoverUnusedFlag'
-    )
-    carry_over_days: int | None = Field(default=None, alias='carryOverDays')
-    allow_overruns_flag: bool | None = Field(default=None, alias='allowOverrunsFlag')
-    overrun_limit: int | None = Field(default=None, alias='overrunLimit')
-    agreement_expires_flag: bool | None = Field(
-        default=None, alias='agreementExpiresFlag'
-    )
-    charge_adjustments_flag: bool | None = Field(
-        default=None, alias='chargeAdjustmentsFlag'
-    )
-    prepay_flag: bool | None = Field(default=None, alias='prepayFlag')
-    agr_billing_cycle: AgreementApplicationBillingCycle | None = Field(
-        default=None, alias='agrBillingCycle'
-    )
-    user_defined_field_values: list[UserDefinedFieldValueModel] | None = Field(
-        default=None, alias='userDefinedFieldValues'
-    )
+class CalendarInfo(ActivityReference):
+    pass
 
 
-class AgreementApplicationUnit(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CalendarReference(ActivityReference):
+    pass
+
+
+class CalendarSetupReference(ConnectWiseModel):
     id: int | None = None
-    tag: str | None = None
-    name: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementBatchSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class CallbackEntry(ConnectWiseModel):
+    id: int | None = None
+    description: str | None = None
+    """
+     Max length: 100;
+    """
+    url: str | None = None
+    """
+     Required Reference
+    """
+    object_id: int | None = Field(default=None, alias='objectId')
+    """
+     Required Reference
+    """
+    type: str | None = None
+    """
+     Required Reference
+    """
+    level: str | None = None
+    """
+     Required Reference
+    """
+    member_id: int | None = Field(default=None, alias='memberId')
+    payload_version: str | None = Field(default=None, alias='payloadVersion')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    is_soap_callback_flag: bool | None = Field(default=None, alias='isSoapCallbackFlag')
+    is_self_suppressed_flag: bool | None = Field(
+        default=None, alias='isSelfSuppressedFlag'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CampaignReference(ActivityReference):
+    pass
+
+
+class CampaignStatus(ConnectWiseModel):
     id: int | None = None
-    next_run_date: datetime = Field(..., alias='nextRunDate')
-    days_in_advance: int = Field(..., alias='daysInAdvance')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str
+    """
+     Max length: 100;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementBillingInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    agreement_name: str | None = Field(default=None, alias='agreementName')
-    agreement_type: str | None = Field(default=None, alias='agreementType')
-    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
-    agreement_rec_id: int | None = Field(default=None, alias='agreementRecId')
-    parent_rec_id: int | None = Field(default=None, alias='parentRecId')
+class CampaignStatusReference(ActivityReference):
+    pass
 
 
-class AgreementInvoicingDisplayOptions(Enum):
-    REMAIN_ON_INVOICING_SCREEN = 'RemainOnInvoicingScreen'
-    SHOW_RECENT_INVOICES = 'ShowRecentInvoices'
+class CampaignSubTypeReference(ActivityReference):
+    pass
 
 
-class AgreementRecap(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CampaignType(ConnectWiseModel):
     id: int | None = None
-    adjustment_amount: float | None = Field(default=None, alias='adjustmentAmount')
-    agreement_status: str | None = Field(default=None, alias='agreementStatus')
-    name: str | None = None
-    available_amount: float | None = Field(default=None, alias='availableAmount')
-    company_name: str | None = Field(default=None, alias='companyName')
-    is_unlimited: str | None = Field(default=None, alias='isUnlimited')
-    last_invoice_amount: str | None = Field(default=None, alias='lastInvoiceAmount')
-    last_invoice_date: str | None = Field(default=None, alias='lastInvoiceDate')
-    last_invoice_number: str | None = Field(default=None, alias='lastInvoiceNumber')
-    next_invoice_amount: float | None = Field(default=None, alias='nextInvoiceAmount')
-    next_invoice_date: str | None = Field(default=None, alias='nextInvoiceDate')
-    overrun_amount: float | None = Field(default=None, alias='overrunAmount')
-    remaining_amount: float | None = Field(default=None, alias='remainingAmount')
-    starting_amount: float | None = Field(default=None, alias='startingAmount')
-    unbilled_overage_amount: float | None = Field(
-        default=None, alias='unbilledOverageAmount'
-    )
-    unbilled_periods: int | None = Field(default=None, alias='unbilledPeriods')
-    used_amount: float | None = Field(default=None, alias='usedAmount')
+    name: str
+    """
+     Max length: 100;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementRecurringParameters(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    billing_cycle: GenericNameIdDTO | None = Field(default=None, alias='billingCycle')
-    cycle_base: GenericNameIdDTO | None = Field(default=None, alias='cycleBase')
-    a_gr_amount: float | None = Field(default=None, alias='aGRAmount')
-    taxable: bool | None = None
-    children_amount: float | None = Field(default=None, alias='childrenAmount')
-    additions_amount: float | None = Field(default=None, alias='additionsAmount')
-    total_amount: float | None = Field(default=None, alias='totalAmount')
-    a_gr_prorate: float | None = Field(default=None, alias='aGRProrate')
-    bill_start_date: str | None = Field(default=None, alias='billStartDate')
-    tax_code: GenericNameIdDTO | None = Field(default=None, alias='taxCode')
-    terms: GenericNameIdDTO | None = None
-    prorate_flag: bool | None = Field(default=None, alias='prorateFlag')
-    invoice_prorated_additions_flag: bool | None = Field(
-        default=None, alias='invoiceProratedAdditionsFlag'
-    )
-    restrict_downpayment: bool | None = Field(default=None, alias='restrictDownpayment')
-    currency: GenericNameIdDTO | None = None
-    auto_invoice_flag: bool | None = Field(default=None, alias='autoInvoiceFlag')
-    user_defined_field_values: list[UserDefinedFieldValueModel] | None = Field(
-        default=None, alias='userDefinedFieldValues'
-    )
+class CampaignTypeInfo(ActivityReference):
+    pass
+
+
+class CampaignTypeReference(ActivityReference):
+    pass
 
 
-class AgreementReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class CatalogItemInfo(ConnectWiseModel):
+    id: int | None = None
+    identifier: str | None = None
+    description: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    product_class: Literal[
+        'Agreement', 'Bundle', 'Inventory', 'NonInventory', 'Service'
+    ] | None = Field(default=None, alias='productClass')
+    serialized_cost_flag: bool | None = Field(default=None, alias='serializedCostFlag')
+    price: float | None = None
+    cost: float | None = None
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    drop_ship_flag: bool | None = Field(default=None, alias='dropShipFlag')
+    special_order_flag: bool | None = Field(default=None, alias='specialOrderFlag')
+    customer_description: str | None = Field(default=None, alias='customerDescription')
+    manufacturer_part_number: str | None = Field(
+        default=None, alias='manufacturerPartNumber'
     )
+    vendor_sku: str | None = Field(default=None, alias='vendorSku')
+    billable_option: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billableOption')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CatalogItemReference(ConnectWiseModel):
     id: int | None = None
+    identifier: str | None = None
     name: str | None = None
-    type: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Category(ConnectWiseModel):
     id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str
+    """
+     Max length: 50;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
+    """
+     Max length: 10;
+    """
+    integration_xref: str | None = Field(default=None, alias='integrationXref')
+    """
+     Max length: 50;
+    """
+    location_ids: list[int] | None = Field(default=None, alias='locationIds')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    add_all_locations: bool | None = Field(default=None, alias='addAllLocations')
+    remove_all_locations: bool | None = Field(default=None, alias='removeAllLocations')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementSite(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CategoryInfo(ConnectWiseModel):
     id: int | None = None
-    company: CompanyReference | None = None
-    site: SiteReference | None = None
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
+    name: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementStatus(Enum):
-    ACTIVE = 'Active'
-    CANCELLED = 'Cancelled'
-    EXPIRED = 'Expired'
-    INACTIVE = 'Inactive'
+class CertificationReference(ActivityReference):
+    pass
 
 
-class AgreementType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ChargeCodeReference(ActivityReference):
+    pass
+
+
+class Classification(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    multiplier: float | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    company_flag: bool | None = Field(default=None, alias='companyFlag')
+    employee_flag: bool | None = Field(default=None, alias='employeeFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ClassificationReference(ActivityReference):
+    pass
+
+
+class ClosedInvoice(ConnectWiseModel):
+    id: int | None = None
+    status: BillingStatusReference | None = None
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Code(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 50;
     """
-    prefix_suffix_option: PrefixSuffixOption | None = Field(
-        default=None, alias='prefixSuffixOption'
-    )
+    description: str
+    board_id: int | None = Field(default=None, alias='boardId')
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CommunicationType(ConnectWiseModel):
+    id: int | None = None
+    description: str
+    phone_flag: bool | None = Field(default=None, alias='phoneFlag')
+    """
+    Gets or sets at least one flag is required to be true -- phone, fax, or email.
+    """
+    fax_flag: bool | None = Field(default=None, alias='faxFlag')
+    """
+    Gets or sets at least one flag is required to be true -- phone, fax, or email.
+    """
+    email_flag: bool | None = Field(default=None, alias='emailFlag')
+    """
+    Gets or sets at least one flag is required to be true -- phone, fax, or email.
+    """
     default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    pre_payment_flag: bool | None = Field(default=None, alias='prePaymentFlag')
-    invoice_pre_suffix: str | None = Field(default=None, alias='invoicePreSuffix')
+    exchange_xref: str | None = Field(default=None, alias='exchangeXref')
     """
-     Max length: 5;
+     Max length: 50;
     """
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    restrict_location_flag: bool | None = Field(
-        default=None, alias='restrictLocationFlag'
-    )
-    restrict_department_flag: bool | None = Field(
-        default=None, alias='restrictDepartmentFlag'
-    )
-    sla: SLAReference | None = None
-    application_units: ApplicationUnits | None = Field(
-        default=None, alias='applicationUnits'
-    )
-    application_limit: float | None = Field(default=None, alias='applicationLimit')
-    application_cycle: ApplicationCycle | None = Field(
-        default=None, alias='applicationCycle'
-    )
-    application_unlimited_flag: bool | None = Field(
-        default=None, alias='applicationUnlimitedFlag'
-    )
-    one_time_flag: bool | None = Field(default=None, alias='oneTimeFlag')
-    cover_agreement_time_flag: bool | None = Field(
-        default=None, alias='coverAgreementTimeFlag'
-    )
-    cover_agreement_product_flag: bool | None = Field(
-        default=None, alias='coverAgreementProductFlag'
-    )
-    cover_agreement_expense_flag: bool | None = Field(
-        default=None, alias='coverAgreementExpenseFlag'
+    iphone_xref: str | None = Field(default=None, alias='iphoneXref')
+    """
+     Max length: 50;
+    """
+    android_xref: str | None = Field(default=None, alias='androidXref')
+    """
+     Max length: 50;
+    """
+    google_xref: str | None = Field(default=None, alias='googleXref')
+    """
+     Max length: 50;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CommunicationTypeInfo(ConnectWiseModel):
+    id: int | None = None
+    description: str | None = None
+    phone_flag: bool | None = Field(default=None, alias='phoneFlag')
+    fax_flag: bool | None = Field(default=None, alias='faxFlag')
+    email_flag: bool | None = Field(default=None, alias='emailFlag')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CommunicationTypeReference(ActivityReference):
+    pass
+
+
+class CompanyMerge(ConnectWiseModel):
+    to_company_id: int = Field(..., alias='toCompanyId')
+    name: Literal['From', 'To'] | None = None
+    identifier: Literal['From', 'To'] | None = None
+    status: Literal['From', 'To'] | None = None
+    type: Literal['From', 'To'] | None = None
+    primary_address: Literal['From', 'To'] | None = Field(
+        default=None, alias='primaryAddress'
+    )
+    primary_contact: Literal['From', 'To'] | None = Field(
+        default=None, alias='primaryContact'
+    )
+    phone: Literal['From', 'To'] | None = None
+    fax: Literal['From', 'To'] | None = None
+    website: Literal['From', 'To'] | None = None
+    market: Literal['From', 'To'] | None = None
+    territory: Literal['From', 'To'] | None = None
+    revenue: Literal['From', 'To'] | None = None
+    revenue_year: Literal['From', 'To'] | None = Field(
+        default=None, alias='revenueYear'
+    )
+    number_of_employees: Literal['From', 'To'] | None = Field(
+        default=None, alias='numberOfEmployees'
     )
-    cover_sales_tax_flag: bool | None = Field(default=None, alias='coverSalesTaxFlag')
-    carry_over_unused_flag: bool | None = Field(
-        default=None, alias='carryOverUnusedFlag'
+    sic_code: Literal['From', 'To'] | None = Field(default=None, alias='sicCode')
+    date_acquired: Literal['From', 'To'] | None = Field(
+        default=None, alias='dateAcquired'
     )
-    allow_overruns_flag: bool | None = Field(default=None, alias='allowOverrunsFlag')
-    expired_days: int | None = Field(default=None, alias='expiredDays')
-    limit: int | None = None
-    expire_when_zero: bool | None = Field(default=None, alias='expireWhenZero')
-    charge_to_firm_flag: bool | None = Field(default=None, alias='chargeToFirmFlag')
-    employee_comp_rate: EmployeeCompRate1 = Field(..., alias='employeeCompRate')
-    employee_comp_not_exceed: EmployeeCompNotExceed = Field(
-        ..., alias='employeeCompNotExceed'
+    time_zone: Literal['From', 'To'] | None = Field(default=None, alias='timeZone')
+    source_list: Literal['From', 'To'] | None = Field(default=None, alias='sourceList')
+    user_defined_field1: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField1'
     )
-    comp_hourly_rate: float | None = Field(default=None, alias='compHourlyRate')
-    comp_limit_amount: float | None = Field(default=None, alias='compLimitAmount')
-    billing_cycle: BillingCycleReference | None = Field(
-        default=None, alias='billingCycle'
+    user_defined_field2: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField2'
     )
-    bill_one_time_flag: bool | None = Field(default=None, alias='billOneTimeFlag')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
+    user_defined_field3: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField3'
     )
-    invoicing_cycle: InvoicingCycle1 = Field(..., alias='invoicingCycle')
-    bill_amount: float | None = Field(default=None, alias='billAmount')
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    restrict_down_payment_flag: bool | None = Field(
-        default=None, alias='restrictDownPaymentFlag'
+    user_defined_field4: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField4'
     )
-    invoice_description: str | None = Field(default=None, alias='invoiceDescription')
-    """
-     Max length: 4000;
-    """
-    top_comment_flag: bool | None = Field(default=None, alias='topCommentFlag')
-    bottom_comment_flag: bool | None = Field(default=None, alias='bottomCommentFlag')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    project_type: ProjectTypeReference | None = Field(default=None, alias='projectType')
-    invoice_template: InvoiceTemplateReference | None = Field(
-        default=None, alias='invoiceTemplate'
+    user_defined_field5: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField5'
     )
-    bill_time: BillTime1 = Field(..., alias='billTime')
-    bill_expenses: BillExpenses1 = Field(..., alias='billExpenses')
-    bill_products: BillProducts1 = Field(..., alias='billProducts')
-    billable_time_invoice_flag: bool | None = Field(
-        default=None, alias='billableTimeInvoiceFlag'
+    user_defined_field6: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField6'
     )
-    billable_expense_invoice_flag: bool | None = Field(
-        default=None, alias='billableExpenseInvoiceFlag'
+    user_defined_field7: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField7'
     )
-    billable_product_invoice_flag: bool | None = Field(
-        default=None, alias='billableProductInvoiceFlag'
+    user_defined_field8: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField8'
     )
-    copy_work_roles_flag: bool | None = Field(default=None, alias='copyWorkRolesFlag')
-    copy_work_types_flag: bool | None = Field(default=None, alias='copyWorkTypesFlag')
-    exclusion_work_role_ids: list[int] | None = Field(
-        default=None, alias='exclusionWorkRoleIds'
+    user_defined_field9: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField9'
     )
-    add_all_work_role_exclusions: bool | None = Field(
-        default=None, alias='addAllWorkRoleExclusions'
+    user_defined_field10: Literal['From', 'To'] | None = Field(
+        default=None, alias='userDefinedField10'
     )
-    remove_all_work_role_exclusions: bool | None = Field(
-        default=None, alias='removeAllWorkRoleExclusions'
+    billing_address: Literal['From', 'To'] | None = Field(
+        default=None, alias='billingAddress'
     )
-    exclusion_work_type_ids: list[int] | None = Field(
-        default=None, alias='exclusionWorkTypeIds'
+    billing_contact: Literal['From', 'To'] | None = Field(
+        default=None, alias='billingContact'
     )
-    add_all_work_type_exclusions: bool | None = Field(
-        default=None, alias='addAllWorkTypeExclusions'
+    tax_code: Literal['From', 'To'] | None = Field(default=None, alias='taxCode')
+    account_number: Literal['From', 'To'] | None = Field(
+        default=None, alias='accountNumber'
     )
-    remove_all_work_type_exclusions: bool | None = Field(
-        default=None, alias='removeAllWorkTypeExclusions'
+    billing_terms: Literal['From', 'To'] | None = Field(
+        default=None, alias='billingTerms'
     )
-    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
+    notes: Literal['Discard', 'Merge'] | None = None
+    sites: Literal['Discard', 'Merge'] | None = None
+    activities: Literal['Discard', 'Merge'] | None = None
+    opportunities: Literal['Discard', 'Merge'] | None = None
+    services: Literal['Discard', 'Merge'] | None = None
+    projects: Literal['Discard', 'Merge'] | None = None
+    contacts: Literal['Discard', 'Merge'] | None = None
+    documents: Literal['Discard', 'Merge'] | None = None
+
+
+class CompanyNoteType(ConnectWiseModel):
+    id: int | None = None
+    identifier: str | None = None
+    """
+     Max length: 15;
+    """
+    name: str
     """
      Max length: 50;
     """
-    prorate_flag: bool | None = Field(default=None, alias='prorateFlag')
-    email_template: EmailTemplateReference | None = Field(
-        default=None, alias='emailTemplate'
-    )
-    auto_invoice_flag: bool | None = Field(default=None, alias='autoInvoiceFlag')
-    invoice_prorated_additions_flag: bool | None = Field(
-        default=None, alias='invoiceProratedAdditionsFlag'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    import_flag: bool | None = Field(default=None, alias='importFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementTypeBoardDefault(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CompanyNoteTypeInfo(ConnectWiseModel):
     id: int | None = None
-    type: AgreementTypeReference | None = None
-    location: SystemLocationReference
-    department: SystemDepartmentReference | None = None
-    board: BoardReference | None = None
-    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
+    identifier: str | None = None
+    name: str | None = None
     default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CompanyReference(CatalogItemReference):
+    pass
+
+
+class CompanyStatusReference(ActivityReference):
+    pass
+
+
+class CompanyType(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    application_units: ApplicationUnits | None = Field(
-        default=None, alias='applicationUnits'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str
+    """
+     Max length: 50;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    vendor_flag: bool | None = Field(default=None, alias='vendorFlag')
+    service_alert_flag: bool | None = Field(default=None, alias='serviceAlertFlag')
+    service_alert_message: str | None = Field(default=None, alias='serviceAlertMessage')
+    """
+     Max length: 150;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CompanyTypeInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    is_vendor: bool | None = Field(default=None, alias='isVendor')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementTypeWorkRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: AgreementTypeReference | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
-    ending_date: datetime | None = Field(default=None, alias='endingDate')
-    rate: float | None = None
-    rate_type: RateType = Field(..., alias='rateType')
-    limit_to: float | None = Field(default=None, alias='limitTo')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class CompanyTypeReference(ActivityReference):
+    pass
 
 
-class AgreementTypeWorkRoleExclusion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: AgreementTypeReference | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ConfigurationQuestion(ConnectWiseModel):
+    answer_id: int | None = Field(default=None, alias='answerId')
+    question_id: int | None = Field(default=None, alias='questionId')
+    question: str | None = None
+    answer: dict[str, Any] | None = None
+    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
+    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
+    field_type: Literal[
+        'TextArea',
+        'Currency',
+        'Date',
+        'Hyperlink',
+        'IPAddress',
+        'Checkbox',
+        'Number',
+        'Percent',
+        'Text',
+        'Password',
+    ] | None = Field(default=None, alias='fieldType')
+    required_flag: bool | None = Field(default=None, alias='requiredFlag')
 
 
-class AgreementTypeWorkRoleInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConfigurationReference(ConnectWiseModel):
     id: int | None = None
-    type: AgreementTypeReference | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    device_identifier: str | None = Field(default=None, alias='deviceIdentifier')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementTypeWorkType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConfigurationStatus(ConnectWiseModel):
     id: int | None = None
-    type: AgreementTypeReference | None = None
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
-    ending_date: datetime | None = Field(default=None, alias='endingDate')
-    rate: float | None = None
-    rate_type: RateType = Field(..., alias='rateType')
-    bill_time: BillTime1 = Field(..., alias='billTime')
-    hours_min: float | None = Field(default=None, alias='hoursMin')
-    hours_max: float | None = Field(default=None, alias='hoursMax')
-    round_bill_hours: float | None = Field(default=None, alias='roundBillHours')
-    overage_rate: float | None = Field(default=None, alias='overageRate')
-    overage_rate_type: OverageRateType = Field(..., alias='overageRateType')
-    limit_to: float | None = Field(default=None, alias='limitTo')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    description: str
+    """
+     Max length: 50;
+    """
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementTypeWorkTypeExclusion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConfigurationStatusInfo(ConnectWiseModel):
     id: int | None = None
-    type: AgreementTypeReference | None = None
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    description: str | None = None
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementWorkRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    location_id: int | None = Field(default=None, alias='locationId')
-    rate_type: RateType = Field(..., alias='rateType')
-    rate: float | None = None
-    limit_to: float | None = Field(default=None, alias='limitTo')
-    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
-    ending_date: datetime | None = Field(default=None, alias='endingDate')
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ConfigurationStatusReference(ActivityReference):
+    pass
 
 
-class AgreementWorkRoleExclusion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConfigurationType(ConnectWiseModel):
     id: int | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str
+    """
+     Max length: 50;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    system_flag: bool | None = Field(default=None, alias='systemFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementWorkType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConfigurationTypeCopy(BoardCopy):
+    pass
+
+
+class ConfigurationTypeInfo(ConnectWiseModel):
     id: int | None = None
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    location: OwnerLevelReference | None = None
-    location_id: int | None = Field(default=None, alias='locationId')
-    rate_type: RateType = Field(..., alias='rateType')
-    bill_time: BillTime1 = Field(..., alias='billTime')
-    rate: float | None = None
-    hours_max: float | None = Field(default=None, alias='hoursMax')
-    hours_min: float | None = Field(default=None, alias='hoursMin')
-    round_bill_hours: float | None = Field(default=None, alias='roundBillHours')
-    overage_rate: float | None = Field(default=None, alias='overageRate')
-    overage_rate_type: OverageRateType | None = Field(
-        default=None, alias='overageRateType'
-    )
-    agreement_limit: float | None = Field(default=None, alias='agreementLimit')
-    site: SiteReference | None = None
-    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
-    ending_date: datetime | None = Field(default=None, alias='endingDate')
-    agreement: AgreementReference | None = None
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    system_flag: bool | None = Field(default=None, alias='systemFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AgreementWorkTypeExclusion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConfigurationTypeQuestionReference(ConnectWiseModel):
     id: int | None = None
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    question: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AllSort(Enum):
-    ASCENDING = 'Ascending'
-    DESCENDING = 'Descending'
+class ConfigurationTypeReference(ActivityReference):
+    pass
 
 
-class AllowedFileType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConnectWiseHostedScreen(ConnectWiseModel):
     id: int | None = None
-    file_type: str = Field(..., alias='fileType')
-    size_limit: int | None = Field(default=None, alias='sizeLimit')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    screen_id: str | None = Field(default=None, alias='screenId')
+    name: str | None = None
 
 
-class AllowedOrigin(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConnectWiseHostedSetup(ConnectWiseModel):
     id: int | None = None
-    origin: str
+    screen_id: int = Field(..., alias='screenId')
     """
-     Max length: 2000;
+    Can be obtained via ConnectWiseHostedApiScreen report.
     """
     description: str
     """
-     Max length: 2000;
+     Max length: 50;
     """
-    last_update_utc: datetime | None = Field(default=None, alias='lastUpdateUtc')
-    updated_by: str | None = Field(default=None, alias='updatedBy')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ApiMember(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str
+    url: str
     """
-     Max length: 15;
+     Max length: 1024;
     """
-    name: str | None = None
+    type: Literal['Tab', 'Pod', 'ToolbarButton']
+    client_id: str | None = Field(default=None, alias='clientId')
     """
-     Max length: 30; Required On Updates;
+    Only required if not already set. Max length: 36;
     """
-    email_address: str | None = Field(default=None, alias='emailAddress')
+    origin: str | None = None
     """
-     Max length: 250;
+     Max length: 100;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    inactive_date: datetime | None = Field(default=None, alias='inactiveDate')
-    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
-    security_role: SecurityRoleReference | None = Field(
-        default=None, alias='securityRole'
-    )
-    structure_level: StructureReference | None = Field(
-        default=None, alias='structureLevel'
-    )
-    security_location: SystemLocationReference | None = Field(
-        default=None, alias='securityLocation'
-    )
-    default_location: SystemLocationReference | None = Field(
-        default=None, alias='defaultLocation'
+    pod_height: int | None = Field(default=None, alias='podHeight')
+    toolbar_button_dialog_height: int | None = Field(
+        default=None, alias='toolbarButtonDialogHeight'
     )
-    default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='defaultDepartment'
+    toolbar_button_dialog_width: int | None = Field(
+        default=None, alias='toolbarButtonDialogWidth'
     )
-    sales_default_location: SystemLocationReference | None = Field(
-        default=None, alias='salesDefaultLocation'
+    toolbar_button_text: str | None = Field(default=None, alias='toolbarButtonText')
+    """
+    Only required for ToolbarButtons. Max length: 50;
+    """
+    toolbar_button_tool_tip: str | None = Field(
+        default=None, alias='toolbarButtonToolTip'
     )
-    service_default_board: BoardReference | None = Field(
-        default=None, alias='serviceDefaultBoard'
+    """
+     Max length: 50;
+    """
+    toolbar_button_icon_document_id: int | None = Field(
+        default=None, alias='toolbarButtonIconDocumentId'
     )
-    notes: str | None = None
-    excluded_service_board_ids: list[int] | None = Field(
-        default=None, alias='excludedServiceBoardIds'
+    disabled_flag: bool | None = Field(default=None, alias='disabledFlag')
+    location_ids: list[int] | None = Field(default=None, alias='locationIds')
+    locations_enabled_flag: bool | None = Field(
+        default=None, alias='locationsEnabledFlag'
     )
-    block_price_flag: bool | None = Field(default=None, alias='blockPriceFlag')
-    block_cost_flag: bool | None = Field(default=None, alias='blockCostFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    created_by: str | None = Field(default=None, alias='createdBy')
+    date_created: str | None = Field(default=None, alias='dateCreated')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ApiRequest(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ContactCommunication(ConnectWiseModel):
     id: int | None = None
-    external_id: str | None = Field(default=None, alias='externalId')
-    parent_id: int | None = Field(default=None, alias='parentId')
-    grand_parent_id: int | None = Field(default=None, alias='grandParentId')
-    entity: IRestIdentifiedItem | None = None
-    filters: FilterValues | None = None
-    page: PageValues | None = None
-    format: str | None = None
-    fields: str | None = None
-    misc_properties: dict[str, dict[str, Any]] | None = Field(
-        default=None, alias='miscProperties'
+    contact_id: int | None = Field(default=None, alias='contactId')
+    type: CommunicationTypeReference | None = None
+    value: str
+    """
+     Max length: 250;
+    """
+    extension: str | None = None
+    """
+     Max length: 15;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    communication_type: Literal['Email', 'Fax', 'Phone'] | None = Field(
+        default=None, alias='communicationType'
     )
-    member_context: str | None = Field(default=None, alias='memberContext')
-    update_only_ces_properties: bool | None = Field(
-        default=None, alias='updateOnlyCesProperties'
+    domain: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ContactCommunicationItem(ConnectWiseModel):
+    id: int | None = None
+    type: CommunicationTypeReference | None = None
+    value: str | None = None
+    extension: str | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    domain: str | None = None
+    communication_type: Literal['Email', 'Fax', 'Phone'] | None = Field(
+        default=None, alias='communicationType'
     )
 
 
-class ApplicationCycle(Enum):
-    CONTRACT2_WEEKS = 'Contract2Weeks'
-    CONTRACT4_WEEKS = 'Contract4Weeks'
-    CONTRACT_YEAR = 'ContractYear'
-    CALENDAR_MONTH = 'CalendarMonth'
-    CALENDAR_QUARTER = 'CalendarQuarter'
-    CALENDAR_WEEK = 'CalendarWeek'
-    CONTRACT_QUARTER = 'ContractQuarter'
-    CALENDAR_YEAR = 'CalendarYear'
+class ContactDepartment(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 30;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ApplicationUnits(Enum):
-    AMOUNT = 'Amount'
-    HOURS = 'Hours'
-    INCIDENTS = 'Incidents'
+class ContactDepartmentInfo(ActivityReference):
+    pass
 
 
-class ApplyToType(Enum):
-    ALL = 'All'
-    AGREEMENT = 'Agreement'
-    PROJECT = 'Project'
-    PROJECT_PHASE = 'ProjectPhase'
-    SALES_ORDER = 'SalesOrder'
-    TICKET = 'Ticket'
+class ContactDepartmentReference(ActivityReference):
+    pass
 
 
-class ApprovalType(Enum):
-    DATA_ENTRY = 'DataEntry'
-    TIER1_UPDATE = 'Tier1Update'
-    TIER2_UPDATE = 'Tier2Update'
-    BILLING = 'Billing'
-    SERVICE = 'Service'
-    PROJECT = 'Project'
-    MONTHLY_SUMMARY = 'MonthlySummary'
-    SALES_ACTIVITY = 'SalesActivity'
-    SCHEDULE = 'Schedule'
+class ContactReference(ActivityReference):
+    pass
 
 
-class AttachConfigurationsFor(Enum):
+class ContactRelationship(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-    Required when notifyType is set to: "Attach Configuration"
+     Max length: 50;
     """
-
-    COMPANY = 'Company'
-    CONTACT = 'Contact'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AuditTrailEntry(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    text: str | None = None
-    entered_date: str | None = Field(default=None, alias='enteredDate')
-    entered_by: str | None = Field(default=None, alias='enteredBy')
-    audit_type: str | None = Field(default=None, alias='auditType')
-    audit_sub_type: str | None = Field(default=None, alias='auditSubType')
-    audit_source: str | None = Field(default=None, alias='auditSource')
+class ContactTrack(ConnectWiseModel):
+    id: int | None = None
+    track_id: int | None = Field(default=None, alias='trackId')
+    name: str | None = None
+    start_date: str | None = Field(default=None, alias='startDate')
+    end_date: str | None = Field(default=None, alias='endDate')
+    action_taken: int | None = Field(default=None, alias='actionTaken')
+    action_remaining: int | None = Field(default=None, alias='actionRemaining')
+    started_by: str | None = Field(default=None, alias='startedBy')
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AuthAnvil(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ContactType(ConnectWiseModel):
     id: int | None = None
-    server_location_url: str = Field(..., alias='serverLocationUrl')
-    site_id: int = Field(..., alias='siteId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    description: str
+    """
+     Max length: 50;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    service_alert_flag: bool | None = Field(default=None, alias='serviceAlertFlag')
+    service_alert_message: str | None = Field(default=None, alias='serviceAlertMessage')
+    """
+     Max length: 150;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AuthenticationServiceType(Enum):
-    AUTH_ANVIL = 'AuthAnvil'
-    GOOGLE_AUTHENTICATOR = 'GoogleAuthenticator'
-    EMAIL = 'Email'
+class ContactTypeInfo(ConnectWiseModel):
+    id: int | None = None
+    description: str | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    service_alert_flag: bool | None = Field(default=None, alias='serviceAlertFlag')
+    service_alert_message: str | None = Field(default=None, alias='serviceAlertMessage')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class AutoSyncTime(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    sync_time: str = Field(..., alias='syncTime')
-    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ContactTypeReference(ActivityReference):
+    pass
 
 
-class AutomateScriptReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CorporateStructureLevel(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BasedOn(Enum):
-    ALL_HOURS = 'AllHours'
-    CUSTOMER = 'Customer'
-    MY_CALENDAR = 'MyCalendar'
-    CUSTOM = 'Custom'
+class CorporateStructureLevelReference(ActivityReference):
+    pass
+
+
+class Count(ConnectWiseModel):
+    count: int | None = None
 
 
-class BatchEntry(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CountryInfo(ConnectWiseModel):
     id: int | None = None
-    account_type: str | None = Field(default=None, alias='accountType')
     name: str | None = None
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    debit: float | None = None
-    credit: float | None = None
-    cost: float | None = None
-    item: str | None = None
-    sales_code: str | None = Field(default=None, alias='salesCode')
-    cost_of_goods_sold_account_number: str | None = Field(
-        default=None, alias='costOfGoodsSoldAccountNumber'
-    )
-    invoice: InvoiceReference | None = None
-    purchase_order: PurchaseOrderReference | None = Field(
-        default=None, alias='purchaseOrder'
-    )
-    line_item: PurchaseOrderLineItemReference | None = Field(
-        default=None, alias='lineItem'
-    )
-    transfer: str | None = None
-    expense: ExpenseDetailReference | None = None
-    adjustment_detail: AdjustmentDetailReference | None = Field(
-        default=None, alias='adjustmentDetail'
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    city_caption: str | None = Field(default=None, alias='cityCaption')
+    state_caption: str | None = Field(default=None, alias='stateCaption')
+    zip_caption: str | None = Field(default=None, alias='zipCaption')
+    dialing_prefix: str | None = Field(default=None, alias='dialingPrefix')
+    localization_caption_one: str | None = Field(
+        default=None, alias='localizationCaptionOne'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BatchFrequencyUnit(Enum):
-    """
-    If not specified, defaults to Minutes. Months is not supported as month length varies
-    """
-
-    MINUTES = 'Minutes'
-    HOURS = 'Hours'
-    DAYS = 'Days'
+class CountryReference(CatalogItemReference):
+    pass
 
 
-class BatchSchedule(Enum):
+class CreateAccountingBatchRequest(ConnectWiseModel):
+    id: int | None = None
+    batch_identifier: str | None = Field(default=None, alias='batchIdentifier')
     """
-    If activateFlag is true, batchSchedule is required
+     Max length: 50;
     """
-
-    ANY_TIME = 'AnyTime'
-    MY_COMPANY_OFFICE_HOURS = 'MyCompanyOfficeHours'
-    SLA_HOURS = 'SlaHours'
-
-
-class BillCustomer(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-
-
-class BillExpense(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillExpenses(Enum):
+    gl_interface_identifier: str | None = Field(
+        default=None, alias='glInterfaceIdentifier'
+    )
+    export_invoices_flag: bool | None = Field(default=None, alias='exportInvoicesFlag')
     """
-    Required On Updates;
+    Batch must export Invoices, Expenses or Products.
     """
-
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillExpenses1(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillExpenses3(Enum):
+    export_expenses_flag: bool | None = Field(default=None, alias='exportExpensesFlag')
     """
-    Required On Updates;
+    Batch must export Invoices, Expenses or Products.
     """
-
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillExpenses5(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillProduct(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillProducts(Enum):
+    export_products_flag: bool | None = Field(default=None, alias='exportProductsFlag')
     """
-    Required On Updates;
+    Batch must export Invoices, Expenses or Products.
     """
-
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillProducts1(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillProducts2(Enum):
+    processed_record_ids: list[int] = Field(..., alias='processedRecordIds')
     """
-    Required On Updates;
+    GL Entry RecIDs.
     """
+    summarize_expenses: bool | None = Field(default=None, alias='summarizeExpenses')
 
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
 
+class CurrencyCode(ActivityReference):
+    pass
 
-class BillProducts4(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
 
+class CurrencyCodeReference(ActivityReference):
+    pass
 
-class BillTime(Enum):
-    """
-    Required On Updates;
-    """
 
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
+class CurrencyInfo(ActivityReference):
+    pass
 
 
-class BillTime1(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
+class CurrencyReference(ConnectWiseModel):
+    id: int | None = None
+    symbol: str | None = None
+    currency_code: str | None = Field(default=None, alias='currencyCode')
+    decimal_separator: str | None = Field(default=None, alias='decimalSeparator')
+    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
+    thousands_separator: str | None = Field(default=None, alias='thousandsSeparator')
+    negative_parentheses_flag: bool | None = Field(
+        default=None, alias='negativeParenthesesFlag'
+    )
+    display_symbol_flag: bool | None = Field(default=None, alias='displaySymbolFlag')
+    currency_identifier: str | None = Field(default=None, alias='currencyIdentifier')
+    display_id_flag: bool | None = Field(default=None, alias='displayIdFlag')
+    right_align: bool | None = Field(default=None, alias='rightAlign')
+    name: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BillTime11(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
+class CustomFieldValue(ConnectWiseModel):
+    id: int | None = None
+    caption: str | None = None
+    type: Literal[
+        'TextArea',
+        'Button',
+        'Currency',
+        'Date',
+        'Hyperlink',
+        'IPAddress',
+        'Checkbox',
+        'Number',
+        'Percent',
+        'Text',
+        'Password',
+    ] | None = None
+    entry_method: Literal['Date', 'EntryField', 'List', 'Option'] | None = Field(
+        default=None, alias='entryMethod'
+    )
+    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
+    value: str | bool | int | None = None
 
 
-class BillTime6(Enum):
+class CustomReport(ConnectWiseModel):
+    id: int | None = None
+    report_link: str = Field(..., alias='reportLink')
+    name: str
     """
-    Required On Updates;
+     Max length: 100;
     """
-
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillTime8(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillableOption(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillableOption4(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-
-
-class BillableOption5(Enum):
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillableOption7(Enum):
+    module: Literal[
+        'Companies',
+        'Finance',
+        'Marketing',
+        'Procurement',
+        'Project',
+        'Sales',
+        'ServiceDesk',
+        'TimeExpense',
+    ]
     """
-    Required On Updates;
+    The Module Name.
     """
-
-    BILLABLE = 'Billable'
-    DO_NOT_BILL = 'DoNotBill'
-    NO_CHARGE = 'NoCharge'
-    NO_DEFAULT = 'NoDefault'
-
-
-class BillingAddress(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class BillingContact(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class BillingCycle(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str
+    description: str
     """
-     Max length: 5;
+     Max length: 150;
     """
-    name: str
+    generated_flag: bool | None = Field(default=None, alias='generatedFlag')
+    parameter_prefix: str | None = Field(default=None, alias='parameterPrefix')
     """
      Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    billing_options: BillingOptions = Field(..., alias='billingOptions')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class BillingCycleInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class BillingCycleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class BillingDeliveryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class BillingLevel(Enum):
-    DETAIL = 'Detail'
-    SUMMARY = 'Summary'
-
-
-class BillingMethod(Enum):
-    AGREEMENT = 'Agreement'
-    CREDIT_MEMO = 'CreditMemo'
-    DOWN_PAYMENT = 'DownPayment'
-    MISCELLANEOUS = 'Miscellaneous'
-    PROGRESS = 'Progress'
-    STANDARD = 'Standard'
-
-
-class BillingMethod1(Enum):
-    ACTUAL_RATES = 'ActualRates'
-    FIXED_FEE = 'FixedFee'
-    NOT_TO_EXCEED = 'NotToExceed'
-    OVERRIDE_RATE = 'OverrideRate'
-
-
-class BillingMethod2(Enum):
-    """
-    billingMethod is required if the phase billSeparatelyFlag is true.
-    """
-
-    ACTUAL_RATES = 'ActualRates'
-    FIXED_FEE = 'FixedFee'
-    NOT_TO_EXCEED = 'NotToExceed'
-    OVERRIDE_RATE = 'OverrideRate'
-
-
-class BillingMethod4(Enum):
-    ACTUAL_RATES = 'ActualRates'
-    FIXED_FEE = 'FixedFee'
-    NOT_TO_EXCEED = 'NotToExceed'
-    OVERRIDE_RATE = 'OverrideRate'
-
-
-class BillingOptions(Enum):
-    BI_MONTHLY = 'BiMonthly'
-    BI_WEEKLY = 'BiWeekly'
-    MONTHLY = 'Monthly'
-    NOT_RECURRING = 'NotRecurring'
-    QUARTERLY = 'Quarterly'
-    SEMI_ANNUAL = 'SemiAnnual'
-    WEEKLY = 'Weekly'
-    YEARLY = 'Yearly'
-
-
-class BillingRateType(Enum):
+    parameter_separator: str | None = Field(default=None, alias='parameterSeparator')
     """
-    Required On Updates;
+     Max length: 50;
     """
-
-    STAFF_MEMBER = 'StaffMember'
-    WORK_ROLE = 'WorkRole'
-
-
-class BillingSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    parameter_name_separator: str | None = Field(
+        default=None, alias='parameterNameSeparator'
     )
-    id: int | None = None
-    remit_name: str = Field(..., alias='remitName')
     """
      Max length: 50;
     """
-    location: SystemLocationReference
-    address_one: str | None = Field(default=None, alias='addressOne')
+    parameter_suffix: str | None = Field(default=None, alias='parameterSuffix')
     """
      Max length: 50;
     """
-    address_two: str | None = Field(default=None, alias='addressTwo')
+    location_flag: bool | None = Field(default=None, alias='locationFlag')
+    location_param_id: int | None = Field(default=None, alias='locationParamId')
     """
-     Max length: 50;
+    Parameter unique identifier for the Custom Report's Location parameter.
     """
-    city: str | None = None
+    location_default_flag: bool | None = Field(
+        default=None, alias='locationDefaultFlag'
+    )
+    location_override: str | None = Field(default=None, alias='locationOverride')
+    department_flag: bool | None = Field(default=None, alias='departmentFlag')
+    department_param_id: int | None = Field(default=None, alias='departmentParamId')
     """
-     Max length: 50;
+    Parameter unique identifier for the Custom Report's Department parameter.
     """
-    state: StateReference | None = None
-    zip: str | None = None
+    department_default_flag: bool | None = Field(
+        default=None, alias='departmentDefaultFlag'
+    )
+    department_override: str | None = Field(default=None, alias='departmentOverride')
+    territory_flag: bool | None = Field(default=None, alias='territoryFlag')
+    territory_param_id: int | None = Field(default=None, alias='territoryParamId')
     """
-     Max length: 12;
+    Parameter unique identifier for the Custom Report's Terriroty parameter.
     """
-    country: CountryReference | None = None
-    phone: str | None = None
+    territory_default_flag: bool | None = Field(
+        default=None, alias='territoryDefaultFlag'
+    )
+    territory_override: str | None = Field(default=None, alias='territoryOverride')
+    company_flag: bool | None = Field(default=None, alias='companyFlag')
+    company_param_id: int | None = Field(default=None, alias='companyParamId')
     """
-     Max length: 15;
+    Parameter unique identifier for the Custom Report's Company parameter.
     """
-    invoice_title: str = Field(..., alias='invoiceTitle')
+    company_override: str | None = Field(default=None, alias='companyOverride')
+    member_flag: bool | None = Field(default=None, alias='memberFlag')
+    member_param_id: int | None = Field(default=None, alias='memberParamId')
     """
-     Max length: 50;
+    Parameter unique identifier for the Custom Report's Member parameter.
     """
-    payable_name: str = Field(..., alias='payableName')
+    member_override: str | None = Field(default=None, alias='memberOverride')
+    start_date_flag: bool | None = Field(default=None, alias='startDateFlag')
+    start_date_param_id: int | None = Field(default=None, alias='startDateParamId')
     """
-     Max length: 50;
+    Parameter unique identifier for the Custom Report's Start Date parameter.
     """
-    topcomment: str | None = None
+    start_date_override: str | None = Field(default=None, alias='startDateOverride')
+    end_date_flag: bool | None = Field(default=None, alias='endDateFlag')
+    end_date_param_id: int | None = Field(default=None, alias='endDateParamId')
     """
-     Max length: 4000;
+    Parameter unique identifier for the Custom Report's End Date parameter.
     """
-    invoice_footer: str | None = Field(default=None, alias='invoiceFooter')
+    end_date_override: str | None = Field(default=None, alias='endDateOverride')
+    opp_type_flag: bool | None = Field(default=None, alias='oppTypeFlag')
+    opp_type_param_id: int | None = Field(default=None, alias='oppTypeParamId')
     """
-     Max length: 500;
+    Parameter unique identifier for the Custom Report's Opportunity Type parameter.
     """
-    quote_footer: str | None = Field(default=None, alias='quoteFooter')
+    opp_type_override: str | None = Field(default=None, alias='oppTypeOverride')
+    opportunity_flag: bool | None = Field(default=None, alias='opportunityFlag')
+    opportunity_param_id: int | None = Field(default=None, alias='opportunityParamId')
     """
-     Max length: 1000;
+    Parameter unique identifier for the Custom Report's Opportunity parameter.
     """
-    overall_invoice_default: InvoiceTemplateReference | None = Field(
-        default=None, alias='overallInvoiceDefault'
-    )
-    standard_invoice_actual: InvoiceTemplateReference | None = Field(
-        default=None, alias='standardInvoiceActual'
-    )
-    standard_invoice_fixed: InvoiceTemplateReference | None = Field(
-        default=None, alias='standardInvoiceFixed'
-    )
-    progress_invoice: InvoiceTemplateReference | None = Field(
-        default=None, alias='progressInvoice'
-    )
-    agreement_invoice: InvoiceTemplateReference | None = Field(
-        default=None, alias='agreementInvoice'
-    )
-    credit_memo_invoice: InvoiceTemplateReference | None = Field(
-        default=None, alias='creditMemoInvoice'
-    )
-    down_payment_invoice: InvoiceTemplateReference | None = Field(
-        default=None, alias='downPaymentInvoice'
-    )
-    misc_invoice: InvoiceTemplateReference | None = Field(
-        default=None, alias='miscInvoice'
-    )
-    sales_order_invoice: InvoiceTemplateReference | None = Field(
-        default=None, alias='salesOrderInvoice'
-    )
-    exclude_do_not_bill_time_flag: bool | None = Field(
-        default=None, alias='excludeDoNotBillTimeFlag'
-    )
-    exclude_do_not_bill_expense_flag: bool | None = Field(
-        default=None, alias='excludeDoNotBillExpenseFlag'
-    )
-    exclude_do_not_bill_product_flag: bool | None = Field(
-        default=None, alias='excludeDoNotBillProductFlag'
+    opportunity_override: str | None = Field(default=None, alias='opportunityOverride')
+    marketing_campaign_flag: bool | None = Field(
+        default=None, alias='marketingCampaignFlag'
     )
-    prefix_suffix_flag: PrefixSuffixFlag | None = Field(
-        default=None, alias='prefixSuffixFlag'
+    marketing_campaign_param_id: int | None = Field(
+        default=None, alias='marketingCampaignParamId'
     )
-    prefix_suffix_text: str | None = Field(default=None, alias='prefixSuffixText')
     """
-     Max length: 5;
+    Parameter unique identifier for the Custom Report's Marketing Campaign parameter.
     """
-    charge_adj_to_firm_flag: bool | None = Field(
-        default=None, alias='chargeAdjToFirmFlag'
-    )
-    no_watermark_flag: bool | None = Field(default=None, alias='noWatermarkFlag')
-    display_tax_flag: bool | None = Field(default=None, alias='displayTaxFlag')
-    allow_restricted_dept_on_routing_flag: bool | None = Field(
-        default=None, alias='allowRestrictedDeptOnRoutingFlag'
-    )
-    bill_ticket_separately_flag: bool | None = Field(
-        default=None, alias='billTicketSeparatelyFlag'
-    )
-    bill_ticket_complete_flag: bool | None = Field(
-        default=None, alias='billTicketCompleteFlag'
-    )
-    bill_ticket_unapproved_flag: bool | None = Field(
-        default=None, alias='billTicketUnapprovedFlag'
-    )
-    bill_project_complete_flag: bool | None = Field(
-        default=None, alias='billProjectCompleteFlag'
-    )
-    bill_project_unapproved_flag: bool | None = Field(
-        default=None, alias='billProjectUnapprovedFlag'
+    marketing_campaign_override: str | None = Field(
+        default=None, alias='marketingCampaignOverride'
     )
-    progress_time_flag: bool | None = Field(default=None, alias='progressTimeFlag')
-    restrict_project_downpayment_flag: bool | None = Field(
-        default=None, alias='restrictProjectDownpaymentFlag'
+    service_board_flag: bool | None = Field(default=None, alias='serviceBoardFlag')
+    service_board_param_id: int | None = Field(
+        default=None, alias='serviceBoardParamId'
     )
-    bill_sales_order_complete_flag: bool | None = Field(
-        default=None, alias='billSalesOrderCompleteFlag'
+    """
+    Parameter unique identifier for the Custom Report's Service Board parameter.
+    """
+    service_board_default_flag: bool | None = Field(
+        default=None, alias='serviceBoardDefaultFlag'
     )
-    bill_product_after_ship_flag: bool | None = Field(
-        default=None, alias='billProductAfterShipFlag'
+    service_board_override: str | None = Field(
+        default=None, alias='serviceBoardOverride'
     )
-    restrict_downpayment_flag: bool | None = Field(
-        default=None, alias='restrictDownpaymentFlag'
+    service_type_flag: bool | None = Field(default=None, alias='serviceTypeFlag')
+    service_type_param_id: int | None = Field(default=None, alias='serviceTypeParamId')
+    """
+    Parameter unique identifier for the Custom Report's Service Type parameter.
+    """
+    service_type_override: str | None = Field(default=None, alias='serviceTypeOverride')
+    service_status_flag: bool | None = Field(default=None, alias='serviceStatusFlag')
+    service_status_param_id: int | None = Field(
+        default=None, alias='serviceStatusParamId'
     )
-    copy_non_service_products_flag: bool | None = Field(
-        default=None, alias='copyNonServiceProductsFlag'
+    """
+    Parameter unique identifier for the Custom Report's Service Status parameter.
+    """
+    service_status_override: str | None = Field(
+        default=None, alias='serviceStatusOverride'
     )
-    copy_service_products_flag: bool | None = Field(
-        default=None, alias='copyServiceProductsFlag'
+    agreement_type_flag: bool | None = Field(default=None, alias='agreementTypeFlag')
+    agreement_type_param_id: int | None = Field(
+        default=None, alias='agreementTypeParamId'
     )
-    copy_agreement_products_flag: bool | None = Field(
-        default=None, alias='copyAgreementProductsFlag'
+    """
+    Parameter unique identifier for the Custom Report's Agreement Type parameter.
+    """
+    agreement_type_override: str | None = Field(
+        default=None, alias='agreementTypeOverride'
     )
-    print_logo_flag: bool | None = Field(default=None, alias='printLogoFlag')
-    read_receipt_flag: bool | None = Field(default=None, alias='readReceiptFlag')
-    delivery_receipt_flag: bool | None = Field(
-        default=None, alias='deliveryReceiptFlag'
+    agreement_flag: bool | None = Field(default=None, alias='agreementFlag')
+    agreement_param_id: int | None = Field(default=None, alias='agreementParamId')
+    """
+    Parameter unique identifier for the Custom Report's Agreement parameter.
+    """
+    agreement_override: str | None = Field(default=None, alias='agreementOverride')
+    project_type_flag: bool | None = Field(default=None, alias='projectTypeFlag')
+    project_type_param_id: int | None = Field(default=None, alias='projectTypeParamId')
+    """
+    Parameter unique identifier for the Custom Report's Project Type parameter.
+    """
+    project_type_override: str | None = Field(default=None, alias='projectTypeOverride')
+    project_flag: bool | None = Field(default=None, alias='projectFlag')
+    project_param_id: int | None = Field(default=None, alias='projectParamId')
+    """
+    Parameter unique identifier for the Custom Report's Project parameter.
+    """
+    project_override: str | None = Field(default=None, alias='projectOverride')
+    work_role_flag: bool | None = Field(default=None, alias='workRoleFlag')
+    work_role_param_id: int | None = Field(default=None, alias='workRoleParamId')
+    """
+    Parameter unique identifier for the Custom Report's Work Role parameter.
+    """
+    work_role_override: str | None = Field(default=None, alias='workRoleOverride')
+    work_type_flag: bool | None = Field(default=None, alias='workTypeFlag')
+    work_type_param_id: int | None = Field(default=None, alias='workTypeParamId')
+    """
+    Parameter unique identifier for the Custom Report's Work Type parameter.
+    """
+    work_type_override: str | None = Field(default=None, alias='workTypeOverride')
+    invoice_flag: bool | None = Field(default=None, alias='invoiceFlag')
+    invoice_param_id: int | None = Field(default=None, alias='invoiceParamId')
+    """
+    Parameter unique identifier for the Custom Report's Invoice Type parameter.
+    """
+    invoice_override: str | None = Field(default=None, alias='invoiceOverride')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CustomReportReference(ActivityReference):
+    pass
+
+
+class CwTimeZone(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    offset: float | None = None
+    """
+    The hours offset (+/-).
+    """
+    start_date: str | None = Field(default=None, alias='startDate')
+    end_date: str | None = Field(default=None, alias='endDate')
+    daylight_savings_flag: bool | None = Field(
+        default=None, alias='daylightSavingsFlag'
     )
-    attach_xml_invoice_flag: bool | None = Field(
-        default=None, alias='attachXmlInvoiceFlag'
+    """
+    Determined based on system library value for specified timeZone.
+                Not able to be used in query params at this time.
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class DeliveryMethod(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 50;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    email_flag: bool | None = Field(default=None, alias='emailFlag')
+    integration_email_flag: bool | None = Field(
+        default=None, alias='integrationEmailFlag'
     )
-    disable_routing_email_flag: bool | None = Field(
-        default=None, alias='disableRoutingEmailFlag'
+    integration_print_flag: bool | None = Field(
+        default=None, alias='integrationPrintFlag'
     )
-    email_template: EmailTemplateReference = Field(..., alias='emailTemplate')
-    localized_country: CountryReference | None = Field(
-        default=None, alias='localizedCountry'
+    integration_active_flag: bool | None = Field(
+        default=None, alias='integrationActiveFlag'
     )
-    business_number: str | None = Field(default=None, alias='businessNumber')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Department(ConnectWiseModel):
+    id: int | None = None
+    identifier: str
     """
-     Max length: 50;
+     Max length: 15;
     """
-    currency: CurrencyReference | None = None
-    custom_label: str | None = Field(default=None, alias='customLabel')
+    name: str
     """
      Max length: 50;
     """
-    custom_text: str | None = Field(default=None, alias='customText')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class DepartmentInfo(ActivityReference):
+    pass
+
+
+class DirectionalSync(ContactRelationship):
+    pass
+
+
+class DirectionalSyncInfo(ActivityReference):
+    pass
+
+
+class DirectionalSyncReference(ActivityReference):
+    pass
+
+
+class DocumentFormData(ConnectWiseModel):
+    file: bytes | None = None
+    record_id: int | None = Field(default=None, alias='recordId')
+    record_type: str | None = Field(default=None, alias='recordType')
+    title: str | None = None
+    url: str | None = None
+    private_flag: bool | None = Field(default=None, alias='privateFlag')
+    read_only_flay: bool | None = Field(default=None, alias='readOnlyFlay')
+    is_avatar: bool | None = Field(default=None, alias='isAvatar')
+
+
+class DocumentReference(ActivityReference):
+    pass
+
+
+class DocumentSetup(ConnectWiseModel):
+    id: int | None = None
+    upload_as_link_flag: bool | None = Field(default=None, alias='uploadAsLinkFlag')
+    is_public_flag: bool | None = Field(default=None, alias='isPublicFlag')
+    doc_path: str | None = Field(default=None, alias='docPath')
     """
-     Max length: 500;
+     Max length: 100;
     """
-    company_code: str | None = Field(default=None, alias='companyCode')
+    template_path: str | None = Field(default=None, alias='templatePath')
     """
-     Max length: 250;
+     Max length: 200;
     """
-    exclude_avalara_flag: bool | None = Field(default=None, alias='excludeAvalaraFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    template_output_path: str | None = Field(default=None, alias='templateOutputPath')
+    """
+     Max length: 200;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BillingSetupInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class DocumentType(ConnectWiseModel):
     id: int | None = None
-    remit_name: str | None = Field(default=None, alias='remitName')
-    location: SystemLocationReference | None = None
-    currency: CurrencyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    file_extension: str | None = Field(default=None, alias='fileExtension')
+    icon: str | None = None
+    mime_type: str | None = Field(default=None, alias='mimeType')
+    description: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BillingSetupReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class DocumentTypeReference(ActivityReference):
+    pass
+
+
+class EmailConnectorParsingStyleReference(ActivityReference):
+    pass
+
+
+class EmailConnectorParsingTypeReference(ActivityReference):
+    pass
+
+
+class EmailConnectorParsingVariableReference(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    identifier: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BillingSetupRouting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    sequence_number: int = Field(..., alias='sequenceNumber')
-    invoice_rule: InvoiceRule = Field(..., alias='invoiceRule')
-    routing_rule: RoutingRule = Field(..., alias='routingRule')
-    member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class EmailConnectorReference(ActivityReference):
+    pass
 
 
-class BillingStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class EmailExclusion(ConnectWiseModel):
     id: int | None = None
-    name: str
+    description: str
     """
-     Max length: 30;
+     Max length: 100;
     """
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    sent_flag: bool | None = Field(default=None, alias='sentFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BillingStatusInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class EmailOpened(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    campaign_id: int | None = Field(default=None, alias='campaignId')
+    contact_id: int = Field(..., alias='contactId')
+    date_opened: datetime | None = Field(default=None, alias='dateOpened')
+
+
+class EmailTemplateReference(ActivityReference):
+    pass
 
 
-class BillingStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class EmailToken(ConnectWiseModel):
+    id: int | None = None
+    token: str | None = None
+    description: str | None = None
+    address_flag: bool | None = Field(default=None, alias='addressFlag')
+    agreement_flag: bool | None = Field(default=None, alias='agreementFlag')
+    company_flag: bool | None = Field(default=None, alias='companyFlag')
+    config_flag: bool | None = Field(default=None, alias='configFlag')
+    contact_flag: bool | None = Field(default=None, alias='contactFlag')
+    invoice_flag: bool | None = Field(default=None, alias='invoiceFlag')
+    purchase_order_flag: bool | None = Field(default=None, alias='purchaseOrderFlag')
+    purchase_order_status_flag: bool | None = Field(
+        default=None, alias='purchaseOrderStatusFlag'
     )
+    rma_flag: bool | None = Field(default=None, alias='rmaFlag')
+    sales_flag: bool | None = Field(default=None, alias='salesFlag')
+    service_flag: bool | None = Field(default=None, alias='serviceFlag')
+    tracks_flag: bool | None = Field(default=None, alias='tracksFlag')
+    workflow_flag: bool | None = Field(default=None, alias='workflowFlag')
+    portal_password_flag: bool | None = Field(default=None, alias='portalPasswordFlag')
+
+
+class EntityType(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    code: str | None = None
 
 
-class BillingTerm(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class EntityTypeInfo(CorporateStructureLevel):
+    pass
+
+
+class EntityTypeReference(ActivityReference):
+    pass
+
+
+class ExpenseDetailReference(ConnectWiseModel):
     id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    due_days: int = Field(..., alias='dueDays')
-    terms_xref: str | None = Field(default=None, alias='termsXref')
-    """
-     Max length: 50;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    amount: float | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BillingTermInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ExpenseReportReference(ActivityReference):
+    pass
+
+
+class ExpenseReportTierUpdate(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    approval_type: Literal[
+        'DataEntry',
+        'Tier1Update',
+        'Tier2Update',
+        'Billing',
+        'Service',
+        'Project',
+        'MonthlySummary',
+        'SalesActivity',
+        'Schedule',
+    ] | None = Field(default=None, alias='approvalType')
 
 
-class BillingTerms(Enum):
-    FROM_ = 'From'
-    TO = 'To'
+class ExpenseRevenueReference(AgreementRevenueReference):
+    pass
 
 
-class BillingTermsReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ExpenseTaxTypeInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    inactive: bool | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Board(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ExpenseTaxTypeReference(ActivityReference):
+    pass
+
+
+class ExpenseType(ConnectWiseModel):
     id: int | None = None
     name: str
     """
-     Max length: 50;
+     Max length: 30;
     """
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    sign_off_template: ServiceSignoffReference | None = Field(
-        default=None, alias='signOffTemplate'
-    )
-    send_to_contact_flag: bool | None = Field(default=None, alias='sendToContactFlag')
-    contact_template: ServiceEmailTemplateReference | None = Field(
-        default=None, alias='contactTemplate'
+    amount_caption: str = Field(..., alias='amountCaption')
+    reimbursement_rate: float | None = Field(default=None, alias='reimbursementRate')
+    bill_expenses: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] = Field(
+        ..., alias='billExpenses'
     )
-    send_to_resource_flag: bool | None = Field(default=None, alias='sendToResourceFlag')
-    resource_template: ServiceEmailTemplateReference | None = Field(
-        default=None, alias='resourceTemplate'
+    invoice_markup_option: Literal['Amount', 'Mile', 'Percent'] = Field(
+        ..., alias='invoiceMarkupOption'
     )
-    project_flag: bool | None = Field(default=None, alias='projectFlag')
-    show_dependencies_flag: bool | None = Field(
-        default=None, alias='showDependenciesFlag'
+    invoice_markup_amount: float | None = Field(
+        default=None, alias='invoiceMarkupAmount'
     )
+    advanced_amount_flag: bool | None = Field(default=None, alias='advancedAmountFlag')
+    mileage_flag: bool | None = Field(default=None, alias='mileageFlag')
+    quantity_flag: bool | None = Field(default=None, alias='quantityFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    max_amount: float | None = Field(default=None, alias='maxAmount')
+    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
     """
-    This field only shows if it is Project Board.
+     Max length: 50;
     """
-    show_estimates_flag: bool | None = Field(default=None, alias='showEstimatesFlag')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ExpenseTypeInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    amount_caption: str | None = Field(default=None, alias='amountCaption')
+    mileage_flag: bool | None = Field(default=None, alias='mileageFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ExpenseTypeReference(ActivityReference):
+    pass
+
+
+class Experiment(ConnectWiseModel):
+    id: int | None = None
+    experiment_id: str | None = Field(default=None, alias='experimentId')
+    name: str | None = None
+    description: str | None = None
+    properties: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    member_inactive_flag: bool | None = Field(default=None, alias='memberInactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ExportAccountingBatchRequest(ConnectWiseModel):
+    batch_identifier: str | None = Field(default=None, alias='batchIdentifier')
     """
-    This field only shows if it is Project Board.
+     Max length: 50;
     """
-    board_icon: DocumentReference | None = Field(default=None, alias='boardIcon')
-    bill_tickets_after_closed_flag: bool | None = Field(
-        default=None, alias='billTicketsAfterClosedFlag'
-    )
-    bill_ticket_separately_flag: bool | None = Field(
-        default=None, alias='billTicketSeparatelyFlag'
-    )
-    bill_unapproved_time_expense_flag: bool | None = Field(
-        default=None, alias='billUnapprovedTimeExpenseFlag'
-    )
-    override_billing_setup_flag: bool | None = Field(
-        default=None, alias='overrideBillingSetupFlag'
-    )
-    dispatch_member: MemberReference | None = Field(
-        default=None, alias='dispatchMember'
-    )
-    service_manager_member: MemberReference | None = Field(
-        default=None, alias='serviceManagerMember'
-    )
-    duty_manager_member: MemberReference | None = Field(
-        default=None, alias='dutyManagerMember'
-    )
-    oncall_member: MemberReference | None = Field(default=None, alias='oncallMember')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    bill_time: BillTime1 | None = Field(default=None, alias='billTime')
-    bill_expense: BillExpense | None = Field(default=None, alias='billExpense')
-    bill_product: BillProduct | None = Field(default=None, alias='billProduct')
-    auto_close_status: ServiceStatusReference | None = Field(
-        default=None, alias='autoCloseStatus'
-    )
-    auto_assign_new_tickets_flag: bool | None = Field(
-        default=None, alias='autoAssignNewTicketsFlag'
-    )
-    auto_assign_new_ec_tickets_flag: bool | None = Field(
-        default=None, alias='autoAssignNewECTicketsFlag'
-    )
-    auto_assign_new_portal_tickets_flag: bool | None = Field(
-        default=None, alias='autoAssignNewPortalTicketsFlag'
-    )
-    discussions_locked_flag: bool | None = Field(
-        default=None, alias='discussionsLockedFlag'
+    gl_interface_identifier: str | None = Field(
+        default=None, alias='glInterfaceIdentifier'
     )
-    time_entry_locked_flag: bool | None = Field(
-        default=None, alias='timeEntryLockedFlag'
+    thru_date: datetime | None = Field(default=None, alias='thruDate')
+    location_id: int | None = Field(default=None, alias='locationId')
+    summarize_invoices: Literal['Default', 'Condensed', 'Detailed'] | None = Field(
+        default=None, alias='summarizeInvoices'
     )
-    notify_email_from: str | None = Field(default=None, alias='notifyEmailFrom')
+    export_invoices_flag: bool | None = Field(default=None, alias='exportInvoicesFlag')
     """
-     Max length: 50;
+    Batch export must include invoices, expenses, or products (procurement).
     """
-    notify_email_from_name: str | None = Field(
-        default=None, alias='notifyEmailFromName'
+    included_invoice_ids: list[int] | None = Field(
+        default=None, alias='includedInvoiceIds'
     )
+    excluded_invoice_ids: list[int] | None = Field(
+        default=None, alias='excludedInvoiceIds'
+    )
+    export_expenses_flag: bool | None = Field(default=None, alias='exportExpensesFlag')
     """
-     Max length: 60;
+    Batch export must include invoices, expenses, or products (procurement).
     """
-    closed_loop_discussions_flag: bool | None = Field(
-        default=None, alias='closedLoopDiscussionsFlag'
-    )
-    closed_loop_resolution_flag: bool | None = Field(
-        default=None, alias='closedLoopResolutionFlag'
-    )
-    closed_loop_internal_analysis_flag: bool | None = Field(
-        default=None, alias='closedLoopInternalAnalysisFlag'
-    )
-    time_entry_discussion_flag: bool | None = Field(
-        default=None, alias='timeEntryDiscussionFlag'
-    )
-    time_entry_resolution_flag: bool | None = Field(
-        default=None, alias='timeEntryResolutionFlag'
-    )
-    time_entry_internal_analysis_flag: bool | None = Field(
-        default=None, alias='timeEntryInternalAnalysisFlag'
-    )
-    problem_sort: ProblemSort | None = Field(default=None, alias='problemSort')
-    resolution_sort: ResolutionSort | None = Field(default=None, alias='resolutionSort')
-    internal_analysis_sort: InternalAnalysisSort | None = Field(
-        default=None, alias='internalAnalysisSort'
-    )
-    email_connector_allow_reopen_closed_flag: bool | None = Field(
-        default=None, alias='emailConnectorAllowReopenClosedFlag'
-    )
-    email_connector_reopen_status: ServiceStatusReference | None = Field(
-        default=None, alias='emailConnectorReopenStatus'
+    included_expense_ids: list[int] | None = Field(
+        default=None, alias='includedExpenseIds'
     )
-    email_connector_reopen_resources_flag: bool | None = Field(
-        default=None, alias='emailConnectorReopenResourcesFlag'
+    excluded_expense_ids: list[int] | None = Field(
+        default=None, alias='excludedExpenseIds'
     )
+    export_payments_flag: bool | None = Field(default=None, alias='exportPaymentsFlag')
     """
-    This field can only be set when emailConnectorAllowReopenClosed is true.
+    Batch export must include invoices, expenses, or products (procurement).
     """
-    email_connector_new_ticket_no_match_flag: bool | None = Field(
-        default=None, alias='emailConnectorNewTicketNoMatchFlag'
+    included_payment_ids: list[int] | None = Field(
+        default=None, alias='includedPaymentIds'
     )
+    export_products_flag: bool | None = Field(default=None, alias='exportProductsFlag')
     """
-    This field can only be set when emailConnectorAllowReopenClosed is true.
+    Batch export must include invoices, expenses, or products (procurement).
     """
-    email_connector_never_reopen_by_days_flag: bool | None = Field(
-        default=None, alias='emailConnectorNeverReopenByDaysFlag'
+    included_product_ids: list[str] | None = Field(
+        default=None, alias='includedProductIds'
+    )
+    excluded_product_ids: list[str] | None = Field(
+        default=None, alias='excludedProductIds'
+    )
+
+
+class FileUploadSetting(ConnectWiseModel):
+    id: int | None = None
+    restrict_file_types_flag: bool = Field(..., alias='restrictFileTypesFlag')
+    global_file_size_limit: int | None = Field(
+        default=None, alias='globalFileSizeLimit'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class FilterValues(ConnectWiseModel):
+    conditions: str | None = None
+    order_by: str | None = Field(default=None, alias='orderBy')
+    childconditions: str | None = None
+    customfieldconditions: str | None = None
+
+
+class FinanceCurrency(ConnectWiseModel):
+    id: int | None = None
+    currency_identifier: str = Field(..., alias='currencyIdentifier')
     """
-    This field can only be set when emailConnectorAllowReopenClosed is true.
+     Max length: 10;
     """
-    email_connector_reopen_days_limit: int | None = Field(
-        default=None, alias='emailConnectorReopenDaysLimit'
-    )
+    name: str
     """
-    This field can only be set when emailConnectorNeverReopenByDaysFlag and emailConnectorAllowReopenClosed are both true
-                This field is required when emailConnectorNeverReopenByDaysFlag is true.
+     Max length: 50;
     """
-    email_connector_never_reopen_by_days_closed_flag: bool | None = Field(
-        default=None, alias='emailConnectorNeverReopenByDaysClosedFlag'
-    )
+    symbol: str | None = None
     """
-    This field can only be set when emailConnectorAllowReopenClosed is true.
+     Max length: 10;
     """
-    email_connector_reopen_days_closed_limit: int | None = Field(
-        default=None, alias='emailConnectorReopenDaysClosedLimit'
+    display_id_flag: bool | None = Field(default=None, alias='displayIdFlag')
+    display_symbol_flag: bool | None = Field(default=None, alias='displaySymbolFlag')
+    currency_code: CurrencyCodeReference | None = Field(
+        default=None, alias='currencyCode'
     )
+    thousands_separator: str | None = Field(default=None, alias='thousandsSeparator')
     """
-    This field can only be set when emailConnectorNeverReopenByDaysClosedFlag and emailConnectorAllowReopenClosed are both true
-                This field is required when emailConnectorNeverReopenByDaysClosedFlag is true.
+     Max length: 1;
     """
-    use_member_display_name_flag: bool | None = Field(
-        default=None, alias='useMemberDisplayNameFlag'
-    )
-    send_to_cc_flag: bool | None = Field(default=None, alias='sendToCCFlag')
-    auto_assign_ticket_owner_flag: bool | None = Field(
-        default=None, alias='autoAssignTicketOwnerFlag'
-    )
-    auto_assign_limit_flag: bool | None = Field(
-        default=None, alias='autoAssignLimitFlag'
-    )
-    auto_assign_limit_amount: int | None = Field(
-        default=None, alias='autoAssignLimitAmount'
-    )
+    decimal_separator: str | None = Field(default=None, alias='decimalSeparator')
     """
-    This field can only be set when autoAssignLimitFlag is true
+     Max length: 1;
     """
-    closed_loop_all_flag: bool | None = Field(default=None, alias='closedLoopAllFlag')
-    percentage_calculation: PercentageCalculation | None = Field(
-        default=None, alias='percentageCalculation'
-    )
-    all_sort: AllSort | None = Field(default=None, alias='allSort')
-    mark_first_note_issue_flag: bool | None = Field(
-        default=None, alias='markFirstNoteIssueFlag'
-    )
-    restrict_board_by_default_flag: bool | None = Field(
-        default=None, alias='restrictBoardByDefaultFlag'
+    negative_parentheses_flag: bool | None = Field(
+        default=None, alias='negativeParenthesesFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    right_align: bool | None = Field(default=None, alias='rightAlign')
+    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
+    report_format: str | None = Field(default=None, alias='reportFormat')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BoardAutoAssignResource(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
-    )
-    member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ForecastRevenueReference(AgreementRevenueReference):
+    pass
 
 
-class BoardAutoTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class FormSubmitted(ConnectWiseModel):
     id: int | None = None
-    type: ServiceTypeReference | None = None
-    subtype: ServiceSubTypeReference | None = None
-    item: ServiceItemReference | None = None
-    service_template: ServiceTemplateReference | None = Field(
-        default=None, alias='serviceTemplate'
-    )
-    board: BoardReference | None = None
-    summary_setting: SummarySetting | None = Field(default=None, alias='summarySetting')
-    discussion_setting: DiscussionSetting | None = Field(
-        default=None, alias='discussionSetting'
-    )
-    internal_analysis_setting: InternalAnalysisSetting | None = Field(
-        default=None, alias='internalAnalysisSetting'
-    )
-    resolution_setting: ResolutionSetting | None = Field(
-        default=None, alias='resolutionSetting'
-    )
-    tasks_setting: TasksSetting | None = Field(default=None, alias='tasksSetting')
-    documents_setting: DocumentsSetting | None = Field(
-        default=None, alias='documentsSetting'
-    )
-    resources_setting: ResourcesSetting | None = Field(
-        default=None, alias='resourcesSetting'
-    )
-    budget_hours_setting: BudgetHoursSetting | None = Field(
-        default=None, alias='budgetHoursSetting'
-    )
-    finance_information_setting: FinanceInformationSetting | None = Field(
-        default=None, alias='financeInformationSetting'
-    )
-    send_notes_as_email_setting: SendNotesAsEmailSetting | None = Field(
-        default=None, alias='sendNotesAsEmailSetting'
-    )
-    impact_urgency_setting: ImpactUrgencySetting | None = Field(
-        default=None, alias='impactUrgencySetting'
-    )
-    template_priority_setting: TemplatePrioritySetting | None = Field(
-        default=None, alias='templatePrioritySetting'
-    )
-    auto_apply_flag: bool | None = Field(default=None, alias='autoApplyFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class BoardCopy(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int
-    name: str
+    campaign_id: int | None = Field(default=None, alias='campaignId')
+    contact_id: int = Field(..., alias='contactId')
+    date_submitted: datetime | None = Field(default=None, alias='dateSubmitted')
+    url: str
     """
-     Max length: 50;
+     Max length: 2083;
     """
+    query_string: str | None = Field(default=None, alias='queryString')
+    page_type: str | None = Field(default=None, alias='pageType')
+    page_sub_type: str | None = Field(default=None, alias='pageSubType')
+    topic: str | None = None
+    version: str | None = None
+    status: str | None = None
 
 
-class BoardDefault(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GenericBoardTeamReference(ConnectWiseModel):
     id: int | None = None
-    board: BoardReference | None = None
-    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str | None = None
+    is_project_team_flag: bool | None = Field(default=None, alias='isProjectTeamFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BoardExcludedMember(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    member_id: int | None = Field(default=None, alias='memberId')
-    board_id: int | None = Field(default=None, alias='boardId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class GenericIdIdentifierReference(AccountingPackage):
+    pass
 
 
-class BoardInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    project_flag: bool | None = Field(default=None, alias='projectFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    closed_loop_discussions_flag: bool | None = Field(
-        default=None, alias='closedLoopDiscussionsFlag'
-    )
-    closed_loop_internal_analysis_flag: bool | None = Field(
-        default=None, alias='closedLoopInternalAnalysisFlag'
-    )
-    closed_loop_resolution_flag: bool | None = Field(
-        default=None, alias='closedLoopResolutionFlag'
-    )
-    closed_loop_all_flag: bool | None = Field(default=None, alias='closedLoopAllFlag')
-    problem_sort: ProblemSort | None = Field(default=None, alias='problemSort')
-    internal_analysis_sort: InternalAnalysisSort | None = Field(
-        default=None, alias='internalAnalysisSort'
-    )
-    resolution_sort: ResolutionSort | None = Field(default=None, alias='resolutionSort')
-    all_sort: AllSort | None = Field(default=None, alias='allSort')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class GenericNameIdDTO(AgreementApplicationAviablePer):
+    pass
 
 
-class BoardItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GLCaption(ConnectWiseModel):
     id: int | None = None
-    name: str
+    segment1: str | None = None
     """
-     Max length: 50;
+     Max length: 255;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    board: BoardReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class BoardItemAssociation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int
-    sub_type_association_ids: list[int] | None = Field(
-        default=None, alias='subTypeAssociationIds'
-    )
+    segment2: str | None = None
     """
-    If addAllSubTypesFlag and removeAllSubTypesFlag are both false, this field is required.
+     Max length: 255;
     """
-    add_all_sub_types_flag: bool | None = Field(
-        default=None, alias='addAllSubTypesFlag'
-    )
-    remove_all_sub_types_flag: bool | None = Field(
-        default=None, alias='removeAllSubTypesFlag'
-    )
-    item: ServiceItemReference | None = None
-    board: BoardReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class BoardNotification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
-    )
-    member: MemberReference | None = None
-    email: str | None = None
+    segment3: str | None = None
     """
-     Max length: 50;
+     Max length: 255;
+    """
+    segment4: str | None = None
+    """
+     Max length: 255;
+    """
+    segment5: str | None = None
+    """
+     Max length: 255;
+    """
+    segment6: str | None = None
+    """
+     Max length: 255;
+    """
+    segment7: str | None = None
+    """
+     Max length: 255;
+    """
+    segment8: str | None = None
+    """
+     Max length: 255;
+    """
+    segment9: str | None = None
+    """
+     Max length: 255;
+    """
+    segment10: str | None = None
+    """
+     Max length: 255;
+    """
+    segment1type: Literal['Account', 'Class'] | None = None
+    segment2type: Literal['Account', 'Class'] | None = None
+    segment3type: Literal['Account', 'Class'] | None = None
+    segment4type: Literal['Account', 'Class'] | None = None
+    segment5type: Literal['Account', 'Class'] | None = None
+    segment6type: Literal['Account', 'Class'] | None = None
+    segment7type: Literal['Account', 'Class'] | None = None
+    segment8type: Literal['Account', 'Class'] | None = None
+    segment9type: Literal['Account', 'Class'] | None = None
+    segment10type: Literal['Account', 'Class'] | None = None
+    cogs1: str | None = None
+    """
+     Max length: 255;
+    """
+    cogs2: str | None = None
+    """
+     Max length: 255;
+    """
+    cogs3: str | None = None
+    """
+     Max length: 255;
+    """
+    cogs4: str | None = None
+    """
+     Max length: 255;
+    """
+    cogs5: str | None = None
+    """
+     Max length: 255;
+    """
+    cogs6: str | None = None
+    """
+     Max length: 255;
+    """
+    cogs7: str | None = None
+    """
+     Max length: 255;
+    """
+    cogs8: str | None = None
+    """
+     Max length: 255;
+    """
+    cogs9: str | None = None
+    """
+     Max length: 255;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    cogs10: str | None = None
+    """
+     Max length: 255;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class GLExportCustomerTaxLevel(ConnectWiseModel):
+    tax_rate: float | None = Field(default=None, alias='taxRate')
+    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
+    agency_xref: str | None = Field(default=None, alias='agencyXref')
+    tax_level: int | None = Field(default=None, alias='taxLevel')
 
 
-class BoardReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class GLExportExpenseBillDetail(ConnectWiseModel):
+    id: list[int] | None = None
+    document_date: str | None = Field(default=None, alias='documentDate')
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    memo: str | None = None
+    company: CompanyReference | None = None
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    expense_class: ClassificationReference | None = Field(
+        default=None, alias='expenseClass'
     )
+    currency: CurrencyReference | None = None
+    total: float | None = None
+    billable: bool | None = None
+    reimbursable: bool | None = None
+    company_advance: bool | None = Field(default=None, alias='companyAdvance')
+
+
+class GLExportInventoryTransferOffset(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    document_type: str | None = Field(default=None, alias='documentType')
+    document_date: str | None = Field(default=None, alias='documentDate')
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    gl_class: str | None = Field(default=None, alias='glClass')
+    total: float | None = None
+    memo: str | None = None
+    description: str | None = None
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
 
 
-class BoardStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GLExportPurchaseTransactionTaxLevel(ConnectWiseModel):
+    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
+    tax_level: int | None = Field(default=None, alias='taxLevel')
+
+
+class GLExportSettings(ConnectWiseModel):
+    pass
+
+
+class GLExportTransactionDetailTaxLevel(ConnectWiseModel):
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    tax_level: int | None = Field(default=None, alias='taxLevel')
+
+
+class GLExportTransactionTaxLevel(ConnectWiseModel):
+    tax_amount: float | None = Field(default=None, alias='taxAmount')
+    taxable_amount: float | None = Field(default=None, alias='taxableAmount')
+    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
+    tax_level: int | None = Field(default=None, alias='taxLevel')
+
+
+class GoogleEmailSetup(ConnectWiseModel):
     id: int | None = None
     name: str
     """
-     Max length: 50;
+     Max length: 200;
     """
-    board: BoardReference | None = None
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    display_on_board: bool | None = Field(default=None, alias='displayOnBoard')
-    inactive: bool | None = None
-    closed_status: bool | None = Field(default=None, alias='closedStatus')
-    time_entry_not_allowed: bool | None = Field(
-        default=None, alias='timeEntryNotAllowed'
-    )
-    round_robin_catchall: bool | None = Field(default=None, alias='roundRobinCatchall')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    escalation_status: EscalationStatus | None = Field(
-        default=None, alias='escalationStatus'
-    )
-    customer_portal_description: str | None = Field(
-        default=None, alias='customerPortalDescription'
-    )
+    username: str
     """
-     Max length: 500;
+     Max length: 100;
     """
-    customer_portal_flag: bool | None = Field(default=None, alias='customerPortalFlag')
-    email_template: ServiceEmailTemplateReference | None = Field(
-        default=None, alias='emailTemplate'
-    )
-    status_indicator: StatusIndicatorReference | None = Field(
-        default=None, alias='statusIndicator'
-    )
-    custom_status_indicator_name: str | None = Field(
-        default=None, alias='customStatusIndicatorName'
-    )
+    inbox_folder: str = Field(..., alias='inboxFolder')
     """
-     Max length: 30;
+     Max length: 40;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    save_time_as_note: bool | None = Field(default=None, alias='saveTimeAsNote')
+    processed_folder: str = Field(..., alias='processedFolder')
+    """
+     Max length: 40;
+    """
+    failed_folder: str = Field(..., alias='failedFolder')
+    """
+     Max length: 40;
+    """
+    client_id: str | None = Field(default=None, alias='clientId')
+    """
+     Max length: 200;
+    """
+    private_key: str | None = Field(default=None, alias='privateKey')
+    """
+     Max length: 4000;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    email_connector: EmailConnectorReference | None = Field(
+        default=None, alias='emailConnector'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BoardStatusInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class GoogleEmailSetupReference(ActivityReference):
+    pass
 
 
-class BoardStatusNotification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Group(ConnectWiseModel):
     id: int | None = None
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
-    )
-    status: ServiceStatusReference | None = None
-    member: MemberReference | None = None
-    email: str | None = None
+    name: str
+    public_description: str | None = Field(default=None, alias='publicDescription')
     """
-    Service Status Notification email must be entered if the notify type is "Email Address". Max length: 255;
+     Max length: 255;
     """
-    workflow_step: int | None = Field(default=None, alias='workflowStep')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    public_flag: bool | None = Field(default=None, alias='publicFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BoardSubType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    type_association_ids: list[int] | None = Field(
-        default=None, alias='typeAssociationIds'
-    )
-    add_all_types_flag: bool | None = Field(default=None, alias='addAllTypesFlag')
-    remove_all_types_flag: bool | None = Field(default=None, alias='removeAllTypesFlag')
-    board: BoardReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class GroupInfo(ActivityReference):
+    pass
 
 
-class BoardSubTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    type_association_ids: list[int] | None = Field(
-        default=None, alias='typeAssociationIds'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class GroupReference(ActivityReference):
+    pass
 
 
-class BoardTeam(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 30;
-    """
-    team_leader: MemberReference | None = Field(default=None, alias='teamLeader')
-    members: list[int] | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    notify_on_ticket_delete: bool | None = Field(
-        default=None, alias='notifyOnTicketDelete'
-    )
-    default_round_robin_flag: bool | None = Field(
-        default=None, alias='defaultRoundRobinFlag'
-    )
-    round_robin_flag: bool | None = Field(default=None, alias='roundRobinFlag')
-    board_id: int | None = Field(default=None, alias='boardId')
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class HolidayList(ContactRelationship):
+    pass
 
 
-class BoardTeamInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class HolidayListInfo(ActivityReference):
+    pass
 
 
-class BoardType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class HolidayListReference(ActivityReference):
+    pass
+
+
+class IdCollection(ConnectWiseModel):
+    ids: list[int] | None = None
+
+
+class Imap(ConnectWiseModel):
     id: int | None = None
     name: str
     """
-     Max length: 50;
+     Max length: 200;
     """
-    category: Category | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    request_for_change_flag: bool | None = Field(
-        default=None, alias='requestForChangeFlag'
-    )
-    integration_xref: str | None = Field(default=None, alias='integrationXref')
+    imap_name: str = Field(..., alias='imapName')
     """
-     Max length: 50;
+     Max length: 40;
     """
-    skill_category: SkillCategoryReference | None = Field(
-        default=None, alias='skillCategory'
+    processed_name: str = Field(..., alias='processedName')
+    """
+     Max length: 40;
+    """
+    failed_folder: str = Field(..., alias='failedFolder')
+    """
+     Max length: 40;
+    """
+    server: str
+    """
+     Max length: 200;
+    """
+    user_name: str = Field(..., alias='userName')
+    """
+     Max length: 80;
+    """
+    password: str | None = None
+    """
+     Max length: 80;
+    """
+    port: int
+    ssl_flag: bool | None = Field(default=None, alias='sslFlag')
+    email_connector: EmailConnectorReference | None = Field(
+        default=None, alias='emailConnector'
     )
-    skill: SkillReference | None = None
-    board: BoardReference | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BoardTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ImapInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    board: BoardReference | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    email_connector: EmailConnectorReference | None = Field(
+        default=None, alias='emailConnector'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BoardTypeSubTypeItemAssociation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: ServiceTypeReference | None = None
-    sub_type: ServiceSubTypeReference | None = Field(default=None, alias='subType')
-    item: ServiceItemReference | None = None
-    board: BoardReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ImapSetupReference(ActivityReference):
+    pass
 
 
-class BudgetAnalysis(Enum):
+class Impact(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    description: str
     """
-    Required On Updates;
+     Max length: 200;
     """
-
-    ACTUAL_HOURS = 'ActualHours'
-    BILLABLE_HOURS = 'BillableHours'
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BudgetHoursSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
+class ImportMassMaintenance(ConnectWiseModel):
+    deleted_contact_count: int | None = Field(default=None, alias='deletedContactCount')
+    deleted_company_count: int | None = Field(default=None, alias='deletedCompanyCount')
+    message: str | None = None
+    success: bool | None = None
 
 
-class BulkResult(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    payload: list[ResultInfo] | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class InclusiveRevenueReference(AgreementRevenueReference):
+    pass
 
 
-class BundleRequest(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
-    resource_type: str | None = Field(default=None, alias='resourceType')
-    version: str | None = None
-    api_request: ApiRequest | None = Field(default=None, alias='apiRequest')
+class InOutType(ConnectWiseModel):
+    id: int | None = None
+    description: str
+    """
+     Max length: 30;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BundleRequestsCollection(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    requests: list[BundleRequest]
+class InOutTypeInfo(ConnectWiseModel):
+    id: int | None = None
+    description: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class BundleResult(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
-    resource_type: str | None = Field(default=None, alias='resourceType')
-    entities: list[IRestIdentifiedItem] | None = None
-    count: int | None = None
-    version: str | None = None
-    success: bool | None = None
-    status_code: int | None = Field(default=None, alias='statusCode')
-    error: ErrorResponseMessage | None = None
+class InOutTypeReference(ActivityReference):
+    pass
 
 
-class BundleResultsCollection(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    results: list[BundleResult] | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class IntegratorLoginReference(ActivityReference):
+    pass
 
 
-class Calendar(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class IntegratorTag(ConnectWiseModel):
     id: int | None = None
-    name: str
-    holiday_list: HolidayListReference | None = Field(default=None, alias='holidayList')
-    monday_start_time: str | None = Field(default=None, alias='mondayStartTime')
-    monday_end_time: str | None = Field(default=None, alias='mondayEndTime')
-    tuesday_start_time: str | None = Field(default=None, alias='tuesdayStartTime')
-    tuesday_end_time: str | None = Field(default=None, alias='tuesdayEndTime')
-    wednesday_start_time: str | None = Field(default=None, alias='wednesdayStartTime')
-    wednesday_end_time: str | None = Field(default=None, alias='wednesdayEndTime')
-    thursday_start_time: str | None = Field(default=None, alias='thursdayStartTime')
-    thursday_end_time: str | None = Field(default=None, alias='thursdayEndTime')
-    friday_start_time: str | None = Field(default=None, alias='fridayStartTime')
-    friday_end_time: str | None = Field(default=None, alias='fridayEndTime')
-    saturday_start_time: str | None = Field(default=None, alias='saturdayStartTime')
-    saturday_end_time: str | None = Field(default=None, alias='saturdayEndTime')
-    sunday_start_time: str | None = Field(default=None, alias='sundayStartTime')
-    sunday_end_time: str | None = Field(default=None, alias='sundayEndTime')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    text: str
+    """
+     Max length: 50;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CalendarInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class IntegratorTagCollection(ConnectWiseModel):
+    tags: list[str] | None = None
 
 
-class CalendarReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InvoiceEmailTemplateInfo(ActivityReference):
+    pass
+
+
+class InvoiceGroupingReference(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    description: str | None = None
+    show_price_flag: bool | None = Field(default=None, alias='showPriceFlag')
+    show_sub_items_flag: bool | None = Field(default=None, alias='showSubItemsFlag')
+    group_parent_child_additions_flag: bool | None = Field(
+        default=None, alias='groupParentChildAdditionsFlag'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CalendarSetupReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InvoiceReference(ConnectWiseModel):
     id: int | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    identifier: str | None = None
+    billing_type: str | None = Field(default=None, alias='billingType')
+    apply_to_type: str | None = Field(default=None, alias='applyToType')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CallbackEntry(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InvoiceTemplate(ConnectWiseModel):
     id: int | None = None
-    description: str | None = None
+    name: str
     """
-     Max length: 100;
+     Max length: 50;
     """
-    url: str | None = None
+    margin_left: float | None = Field(default=None, alias='marginLeft')
+    margin_right: float | None = Field(default=None, alias='marginRight')
+    margin_top: float | None = Field(default=None, alias='marginTop')
+    margin_bottom: float | None = Field(default=None, alias='marginBottom')
+    logo_visible_flag: bool | None = Field(default=None, alias='logoVisibleFlag')
+    header_logo_position: Literal['Center', 'LeftSide', 'RightSide'] | None = Field(
+        default=None, alias='headerLogoPosition'
+    )
+    remit_to_visible_flag: bool | None = Field(default=None, alias='remitToVisibleFlag')
+    header_address_position: Literal['Center', 'LeftSide', 'RightSide'] | None = Field(
+        default=None, alias='headerAddressPosition'
+    )
+    header_title_visible_flag: bool | None = Field(
+        default=None, alias='headerTitleVisibleFlag'
+    )
+    header_title_caption: str | None = Field(default=None, alias='headerTitleCaption')
     """
-     Required Reference
+     Max length: 50;
     """
-    object_id: int | None = Field(default=None, alias='objectId')
+    header_title_position: Literal['Center', 'LeftSide', 'RightSide'] | None = Field(
+        default=None, alias='headerTitlePosition'
+    )
+    header_title_font: Literal[
+        'Regular', 'RegularBold', 'Large', 'LargeBold', 'ExtraLarge', 'ExtraLargeBold'
+    ] | None = Field(default=None, alias='headerTitleFont')
+    header_terms_visible_flag: bool | None = Field(
+        default=None, alias='headerTermsVisibleFlag'
+    )
+    header_terms_caption: str | None = Field(default=None, alias='headerTermsCaption')
     """
-     Required Reference
+     Max length: 50;
     """
-    type: str | None = None
+    header_due_date_visible_flag: bool | None = Field(
+        default=None, alias='headerDueDateVisibleFlag'
+    )
+    header_due_date_caption: str | None = Field(
+        default=None, alias='headerDueDateCaption'
+    )
     """
-     Required Reference
+     Max length: 50;
     """
-    level: str | None = None
+    header_po_number_visible_flag: bool | None = Field(
+        default=None, alias='headerPoNumberVisibleFlag'
+    )
+    header_po_number_caption: str | None = Field(
+        default=None, alias='headerPoNumberCaption'
+    )
     """
-     Required Reference
+     Max length: 50;
     """
-    member_id: int | None = Field(default=None, alias='memberId')
-    payload_version: str | None = Field(default=None, alias='payloadVersion')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    is_soap_callback_flag: bool | None = Field(default=None, alias='isSoapCallbackFlag')
-    is_self_suppressed_flag: bool | None = Field(
-        default=None, alias='isSelfSuppressedFlag'
+    header_reference_visible_flag: bool | None = Field(
+        default=None, alias='headerReferenceVisibleFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Campaign(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    header_reference_caption: str | None = Field(
+        default=None, alias='headerReferenceCaption'
     )
-    id: int | None = None
-    name: str
     """
      Max length: 50;
     """
-    type: CampaignTypeReference | None = None
-    sub_type: CampaignSubTypeReference | None = Field(default=None, alias='subType')
-    status: CampaignStatusReference | None = None
-    start_date: datetime = Field(..., alias='startDate')
-    end_date: datetime | None = Field(default=None, alias='endDate')
-    location_id: int | None = Field(default=None, alias='locationId')
-    member: MemberReference | None = None
-    inactive: bool | None = None
-    inactive_days_after_end: int | None = Field(
-        default=None, alias='inactiveDaysAfterEnd'
-    )
-    notes: str | None = None
-    default_group: GroupReference | None = Field(default=None, alias='defaultGroup')
-    marketing_manager_default_track_id: int | None = Field(
-        default=None, alias='marketingManagerDefaultTrackId'
+    header_account_visible_flag: bool | None = Field(
+        default=None, alias='headerAccountVisibleFlag'
     )
-    opportunity_default_track_id: int | None = Field(
-        default=None, alias='opportunityDefaultTrackId'
+    header_account_caption: str | None = Field(
+        default=None, alias='headerAccountCaption'
     )
-    impressions: int | None = None
-    budget_revenue: float | None = Field(default=None, alias='budgetRevenue')
-    budget_cost: float | None = Field(default=None, alias='budgetCost')
-    actual_cost: float | None = Field(default=None, alias='actualCost')
-    budget_gross_margin: float | None = Field(default=None, alias='budgetGrossMargin')
-    budget_roi: float | None = Field(default=None, alias='budgetROI')
-    actual_revenue: float | None = Field(default=None, alias='actualRevenue')
-    actual_gross_margin: float | None = Field(default=None, alias='actualGrossMargin')
-    actual_roi: float | None = Field(default=None, alias='actualROI')
-    emails_sent: int | None = Field(default=None, alias='emailsSent')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CampaignAudit(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    """
+     Max length: 50;
+    """
+    header_tax_id_visible_flag: bool | None = Field(
+        default=None, alias='headerTaxIdVisibleFlag'
     )
-    id: int | None = None
-    emails_sent: int = Field(..., alias='emailsSent')
-    emails_unsent: int | None = Field(default=None, alias='emailsUnsent')
-    documents_created: int | None = Field(default=None, alias='documentsCreated')
-    email_subject: str | None = Field(default=None, alias='emailSubject')
+    header_tax_id_caption: str | None = Field(default=None, alias='headerTaxIdCaption')
     """
-     Max length: 1000;
+     Max length: 50;
     """
-    group: GroupReference | None = None
-    campaign_id: int | None = Field(default=None, alias='campaignId')
-    created_by: str | None = Field(default=None, alias='createdBy')
-    date_created: str | None = Field(default=None, alias='dateCreated')
-
-
-class CampaignReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    header_ship_to_visible_flag: bool | None = Field(
+        default=None, alias='headerShipToVisibleFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CampaignStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    header_ship_to_caption: str | None = Field(
+        default=None, alias='headerShipToCaption'
     )
-    id: int | None = None
-    name: str
     """
-     Max length: 100;
+     Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CampaignStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    header_hours_based_extended_amount_visible_flag: bool | None = Field(
+        default=None, alias='headerHoursBasedExtendedAmountVisibleFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CampaignSubTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    payable_caption: str | None = Field(default=None, alias='payableCaption')
+    """
+     Max length: 1000;
+    """
+    service_header_ticket_number_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderTicketNumberVisibleFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CampaignType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_header_ticket_number_caption: str | None = Field(
+        default=None, alias='serviceHeaderTicketNumberCaption'
     )
-    id: int | None = None
-    name: str
     """
-     Max length: 100;
+     Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CampaignTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CampaignTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_header_company_name_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderCompanyNameVisibleFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CatalogComponent(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_header_company_name_caption: str | None = Field(
+        default=None, alias='serviceHeaderCompanyNameCaption'
     )
-    id: int | None = None
-    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
-    quantity: float
-    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
-    hide_price_flag: bool | None = Field(default=None, alias='hidePriceFlag')
-    hide_item_identifier_flag: bool | None = Field(
-        default=None, alias='hideItemIdentifierFlag'
+    """
+     Max length: 50;
+    """
+    service_header_summary_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderSummaryVisibleFlag'
     )
-    hide_description_flag: bool | None = Field(
-        default=None, alias='hideDescriptionFlag'
+    service_header_summary_caption: str | None = Field(
+        default=None, alias='serviceHeaderSummaryCaption'
     )
-    hide_quantity_flag: bool | None = Field(default=None, alias='hideQuantityFlag')
-    hide_extended_price_flag: bool | None = Field(
-        default=None, alias='hideExtendedPriceFlag'
+    """
+     Max length: 50;
+    """
+    service_header_contact_name_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderContactNameVisibleFlag'
     )
-    parent_catalog_item: CatalogItemReference | None = Field(
-        default=None, alias='parentCatalogItem'
+    service_header_contact_name_caption: str | None = Field(
+        default=None, alias='serviceHeaderContactNameCaption'
     )
-    price: float | None = None
-    cost: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CatalogInventory(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    """
+     Max length: 50;
+    """
+    service_header_detail_description_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderDetailDescriptionVisibleFlag'
     )
-    id: int | None = None
-    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
+    service_header_detail_description_caption: str | None = Field(
+        default=None, alias='serviceHeaderDetailDescriptionCaption'
     )
-    on_hand: int | None = Field(default=None, alias='onHand')
-    serial_numbers: list[OnHandSerialNumberReference] | None = Field(
-        default=None, alias='serialNumbers'
+    """
+     Max length: 50;
+    """
+    service_header_resolution_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderResolutionVisibleFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CatalogItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_header_resolution_caption: str | None = Field(
+        default=None, alias='serviceHeaderResolutionCaption'
     )
-    id: int | None = None
-    identifier: str
     """
-     Max length: 60;
+     Max length: 50;
     """
-    description: str
+    service_header_amount_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderAmountVisibleFlag'
+    )
+    service_header_amount_caption: str | None = Field(
+        default=None, alias='serviceHeaderAmountCaption'
+    )
     """
-     Max length: 60;
+     Max length: 50;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    subcategory: ProductSubCategoryReference | None = None
-    type: ProductTypeReference | None = None
-    product_class: ProductClass | None = Field(default=None, alias='productClass')
+    service_header_billing_method_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderBillingMethodVisibleFlag'
+    )
+    service_header_billing_method_caption: str | None = Field(
+        default=None, alias='serviceHeaderBillingMethodCaption'
+    )
     """
-    Defaults to Non-Inventory.
+     Max length: 50;
     """
-    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
-    serialized_cost_flag: bool | None = Field(default=None, alias='serializedCostFlag')
-    phase_product_flag: bool | None = Field(default=None, alias='phaseProductFlag')
-    unit_of_measure: UnitOfMeasureReference | None = Field(
-        default=None, alias='unitOfMeasure'
+    service_header_closed_tasks_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderClosedTasksVisibleFlag'
+    )
+    service_header_open_tasks_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderOpenTasksVisibleFlag'
+    )
+    service_header_bundled_tickets_visible_flag: bool | None = Field(
+        default=None, alias='serviceHeaderBundledTicketsVisibleFlag'
+    )
+    project_header_project_name_visible_flag: bool | None = Field(
+        default=None, alias='projectHeaderProjectNameVisibleFlag'
+    )
+    project_header_project_name_caption: str | None = Field(
+        default=None, alias='projectHeaderProjectNameCaption'
     )
-    min_stock_level: int | None = Field(default=None, alias='minStockLevel')
-    price: float | None = None
-    cost: float | None = None
-    price_attribute: PriceAttribute | None = Field(default=None, alias='priceAttribute')
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    drop_ship_flag: bool | None = Field(default=None, alias='dropShipFlag')
-    special_order_flag: bool | None = Field(default=None, alias='specialOrderFlag')
-    customer_description: str = Field(..., alias='customerDescription')
     """
-     Max length: 6000;
+     Max length: 50;
     """
-    manufacturer: ManufacturerReference | None = None
-    manufacturer_part_number: str | None = Field(
-        default=None, alias='manufacturerPartNumber'
+    project_header_company_name_visible_flag: bool | None = Field(
+        default=None, alias='projectHeaderCompanyNameVisibleFlag'
+    )
+    project_header_company_name_caption: str | None = Field(
+        default=None, alias='projectHeaderCompanyNameCaption'
     )
     """
      Max length: 50;
     """
-    vendor: CompanyReference | None = None
-    vendor_sku: str | None = Field(default=None, alias='vendorSku')
+    project_header_original_downpayment_visible_flag: bool | None = Field(
+        default=None, alias='projectHeaderOriginalDownpaymentVisibleFlag'
+    )
+    project_header_original_downpayment_caption: str | None = Field(
+        default=None, alias='projectHeaderOriginalDownpaymentCaption'
+    )
     """
      Max length: 50;
     """
-    notes: str | None = None
-    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
+    project_header_contact_name_visible_flag: bool | None = Field(
+        default=None, alias='projectHeaderContactNameVisibleFlag'
+    )
+    project_header_contact_name_caption: str | None = Field(
+        default=None, alias='projectHeaderContactNameCaption'
+    )
     """
      Max length: 50;
     """
-    sla: SLAReference | None = None
-    entity_type: EntityTypeReference | None = Field(default=None, alias='entityType')
-    recurring_flag: bool | None = Field(default=None, alias='recurringFlag')
-    recurring_revenue: float | None = Field(default=None, alias='recurringRevenue')
-    recurring_cost: float | None = Field(default=None, alias='recurringCost')
-    recurring_one_time_flag: bool | None = Field(
-        default=None, alias='recurringOneTimeFlag'
+    project_header_amount_visible_flag: bool | None = Field(
+        default=None, alias='projectHeaderAmountVisibleFlag'
     )
-    recurring_bill_cycle: BillingCycleReference | None = Field(
-        default=None, alias='recurringBillCycle'
+    project_header_amount_caption: str | None = Field(
+        default=None, alias='projectHeaderAmountCaption'
     )
-    recurring_cycle_type: RecurringCycleType | None = Field(
-        default=None, alias='recurringCycleType'
+    """
+     Max length: 50;
+    """
+    project_header_billing_method_visible_flag: bool | None = Field(
+        default=None, alias='projectHeaderBillingMethodVisibleFlag'
     )
-    date_entered: str | None = Field(default=None, alias='dateEntered')
-    calculated_price_flag: bool | None = Field(
-        default=None, alias='calculatedPriceFlag'
+    project_header_billing_method_caption: str | None = Field(
+        default=None, alias='projectHeaderBillingMethodCaption'
     )
-    calculated_cost_flag: bool | None = Field(default=None, alias='calculatedCostFlag')
-    category: ProductCategoryReference | None = None
-    calculated_price: float | None = Field(default=None, alias='calculatedPrice')
-    calculated_cost: float | None = Field(default=None, alias='calculatedCost')
-    billable_option: BillableOption | None = Field(default=None, alias='billableOption')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
-
-
-class CatalogItemInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    description: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    product_class: ProductClass1 | None = Field(default=None, alias='productClass')
-    serialized_cost_flag: bool | None = Field(default=None, alias='serializedCostFlag')
-    price: float | None = None
-    cost: float | None = None
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    drop_ship_flag: bool | None = Field(default=None, alias='dropShipFlag')
-    special_order_flag: bool | None = Field(default=None, alias='specialOrderFlag')
-    customer_description: str | None = Field(default=None, alias='customerDescription')
-    manufacturer_part_number: str | None = Field(
-        default=None, alias='manufacturerPartNumber'
-    )
-    vendor_sku: str | None = Field(default=None, alias='vendorSku')
-    billable_option: BillableOption | None = Field(default=None, alias='billableOption')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CatalogItemReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CatalogPricing(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    """
+     Max length: 50;
+    """
+    project_header_billing_type_visible_flag: bool | None = Field(
+        default=None, alias='projectHeaderBillingTypeVisibleFlag'
     )
-    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
-    company: CompanyReference | None = None
-    location: SystemLocationReference | None = None
-    quantity: int | None = None
-    date: str | None = None
-    price: float | None = None
-
-
-class Category(Enum):
-    REACTIVE = 'Reactive'
-    PROACTIVE = 'Proactive'
-
-
-class Category1(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_header_billing_type_caption: str | None = Field(
+        default=None, alias='projectHeaderBillingTypeCaption'
     )
-    id: int | None = None
-    name: str
     """
      Max length: 50;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
+    invoice_payment_amount_visible_flag: bool | None = Field(
+        default=None, alias='invoicePaymentAmountVisibleFlag'
+    )
+    invoice_payment_amount_caption: str | None = Field(
+        default=None, alias='invoicePaymentAmountCaption'
+    )
     """
-     Max length: 10;
+     Max length: 50;
     """
-    integration_xref: str | None = Field(default=None, alias='integrationXref')
+    invoice_credit_amount_visible_flag: bool | None = Field(
+        default=None, alias='invoiceCreditAmountVisibleFlag'
+    )
+    invoice_credit_amount_caption: str | None = Field(
+        default=None, alias='invoiceCreditAmountCaption'
+    )
     """
      Max length: 50;
     """
-    location_ids: list[int] | None = Field(default=None, alias='locationIds')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    add_all_locations: bool | None = Field(default=None, alias='addAllLocations')
-    remove_all_locations: bool | None = Field(default=None, alias='removeAllLocations')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CategoryInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    invoice_balance_due_visible_flag: bool | None = Field(
+        default=None, alias='invoiceBalanceDueVisibleFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Certification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    invoice_balance_due_caption: str | None = Field(
+        default=None, alias='invoiceBalanceDueCaption'
     )
-    id: int | None = None
-    name: str
     """
      Max length: 50;
     """
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CertificationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    credit_credit_amount_visible_flag: bool | None = Field(
+        default=None, alias='creditCreditAmountVisibleFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ChargeCode(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    credit_credit_amount_caption: str | None = Field(
+        default=None, alias='creditCreditAmountCaption'
     )
-    id: int | None = None
-    name: str
     """
      Max length: 50;
     """
-    company: CompanyReference | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    bill_time: BillTime1 | None = Field(default=None, alias='billTime')
-    expense_entry_flag: bool | None = Field(default=None, alias='expenseEntryFlag')
-    allow_all_expense_type_flag: bool | None = Field(
-        default=None, alias='allowAllExpenseTypeFlag'
+    credit_remaining_amount_visible_flag: bool | None = Field(
+        default=None, alias='creditRemainingAmountVisibleFlag'
+    )
+    credit_remaining_amount_caption: str | None = Field(
+        default=None, alias='creditRemainingAmountCaption'
     )
-    time_entry_flag: bool | None = Field(default=None, alias='timeEntryFlag')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    integration_xref: str | None = Field(default=None, alias='integrationXref')
     """
      Max length: 50;
     """
-    expense_type_ids: list[int] | None = Field(default=None, alias='expenseTypeIds')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ChargeCodeExpenseType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: ExpenseTypeReference | None = None
-    charge_code: ChargeCodeReference | None = Field(default=None, alias='chargeCode')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ChargeCodeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailVisibleFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    expense_entry_flag: bool | None = Field(default=None, alias='expenseEntryFlag')
-    allow_all_expense_type_flag: bool | None = Field(
-        default=None, alias='allowAllExpenseTypeFlag'
+    time_detail_primary_sort_field: str | None = Field(
+        default=None, alias='timeDetailPrimarySortField'
     )
-    time_entry_flag: bool | None = Field(default=None, alias='timeEntryFlag')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    expense_type_ids: list[int] | None = Field(default=None, alias='expenseTypeIds')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ChargeCodeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_primary_sort_direction: str | None = Field(
+        default=None, alias='timeDetailPrimarySortDirection'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ChargeToType(Enum):
-    """
-    Gets or sets
-                company or chargeToType is required.
-    """
-
-    SERVICE_TICKET = 'ServiceTicket'
-    PROJECT_TICKET = 'ProjectTicket'
-    CHARGE_CODE = 'ChargeCode'
-    ACTIVITY = 'Activity'
-
-
-class ChargeToType1(Enum):
-    """
-    If chargeToId is not specified, we asume you enter time against the company specified
-    """
-
-    SERVICE_TICKET = 'ServiceTicket'
-    PROJECT_TICKET = 'ProjectTicket'
-    CHARGE_CODE = 'ChargeCode'
-    ACTIVITY = 'Activity'
-
-
-class ChildScheduleAction(Enum):
-    TRANSFER = 'Transfer'
-    DELETE = 'Delete'
-    DONE = 'Done'
-
-
-class Classification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_secondary_sort_field: str | None = Field(
+        default=None, alias='timeDetailSecondarySortField'
     )
-    id: int | None = None
-    name: str | None = None
-    multiplier: float | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    company_flag: bool | None = Field(default=None, alias='companyFlag')
-    employee_flag: bool | None = Field(default=None, alias='employeeFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Classification1(Enum):
-    NON_REIMBURSABLE = 'NonReimbursable'
-    REIMBURSABLE = 'Reimbursable'
-    PERSONAL = 'Personal'
-
-
-class ClassificationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_secondary_sort_direction: str | None = Field(
+        default=None, alias='timeDetailSecondarySortDirection'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ClearPickerRequest(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_subtotal_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailSubtotalVisibleFlag'
     )
-    member: MemberReference | None = None
-    type: Type | None = None
-
-
-class ClosedInvoice(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_start_end_time_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailStartEndTimeVisibleFlag'
     )
-    id: int | None = None
-    status: BillingStatusReference | None = None
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Code(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_hours_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailHoursVisibleFlag'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    description: str
-    board_id: int | None = Field(default=None, alias='boardId')
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Color(Enum):
-    BLACK = 'Black'
-    BLUE = 'Blue'
-    CYAN = 'Cyan'
-    GRAY = 'Gray'
-    GREEN = 'Green'
-    LIME = 'Lime'
-    ORANGE = 'Orange'
-    PINK = 'Pink'
-    PURPLE = 'Purple'
-    RED = 'Red'
-    WHITE = 'White'
-    YELLOW = 'Yellow'
-    CUSTOM = 'Custom'
-
-
-class Commission(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_members_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailMembersVisibleFlag'
     )
-    id: int | None = None
-    member: MemberReference | None = None
-    commission_percent: float | None = Field(default=None, alias='commissionPercent')
-    date_start: datetime | None = Field(default=None, alias='dateStart')
-    date_end: datetime | None = Field(default=None, alias='dateEnd')
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    company: CompanyReference | None = None
-    site: SiteReference | None = None
-    agreement: AgreementReference | None = None
-    project: ProjectReference | None = None
-    service_board: BoardReference | None = Field(default=None, alias='serviceBoard')
-    ticket: TicketReference | None = None
-    territory: SystemLocationReference | None = None
-    billing_method: BillingMethod | None = Field(default=None, alias='billingMethod')
-    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
-    project_board: ProjectBoardReference | None = Field(
-        default=None, alias='projectBoard'
+    time_detail_billable_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailBillableVisibleFlag'
     )
-    project_type: ProjectTypeReference | None = Field(default=None, alias='projectType')
-    agreement_type: AgreementTypeReference | None = Field(
-        default=None, alias='agreementType'
+    time_detail_extended_amount_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailExtendedAmountVisibleFlag'
     )
-    number_of_months: int | None = Field(default=None, alias='numberOfMonths')
-    product_category: ProductCategoryReference | None = Field(
-        default=None, alias='productCategory'
+    time_detail_dollar_amounts_on_hourse_based_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailDollarAmountsOnHourseBasedVisibleFlag'
     )
-    product_sub_category: ProductSubCategoryReference | None = Field(
-        default=None, alias='productSubCategory'
+    time_detail_hourly_rate_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailHourlyRateVisibleFlag'
     )
-    item: IvItemReference | None = None
-    commission_basis: CommissionBasis | None = Field(
-        default=None, alias='commissionBasis'
+    time_detail_contacts_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailContactsVisibleFlag'
     )
-    invoice_option: InvoiceOption | None = Field(default=None, alias='invoiceOption')
-    services_flag: bool | None = Field(default=None, alias='servicesFlag')
-    agreements_flag: bool | None = Field(default=None, alias='agreementsFlag')
-    products_flag: bool | None = Field(default=None, alias='productsFlag')
-    my_opportunities_flag: bool | None = Field(
-        default=None, alias='myOpportunitiesFlag'
+    time_detail_notes_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailNotesVisibleFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CommissionBasis(Enum):
-    GROSS_PROFIT = 'GrossProfit'
-    SALES_AMOUNT = 'SalesAmount'
-
-
-class CommunicationType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_non_billable_caption: str | None = Field(
+        default=None, alias='timeDetailNonBillableCaption'
     )
-    id: int | None = None
-    description: str
-    phone_flag: bool | None = Field(default=None, alias='phoneFlag')
-    """
-    Gets or sets at least one flag is required to be true -- phone, fax, or email.
-    """
-    fax_flag: bool | None = Field(default=None, alias='faxFlag')
-    """
-    Gets or sets at least one flag is required to be true -- phone, fax, or email.
-    """
-    email_flag: bool | None = Field(default=None, alias='emailFlag')
-    """
-    Gets or sets at least one flag is required to be true -- phone, fax, or email.
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    exchange_xref: str | None = Field(default=None, alias='exchangeXref')
     """
      Max length: 50;
     """
-    iphone_xref: str | None = Field(default=None, alias='iphoneXref')
-    """
-     Max length: 50;
-    """
-    android_xref: str | None = Field(default=None, alias='androidXref')
-    """
-     Max length: 50;
-    """
-    google_xref: str | None = Field(default=None, alias='googleXref')
-    """
-     Max length: 50;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CommunicationType1(Enum):
-    EMAIL = 'Email'
-    FAX = 'Fax'
-    PHONE = 'Phone'
-
-
-class CommunicationTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_agreement_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailAgreementVisibleFlag'
     )
-    id: int | None = None
-    description: str | None = None
-    phone_flag: bool | None = Field(default=None, alias='phoneFlag')
-    fax_flag: bool | None = Field(default=None, alias='faxFlag')
-    email_flag: bool | None = Field(default=None, alias='emailFlag')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CommunicationTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_hours_based_hours_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailHoursBasedHoursVisibleFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Company(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_detail_hours_based_ext_amount_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailHoursBasedExtAmountVisibleFlag'
     )
-    id: int | None = None
-    identifier: str
-    """
-     Max length: 30;
-    """
-    name: str
-    """
-     Max length: 50;
-    """
-    status: CompanyStatusReference | None = None
-    address_line1: str | None = Field(default=None, alias='addressLine1')
-    """
-    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 50;
-    """
-    address_line2: str | None = Field(default=None, alias='addressLine2')
-    """
-    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 50;
-    """
-    city: str | None = None
-    """
-    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 50;
-    """
-    state: str | None = None
-    """
-    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 50;
-    """
-    zip: str | None = None
-    """
-    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 12;
-    """
-    country: CountryReference | None = None
-    phone_number: str | None = Field(default=None, alias='phoneNumber')
-    """
-     Max length: 30;
-    """
-    fax_number: str | None = Field(default=None, alias='faxNumber')
-    """
-     Max length: 30;
-    """
-    website: str | None = None
-    """
-     Max length: 255;
-    """
-    territory: SystemLocationReference | None = None
-    market: MarketDescriptionReference | None = None
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    default_contact: ContactReference | None = Field(
-        default=None, alias='defaultContact'
+    time_detail_hoursbased_hourly_rate_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailHoursbasedHourlyRateVisibleFlag'
     )
-    date_acquired: datetime | None = Field(default=None, alias='dateAcquired')
-    sic_code: SicCodeReference | None = Field(default=None, alias='sicCode')
-    parent_company: CompanyReference | None = Field(default=None, alias='parentCompany')
-    annual_revenue: float | None = Field(default=None, alias='annualRevenue')
-    number_of_employees: int | None = Field(default=None, alias='numberOfEmployees')
-    year_established: int | None = Field(default=None, alias='yearEstablished')
-    revenue_year: int | None = Field(default=None, alias='revenueYear')
-    ownership_type: OwnershipTypeReference | None = Field(
-        default=None, alias='ownershipType'
+    time_detail_amount_based_hours_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailAmountBasedHoursVisibleFlag'
     )
-    time_zone_setup: TimeZoneSetupReference | None = Field(
-        default=None, alias='timeZoneSetup'
+    time_detail_amount_based_ext_amount_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailAmountBasedExtAmountVisibleFlag'
+    )
+    time_detail_amount_based_hourly_rate_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailAmountBasedHourlyRateVisibleFlag'
+    )
+    time_detail_sr_ticket_summary_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailSRTicketSummaryVisibleFlag'
+    )
+    time_detail_sr_contact_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailSRContactVisibleFlag'
+    )
+    time_detail_sr_address_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailSRAddressVisibleFlag'
+    )
+    time_detail_pm_phase_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailPmPhaseVisibleFlag'
+    )
+    time_detail_pm_summary_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailPmSummaryVisibleFlag'
+    )
+    time_detail_ticket_number_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailTicketNumberVisibleFlag'
+    )
+    time_detail_dates_visible_flag: bool | None = Field(
+        default=None, alias='timeDetailDatesVisibleFlag'
+    )
+    services_staff_caption: str | None = Field(
+        default=None, alias='servicesStaffCaption'
     )
-    lead_source: str | None = Field(default=None, alias='leadSource')
-    """
-     Max length: 50;
-    """
-    lead_flag: bool | None = Field(default=None, alias='leadFlag')
-    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
-    calendar: CalendarReference | None = None
-    user_defined_field1: str | None = Field(default=None, alias='userDefinedField1')
     """
      Max length: 50;
     """
-    user_defined_field2: str | None = Field(default=None, alias='userDefinedField2')
+    services_staff_visible_flag: bool | None = Field(
+        default=None, alias='servicesStaffVisibleFlag'
+    )
+    services_amount_caption: str | None = Field(
+        default=None, alias='servicesAmountCaption'
+    )
     """
      Max length: 50;
     """
-    user_defined_field3: str | None = Field(default=None, alias='userDefinedField3')
+    services_amount_visible_flag: bool | None = Field(
+        default=None, alias='servicesAmountVisibleFlag'
+    )
+    services_hours_caption: str | None = Field(
+        default=None, alias='servicesHoursCaption'
+    )
     """
      Max length: 50;
     """
-    user_defined_field4: str | None = Field(default=None, alias='userDefinedField4')
+    services_hours_visible_flag: bool | None = Field(
+        default=None, alias='servicesHoursVisibleFlag'
+    )
+    services_rate_caption: str | None = Field(default=None, alias='servicesRateCaption')
     """
      Max length: 50;
     """
-    user_defined_field5: str | None = Field(default=None, alias='userDefinedField5')
+    services_rate_visible_flag: bool | None = Field(
+        default=None, alias='servicesRateVisibleFlag'
+    )
+    services_work_role_caption: str | None = Field(
+        default=None, alias='servicesWorkRoleCaption'
+    )
     """
      Max length: 50;
     """
-    user_defined_field6: str | None = Field(default=None, alias='userDefinedField6')
+    services_work_role_visible_flag: bool | None = Field(
+        default=None, alias='servicesWorkRoleVisibleFlag'
+    )
+    services_work_type_caption: str | None = Field(
+        default=None, alias='servicesWorkTypeCaption'
+    )
     """
      Max length: 50;
     """
-    user_defined_field7: str | None = Field(default=None, alias='userDefinedField7')
+    services_work_type_visible_flag: bool | None = Field(
+        default=None, alias='servicesWorkTypeVisibleFlag'
+    )
+    services_total_visible_flag: bool | None = Field(
+        default=None, alias='servicesTotalVisibleFlag'
+    )
+    services_member_name_visible_flag: bool | None = Field(
+        default=None, alias='servicesMemberNameVisibleFlag'
+    )
+    services_member_name_caption: str | None = Field(
+        default=None, alias='servicesMemberNameCaption'
+    )
     """
      Max length: 50;
     """
-    user_defined_field8: str | None = Field(default=None, alias='userDefinedField8')
+    currency_id_visible_flag: bool | None = Field(
+        default=None, alias='currencyIdVisibleFlag'
+    )
+    currency_symbol_visible_flag: bool | None = Field(
+        default=None, alias='currencySymbolVisibleFlag'
+    )
+    portal_flag: bool | None = Field(default=None, alias='portalFlag')
+    services_collapsed_flag: bool | None = Field(
+        default=None, alias='servicesCollapsedFlag'
+    )
+    expenses_collapsed_flag: bool | None = Field(
+        default=None, alias='expensesCollapsedFlag'
+    )
+    other_charges_collapsed_flag: bool | None = Field(
+        default=None, alias='otherChargesCollapsedFlag'
+    )
+    expenses_type_caption: str | None = Field(default=None, alias='expensesTypeCaption')
     """
      Max length: 50;
     """
-    user_defined_field9: str | None = Field(default=None, alias='userDefinedField9')
+    expenses_staff_caption: str | None = Field(
+        default=None, alias='expensesStaffCaption'
+    )
     """
      Max length: 50;
     """
-    user_defined_field10: str | None = Field(default=None, alias='userDefinedField10')
+    expenses_amount_caption: str | None = Field(
+        default=None, alias='expensesAmountCaption'
+    )
     """
      Max length: 50;
     """
-    vendor_identifier: str | None = Field(default=None, alias='vendorIdentifier')
-    tax_identifier: str | None = Field(default=None, alias='taxIdentifier')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
+    expenses_type_visible_flag: bool | None = Field(
+        default=None, alias='expensesTypeVisibleFlag'
     )
-    invoice_template: InvoiceTemplateReference | None = Field(
-        default=None, alias='invoiceTemplate'
+    expenses_staff_visible_flag: bool | None = Field(
+        default=None, alias='expensesStaffVisibleFlag'
     )
-    pricing_schedule: PricingScheduleReference | None = Field(
-        default=None, alias='pricingSchedule'
+    expenses_amount_visible_flag: bool | None = Field(
+        default=None, alias='expensesAmountVisibleFlag'
     )
-    company_entity_type: EntityTypeReference | None = Field(
-        default=None, alias='companyEntityType'
+    expenses_total_visible_flag: bool | None = Field(
+        default=None, alias='expensesTotalVisibleFlag'
     )
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
+    expense_detail_subtotal_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailSubtotalVisibleFlag'
     )
-    billing_site: SiteReference | None = Field(default=None, alias='billingSite')
-    billing_contact: ContactReference | None = Field(
-        default=None, alias='billingContact'
+    expense_detail_members_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailMembersVisibleFlag'
     )
-    invoice_delivery_method: BillingDeliveryReference | None = Field(
-        default=None, alias='invoiceDeliveryMethod'
+    expense_detail_contacts_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailContactsVisibleFlag'
     )
-    invoice_to_email_address: str | None = Field(
-        default=None, alias='invoiceToEmailAddress'
+    expense_detail_billable_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailBillableVisibleFlag'
     )
-    invoice_cc_email_address: str | None = Field(
-        default=None, alias='invoiceCCEmailAddress'
+    expense_detail_ext_amount_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailExtAmountVisibleFlag'
     )
-    deleted_flag: bool | None = Field(default=None, alias='deletedFlag')
-    date_deleted: datetime | None = Field(default=None, alias='dateDeleted')
-    deleted_by: str | None = Field(default=None, alias='deletedBy')
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    facebook_url: str | None = Field(default=None, alias='facebookUrl')
-    twitter_url: str | None = Field(default=None, alias='twitterUrl')
-    linked_in_url: str | None = Field(default=None, alias='linkedInUrl')
-    currency: CurrencyReference | None = None
-    territory_manager: MemberReference | None = Field(
-        default=None, alias='territoryManager'
+    expense_detail_notes_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailNotesVisibleFlag'
     )
-    reseller_identifier: str | None = Field(default=None, alias='resellerIdentifier')
-    is_vendor_flag: bool | None = Field(default=None, alias='isVendorFlag')
-    types: list[CompanyTypeReference] | None = None
-    """
-    Gets or sets integrer array of Company_Type_Recids to be assigned to company that can be passed in only during new company creation (post)
-                To update existing companies type, use the /company/companyTypeAssociations or /company/companies/{ID}/typeAssociations endpoints.
-    """
-    site: SiteReference | None = None
-    integrator_tags: list[str] | None = Field(default=None, alias='integratorTags')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    expense_detail_primary_sort_field: str | None = Field(
+        default=None, alias='expenseDetailPrimarySortField'
     )
-
-
-class CompanyActivityTabFormat(Enum):
-    SUMMARY_LIST = 'SummaryList'
-    DETAIL_LIST = 'DetailList'
-
-
-class CompanyCustomNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    expense_detail_primary_sort_direction: str | None = Field(
+        default=None, alias='expenseDetailPrimarySortDirection'
     )
-    id: int | None = None
-    custom_note: str = Field(..., alias='customNote')
-    """
-     Max length: 1500;
-    """
-    status: CompanyStatusReference | None = None
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CompanyFinance(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    expense_detail_secondary_sort_field: str | None = Field(
+        default=None, alias='expenseDetailSecondarySortField'
     )
-    id: int | None = None
-    bill_override_flag: bool | None = Field(default=None, alias='billOverrideFlag')
-    bill_sr_flag: bool | None = Field(default=None, alias='billSrFlag')
-    bill_complete_sr_flag: bool | None = Field(default=None, alias='billCompleteSrFlag')
-    bill_unapproved_sr_flag: bool | None = Field(
-        default=None, alias='billUnapprovedSrFlag'
+    expense_detail_secondary_sort_direction: str | None = Field(
+        default=None, alias='expenseDetailSecondarySortDirection'
     )
-    bill_restrict_pm_flag: bool | None = Field(default=None, alias='billRestrictPmFlag')
-    bill_complete_pm_flag: bool | None = Field(default=None, alias='billCompletePmFlag')
-    bill_unapproved_pm_flag: bool | None = Field(
-        default=None, alias='billUnapprovedPmFlag'
+    expense_detail_nonbillable_caption: str | None = Field(
+        default=None, alias='expenseDetailNonbillableCaption'
     )
-    email_template: EmailTemplateReference | None = Field(
-        default=None, alias='emailTemplate'
+    """
+     Max length: 50;
+    """
+    expense_detail_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailVisibleFlag'
     )
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    expense_detail_agreement_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailAgreementVisibleFlag'
     )
-
-
-class CompanyGroup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    expense_detail_agreement_ext_amount_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailAgreementExtAmountVisibleFlag'
     )
-    id: int | None = None
-    """
-     Required On Updates;
-    """
-    group: GroupReference | None = None
-    company: CompanyReference | None = None
-    default_contact_flag: bool | None = Field(default=None, alias='defaultContactFlag')
-    all_contacts_flag: bool | None = Field(default=None, alias='allContactsFlag')
-    remove_all_contacts_flag: bool | None = Field(
-        default=None, alias='removeAllContactsFlag'
+    expense_detail_ticket_number_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailTicketNumberVisibleFlag'
     )
-    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
-    contact_ids: list[int] | None = Field(default=None, alias='contactIds')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CompanyManagementSummary(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    expense_detail_sr_ticket_summary_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailSrTicketSummaryVisibleFlag'
     )
-    id: int | None = None
-    management_solution: ManagementSolutionReference | None = Field(
-        default=None, alias='managementSolution'
+    expense_detail_sr_contact_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailSrContactVisibleFlag'
     )
-    group_identifier: str = Field(..., alias='groupIdentifier')
-    """
-     Max length: 100;
-    """
-    device_type: DeviceType | None = Field(default=None, alias='deviceType')
-    """
-    Gets or sets deviceType is required if the managementSolution is Legacy.
-    """
-    agreement: AgreementReference | None = None
-    snmp_machines: int | None = Field(default=None, alias='snmpMachines')
-    total_workstations: int | None = Field(default=None, alias='totalWorkstations')
-    total_servers: int | None = Field(default=None, alias='totalServers')
-    total_windows_servers: int | None = Field(default=None, alias='totalWindowsServers')
-    total_windows_workstations: int | None = Field(
-        default=None, alias='totalWindowsWorkstations'
+    expense_detail_sr_address_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailSrAddressVisibleFlag'
     )
-    total_managed_machines: int | None = Field(
-        default=None, alias='totalManagedMachines'
+    expense_detail_pm_phase_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailPmPhaseVisibleFlag'
     )
-    servers_offline: int | None = Field(default=None, alias='serversOffline')
-    servers_disk_space_low: int | None = Field(
-        default=None, alias='serversDiskSpaceLow'
+    expense_detail_pm_summary_visible_flag: bool | None = Field(
+        default=None, alias='expenseDetailPmSummaryVisibleFlag'
     )
-    failed_backup_jobs: int | None = Field(default=None, alias='failedBackupJobs')
-    total_notifications: int | None = Field(default=None, alias='totalNotifications')
-    successful_backup_jobs: int | None = Field(
-        default=None, alias='successfulBackupJobs'
+    other_charges_amount_caption: str | None = Field(
+        default=None, alias='otherChargesAmountCaption'
     )
-    server_availability: int | None = Field(default=None, alias='serverAvailability')
-    viruses_removed: int | None = Field(default=None, alias='virusesRemoved')
-    spyware_items_removed: int | None = Field(default=None, alias='spywareItemsRemoved')
-    windows_patches_installed: int | None = Field(
-        default=None, alias='windowsPatchesInstalled'
+    """
+     Max length: 50;
+    """
+    other_charges_amount_visible_flag: bool | None = Field(
+        default=None, alias='otherChargesAmountVisibleFlag'
     )
-    disk_cleanups: int | None = Field(default=None, alias='diskCleanups')
-    disk_defragmentations: int | None = Field(
-        default=None, alias='diskDefragmentations'
+    other_charges_description_caption: str | None = Field(
+        default=None, alias='otherChargesDescriptionCaption'
     )
-    fully_patched_machines: int | None = Field(
-        default=None, alias='fullyPatchedMachines'
+    """
+     Max length: 50;
+    """
+    other_charges_description_visible_flag: bool | None = Field(
+        default=None, alias='otherChargesDescriptionVisibleFlag'
     )
-    missing_one_two_patches_machines: int | None = Field(
-        default=None, alias='missingOneTwoPatchesMachines'
+    other_charges_display_six_decimals: bool | None = Field(
+        default=None, alias='otherChargesDisplaySixDecimals'
     )
-    missing_three_five_patches_machines: int | None = Field(
-        default=None, alias='missingThreeFivePatchesMachines'
+    other_charges_item_id_visible_flag: bool | None = Field(
+        default=None, alias='otherChargesItemIdVisibleFlag'
     )
-    missing_more_five_patches_machines: int | None = Field(
-        default=None, alias='missingMoreFivePatchesMachines'
+    other_charges_price_caption: str | None = Field(
+        default=None, alias='otherChargesPriceCaption'
     )
-    missing_unscanned_patches_machines: int | None = Field(
-        default=None, alias='missingUnscannedPatchesMachines'
+    """
+     Max length: 50;
+    """
+    other_charges_price_visible_flag: bool | None = Field(
+        default=None, alias='otherChargesPriceVisibleFlag'
     )
-    alerts_generated: str | None = Field(default=None, alias='alertsGenerated')
-    internet_connectivity: float | None = Field(
-        default=None, alias='internetConnectivity'
+    other_charges_quantity_caption: str | None = Field(
+        default=None, alias='otherChargesQuantityCaption'
     )
-    disk_space_cleaned_mb: int | None = Field(default=None, alias='diskSpaceCleanedMb')
-    missing_security_patches: str | None = Field(
-        default=None, alias='missingSecurityPatches'
+    """
+     Max length: 50;
+    """
+    other_charges_quantity_visible_flag: bool | None = Field(
+        default=None, alias='otherChargesQuantityVisibleFlag'
     )
-    cpu_utilization: float | None = Field(default=None, alias='cpuUtilization')
-    memory_utilization: float | None = Field(default=None, alias='memoryUtilization')
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CompanyMerge(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    other_charges_serial_number_visible_flag: bool | None = Field(
+        default=None, alias='otherChargesSerialNumberVisibleFlag'
     )
-    to_company_id: int = Field(..., alias='toCompanyId')
-    name: Name | None = None
-    identifier: Identifier1 | None = None
-    status: Status1 | None = None
-    type: Type1 | None = None
-    primary_address: PrimaryAddress | None = Field(default=None, alias='primaryAddress')
-    primary_contact: PrimaryContact | None = Field(default=None, alias='primaryContact')
-    phone: Phone | None = None
-    fax: Fax | None = None
-    website: Website | None = None
-    market: Market | None = None
-    territory: Territory | None = None
-    revenue: Revenue | None = None
-    revenue_year: RevenueYear | None = Field(default=None, alias='revenueYear')
-    number_of_employees: NumberOfEmployees | None = Field(
-        default=None, alias='numberOfEmployees'
+    other_charges_total_visible_flag: bool | None = Field(
+        default=None, alias='otherChargesTotalVisibleFlag'
     )
-    sic_code: SicCode | None = Field(default=None, alias='sicCode')
-    date_acquired: DateAcquired | None = Field(default=None, alias='dateAcquired')
-    time_zone: TimeZone | None = Field(default=None, alias='timeZone')
-    source_list: SourceList | None = Field(default=None, alias='sourceList')
-    user_defined_field1: UserDefinedField1 | None = Field(
-        default=None, alias='userDefinedField1'
+    adjustment_description_visible_flag: bool | None = Field(
+        default=None, alias='adjustmentDescriptionVisibleFlag'
     )
-    user_defined_field2: UserDefinedField2 | None = Field(
-        default=None, alias='userDefinedField2'
+    adjustment_description_caption: str | None = Field(
+        default=None, alias='adjustmentDescriptionCaption'
     )
-    user_defined_field3: UserDefinedField3 | None = Field(
-        default=None, alias='userDefinedField3'
+    """
+     Max length: 50;
+    """
+    adjustment_quantity_visible_flag: bool | None = Field(
+        default=None, alias='adjustmentQuantityVisibleFlag'
     )
-    user_defined_field4: UserDefinedField4 | None = Field(
-        default=None, alias='userDefinedField4'
+    adjustment_quantity_caption: str | None = Field(
+        default=None, alias='adjustmentQuantityCaption'
     )
-    user_defined_field5: UserDefinedField5 | None = Field(
-        default=None, alias='userDefinedField5'
+    """
+     Max length: 50;
+    """
+    adjustment_amount_visible_flag: bool | None = Field(
+        default=None, alias='adjustmentAmountVisibleFlag'
     )
-    user_defined_field6: UserDefinedField6 | None = Field(
-        default=None, alias='userDefinedField6'
+    adjustment_amount_caption: str | None = Field(
+        default=None, alias='adjustmentAmountCaption'
     )
-    user_defined_field7: UserDefinedField7 | None = Field(
-        default=None, alias='userDefinedField7'
+    """
+     Max length: 50;
+    """
+    adjustment_agr_type_visible_flag: bool | None = Field(
+        default=None, alias='adjustmentAgrTypeVisibleFlag'
     )
-    user_defined_field8: UserDefinedField8 | None = Field(
-        default=None, alias='userDefinedField8'
+    adjustment_total_visible_flag: bool | None = Field(
+        default=None, alias='adjustmentTotalVisibleFlag'
     )
-    user_defined_field9: UserDefinedField9 | None = Field(
-        default=None, alias='userDefinedField9'
+    adjustment_price_visible_flag: bool | None = Field(
+        default=None, alias='adjustmentPriceVisibleFlag'
     )
-    user_defined_field10: UserDefinedField10 | None = Field(
-        default=None, alias='userDefinedField10'
+    adjustment_price_caption: str | None = Field(
+        default=None, alias='adjustmentPriceCaption'
     )
-    billing_address: BillingAddress | None = Field(default=None, alias='billingAddress')
-    billing_contact: BillingContact | None = Field(default=None, alias='billingContact')
-    tax_code: TaxCode | None = Field(default=None, alias='taxCode')
-    account_number: AccountNumber | None = Field(default=None, alias='accountNumber')
-    billing_terms: BillingTerms | None = Field(default=None, alias='billingTerms')
-    notes: Notes | None = None
-    sites: Sites | None = None
-    activities: Activities | None = None
-    opportunities: Opportunities | None = None
-    services: Services | None = None
-    projects: Projects | None = None
-    contacts: Contacts | None = None
-    documents: Documents | None = None
+    """
+     Max length: 50;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CompanyNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    text: str
-    type: NoteTypeReference | None = None
-    flagged: bool | None = None
-    entered_by: str | None = Field(default=None, alias='enteredBy')
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class InvoiceTemplateDetailReference(ActivityReference):
+    pass
 
 
-class CompanyNoteType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InvoiceTemplateReference(ConnectWiseModel):
     id: int | None = None
-    identifier: str | None = None
-    """
-     Max length: 15;
-    """
-    name: str
     """
-     Max length: 50;
+    Gets or sets invoice Template Setup Id.
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    import_flag: bool | None = Field(default=None, alias='importFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CompanyNoteTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InvoiceTemplateSetup(ConnectWiseModel):
     id: int | None = None
-    identifier: str | None = None
     name: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_flag: bool | None = Field(default=None, alias='customFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CompanyPickerItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class IRestIdentifiedItem(ConnectWiseModel):
     id: int | None = None
-    member: MemberReference | None = None
-    company: CompanyReference | None = None
-    company_status: CompanyStatusReference | None = Field(
-        default=None, alias='companyStatus'
-    )
-    company_type: CompanyTypeReference | None = Field(default=None, alias='companyType')
-    company_site: SiteReference | None = Field(default=None, alias='companySite')
-    company_location: SystemLocationReference | None = Field(
-        default=None, alias='companyLocation'
-    )
-    company_country: CountryReference | None = Field(
-        default=None, alias='companyCountry'
-    )
-    vendor_picker_flag: bool | None = Field(default=None, alias='vendorPickerFlag')
-    """
-    Gets or sets if true, this record was created by the vendor picker component. Otherwise, the record was created by the company picker component.
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CompanyReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class IvItemReference(ConnectWiseModel):
     id: int | None = None
     identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CompanySite(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    address_line1: str | None = Field(default=None, alias='addressLine1')
-    """
-     Max length: 50;
-    """
-    address_line2: str | None = Field(default=None, alias='addressLine2')
-    """
-     Max length: 50;
-    """
-    city: str | None = None
-    """
-     Max length: 50;
-    """
-    state_reference: StateReference | None = Field(default=None, alias='stateReference')
-    zip: str | None = None
-    """
-     Max length: 12;
-    """
-    country: CountryReference | None = None
-    address_format: str | None = Field(default=None, alias='addressFormat')
-    phone_number: str | None = Field(default=None, alias='phoneNumber')
-    """
-     Max length: 30;
-    """
-    phone_number_ext: str | None = Field(default=None, alias='phoneNumberExt')
-    """
-     Max length: 30;
-    """
-    fax_number: str | None = Field(default=None, alias='faxNumber')
-    """
-     Max length: 30;
-    """
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    entity_type: EntityTypeReference | None = Field(default=None, alias='entityType')
-    expense_reimbursement: float | None = Field(
-        default=None, alias='expenseReimbursement'
-    )
-    primary_address_flag: bool | None = Field(default=None, alias='primaryAddressFlag')
-    default_shipping_flag: bool | None = Field(
-        default=None, alias='defaultShippingFlag'
-    )
-    default_billing_flag: bool | None = Field(default=None, alias='defaultBillingFlag')
-    default_mailing_flag: bool | None = Field(default=None, alias='defaultMailingFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    bill_separate_flag: bool | None = Field(default=None, alias='billSeparateFlag')
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    calendar: CalendarReference | None = None
-    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
+class KBCategoryReference(ActivityReference):
+    pass
 
 
-class CompanyStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class KnowledgeBaseArticle(ConnectWiseModel):
     id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    notify_flag: bool | None = Field(default=None, alias='notifyFlag')
-    disallow_saving_flag: bool | None = Field(default=None, alias='disallowSavingFlag')
-    notification_message: str | None = Field(default=None, alias='notificationMessage')
-    """
-     Max length: 500;
-    """
-    custom_note_flag: bool | None = Field(default=None, alias='customNoteFlag')
-    cancel_open_tracks_flag: bool | None = Field(
-        default=None, alias='cancelOpenTracksFlag'
-    )
-    track: TrackReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    title: str
+    issue: str
+    resolution: str
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    board: BoardReference | None = None
+    category_id: int | None = Field(default=None, alias='categoryId')
+    sub_category_id: int | None = Field(default=None, alias='subCategoryId')
+    date_created: str | None = Field(default=None, alias='dateCreated')
+    created_by: str | None = Field(default=None, alias='createdBy')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CompanyStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class KPICategory(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
 
 
-class CompanyTeam(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    company: CompanyReference | None = None
-    team_role: TeamRoleReference | None = Field(default=None, alias='teamRole')
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    contact: ContactReference | None = None
-    member: MemberReference | None = None
-    account_manager_flag: bool | None = Field(default=None, alias='accountManagerFlag')
-    tech_flag: bool | None = Field(default=None, alias='techFlag')
-    sales_flag: bool | None = Field(default=None, alias='salesFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class KPICategoryReference(ActivityReference):
+    pass
 
 
-class CompanyType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class KPIReference(ActivityReference):
+    pass
+
+
+class LdapConfiguration(ConnectWiseModel):
     id: int | None = None
     name: str
     """
-     Max length: 50;
+     Max length: 100;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    vendor_flag: bool | None = Field(default=None, alias='vendorFlag')
-    service_alert_flag: bool | None = Field(default=None, alias='serviceAlertFlag')
-    service_alert_message: str | None = Field(default=None, alias='serviceAlertMessage')
+    server: str
     """
-     Max length: 150;
+    FQDN of the Server. Max length: 200;
+    """
+    domain: str
+    """
+    Domain Name of the server. Max length: 50;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CompanyTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    is_vendor: bool | None = Field(default=None, alias='isVendor')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class LdapConfigurationInfo(ActivityReference):
+    pass
 
 
-class CompanyTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class LdapConfigurationReference(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ConfigurationQuestion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    answer_id: int | None = Field(default=None, alias='answerId')
-    question_id: int | None = Field(default=None, alias='questionId')
-    question: str | None = None
-    answer: dict[str, Any] | None = None
-    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
-    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
-    field_type: FieldType | None = Field(default=None, alias='fieldType')
-    required_flag: bool | None = Field(default=None, alias='requiredFlag')
+    server: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ConfigurationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    device_identifier: str | None = Field(default=None, alias='deviceIdentifier')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class LdapConfigurationTestLink(ConnectWiseModel):
+    server: str | None = None
+    """
+     Max length: 200;
+    """
 
 
-class ConfigurationStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class LegacySubCategory(ConnectWiseModel):
     id: int | None = None
-    description: str
+    name: str
     """
      Max length: 50;
     """
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ConfigurationStatusInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    description: str | None = None
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class LegacySubCategoryInfo(CategoryInfo):
+    pass
 
 
-class ConfigurationStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
+class LicenseBit(ConnectWiseModel):
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    active_flag: bool | None = Field(default=None, alias='activeFlag')
 
 
-class ConfigurationType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Link(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 50;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    system_flag: bool | None = Field(default=None, alias='systemFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    table_reference_id: int | None = Field(default=None, alias='tableReferenceId')
+    url: str | None = None
+    """
+     Max length: 1000;
+    """
+    screen_link: Literal[
+        'Company', 'Contact', 'Service', 'Invoice', 'PurchaseOrder', 'SalesOrder'
+    ] | None = Field(default=None, alias='screenLink')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ConfigurationTypeCopy(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int
-    name: str
+class LinkClicked(ConnectWiseModel):
+    id: int | None = None
+    campaign_id: int | None = Field(default=None, alias='campaignId')
+    contact_id: int = Field(..., alias='contactId')
+    date_clicked: datetime | None = Field(default=None, alias='dateClicked')
+    url: str
     """
-     Max length: 50;
+     Max length: 2083;
     """
+    query_string: str | None = Field(default=None, alias='queryString')
 
 
-class ConfigurationTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class LinkInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    system_flag: bool | None = Field(default=None, alias='systemFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    screen_link: Literal[
+        'Company', 'Contact', 'Service', 'Invoice', 'PurchaseOrder', 'SalesOrder'
+    ] | None = Field(default=None, alias='screenLink')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ConfigurationTypeQuestion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    configuration_type: ConfigurationTypeReference | None = Field(
-        default=None, alias='configurationType'
-    )
-    field_type: FieldType = Field(..., alias='fieldType')
-    entry_type: EntryType = Field(..., alias='entryType')
-    sequence_number: float = Field(..., alias='sequenceNumber')
-    question: str
-    """
-     Max length: 1000;
-    """
-    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
-    required_flag: bool | None = Field(default=None, alias='requiredFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class LinkResolveUrlInfo(ConnectWiseModel):
+    reference_id: int = Field(..., alias='referenceId')
+    url: str | None = None
 
 
-class ConfigurationTypeQuestionInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class LocaleInfo(ConnectWiseModel):
     id: int | None = None
-    configuration_type: ConfigurationTypeReference | None = Field(
-        default=None, alias='configurationType'
-    )
-    field_type: FieldType | None = Field(default=None, alias='fieldType')
-    entry_type: EntryType | None = Field(default=None, alias='entryType')
-    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
-    question: str | None = None
-    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
-    required_flag: bool | None = Field(default=None, alias='requiredFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str | None = None
+    locale_code: str | None = Field(default=None, alias='localeCode')
 
 
-class ConfigurationTypeQuestionReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    question: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class LocaleReference(ActivityReference):
+    pass
 
 
-class ConfigurationTypeQuestionValue(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class LocationInfo(ConnectWiseModel):
     id: int | None = None
-    configuration_type: ConfigurationTypeReference | None = Field(
-        default=None, alias='configurationType'
+    name: str | None = None
+    location_flag: bool | None = None
+    structure_level: CorporateStructureLevelReference | None = Field(
+        default=None, alias='structureLevel'
     )
-    question: ConfigurationTypeQuestionReference | None = None
-    value: str
-    """
-     Max length: 1000;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ConfigurationTypeQuestionValueInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class LostRevenueReference(AgreementRevenueReference):
+    pass
+
+
+class M365Contact(ConnectWiseModel):
     id: int | None = None
-    configuration_type: ConfigurationTypeReference | None = Field(
-        default=None, alias='configurationType'
-    )
-    question: ConfigurationTypeQuestionReference | None = None
-    value: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    user_principal_name: str | None = Field(default=None, alias='userPrincipalName')
+    display_name: str | None = Field(default=None, alias='displayName')
+    contact_rec_id: int | None = Field(default=None, alias='contactRecId')
+    tenant_id: str | None = Field(default=None, alias='tenantId')
+    m365_contact_id: str | None = Field(default=None, alias='m365ContactId')
+    department: str | None = None
+    employee_type: str | None = Field(default=None, alias='employeeType')
+    manager_id: str | None = Field(default=None, alias='managerId')
+    proxy_addresses: str | None = Field(default=None, alias='proxyAddresses')
+    proxy_addresses_plain: str | None = Field(default=None, alias='proxyAddressesPlain')
+    groups: str | None = None
+    directory_roles: str | None = Field(default=None, alias='directoryRoles')
+    assigned_licenses: str | None = Field(default=None, alias='assignedLicenses')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ConfigurationTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class M365ContactSync(ConnectWiseModel):
+    id: int | None = None
+    tenant_id: str | None = Field(default=None, alias='tenantId')
+    client_id: str | None = Field(default=None, alias='clientId')
+    client_secret: str | None = Field(default=None, alias='clientSecret')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    primary_domain: str | None = Field(default=None, alias='primaryDomain')
+    display_name: str | None = Field(default=None, alias='displayName')
+    authorized_flag: bool | None = Field(default=None, alias='authorizedFlag')
+    server_url: str | None = Field(default=None, alias='serverUrl')
+    username: str | None = None
+    password: str | None = None
+    domain: str | None = None
+    company_contacts_folder: str | None = Field(
+        default=None, alias='companyContactsFolder'
     )
+    service_account_email: str | None = Field(default=None, alias='serviceAccountEmail')
+    credential_file: str | None = Field(default=None, alias='credentialFile')
+    credential_file_name: str | None = Field(default=None, alias='credentialFileName')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class M365ContactSyncInfo(ActivityReference):
+    pass
+
+
+class M365ContactSyncMonitoring(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    monitoring_type_id: int | None = Field(default=None, alias='monitoringTypeId')
+    email_address: str | None = Field(default=None, alias='emailAddress')
+    service_board_id: int | None = Field(default=None, alias='serviceBoardId')
+    service_board_status_id: int | None = Field(
+        default=None, alias='serviceBoardStatusId'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ConnectWiseHostedScreen(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class M365ContactSyncMonitoringNotificationInfo(ConnectWiseModel):
+    company_rec_id: int | None = Field(default=None, alias='companyRecId')
+    company_name: str | None = Field(default=None, alias='companyName')
+    address_rec_id: int | None = Field(default=None, alias='addressRecId')
+    primary_contact_rec_id: int | None = Field(
+        default=None, alias='primaryContactRecId'
+    )
+    primary_contact_full_name: str | None = Field(
+        default=None, alias='primaryContactFullName'
     )
+    tenant_id: str | None = Field(default=None, alias='tenantId')
+    tenant_name: str | None = Field(default=None, alias='tenantName')
+
+
+class M365ContactSyncProperty(ConnectWiseModel):
     id: int | None = None
-    screen_id: str | None = Field(default=None, alias='screenId')
+    include_exclude_type: Literal['All', 'M365Property', 'None'] | None = Field(
+        default=None, alias='includeExcludeType'
+    )
+    property_type: Literal[
+        'City',
+        'DepartmentContactSync',
+        'Email',
+        'DistributionGroup',
+        'JobTitle',
+        'AssignedLicenses',
+        'DisplayName',
+        'OfficeLocation',
+        'ReportManager',
+        'State',
+        'EmployeeType',
+        'UserType',
+    ] | None = Field(default=None, alias='propertyType')
+    exclude_include_flag: bool | None = Field(default=None, alias='excludeIncludeFlag')
+    wild_card: str | None = Field(default=None, alias='wildCard')
+    company_rec_id: int | None = Field(default=None, alias='companyRecID')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class M365License(ConnectWiseModel):
+    id: str | None = None
+    description: str | None = None
+
+
+class M365Tenant(ConnectWiseModel):
+    id: str | None = None
     name: str | None = None
 
 
-class ConnectWiseHostedSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ManagedDevicesIntegrationInfo(ConnectWiseModel):
     id: int | None = None
-    screen_id: int = Field(..., alias='screenId')
-    """
-    Can be obtained via ConnectWiseHostedApiScreen report.
-    """
-    description: str
-    """
-     Max length: 50;
-    """
-    url: str
-    """
-     Max length: 1024;
-    """
-    type: Type2
-    client_id: str | None = Field(default=None, alias='clientId')
-    """
-    Only required if not already set. Max length: 36;
-    """
-    origin: str | None = None
-    """
-     Max length: 100;
-    """
-    pod_height: int | None = Field(default=None, alias='podHeight')
-    toolbar_button_dialog_height: int | None = Field(
-        default=None, alias='toolbarButtonDialogHeight'
+    name: str | None = None
+    solution: str | None = None
+    management_it_setup_type: str | None = Field(
+        default=None, alias='managementItSetupType'
     )
-    toolbar_button_dialog_width: int | None = Field(
-        default=None, alias='toolbarButtonDialogWidth'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ManagedDevicesIntegrationReference(ActivityReference):
+    pass
+
+
+class ManagedInformation(ConnectWiseModel):
+    management_solution_name: str | None = Field(
+        default=None, alias='managementSolutionName'
     )
-    toolbar_button_text: str | None = Field(default=None, alias='toolbarButtonText')
-    """
-    Only required for ToolbarButtons. Max length: 50;
-    """
-    toolbar_button_tool_tip: str | None = Field(
-        default=None, alias='toolbarButtonToolTip'
+    managed_identifier: str | None = Field(default=None, alias='managedIdentifier')
+    type: str | None = None
+    level: str | None = None
+    child_configurations_matching_on: str | None = Field(
+        default=None, alias='childConfigurationsMatchingOn'
     )
-    """
-     Max length: 50;
-    """
-    toolbar_button_icon_document_id: int | None = Field(
-        default=None, alias='toolbarButtonIconDocumentId'
+    inactivate_configurations_matching_on: str | None = Field(
+        default=None, alias='inactivateConfigurationsMatchingOn'
     )
-    disabled_flag: bool | None = Field(default=None, alias='disabledFlag')
-    location_ids: list[int] | None = Field(default=None, alias='locationIds')
-    locations_enabled_flag: bool | None = Field(
-        default=None, alias='locationsEnabledFlag'
+    inactive_configuration_status_id: int | None = Field(
+        default=None, alias='inactiveConfigurationStatusId'
     )
-    created_by: str | None = Field(default=None, alias='createdBy')
-    date_created: str | None = Field(default=None, alias='dateCreated')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Contact(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Management(ConnectWiseModel):
     id: int | None = None
-    first_name: str | None = Field(default=None, alias='firstName')
-    last_name: str | None = Field(default=None, alias='lastName')
-    company: CompanyReference | None = None
-    site: SiteReference | None = None
-    address_line1: str | None = Field(default=None, alias='addressLine1')
-    address_line2: str | None = Field(default=None, alias='addressLine2')
-    city: str | None = None
-    state: str | None = None
-    zip: str | None = None
-    country: CountryReference | None = None
-    relationship: RelationshipReference | None = None
-    relationship_override: str | None = Field(
-        default=None, alias='relationshipOverride'
-    )
-    department: ContactDepartmentReference | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    default_merge_contact_id: int | None = Field(
-        default=None, alias='defaultMergeContactId'
+    run_time: datetime | None = Field(default=None, alias='runTime')
+    added_configuration_status: ConfigurationStatusReference | None = Field(
+        default=None, alias='addedConfigurationStatus'
     )
-    security_identifier: str | None = Field(default=None, alias='securityIdentifier')
-    manager_contact: ContactReference | None = Field(
-        default=None, alias='managerContact'
+    deleted_configuration_status: ConfigurationStatusReference | None = Field(
+        default=None, alias='deletedConfigurationStatus'
     )
-    assistant_contact: ContactReference | None = Field(
-        default=None, alias='assistantContact'
+    integrator_login: IntegratorLoginReference | None = Field(
+        default=None, alias='integratorLogin'
     )
-    title: str | None = None
-    school: str | None = None
-    nick_name: str | None = Field(default=None, alias='nickName')
-    married_flag: bool | None = Field(default=None, alias='marriedFlag')
-    children_flag: bool | None = Field(default=None, alias='childrenFlag')
-    children: str | None = None
-    significant_other: str | None = Field(default=None, alias='significantOther')
-    portal_password: str | None = Field(default=None, alias='portalPassword')
-    portal_security_level: int | None = Field(default=None, alias='portalSecurityLevel')
-    disable_portal_login_flag: bool | None = Field(
-        default=None, alias='disablePortalLoginFlag'
+    schedule_executive_summary_report_flag: bool = Field(
+        ..., alias='scheduleExecutiveSummaryReportFlag'
     )
-    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
-    gender: Gender | None = None
-    birth_day: str | None = Field(default=None, alias='birthDay')
-    anniversary: str | None = None
-    presence: Presence | None = None
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    facebook_url: str | None = Field(default=None, alias='facebookUrl')
-    twitter_url: str | None = Field(default=None, alias='twitterUrl')
-    linked_in_url: str | None = Field(default=None, alias='linkedInUrl')
-    default_phone_type: str | None = Field(default=None, alias='defaultPhoneType')
-    default_phone_nbr: str | None = Field(default=None, alias='defaultPhoneNbr')
-    default_phone_extension: str | None = Field(
-        default=None, alias='defaultPhoneExtension'
+    executive_summary_report_schedule_day: int | None = Field(
+        default=None, alias='executiveSummaryReportScheduleDay'
     )
-    default_billing_flag: bool | None = Field(default=None, alias='defaultBillingFlag')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    user_defined_field1: str | None = Field(default=None, alias='userDefinedField1')
     """
-     Max length: 50;
+    Gets or sets
+                this is only required when scheduleExecutiveSummaryReportFlag = true.
     """
-    user_defined_field2: str | None = Field(default=None, alias='userDefinedField2')
+    executive_summary_report_schedule_hour: int | None = Field(
+        default=None, alias='executiveSummaryReportScheduleHour'
+    )
     """
-     Max length: 50;
+    Gets or sets
+                this is only required when scheduleExecutiveSummaryReportFlag = true. Input should be in 24 hour format, ie 2pm is 14.
     """
-    user_defined_field3: str | None = Field(default=None, alias='userDefinedField3')
+    executive_summary_report_schedule_minute: int | None = Field(
+        default=None, alias='executiveSummaryReportScheduleMinute'
+    )
     """
-     Max length: 50;
+    Gets or sets
+                this is only required when scheduleExecutiveSummaryReportFlag = true.
     """
-    user_defined_field4: str | None = Field(default=None, alias='userDefinedField4')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ManagementBackup(ConnectWiseModel):
+    id: int | None = None
+    type: AgreementTypeReference | None = None
+    item: CatalogItemReference | None = None
+    billing_level: Literal['Detail', 'Summary'] = Field(..., alias='billingLevel')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ManagementItSolution(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 50;
+     Max length: 30;
     """
-    user_defined_field5: str | None = Field(default=None, alias='userDefinedField5')
+    management_it_solution_type: Literal[
+        'LevelPlatforms', 'NAble', 'Continuum', 'Custom'
+    ] = Field(..., alias='managementItSolutionType')
+    management_solution_name: str | None = Field(
+        default=None, alias='managementSolutionName'
+    )
     """
-     Max length: 50;
+    Gets or sets
+                this is only required when managementItSolutionType is Custom. Max length: 30;
     """
-    user_defined_field6: str | None = Field(default=None, alias='userDefinedField6')
+    management_server_url: str | None = Field(default=None, alias='managementServerUrl')
     """
-     Max length: 50;
+    Gets or sets
+                this is only required for Level Platforms. Max length: 200;
     """
-    user_defined_field7: str | None = Field(default=None, alias='userDefinedField7')
+    webservice_override_url: str | None = Field(
+        default=None, alias='webserviceOverrideUrl'
+    )
     """
-     Max length: 50;
+    Gets or sets
+                this is only required for Level Platforms when overrideWebServiceLocationFlag is true. Max length: 200;
     """
-    user_defined_field8: str | None = Field(default=None, alias='userDefinedField8')
+    portal_override_login_url: str | None = Field(
+        default=None, alias='portalOverrideLoginUrl'
+    )
     """
-     Max length: 50;
+    Gets or sets
+                this is only required for Level Platforms when overrideLoginLocationFlag is true. Max length: 200;
     """
-    user_defined_field9: str | None = Field(default=None, alias='userDefinedField9')
+    global_login_flag: bool | None = Field(default=None, alias='globalLoginFlag')
+    global_login_username: str | None = Field(default=None, alias='globalLoginUsername')
     """
-     Max length: 50;
+    Gets or sets
+                this is only required when globalLoginFlag = true. Max length: 50;
     """
-    user_defined_field10: str | None = Field(default=None, alias='userDefinedField10')
+    global_login_password: str | None = Field(default=None, alias='globalLoginPassword')
     """
-     Max length: 50;
+    Gets or sets
+                this is only required when globalLoginFlag = true. Max length: 50;
     """
-    company_location: SystemLocationReference | None = Field(
-        default=None, alias='companyLocation'
+    using_ssl_flag: bool | None = Field(default=None, alias='usingSslFlag')
+    n_able_username: str | None = Field(default=None, alias='nAbleUsername')
+    """
+    Gets or sets
+                this is only required for N-Able solution. Max length: 50;
+    """
+    n_able_password: str | None = Field(default=None, alias='nAblePassword')
+    """
+    Gets or sets
+                this is only required for N-Able solution. Max length: 50;
+    """
+    override_web_service_location_flag: bool | None = Field(
+        default=None, alias='overrideWebServiceLocationFlag'
     )
-    communication_items: list[ContactCommunicationItem] | None = Field(
-        default=None, alias='communicationItems'
+    override_login_location_flag: bool | None = Field(
+        default=None, alias='overrideLoginLocationFlag'
     )
-    types: list[ContactTypeReference] | None = None
-    integrator_tags: list[str] | None = Field(default=None, alias='integratorTags')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    continuum_api_username: str | None = Field(
+        default=None, alias='continuumApiUsername'
     )
-    photo: DocumentReference | None = None
-    ignore_duplicates: bool | None = Field(default=None, alias='ignoreDuplicates')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    type_ids: list[int] | None = Field(default=None, alias='typeIds')
     """
-    Gets or sets integrer array of Contact_Type_Recids to be assigned to contact that can be passed in only during new contact creation (post)
-                To update existing contacts type, use the /company/contactTypeAssociations or /company/contacts/{ID}/typeAssociations endpoints.
+    Gets or sets
+                this is only required for Continuum solution. Max length: 100;
     """
-
-
-class ContactCommunication(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    continuum_api_password: str | None = Field(
+        default=None, alias='continuumApiPassword'
     )
-    id: int | None = None
-    contact_id: int | None = Field(default=None, alias='contactId')
-    type: CommunicationTypeReference | None = None
-    value: str
     """
-     Max length: 250;
+    Gets or sets
+                this is only required for Continuum solution. Max length: 100;
     """
-    extension: str | None = None
+    level_api_username: str | None = Field(default=None, alias='levelApiUsername')
     """
-     Max length: 15;
+    Gets or sets
+                this is only required for Level Platforms solution. Max length: 100;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    communication_type: CommunicationType1 | None = Field(
-        default=None, alias='communicationType'
-    )
-    domain: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    level_api_password: str | None = Field(default=None, alias='levelApiPassword')
+    """
+    Gets or sets
+                this is only required for Level Platforms solution. Max length: 100;
+    """
+    level_var_domain: str | None = Field(default=None, alias='levelVarDomain')
+    """
+    Gets or sets
+                this is only required for Level Platforms solution. Max length: 100;
+    """
+    no_display_flag: bool | None = Field(default=None, alias='noDisplayFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ContactCommunicationItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ManagementItSolutionAgreementInterfaceParameter(ConnectWiseModel):
     id: int | None = None
-    type: CommunicationTypeReference | None = None
-    value: str | None = None
-    extension: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    domain: str | None = None
-    communication_type: CommunicationType1 | None = Field(
-        default=None, alias='communicationType'
+    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
+        default=None, alias='managedDevicesIntegration'
+    )
+    agreement_type: AgreementTypeReference | None = Field(
+        default=None, alias='agreementType'
     )
+    server_product: IvItemReference | None = Field(default=None, alias='serverProduct')
+    workstation_product: IvItemReference | None = Field(
+        default=None, alias='workstationProduct'
+    )
+    spam_stats_product: IvItemReference | None = Field(
+        default=None, alias='spamStatsProduct'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ContactDepartment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ManagementLogDocumentInfo(ConnectWiseModel):
+    full_path_file_name: str | None = Field(default=None, alias='fullPathFileName')
+    file_size: str | None = Field(default=None, alias='fileSize')
+
+
+class ManagementNetworkSecurity(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 30;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    username: str | None = None
+    """
+     Max length: 50;
+    """
+    password: str | None = None
+    """
+     Max length: 50;
+    """
+    site: str
+    """
+     Max length: 100;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ContactDepartmentInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ManagementReportSetup(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    scheduled_report_disabled_flag: bool = Field(
+        ..., alias='scheduledReportDisabledFlag'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ContactDepartmentReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ManagementSolutionReference(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    setup_name: str | None = Field(default=None, alias='setupName')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ContactGroup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    group: GroupReference | None = None
-    contact: ContactReference | None = None
-    description: str | None = None
-    """
-     Max length: 50;
-    """
-    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
-    company_unsubcribed_email_message: str | None = Field(
-        default=None, alias='companyUnsubcribedEmailMessage'
-    )
-    company_group_unsubscribed_email_message: str | None = Field(
-        default=None, alias='companyGroupUnsubscribedEmailMessage'
-    )
-    contact_unsubscribed_email_message: str | None = Field(
-        default=None, alias='contactUnsubscribedEmailMessage'
-    )
-    contact_group_unsubscribed_email_message: str | None = Field(
-        default=None, alias='contactGroupUnsubscribedEmailMessage'
+class Manager(ConnectWiseModel):
+    manager_id: str | None = None
+    user_type: str | None = Field(default=None, alias='userType')
+    microsoft_365_contact_rec_id: int | None = Field(
+        default=None, alias='microsoft_365_Contact_RecID'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    principal_name: str | None = Field(default=None, alias='principalName')
+    display_name: str | None = Field(default=None, alias='displayName')
+    contact_rec_id: int | None = Field(default=None, alias='contact_RecID')
+    tenant_id: str | None = Field(default=None, alias='tenant_ID')
+    id: str | None = None
+    department: str | None = None
+    manager_id_1: str | None = Field(default=None, alias='manager_ID')
+    employee_type: str | None = Field(default=None, alias='employeeType')
+    manager: Manager | None = None
+    date_entered_utc: datetime | None = Field(default=None, alias='date_Entered_UTC')
+    entered_by: str | None = Field(default=None, alias='entered_By')
+    last_update_utc: datetime | None = Field(default=None, alias='last_Update_UTC')
+    updated_by: str | None = Field(default=None, alias='updated_By')
+    first_name: str | None = Field(default=None, alias='firstName')
+    last_name: str | None = Field(default=None, alias='lastName')
+    groups: list[str] | None = None
+    directory_roles: list[str] | None = Field(default=None, alias='directoryRoles')
+    proxy_addresses: list[str] | None = Field(default=None, alias='proxyAddresses')
+    mail_nickname: str | None = Field(default=None, alias='mailNickname')
+    mail: str | None = None
+    country: str | None = None
+    state: str | None = None
+    city: str | None = None
+    address: str | None = None
+    fax: str | None = None
+    title: str | None = None
+    mobile_phone: str | None = Field(default=None, alias='mobilePhone')
+    office: str | None = None
+    phone_number: str | None = Field(default=None, alias='phoneNumber')
+    language: str | None = None
+    usage_location: str | None = Field(default=None, alias='usageLocation')
+    postal_code: str | None = Field(default=None, alias='postalCode')
+    licenses: list[M365License] | None = None
+    account_enabled: bool | None = Field(default=None, alias='accountEnabled')
 
 
-class ContactNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    contact_id: int | None = Field(default=None, alias='contactId')
-    text: str
-    type: NoteTypeReference | None = None
-    flagged: bool | None = None
-    entered_by: str | None = Field(default=None, alias='enteredBy')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class Manufacturer(LegacySubCategory):
+    pass
 
 
-class ContactReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ManufacturerInfo(CategoryInfo):
+    pass
+
+
+class ManufacturerReference(ActivityReference):
+    pass
+
+
+class MappedRecordReference(CorporateStructureLevel):
+    pass
+
+
+class MappedType(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    table: str | None = None
+    rec_id_field: str | None = Field(default=None, alias='recIdField')
+    gl_type: Literal[
+        'AP',
+        'AR',
+        'EE',
+        'EI',
+        'EO',
+        'IA',
+        'IT',
+        'P',
+        'PF',
+        'R',
+        'RA',
+        'RD',
+        'RE',
+        'RP',
+        'ST',
+        'SD',
+        'ET',
+        'FT',
+        'PT',
+        'WP',
+        'WR',
+    ] | None = Field(default=None, alias='glType')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
 
 
-class ContactRelationship(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class MappedTypeReference(ActivityReference):
+    pass
 
 
-class ContactSync(Enum):
-    FL = 'FL'
-    LF = 'LF'
-    CFL = 'CFL'
-    CLF = 'CLF'
+class MarketDescription(ContactRelationship):
+    pass
 
 
-class ContactTrack(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MarketDescriptionInfo(ActivityReference):
+    pass
+
+
+class MarketDescriptionReference(ActivityReference):
+    pass
+
+
+class MarketingCompany(ConnectWiseModel):
     id: int | None = None
-    track_id: int | None = Field(default=None, alias='trackId')
-    name: str | None = None
-    start_date: str | None = Field(default=None, alias='startDate')
-    end_date: str | None = Field(default=None, alias='endDate')
-    action_taken: int | None = Field(default=None, alias='actionTaken')
-    action_remaining: int | None = Field(default=None, alias='actionRemaining')
-    started_by: str | None = Field(default=None, alias='startedBy')
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    group_id: int | None = Field(default=None, alias='groupId')
+    default_contact_flag: bool | None = Field(default=None, alias='defaultContactFlag')
+    all_contacts_flag: bool | None = Field(default=None, alias='allContactsFlag')
+    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ContactType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MarketingContact(ConnectWiseModel):
     id: int | None = None
-    description: str
+    group_id: int | None = Field(default=None, alias='groupId')
+    note: str | None = None
     """
      Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    service_alert_flag: bool | None = Field(default=None, alias='serviceAlertFlag')
-    service_alert_message: str | None = Field(default=None, alias='serviceAlertMessage')
+    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class MarketplaceImport(ConnectWiseModel):
+    id: int | None = None
+    marketplace_import_type: Literal[
+        'Agreements',
+        'Configurations',
+        'CRMSurveys',
+        'CustomReports',
+        'CustomerPortalTypes',
+        'HTMLEmailTemplates',
+        'Products',
+        'ProjectBoards',
+        'ProjectTemplates',
+        'ReportWriterReports',
+        'ServiceBoards',
+        'TicketTemplates',
+        'Views',
+    ] | None = Field(default=None, alias='marketplaceImportType')
+    marketplace_object: list | None = Field(default=None, alias='marketplaceObject')
+    required_fields: list[str] | None = Field(default=None, alias='requiredFields')
+
+
+class MemberInfo(ConnectWiseModel):
+    id: int | None = None
+    identifier: str | None = None
+    first_name: str | None = Field(default=None, alias='firstName')
+    middle_initial: str | None = Field(default=None, alias='middleInitial')
+    last_name: str | None = Field(default=None, alias='lastName')
+    full_name: str | None = Field(default=None, alias='fullName')
+    default_email: str | None = Field(default=None, alias='defaultEmail')
+    photo: DocumentReference | None = None
+    license_class: Literal['A', 'C', 'F', 'X'] | None = Field(
+        default=None, alias='licenseClass'
+    )
     """
-     Max length: 150;
+    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ContactTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    description: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    service_alert_flag: bool | None = Field(default=None, alias='serviceAlertFlag')
-    service_alert_message: str | None = Field(default=None, alias='serviceAlertMessage')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class MemberLinkSsoUser(ConnectWiseModel):
+    sso_user_id: str | None = Field(default=None, alias='ssoUserId')
+    """
+     Max length: 100;
+    """
 
 
-class ContactTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberNotificationSetting(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    notification_type: Literal['Email', 'Push'] = Field(..., alias='notificationType')
+    notification_trigger: Literal[
+        'ActivityStatusReq',
+        'CustomerUpdated',
+        'ExpenseReport',
+        'TicketStatusChange',
+        'TicketStatusRequest',
+        'TimeNagApprover',
+        'TimeNagMember',
+        'TimeSheet',
+        'WorkflowRules',
+    ] = Field(..., alias='notificationTrigger')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Contacts(Enum):
-    DISCARD = 'Discard'
-    MERGE = 'Merge'
+class MemberOffice365(M365Tenant):
+    pass
 
 
-class Conversion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberReference(CatalogItemReference):
+    pass
+
+
+class MemberSsoSettingsReference(ConnectWiseModel):
     id: int | None = None
-    quantity: float | None = None
-    uom_type: UnitOfMeasureReference | None = Field(default=None, alias='uomType')
-    parent_uom: UnitOfMeasureReference | None = Field(default=None, alias='parentUOM')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    sso_user_id: str | None = Field(default=None, alias='ssoUserId')
+    user_name: str | None = Field(default=None, alias='userName')
+    email: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ConvertItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberSsoToken(ConnectWiseModel):
+    token: str | None = None
+
+
+class MemberType(ConnectWiseModel):
     id: int | None = None
-    record_type: RecordType = Field(..., alias='recordType')
-    project: ProjectReference | None = None
-    phase: ProjectPhaseReference | None = None
-    wbs_code: str | None = Field(default=None, alias='wbsCode')
+    name: str
+    """
+     Max length: 30;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class MemberTypeInfo(CategoryInfo):
+    pass
 
 
-class ConvertToProject(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class MemberTypeReference(ActivityReference):
+    pass
+
+
+class MenuLocationReference(ActivityReference):
+    pass
+
+
+class MySecurity(ConnectWiseModel):
+    id: int | None = None
+    add_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='addLevel'
+    )
+    edit_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='editLevel'
     )
+    delete_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='deleteLevel'
+    )
+    inquire_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='inquireLevel'
+    )
+    module_function_name: str | None = Field(default=None, alias='moduleFunctionName')
+    module_function_description: str | None = Field(
+        default=None, alias='moduleFunctionDescription'
+    )
+    my_all_flag: bool | None = Field(default=None, alias='myAllFlag')
+    module_function_identifier: str | None = Field(
+        default=None, alias='moduleFunctionIdentifier'
+    )
+    report_flag: bool | None = Field(default=None, alias='reportFlag')
+    restrict_flag: bool | None = Field(default=None, alias='restrictFlag')
+    custom_flag: bool | None = Field(default=None, alias='customFlag')
+    module_description: str | None = Field(default=None, alias='moduleDescription')
+    module_identifier: str | None = Field(default=None, alias='moduleIdentifier')
+    module_name: str | None = Field(default=None, alias='moduleName')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class MySecurityCustomizeItem(ConnectWiseModel):
+    id: int | None = None
+    customize_identifier: Literal[
+        'CompanyReports',
+        'FinanceReports',
+        'MarketingReports',
+        'ProcurementReports',
+        'ProjectReports',
+        'SalesReports',
+        'ServiceReports',
+        'SystemReports',
+        'TimeAndExpenseReports',
+        'CompanyConfigurations',
+        'FinanceAgreements',
+        'ProjectScheduling',
+        'ServiceResourceScheduling',
+        'SystemManageHostedApi',
+        'SystemMyAccount',
+        'SystemCustomMenuEntry',
+        'SystemMassMaintenance',
+        'SystemTableSetup',
+    ] | None = Field(default=None, alias='customizeIdentifier')
+    item_identifier: str | None = Field(default=None, alias='itemIdentifier')
+
+
+class NoteTypeReference(ActivityReference):
+    pass
+
+
+class NotificationRecipient(ConnectWiseModel):
     id: int | None = None
-    record_type: RecordType | None = Field(default=None, alias='recordType')
-    project: ProjectReference | None = None
-    phase: ProjectPhaseReference | None = None
-    wbs_code: str = Field(..., alias='wbsCode')
+    identifier: str | None = None
+    name: str | None = None
+    external_flag: bool | None = Field(default=None, alias='externalFlag')
+    service_flag: bool | None = Field(default=None, alias='serviceFlag')
+    sales_flag: bool | None = Field(default=None, alias='salesFlag')
+    invoice_flag: bool | None = Field(default=None, alias='invoiceFlag')
+    agreement_flag: bool | None = Field(default=None, alias='agreementFlag')
+    member_flag: bool | None = Field(default=None, alias='memberFlag')
+    config_flag: bool | None = Field(default=None, alias='configFlag')
+    msp_flag: bool | None = Field(default=None, alias='mspFlag')
+    track_flag: bool | None = Field(default=None, alias='trackFlag')
+    project_flag: bool | None = Field(default=None, alias='projectFlag')
+    procurement_flag: bool | None = Field(default=None, alias='procurementFlag')
+    knowledge_base_flag: bool | None = Field(default=None, alias='knowledgeBaseFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CoreEntityCountryCode(Enum):
-    AF = 'AF'
-    AX = 'AX'
-    AL = 'AL'
-    DZ = 'DZ'
-    AS_ = 'AS'
-    AD = 'AD'
-    AO = 'AO'
-    AI = 'AI'
-    AQ = 'AQ'
-    AR = 'AR'
-    AM = 'AM'
-    AW = 'AW'
-    AT = 'AT'
-    AZ = 'AZ'
-    BH = 'BH'
-    BD = 'BD'
-    BB = 'BB'
-    BY = 'BY'
-    BZ = 'BZ'
-    BJ = 'BJ'
-    BM = 'BM'
-    BT = 'BT'
-    BO = 'BO'
-    BQ = 'BQ'
-    BA = 'BA'
-    BW = 'BW'
-    BV = 'BV'
-    IO = 'IO'
-    BN = 'BN'
-    BG = 'BG'
-    BF = 'BF'
-    BI = 'BI'
-    CM = 'CM'
-    CV = 'CV'
-    KY = 'KY'
-    CF = 'CF'
-    TD = 'TD'
-    CL = 'CL'
-    CX = 'CX'
-    CC = 'CC'
-    CO = 'CO'
-    KM = 'KM'
-    CG = 'CG'
-    CK = 'CK'
-    CI = 'CI'
-    HR = 'HR'
-    CU = 'CU'
-    CW = 'CW'
-    CY = 'CY'
-    CZ = 'CZ'
-    CD = 'CD'
-    DK = 'DK'
-    DJ = 'DJ'
-    DM = 'DM'
-    EC = 'EC'
-    EG = 'EG'
-    GQ = 'GQ'
-    ER = 'ER'
-    EE = 'EE'
-    ET = 'ET'
-    FK = 'FK'
-    FO = 'FO'
-    FJ = 'FJ'
-    FI = 'FI'
-    FR = 'FR'
-    GF = 'GF'
-    PF = 'PF'
-    TF = 'TF'
-    GA = 'GA'
-    GM = 'GM'
-    GE = 'GE'
-    GH = 'GH'
-    GI = 'GI'
-    GR = 'GR'
-    GL = 'GL'
-    GD = 'GD'
-    GP = 'GP'
-    GU = 'GU'
-    GT = 'GT'
-    GG = 'GG'
-    GN = 'GN'
-    GW = 'GW'
-    GY = 'GY'
-    HT = 'HT'
-    HM = 'HM'
-    HN = 'HN'
-    HK = 'HK'
-    HU = 'HU'
-    IS_ = 'IS'
-    IN_ = 'IN'
-    IR = 'IR'
-    IQ = 'IQ'
-    IE = 'IE'
-    IM = 'IM'
-    IT = 'IT'
-    JM = 'JM'
-    JP = 'JP'
-    JE = 'JE'
-    JO = 'JO'
-    KZ = 'KZ'
-    KE = 'KE'
-    KI = 'KI'
-    XK = 'XK'
-    KW = 'KW'
-    KG = 'KG'
-    LA = 'LA'
-    LV = 'LV'
-    LB = 'LB'
-    LS = 'LS'
-    LR = 'LR'
-    LY = 'LY'
-    LI = 'LI'
-    LT = 'LT'
-    LU = 'LU'
-    MO = 'MO'
-    MK = 'MK'
-    MG = 'MG'
-    MW = 'MW'
-    MY = 'MY'
-    ML = 'ML'
-    MT = 'MT'
-    MH = 'MH'
-    MQ = 'MQ'
-    MR = 'MR'
-    MU = 'MU'
-    YT = 'YT'
-    FM = 'FM'
-    MD = 'MD'
-    MC = 'MC'
-    MN = 'MN'
-    ME = 'ME'
-    MS = 'MS'
-    MZ = 'MZ'
-    NA = 'NA'
-    NR = 'NR'
-    NP = 'NP'
-    NC = 'NC'
-    NZ = 'NZ'
-    NI = 'NI'
-    NE = 'NE'
-    NG = 'NG'
-    NU = 'NU'
-    NF = 'NF'
-    KP = 'KP'
-    MP = 'MP'
-    OM = 'OM'
-    PK = 'PK'
-    PW = 'PW'
-    PS = 'PS'
-    PG = 'PG'
-    PY = 'PY'
-    PE = 'PE'
-    PN = 'PN'
-    PL = 'PL'
-    PT = 'PT'
-    PR = 'PR'
-    RE = 'RE'
-    RO = 'RO'
-    RU = 'RU'
-    RW = 'RW'
-    BL = 'BL'
-    SH = 'SH'
-    PM = 'PM'
-    VC = 'VC'
-    WS = 'WS'
-    SM = 'SM'
-    ST = 'ST'
-    SN = 'SN'
-    RS = 'RS'
-    SC = 'SC'
-    SL = 'SL'
-    SX = 'SX'
-    SK = 'SK'
-    SI = 'SI'
-    SB = 'SB'
-    SO = 'SO'
-    ZA = 'ZA'
-    GS = 'GS'
-    KR = 'KR'
-    SS = 'SS'
-    ES = 'ES'
-    LK = 'LK'
-    SD = 'SD'
-    SR = 'SR'
-    SJ = 'SJ'
-    SZ = 'SZ'
-    SE = 'SE'
-    SY = 'SY'
-    TJ = 'TJ'
-    TZ = 'TZ'
-    TH = 'TH'
-    TL = 'TL'
-    TG = 'TG'
-    TK = 'TK'
-    TO = 'TO'
-    TN = 'TN'
-    TR = 'TR'
-    TV = 'TV'
-    UG = 'UG'
-    UA = 'UA'
-    GB = 'GB'
-    UM = 'UM'
-    UZ = 'UZ'
-    VU = 'VU'
-    VN = 'VN'
-    WF = 'WF'
-    EH = 'EH'
-    YE = 'YE'
-    ZM = 'ZM'
-    ZW = 'ZW'
-    US = 'US'
-    CR = 'CR'
-    MX = 'MX'
-    AE = 'AE'
-    VI = 'VI'
-    VG = 'VG'
-    SA = 'SA'
-    KH = 'KH'
-    AU = 'AU'
-    ID = 'ID'
-    CA = 'CA'
-    BR = 'BR'
-    TW = 'TW'
-    TM = 'TM'
-    TC = 'TC'
-    QA = 'QA'
-    MM = 'MM'
-    CN = 'CN'
-    SG = 'SG'
-    IL = 'IL'
-    VA = 'VA'
-    DE = 'DE'
-    NL = 'NL'
-    AG = 'AG'
-    BE = 'BE'
-    LC = 'LC'
-    UY = 'UY'
-    PH = 'PH'
-    BS = 'BS'
-    VE = 'VE'
-    CH = 'CH'
-    MF = 'MF'
-    KN = 'KN'
-    TT = 'TT'
-    DO = 'DO'
-    PA = 'PA'
-    MV = 'MV'
-    SV = 'SV'
-    NO = 'NO'
-    MA = 'MA'
-    AC = 'AC'
-    TA = 'TA'
-
-
-class CorporateStructure(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    level_count: LevelCount | None = Field(default=None, alias='levelCount')
-    level1_name: str | None = Field(default=None, alias='level1Name')
+class NotificationRecipientReference(CatalogItemReference):
+    pass
+
+
+class NotifyTypeReference(CatalogItemReference):
+    pass
+
+
+class Office365EmailSetup(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 20;
+     Max length: 200;
     """
-    level2_name: str | None = Field(default=None, alias='level2Name')
+    username: str
     """
-     Max length: 20;
+     Max length: 100;
     """
-    level3_name: str | None = Field(default=None, alias='level3Name')
+    inbox_folder: str = Field(..., alias='inboxFolder')
     """
-     Max length: 20;
+     Max length: 40;
     """
-    level4_name: str | None = Field(default=None, alias='level4Name')
+    processed_folder: str = Field(..., alias='processedFolder')
     """
-     Max length: 20;
+     Max length: 40;
     """
-    level5_name: str | None = Field(default=None, alias='level5Name')
+    failed_folder: str = Field(..., alias='failedFolder')
     """
-     Max length: 20;
+     Max length: 40;
     """
-    fiscal_year_start: FiscalYearStart = Field(..., alias='fiscalYearStart')
-    location_caption: str = Field(..., alias='locationCaption')
+    tenant_id: str | None = Field(default=None, alias='tenantId')
     """
-     Max length: 50;
+     Max length: 36;
     """
-    group_caption: str = Field(..., alias='groupCaption')
+    client_id: str | None = Field(default=None, alias='clientId')
     """
-     Max length: 50;
+     Max length: 36;
     """
-    base_currency: CurrencyReference = Field(..., alias='baseCurrency')
-    president: MemberReference | None = None
-    chief_operating_officer: MemberReference | None = Field(
-        default=None, alias='chiefOperatingOfficer'
-    )
-    controller: MemberReference | None = None
-    dispatcher: MemberReference | None = None
-    service_manager: MemberReference | None = Field(
-        default=None, alias='serviceManager'
+    client_secret: str | None = Field(default=None, alias='clientSecret')
+    """
+     Max length: 4000;
+    """
+    authorized_flag: bool | None = Field(default=None, alias='authorizedFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    source: int | None = None
+    email_connector: EmailConnectorReference | None = Field(
+        default=None, alias='emailConnector'
     )
-    duty_manager: MemberReference | None = Field(default=None, alias='dutyManager')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CorporateStructureInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Office365EmailSetupReference(ActivityReference):
+    pass
+
+
+class OnHandSerialNumberReference(ConnectWiseModel):
     id: int | None = None
-    location_caption: str | None = Field(default=None, alias='locationCaption')
-    group_caption: str | None = Field(default=None, alias='groupCaption')
-    base_currency: CurrencyReference | None = Field(default=None, alias='baseCurrency')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    serial_number: str | None = Field(default=None, alias='serialNumber')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CorporateStructureLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OnPremiseSearchSetting(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
+    password: str
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CorporateStructureLevelReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpenRevenueReference(AgreementRevenueReference):
+    pass
+
+
+class OpportunityNote(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    opportunity_id: int | None = Field(default=None, alias='opportunityId')
+    type: NoteTypeReference | None = None
+    text: str
+    flagged: bool | None = None
+    entered_by: str | None = Field(default=None, alias='enteredBy')
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CostingMethod(Enum):
-    FIFO = 'FIFO'
-    LIFO = 'LIFO'
-    AVERAGE_COSTING = 'AverageCosting'
+class OpportunityPriorityReference(ActivityReference):
+    pass
 
 
-class Count(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
+class OpportunityProbabilityReference(ActivityReference):
+    pass
 
 
-class Country(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpportunityRating(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    currency: CurrencyReference | None = None
-    city_caption: str | None = Field(default=None, alias='cityCaption')
-    """
-     Max length: 25;
-    """
-    state_caption: str | None = Field(default=None, alias='stateCaption')
-    """
-     Max length: 25;
-    """
-    zip_caption: str | None = Field(default=None, alias='zipCaption')
-    """
-     Max length: 25;
-    """
-    zip_minimum_length: int | None = Field(default=None, alias='zipMinimumLength')
-    dialing_prefix: str | None = Field(default=None, alias='dialingPrefix')
-    """
-     Max length: 5;
-    """
-    address_format: AddressFormatReference | None = Field(
-        default=None, alias='addressFormat'
-    )
-    country_code: str | None = Field(default=None, alias='countryCode')
-    """
-     Max length: 2;
-    """
-    core_entity_country_code: CoreEntityCountryCode | None = Field(
-        default=None, alias='coreEntityCountryCode'
-    )
-    localization_caption_one: str | None = Field(
-        default=None, alias='localizationCaptionOne'
-    )
-    """
-     Max length: 25;
-    """
-    localization_value_one: str | None = Field(
-        default=None, alias='localizationValueOne'
-    )
-    """
-     Max length: 50;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CountryInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpportunityRatingInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    city_caption: str | None = Field(default=None, alias='cityCaption')
-    state_caption: str | None = Field(default=None, alias='stateCaption')
-    zip_caption: str | None = Field(default=None, alias='zipCaption')
-    dialing_prefix: str | None = Field(default=None, alias='dialingPrefix')
-    localization_caption_one: str | None = Field(
-        default=None, alias='localizationCaptionOne'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CountryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class OpportunityRatingReference(ActivityReference):
+    pass
 
 
-class CreateAccountingBatchRequest(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpportunityReference(ActivityReference):
+    pass
+
+
+class OpportunitySalesRoleReference(ActivityReference):
+    pass
+
+
+class OpportunityStage(ConnectWiseModel):
     id: int | None = None
-    batch_identifier: str | None = Field(default=None, alias='batchIdentifier')
+    name: str
     """
      Max length: 50;
     """
-    gl_interface_identifier: str | None = Field(
-        default=None, alias='glInterfaceIdentifier'
-    )
-    export_invoices_flag: bool | None = Field(default=None, alias='exportInvoicesFlag')
-    """
-    Batch must export Invoices, Expenses or Products.
-    """
-    export_expenses_flag: bool | None = Field(default=None, alias='exportExpensesFlag')
-    """
-    Batch must export Invoices, Expenses or Products.
-    """
-    export_products_flag: bool | None = Field(default=None, alias='exportProductsFlag')
-    """
-    Batch must export Invoices, Expenses or Products.
-    """
-    processed_record_ids: list[int] = Field(..., alias='processedRecordIds')
+    probability: OpportunityProbabilityReference | None = None
+    color: str | None = None
     """
-    GL Entry RecIDs.
+     Max length: 25;
     """
-    summarize_expenses: bool | None = Field(default=None, alias='summarizeExpenses')
+    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Crm(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpportunityStageInfo(ConnectWiseModel):
     id: int | None = None
-    company_list_count: int | None = Field(default=None, alias='companyListCount')
-    lock_probability_flag: bool | None = Field(
-        default=None, alias='lockProbabilityFlag'
-    )
-    account_manager_role: TeamRoleReference | None = Field(
-        default=None, alias='accountManagerRole'
-    )
-    technical_contact_role: TeamRoleReference | None = Field(
-        default=None, alias='technicalContactRole'
-    )
-    sales_rep_role: TeamRoleReference | None = Field(default=None, alias='salesRepRole')
-    company_id_generation_flag: bool | None = Field(
-        default=None, alias='companyIdGenerationFlag'
-    )
-    exclude_spaces_flag: bool | None = Field(default=None, alias='excludeSpacesFlag')
-    field1_caption: str | None = Field(default=None, alias='field1Caption')
-    """
-     Max length: 25;
-    """
-    field2_caption: str | None = Field(default=None, alias='field2Caption')
-    """
-     Max length: 25;
-    """
-    field3_caption: str | None = Field(default=None, alias='field3Caption')
-    """
-     Max length: 25;
-    """
-    field4_caption: str | None = Field(default=None, alias='field4Caption')
-    """
-     Max length: 25;
-    """
-    field5_caption: str | None = Field(default=None, alias='field5Caption')
-    """
-     Max length: 25;
-    """
-    field6_caption: str | None = Field(default=None, alias='field6Caption')
-    """
-     Max length: 25;
-    """
-    field7_caption: str | None = Field(default=None, alias='field7Caption')
-    """
-     Max length: 25;
-    """
-    field8_caption: str | None = Field(default=None, alias='field8Caption')
-    """
-     Max length: 25;
-    """
-    field9_caption: str | None = Field(default=None, alias='field9Caption')
-    """
-     Max length: 25;
-    """
-    field10_caption: str | None = Field(default=None, alias='field10Caption')
-    """
-     Max length: 25;
-    """
-    primary_rep_caption: str | None = Field(default=None, alias='primaryRepCaption')
-    """
-     Max length: 50;
-    """
-    secondary_rep_caption: str | None = Field(default=None, alias='secondaryRepCaption')
-    """
-     Max length: 50;
-    """
-    other1_caption: str | None = Field(default=None, alias='other1Caption')
-    """
-     Max length: 50;
-    """
-    other2_caption: str | None = Field(default=None, alias='other2Caption')
+    name: str | None = None
+    probability: OpportunityProbabilityReference | None = None
+    color: str | None = None
+    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class OpportunityStageReference(ActivityReference):
+    pass
+
+
+class OpportunityStatus(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 50;
+     Max length: 30;
     """
-    default_year: bool | None = Field(default=None, alias='defaultYear')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    won_flag: bool | None = Field(default=None, alias='wonFlag')
+    lost_flag: bool | None = Field(default=None, alias='lostFlag')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    entered_by: str | None = Field(default=None, alias='enteredBy')
+    date_entered: datetime | None = Field(default=None, alias='dateEntered')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CrmInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpportunityStatusInfo(ConnectWiseModel):
     id: int | None = None
-    account_manager_role: TeamRoleReference | None = Field(
-        default=None, alias='accountManagerRole'
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    name: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class OpportunityStatusReference(ActivityReference):
+    pass
+
+
+class OpportunityToAgreementConversion(ConnectWiseModel):
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    name: str | None = None
+    type: AgreementTypeReference | None = None
+    start_date: str | None = Field(default=None, alias='startDate')
+    end_date: str | None = Field(default=None, alias='endDate')
+    no_ending_date_flag: bool | None = Field(default=None, alias='noEndingDateFlag')
+    bill_cycle_id: int | None = Field(default=None, alias='billCycleId')
+    bill_one_time_flag: bool | None = Field(default=None, alias='billOneTimeFlag')
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    include_all_notes_flag: bool | None = Field(
+        default=None, alias='includeAllNotesFlag'
     )
-    technical_contact_role: TeamRoleReference | None = Field(
-        default=None, alias='technicalContactRole'
+    include_all_documents_flag: bool | None = Field(
+        default=None, alias='includeAllDocumentsFlag'
+    )
+    include_all_products_flag: bool | None = Field(
+        default=None, alias='includeAllProductsFlag'
+    )
+    include_note_ids: list[int] | None = Field(default=None, alias='includeNoteIds')
+    include_document_ids: list[int] | None = Field(
+        default=None, alias='includeDocumentIds'
+    )
+    include_product_ids: list[int] | None = Field(
+        default=None, alias='includeProductIds'
     )
-    sales_rep_role: TeamRoleReference | None = Field(default=None, alias='salesRepRole')
-    field1_caption: str | None = Field(default=None, alias='field1Caption')
-    field2_caption: str | None = Field(default=None, alias='field2Caption')
-    field3_caption: str | None = Field(default=None, alias='field3Caption')
-    field4_caption: str | None = Field(default=None, alias='field4Caption')
-    field5_caption: str | None = Field(default=None, alias='field5Caption')
-    field6_caption: str | None = Field(default=None, alias='field6Caption')
-    field7_caption: str | None = Field(default=None, alias='field7Caption')
-    field8_caption: str | None = Field(default=None, alias='field8Caption')
-    field9_caption: str | None = Field(default=None, alias='field9Caption')
-    field10_caption: str | None = Field(default=None, alias='field10Caption')
-    primary_rep_caption: str | None = Field(default=None, alias='primaryRepCaption')
-    secondary_rep_caption: str | None = Field(default=None, alias='secondaryRepCaption')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CurrencyCode(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
+class OpportunityToSalesOrderConversion(ConnectWiseModel):
+    sales_order_id: int | None = Field(default=None, alias='salesOrderId')
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    include_all_notes_flag: bool | None = Field(
+        default=None, alias='includeAllNotesFlag'
+    )
+    include_all_documents_flag: bool | None = Field(
+        default=None, alias='includeAllDocumentsFlag'
+    )
+    include_all_products_flag: bool | None = Field(
+        default=None, alias='includeAllProductsFlag'
+    )
+    include_note_ids: list[int] | None = Field(default=None, alias='includeNoteIds')
+    include_document_ids: list[int] | None = Field(
+        default=None, alias='includeDocumentIds'
+    )
+    include_product_ids: list[int] | None = Field(
+        default=None, alias='includeProductIds'
+    )
 
 
-class CurrencyCodeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class OpportunityToServiceTicketConversion(ConnectWiseModel):
+    ticket_id: int | None = Field(default=None, alias='ticketId')
+    summary: str | None = None
+    include_all_notes_flag: bool | None = Field(
+        default=None, alias='includeAllNotesFlag'
+    )
+    include_all_documents_flag: bool | None = Field(
+        default=None, alias='includeAllDocumentsFlag'
+    )
+    include_all_products_flag: bool | None = Field(
+        default=None, alias='includeAllProductsFlag'
+    )
+    include_note_ids: list[int] | None = Field(default=None, alias='includeNoteIds')
+    include_document_ids: list[int] | None = Field(
+        default=None, alias='includeDocumentIds'
+    )
+    include_product_ids: list[int] | None = Field(
+        default=None, alias='includeProductIds'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CurrencyInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpportunityType(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    description: str
+    """
+     Max length: 50;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CurrencyReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpportunityTypeInfo(ConnectWiseModel):
     id: int | None = None
-    symbol: str | None = None
-    currency_code: str | None = Field(default=None, alias='currencyCode')
-    decimal_separator: str | None = Field(default=None, alias='decimalSeparator')
-    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
-    thousands_separator: str | None = Field(default=None, alias='thousandsSeparator')
-    negative_parentheses_flag: bool | None = Field(
-        default=None, alias='negativeParenthesesFlag'
-    )
-    display_symbol_flag: bool | None = Field(default=None, alias='displaySymbolFlag')
-    currency_identifier: str | None = Field(default=None, alias='currencyIdentifier')
-    display_id_flag: bool | None = Field(default=None, alias='displayIdFlag')
-    right_align: bool | None = Field(default=None, alias='rightAlign')
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    description: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CustomFieldValue(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OpportunityTypeReference(ActivityReference):
+    pass
+
+
+class OrderStatusEmailTemplateReference(ActivityReference):
+    pass
+
+
+class OrderStatusInfo(CategoryInfo):
+    pass
+
+
+class OrderStatusReference(ActivityReference):
+    pass
+
+
+class OsGradeWeight(ConnectWiseModel):
     id: int | None = None
-    caption: str | None = None
-    type: Type3 | None = None
-    entry_method: EntryMethod | None = Field(default=None, alias='entryMethod')
-    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
-    value: Any | None = None
+    os_grade_weight: float | None = Field(default=None, alias='osGradeWeight')
+    os_name: str | None = Field(default=None, alias='osName')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class CustomReport(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Other1RevenueReference(AgreementRevenueReference):
+    pass
+
+
+class Other2RevenueReference(AgreementRevenueReference):
+    pass
+
+
+class OwnerLevelReference(ActivityReference):
+    pass
+
+
+class OwnershipType(ConnectWiseModel):
     id: int | None = None
-    report_link: str = Field(..., alias='reportLink')
     name: str
     """
-     Max length: 100;
-    """
-    module: Module
-    """
-    The Module Name.
+     Max length: 200;
     """
-    description: str
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class OwnershipTypeInfo(ActivityReference):
+    pass
+
+
+class OwnershipTypeReference(ActivityReference):
+    pass
+
+
+class PageValues(ConnectWiseModel):
+    page: int | None = None
+    page_size: int | None = Field(default=None, alias='pageSize')
+    page_id: int | None = Field(default=None, alias='pageId')
+
+
+class ParsingType(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    parse_rule: str | None = Field(default=None, alias='parseRule')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ParsingVariable(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    code: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class PatchOperation(ConnectWiseModel):
+    op: str | None = None
+    path: str | None = None
+    value: dict[str, Any] | None = None
+
+
+class PaymentMethodReference(ActivityReference):
+    pass
+
+
+class PaymentType(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 150;
+     Max length: 30;
     """
-    generated_flag: bool | None = Field(default=None, alias='generatedFlag')
-    parameter_prefix: str | None = Field(default=None, alias='parameterPrefix')
-    """
-     Max length: 50;
-    """
-    parameter_separator: str | None = Field(default=None, alias='parameterSeparator')
-    """
-     Max length: 50;
-    """
-    parameter_name_separator: str | None = Field(
-        default=None, alias='parameterNameSeparator'
-    )
-    """
-     Max length: 50;
-    """
-    parameter_suffix: str | None = Field(default=None, alias='parameterSuffix')
-    """
-     Max length: 50;
-    """
-    location_flag: bool | None = Field(default=None, alias='locationFlag')
-    location_param_id: int | None = Field(default=None, alias='locationParamId')
+    classification: ClassificationReference | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    company_flag: bool | None = Field(default=None, alias='companyFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class PaymentTypeInfo(AddressFormatInfo):
+    pass
+
+
+class PersonasInfo(CorporateStructureLevel):
+    pass
+
+
+class PhaseStatusReference(ActivityReference):
+    pass
+
+
+class PortalCalendar(ConnectWiseModel):
+    id: int | None = None
+    week_start: Literal[
+        'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'
+    ] = Field(..., alias='weekStart')
+    adjust1_start: str | None = Field(default=None, alias='adjust1Start')
+    adjust1_end: str | None = Field(default=None, alias='adjust1End')
+    adjust1_hours: float | None = Field(default=None, alias='adjust1Hours')
+    adjust2_start: str | None = Field(default=None, alias='adjust2Start')
+    adjust2_end: str | None = Field(default=None, alias='adjust2End')
+    adjust2_hours: float | None = Field(default=None, alias='adjust2Hours')
+    adjust3_start: str | None = Field(default=None, alias='adjust3Start')
+    adjust3_end: str | None = Field(default=None, alias='adjust3End')
+    adjust3_hours: float | None = Field(default=None, alias='adjust3Hours')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class PortalConfiguration(ConnectWiseModel):
+    id: int | None = None
     """
-    Parameter unique identifier for the Custom Report's Location parameter.
+    Gets or sets and Sets
+                An existing Portal Configuration id is required when copying a Portal Configuration.
     """
-    location_default_flag: bool | None = Field(
-        default=None, alias='locationDefaultFlag'
-    )
-    location_override: str | None = Field(default=None, alias='locationOverride')
-    department_flag: bool | None = Field(default=None, alias='departmentFlag')
-    department_param_id: int | None = Field(default=None, alias='departmentParamId')
+    name: str
     """
-    Parameter unique identifier for the Custom Report's Department parameter.
+     Max length: 150;
     """
-    department_default_flag: bool | None = Field(
-        default=None, alias='departmentDefaultFlag'
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    company: CompanyReference | None = None
+    login_background_color: str | None = Field(
+        default=None, alias='loginBackgroundColor'
     )
-    department_override: str | None = Field(default=None, alias='departmentOverride')
-    territory_flag: bool | None = Field(default=None, alias='territoryFlag')
-    territory_param_id: int | None = Field(default=None, alias='territoryParamId')
     """
-    Parameter unique identifier for the Custom Report's Terriroty parameter.
+     Max length: 7;
     """
-    territory_default_flag: bool | None = Field(
-        default=None, alias='territoryDefaultFlag'
+    portal_background_color: str | None = Field(
+        default=None, alias='portalBackgroundColor'
     )
-    territory_override: str | None = Field(default=None, alias='territoryOverride')
-    company_flag: bool | None = Field(default=None, alias='companyFlag')
-    company_param_id: int | None = Field(default=None, alias='companyParamId')
     """
-    Parameter unique identifier for the Custom Report's Company parameter.
+     Max length: 7;
     """
-    company_override: str | None = Field(default=None, alias='companyOverride')
-    member_flag: bool | None = Field(default=None, alias='memberFlag')
-    member_param_id: int | None = Field(default=None, alias='memberParamId')
+    menu_color: str | None = Field(default=None, alias='menuColor')
     """
-    Parameter unique identifier for the Custom Report's Member parameter.
+     Max length: 7;
     """
-    member_override: str | None = Field(default=None, alias='memberOverride')
-    start_date_flag: bool | None = Field(default=None, alias='startDateFlag')
-    start_date_param_id: int | None = Field(default=None, alias='startDateParamId')
+    button_color: str | None = Field(default=None, alias='buttonColor')
     """
-    Parameter unique identifier for the Custom Report's Start Date parameter.
+     Max length: 7;
     """
-    start_date_override: str | None = Field(default=None, alias='startDateOverride')
-    end_date_flag: bool | None = Field(default=None, alias='endDateFlag')
-    end_date_param_id: int | None = Field(default=None, alias='endDateParamId')
+    header_color: str | None = Field(default=None, alias='headerColor')
     """
-    Parameter unique identifier for the Custom Report's End Date parameter.
+     Max length: 7;
     """
-    end_date_override: str | None = Field(default=None, alias='endDateOverride')
-    opp_type_flag: bool | None = Field(default=None, alias='oppTypeFlag')
-    opp_type_param_id: int | None = Field(default=None, alias='oppTypeParamId')
+    url: str | None = None
     """
-    Parameter unique identifier for the Custom Report's Opportunity Type parameter.
+     Max length: 1000;
     """
-    opp_type_override: str | None = Field(default=None, alias='oppTypeOverride')
-    opportunity_flag: bool | None = Field(default=None, alias='opportunityFlag')
-    opportunity_param_id: int | None = Field(default=None, alias='opportunityParamId')
+    language: Literal[
+        'English',
+        'Spanish',
+        'French',
+        'British',
+        'Australian',
+        'BrazilianPortuguese',
+        'CanadianFrench',
+        'German',
+        'NewZealand',
+        'Dutch',
+    ] | None = None
+    welcome_text: str | None = Field(default=None, alias='welcomeText')
     """
-    Parameter unique identifier for the Custom Report's Opportunity parameter.
+     Max length: 4000;
     """
-    opportunity_override: str | None = Field(default=None, alias='opportunityOverride')
-    marketing_campaign_flag: bool | None = Field(
-        default=None, alias='marketingCampaignFlag'
+    board_ids: list[int] | None = Field(default=None, alias='boardIds')
+    agreement_type_ids: list[int] | None = Field(default=None, alias='agreementTypeIds')
+    config_type_ids: list[int] | None = Field(default=None, alias='configTypeIds')
+    location_ids: list[int] | None = Field(default=None, alias='locationIds')
+    portal_image_copy_success_flag: bool | None = Field(
+        default=None, alias='portalImageCopySuccessFlag'
     )
-    marketing_campaign_param_id: int | None = Field(
-        default=None, alias='marketingCampaignParamId'
+    display_vendor_flag: bool | None = Field(default=None, alias='displayVendorFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class PortalConfigurationOpportunitySetup(ConnectWiseModel):
+    id: int | None = None
+    opportunity_status_rec_i_ds: list[int] | None = Field(
+        default=None, alias='opportunityStatusRecIDs'
     )
-    """
-    Parameter unique identifier for the Custom Report's Marketing Campaign parameter.
-    """
-    marketing_campaign_override: str | None = Field(
-        default=None, alias='marketingCampaignOverride'
+    add_all_opportunity_statuses: bool | None = Field(
+        default=None, alias='addAllOpportunityStatuses'
     )
-    service_board_flag: bool | None = Field(default=None, alias='serviceBoardFlag')
-    service_board_param_id: int | None = Field(
-        default=None, alias='serviceBoardParamId'
+    remove_all_opportunity_statuses: bool | None = Field(
+        default=None, alias='removeAllOpportunityStatuses'
     )
-    """
-    Parameter unique identifier for the Custom Report's Service Board parameter.
-    """
-    service_board_default_flag: bool | None = Field(
-        default=None, alias='serviceBoardDefaultFlag'
+    opportunity_type_rec_i_ds: list[int] | None = Field(
+        default=None, alias='opportunityTypeRecIDs'
     )
-    service_board_override: str | None = Field(
-        default=None, alias='serviceBoardOverride'
+    add_all_opportunity_types: bool | None = Field(
+        default=None, alias='addAllOpportunityTypes'
     )
-    service_type_flag: bool | None = Field(default=None, alias='serviceTypeFlag')
-    service_type_param_id: int | None = Field(default=None, alias='serviceTypeParamId')
-    """
-    Parameter unique identifier for the Custom Report's Service Type parameter.
-    """
-    service_type_override: str | None = Field(default=None, alias='serviceTypeOverride')
-    service_status_flag: bool | None = Field(default=None, alias='serviceStatusFlag')
-    service_status_param_id: int | None = Field(
-        default=None, alias='serviceStatusParamId'
+    remove_all_opportunity_types: bool | None = Field(
+        default=None, alias='removeAllOpportunityTypes'
     )
-    """
-    Parameter unique identifier for the Custom Report's Service Status parameter.
-    """
-    service_status_override: str | None = Field(
-        default=None, alias='serviceStatusOverride'
+    restrict_view_by_opportunity_status_flag: bool | None = Field(
+        default=None, alias='restrictViewByOpportunityStatusFlag'
     )
-    agreement_type_flag: bool | None = Field(default=None, alias='agreementTypeFlag')
-    agreement_type_param_id: int | None = Field(
-        default=None, alias='agreementTypeParamId'
+    restrict_view_by_opportunity_type_flag: bool | None = Field(
+        default=None, alias='restrictViewByOpportunityTypeFlag'
     )
-    """
-    Parameter unique identifier for the Custom Report's Agreement Type parameter.
-    """
-    agreement_type_override: str | None = Field(
-        default=None, alias='agreementTypeOverride'
+    acceptance_change_status_flag: bool | None = Field(
+        default=None, alias='acceptanceChangeStatusFlag'
     )
-    agreement_flag: bool | None = Field(default=None, alias='agreementFlag')
-    agreement_param_id: int | None = Field(default=None, alias='agreementParamId')
-    """
-    Parameter unique identifier for the Custom Report's Agreement parameter.
-    """
-    agreement_override: str | None = Field(default=None, alias='agreementOverride')
-    project_type_flag: bool | None = Field(default=None, alias='projectTypeFlag')
-    project_type_param_id: int | None = Field(default=None, alias='projectTypeParamId')
-    """
-    Parameter unique identifier for the Custom Report's Project Type parameter.
-    """
-    project_type_override: str | None = Field(default=None, alias='projectTypeOverride')
-    project_flag: bool | None = Field(default=None, alias='projectFlag')
-    project_param_id: int | None = Field(default=None, alias='projectParamId')
-    """
-    Parameter unique identifier for the Custom Report's Project parameter.
-    """
-    project_override: str | None = Field(default=None, alias='projectOverride')
-    work_role_flag: bool | None = Field(default=None, alias='workRoleFlag')
-    work_role_param_id: int | None = Field(default=None, alias='workRoleParamId')
-    """
-    Parameter unique identifier for the Custom Report's Work Role parameter.
-    """
-    work_role_override: str | None = Field(default=None, alias='workRoleOverride')
-    work_type_flag: bool | None = Field(default=None, alias='workTypeFlag')
-    work_type_param_id: int | None = Field(default=None, alias='workTypeParamId')
-    """
-    Parameter unique identifier for the Custom Report's Work Type parameter.
-    """
-    work_type_override: str | None = Field(default=None, alias='workTypeOverride')
-    invoice_flag: bool | None = Field(default=None, alias='invoiceFlag')
-    invoice_param_id: int | None = Field(default=None, alias='invoiceParamId')
-    """
-    Parameter unique identifier for the Custom Report's Invoice Type parameter.
-    """
-    invoice_override: str | None = Field(default=None, alias='invoiceOverride')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CustomReportParameter(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    acceptance_create_activity_flag: bool | None = Field(
+        default=None, alias='acceptanceCreateActivityFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    """
-    Either a caption name or parameter name is required. Max length: 50;
-    """
-    caption_name: str | None = Field(default=None, alias='captionName')
-    """
-    Either a caption name or parameter name is required. Max length: 50;
-    """
-    custom_report: CustomReportReference | None = Field(
-        default=None, alias='customReport'
+    acceptance_opportunity_status: OpportunityStatusReference | None = Field(
+        default=None, alias='acceptanceOpportunityStatus'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CustomReportReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    acceptance_send_email_flag: bool | None = Field(
+        default=None, alias='acceptanceSendEmailFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CustomizeIdentifier(Enum):
-    COMPANY_REPORTS = 'CompanyReports'
-    FINANCE_REPORTS = 'FinanceReports'
-    MARKETING_REPORTS = 'MarketingReports'
-    PROCUREMENT_REPORTS = 'ProcurementReports'
-    PROJECT_REPORTS = 'ProjectReports'
-    SALES_REPORTS = 'SalesReports'
-    SERVICE_REPORTS = 'ServiceReports'
-    SYSTEM_REPORTS = 'SystemReports'
-    TIME_AND_EXPENSE_REPORTS = 'TimeAndExpenseReports'
-    COMPANY_CONFIGURATIONS = 'CompanyConfigurations'
-    FINANCE_AGREEMENTS = 'FinanceAgreements'
-    PROJECT_SCHEDULING = 'ProjectScheduling'
-    SERVICE_RESOURCE_SCHEDULING = 'ServiceResourceScheduling'
-    SYSTEM_MANAGE_HOSTED_API = 'SystemManageHostedApi'
-    SYSTEM_MY_ACCOUNT = 'SystemMyAccount'
-    SYSTEM_CUSTOM_MENU_ENTRY = 'SystemCustomMenuEntry'
-    SYSTEM_MASS_MAINTENANCE = 'SystemMassMaintenance'
-    SYSTEM_TABLE_SETUP = 'SystemTableSetup'
-
-
-class CwTimeZone(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    acceptance_email_from_first_name: str | None = Field(
+        default=None, alias='acceptanceEmailFromFirstName'
     )
-    id: int | None = None
-    name: str | None = None
-    offset: float | None = None
+    acceptance_email_from_last_name: str | None = Field(
+        default=None, alias='acceptanceEmailFromLastName'
+    )
+    acceptance_email_subject: str | None = Field(
+        default=None, alias='acceptanceEmailSubject'
+    )
+    acceptance_email_body: str | None = Field(default=None, alias='acceptanceEmailBody')
+    acceptance_from_email: str | None = Field(default=None, alias='acceptanceFromEmail')
     """
-    The hours offset (+/-).
+    Gets or sets
+                required when acceptanceSendEmailFlag is true.
     """
-    start_date: str | None = Field(default=None, alias='startDate')
-    end_date: str | None = Field(default=None, alias='endDate')
-    daylight_savings_flag: bool | None = Field(
-        default=None, alias='daylightSavingsFlag'
+    acceptance_email_activity_type: ActivityTypeReference | None = Field(
+        default=None, alias='acceptanceEmailActivityType'
+    )
+    acceptance_email_assigned_by_member: MemberReference | None = Field(
+        default=None, alias='acceptanceEmailAssignedByMember'
+    )
+    rejection_change_status_flag: bool | None = Field(
+        default=None, alias='rejectionChangeStatusFlag'
+    )
+    rejection_create_activity_flag: bool | None = Field(
+        default=None, alias='rejectionCreateActivityFlag'
+    )
+    rejection_opportunity_status: OpportunityStatusReference | None = Field(
+        default=None, alias='rejectionOpportunityStatus'
     )
+    rejection_send_email_flag: bool | None = Field(
+        default=None, alias='rejectionSendEmailFlag'
+    )
+    rejection_email_from_first_name: str | None = Field(
+        default=None, alias='rejectionEmailFromFirstName'
+    )
+    rejection_email_from_last_name: str | None = Field(
+        default=None, alias='rejectionEmailFromLastName'
+    )
+    rejection_from_email: str | None = Field(default=None, alias='rejectionFromEmail')
     """
-    Determined based on system library value for specified timeZone.
-                Not able to be used in query params at this time.
+    Gets or sets
+                required when rejectionSendEmailFlag is true.
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class CycleType(Enum):
-    CONTRACT_YEAR = 'ContractYear'
-    CALENDAR_YEAR = 'CalendarYear'
-
-
-class DateAcquired(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class DefaultBillingLevel(Enum):
-    DETAIL = 'Detail'
-    SUMMARY = 'Summary'
-
-
-class DefaultEmail(Enum):
-    OFFICE = 'Office'
-    MOBILE = 'Mobile'
-    HOME = 'Home'
-
-
-class DefaultPhone(Enum):
-    OFFICE = 'Office'
-    MOBILE = 'Mobile'
-    HOME = 'Home'
-
-
-class DefaultSpecialInvoiceType(Enum):
-    AGREEMENT = 'Agreement'
-    CREDIT_MEMO = 'CreditMemo'
-    DOWN_PAYMENT = 'DownPayment'
-    MISCELLANEOUS = 'Miscellaneous'
-    PROGRESS = 'Progress'
-    STANDARD = 'Standard'
-
-
-class DelegationType(Enum):
-    APPROVAL = 'Approval'
-    PROJECT = 'Project'
-
-
-class DeleteLevel(Enum):
-    NONE = 'None'
-    MY = 'My'
-    ALL = 'All'
-
-
-class DeliveryMethod(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    rejection_email_subject: str | None = Field(
+        default=None, alias='rejectionEmailSubject'
+    )
+    rejection_email_body: str | None = Field(default=None, alias='rejectionEmailBody')
+    rejection_email_activity_type: ActivityTypeReference | None = Field(
+        default=None, alias='rejectionEmailActivityType'
+    )
+    rejection_email_assigned_by_member: MemberReference | None = Field(
+        default=None, alias='rejectionEmailAssignedByMember'
+    )
+    confirmation_send_email_flag: bool | None = Field(
+        default=None, alias='confirmationSendEmailFlag'
+    )
+    confirmation_email_use_default_company_email_address_flag: bool | None = Field(
+        default=None, alias='confirmationEmailUseDefaultCompanyEmailAddressFlag'
+    )
+    confirmation_email_from_first_name: str | None = Field(
+        default=None, alias='confirmationEmailFromFirstName'
+    )
+    confirmation_email_from_last_name: str | None = Field(
+        default=None, alias='confirmationEmailFromLastName'
+    )
+    confirmation_from_email: str | None = Field(
+        default=None, alias='confirmationFromEmail'
     )
-    id: int | None = None
-    name: str
     """
-     Max length: 50;
+    Gets or sets
+                required when confirmationSendEmailFlag is true.
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    email_flag: bool | None = Field(default=None, alias='emailFlag')
-    integration_email_flag: bool | None = Field(
-        default=None, alias='integrationEmailFlag'
-    )
-    integration_print_flag: bool | None = Field(
-        default=None, alias='integrationPrintFlag'
+    confirmation_email_subject: str | None = Field(
+        default=None, alias='confirmationEmailSubject'
     )
-    integration_active_flag: bool | None = Field(
-        default=None, alias='integrationActiveFlag'
+    confirmation_email_body: str | None = Field(
+        default=None, alias='confirmationEmailBody'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Department(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PortalConfigurationPasswordEmailSetup(ConnectWiseModel):
     id: int | None = None
-    identifier: str
+    valid_password_email_use_custom_email_flag: bool | None = Field(
+        default=None, alias='validPasswordEmailUseCustomEmailFlag'
+    )
+    valid_password_email_from_first_name: str | None = Field(
+        default=None, alias='validPasswordEmailFromFirstName'
+    )
+    valid_password_email_from_last_name: str | None = Field(
+        default=None, alias='validPasswordEmailFromLastName'
+    )
+    valid_password_email_from_email: str | None = Field(
+        default=None, alias='validPasswordEmailFromEmail'
+    )
     """
-     Max length: 15;
+    Gets or sets
+                required when validPasswordEmailUseCustomEmailFlag is true.
     """
-    name: str
+    valid_password_email_subject: str | None = Field(
+        default=None, alias='validPasswordEmailSubject'
+    )
+    valid_password_email_body: str | None = Field(
+        default=None, alias='validPasswordEmailBody'
+    )
+    invalid_password_email_use_custom_email_flag: bool | None = Field(
+        default=None, alias='invalidPasswordEmailUseCustomEmailFlag'
+    )
+    invalid_password_email_from_first_name: str | None = Field(
+        default=None, alias='invalidPasswordEmailFromFirstName'
+    )
+    invalid_password_email_from_last_name: str | None = Field(
+        default=None, alias='invalidPasswordEmailFromLastName'
+    )
+    invalid_password_email_from_email: str | None = Field(
+        default=None, alias='invalidPasswordEmailFromEmail'
+    )
     """
-     Max length: 50;
+    Gets or sets
+                required when invalidPasswordEmailUseCustomEmailFlag is true.
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    invalid_password_email_subject: str | None = Field(
+        default=None, alias='invalidPasswordEmailSubject'
+    )
+    invalid_password_email_body: str | None = Field(
+        default=None, alias='invalidPasswordEmailBody'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class DepartmentInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PortalConfigurationPaymentProcessor(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    test_url: str | None = Field(default=None, alias='testURL')
 
 
-class DepartmentLocation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    department_manager: MemberReference | None = Field(
-        default=None, alias='departmentManager'
-    )
-    dispatch: MemberReference | None = None
-    service_manager: MemberReference | None = Field(
-        default=None, alias='serviceManager'
-    )
-    duty_manager: MemberReference | None = Field(default=None, alias='dutyManager')
-    ldap_config: LdapConfigurationReference | None = Field(
-        default=None, alias='ldapConfig'
-    )
-    add_all_locations: bool | None = Field(default=None, alias='addAllLocations')
-    remove_all_locations: bool | None = Field(default=None, alias='removeAllLocations')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class PortalConfigurationPaymentProcessorReference(ActivityReference):
+    pass
 
 
-class DepartmentLocationInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class PortalConfigurationReference(ActivityReference):
+    pass
 
 
-class DeviceType(Enum):
+class PortalReport(ConnectWiseModel):
+    id: int | None = None
+    portal_configuration: PortalConfigurationReference | None = Field(
+        default=None, alias='portalConfiguration'
+    )
+    name: str
     """
-    Gets or sets deviceType is required if the managementSolution is Legacy.
+     Max length: 255;
+    """
+    url: str
+    """
+     Max length: 255;
     """
+    open_same_window_flag: bool | None = Field(default=None, alias='openSameWindowFlag')
+    custom_flag: bool | None = Field(default=None, alias='customFlag')
+    display_flag: bool | None = Field(default=None, alias='displayFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
-    WORKSTATIONS_AND_SERVERS = 'WorkstationsAndServers'
-    BACKUP_STATS = 'BackupStats'
-    SERVERS = 'Servers'
-    WORKSTATIONS = 'Workstations'
+
+class PortalSecurity(ConnectWiseModel):
+    identifier: str | None = None
+    enabled: bool | None = None
 
 
-class DirectionalSync(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PortalSecurityLevel(ConnectWiseModel):
     id: int | None = None
-    name: str
+    caption_identifier: str | None = Field(default=None, alias='captionIdentifier')
+    is_default_flag: bool | None = Field(default=None, alias='isDefaultFlag')
+    caption: str | None = None
     """
      Max length: 50;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class DirectionalSyncInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PortalSecuritySetting(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    function_identifier: str | None = Field(default=None, alias='functionIdentifier')
+    function_description: str | None = Field(default=None, alias='functionDescription')
+    level_one: bool | None = Field(default=None, alias='levelOne')
+    level_two: bool | None = Field(default=None, alias='levelTwo')
+    level_three: bool | None = Field(default=None, alias='levelThree')
+    level_four: bool | None = Field(default=None, alias='levelFour')
+    level_five: bool | None = Field(default=None, alias='levelFive')
+    level_six: bool | None = Field(default=None, alias='levelSix')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class DirectionalSyncReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PricingBreak(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    detail_id: int | None = Field(default=None, alias='detailId')
+    amount: float | None = None
+    quantity_start: float = Field(..., alias='quantityStart')
+    quantity_end: float | None = Field(default=None, alias='quantityEnd')
+    unlimited: bool | None = None
+    price_method: Literal[
+        'FlatRateForRange',
+        'PercentMarkupFromCost',
+        'PercentMarkdownFromPrice',
+        'PricePerUnit',
+    ] = Field(..., alias='priceMethod')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class DiscussionSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
+class PricingSchedule(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 30;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    currency: CurrencyReference | None = None
+    companies: list[int] | None = None
+    set_all_companies_flag: bool | None = Field(
+        default=None, alias='setAllCompaniesFlag'
+    )
+    remove_all_companies_flag: bool | None = Field(
+        default=None, alias='removeAllCompaniesFlag'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class DisplayClosedTicketsOption(Enum):
-    DO_NOT_DISPLAY = 'DoNotDisplay'
-    CLOSED30_DAYS = 'Closed30Days'
-    CLOSED60_DAYS = 'Closed60Days'
-    CLOSED90_DAYS = 'Closed90Days'
-    CLOSED120_DAYS = 'Closed120Days'
-    ALL_CLOSED = 'AllClosed'
+class PricingScheduleReference(ActivityReference):
+    pass
 
 
-class DisplaySection(Enum):
-    CUSTOMER_INFORMATION = 'CustomerInformation'
-    DETAIL = 'Detail'
-    EXPENSES = 'Expenses'
-    CONFIGURATIONS = 'Configurations'
-    ADDITIONAL_SIGN_OFF_FIELDS = 'AdditionalSignOffFields'
-    INTERNAL_NOTES = 'InternalNotes'
-    TIME = 'Time'
-    PRODUCTS = 'Products'
-    RESOLUTION = 'Resolution'
-    SUMMARY = 'Summary'
-    TASKS = 'Tasks'
+class Priority(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 50;
+    """
+    color: Literal[
+        'Black',
+        'Blue',
+        'Cyan',
+        'Gray',
+        'Green',
+        'Lime',
+        'Orange',
+        'Pink',
+        'Purple',
+        'Red',
+        'White',
+        'Yellow',
+        'Custom',
+    ]
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    image_link: str | None = Field(default=None, alias='imageLink')
+    urgency_sort_order: str | None = Field(default=None, alias='urgencySortOrder')
+    level: Literal['Critical', 'High', 'Medium', 'Low'] | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class DocumentFormData(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    file: bytes | None = None
-    record_id: int | None = Field(default=None, alias='recordId')
-    record_type: str | None = Field(default=None, alias='recordType')
-    title: str | None = None
-    url: str | None = None
-    private_flag: bool | None = Field(default=None, alias='privateFlag')
-    read_only_flay: bool | None = Field(default=None, alias='readOnlyFlay')
-    is_avatar: bool | None = Field(default=None, alias='isAvatar')
+class PriorityInfo(OpportunityRatingInfo):
+    pass
 
 
-class DocumentInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PriorityReference(ConnectWiseModel):
     id: int | None = None
-    title: str | None = None
-    file_name: str | None = Field(default=None, alias='fileName')
-    server_file_name: str | None = Field(default=None, alias='serverFileName')
-    owner: str | None = None
-    link_flag: bool | None = Field(default=None, alias='linkFlag')
-    image_flag: bool | None = Field(default=None, alias='imageFlag')
-    public_flag: bool | None = Field(default=None, alias='publicFlag')
-    html_template_flag: bool | None = Field(default=None, alias='htmlTemplateFlag')
-    read_only_flag: bool | None = Field(default=None, alias='readOnlyFlag')
-    size: int | None = None
-    url_flag: bool | None = Field(default=None, alias='urlFlag')
-    created_on_date: str | None = Field(default=None, alias='createdOnDate')
-    document_type: DocumentTypeReference | None = Field(
-        default=None, alias='documentType'
-    )
-    guid: UUID | None = Field(
-        default=None, example='00000000-0000-0000-0000-000000000000'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str | None = None
+    sort: int | None = None
+    level: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class DocumentReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class DocumentSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProcurementSetting(ConnectWiseModel):
     id: int | None = None
-    upload_as_link_flag: bool | None = Field(default=None, alias='uploadAsLinkFlag')
-    is_public_flag: bool | None = Field(default=None, alias='isPublicFlag')
-    doc_path: str | None = Field(default=None, alias='docPath')
+    starting_purchase_order_num: int = Field(..., alias='startingPurchaseOrderNum')
+    purchase_order_prefix: str | None = Field(default=None, alias='purchaseOrderPrefix')
     """
-     Max length: 100;
+     Max length: 5;
     """
-    template_path: str | None = Field(default=None, alias='templatePath')
+    purchase_order_suffix: str | None = Field(default=None, alias='purchaseOrderSuffix')
     """
-     Max length: 200;
+     Max length: 5;
     """
-    template_output_path: str | None = Field(default=None, alias='templateOutputPath')
+    prefix_suffix_type: Literal['Prefix', 'Suffix'] | None = Field(
+        default=None, alias='prefixSuffixType'
+    )
+    disable_cost_updates_flag: bool | None = Field(
+        default=None, alias='disableCostUpdatesFlag'
+    )
+    disable_negative_inventory_flag: bool | None = Field(
+        default=None, alias='disableNegativeInventoryFlag'
+    )
+    costing_method: Literal['FIFO', 'LIFO', 'AverageCosting'] = Field(
+        ..., alias='costingMethod'
+    )
+    auto_close_purchase_order_flag: bool | None = Field(
+        default=None, alias='autoClosePurchaseOrderFlag'
+    )
+    auto_close_purchase_order_item_flag: bool | None = Field(
+        default=None, alias='autoClosePurchaseOrderItemFlag'
+    )
+    auto_approve_purchase_order_flag: bool | None = Field(
+        default=None, alias='autoApprovePurchaseOrderFlag'
+    )
+    tax_purchase_order_flag: bool | None = Field(
+        default=None, alias='taxPurchaseOrderFlag'
+    )
+    tax_freight_flag: bool | None = Field(default=None, alias='taxFreightFlag')
+    use_vendor_tax_code_flag: bool | None = Field(
+        default=None, alias='useVendorTaxCodeFlag'
+    )
+    num_decimal_places: int | None = Field(default=None, alias='numDecimalPlaces')
+    disable_auto_pick_flag: bool | None = Field(
+        default=None, alias='disableAutoPickFlag'
+    )
+    default_product_taxable_flag: bool | None = Field(
+        default=None, alias='defaultProductTaxableFlag'
+    )
+    eori_number: str | None = Field(default=None, alias='eoriNumber')
     """
-     Max length: 200;
+     Max length: 50;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class DocumentType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    file_extension: str | None = Field(default=None, alias='fileExtension')
-    icon: str | None = None
-    mime_type: str | None = Field(default=None, alias='mimeType')
-    description: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProductCategoryReference(ActivityReference):
+    pass
 
 
-class DocumentTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProductDemand(ConnectWiseModel):
+    product_rec_id: int | None = Field(default=None, alias='productRecId')
+    quantity: int | None = None
+    cost: float | None = None
 
 
-class Documents(Enum):
-    DISCARD = 'Discard'
-    MERGE = 'Merge'
+class ProductDetach(ConnectWiseModel):
+    remove_from_ticket: bool | None = Field(default=None, alias='removeFromTicket')
+    remove_from_invoice: bool | None = Field(default=None, alias='removeFromInvoice')
+    remove_from_opportunity: bool | None = Field(
+        default=None, alias='removeFromOpportunity'
+    )
+    remove_from_sales_order: bool | None = Field(
+        default=None, alias='removeFromSalesOrder'
+    )
+    remove_from_project: bool | None = Field(default=None, alias='removeFromProject')
 
 
-class DocumentsSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
+class ProductItemReference(ActivityReference):
+    pass
 
 
-class EPayConfiguration(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    location: SystemLocationReference | None = None
-    currency: CurrencyReference | None = None
-    url: str
-    """
-     Max length: 400;
-    """
-    store_identifier: str = Field(..., alias='storeIdentifier')
-    """
-     Max length: 500;
-    """
-    encryption_key: str | None = Field(default=None, alias='encryptionKey')
+class ProductRecurring(ConnectWiseModel):
+    recurring_revenue: float | None = Field(default=None, alias='recurringRevenue')
+    recurring_cost: float | None = Field(default=None, alias='recurringCost')
+    start_date: str | None = Field(default=None, alias='startDate')
+    end_date: str | None = Field(default=None, alias='endDate')
     """
-     Max length: 500;
+    The Recurring End Date is calculated based on the
+                start date, number of cycles, and cycle type.
     """
-    initialization_vector: str | None = Field(
-        default=None, alias='initializationVector'
+    bill_cycle_id: int | None = Field(default=None, alias='billCycleId')
+    cycles: int | None = None
+    cycle_type: Literal['ContractYear', 'CalendarYear'] | None = Field(
+        default=None, alias='cycleType'
     )
-    """
-     Max length: 500;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class EditLevel(Enum):
-    NONE = 'None'
-    MY = 'My'
-    ALL = 'All'
+class ProductReference(InOutTypeInfo):
+    pass
 
 
-class EmailConnector(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    email_server_type: EmailServerType | None = Field(
-        default=None, alias='emailServerType'
-    )
-    imap_setup: ImapSetupReference | None = Field(default=None, alias='imapSetup')
-    office365_email_setup: Office365EmailSetupReference | None = Field(
-        default=None, alias='office365EmailSetup'
-    )
-    asio365_email_setup: Office365EmailSetupReference | None = Field(
-        default=None, alias='asio365EmailSetup'
-    )
-    google_email_setup: GoogleEmailSetupReference | None = Field(
-        default=None, alias='googleEmailSetup'
-    )
-    service_board: BoardReference | None = Field(default=None, alias='serviceBoard')
-    default_company: CompanyReference | None = Field(
-        default=None, alias='defaultCompany'
-    )
-    default_member: MemberReference | None = Field(default=None, alias='defaultMember')
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    email_notify_from: str | None = Field(default=None, alias='emailNotifyFrom')
-    """
-     Max length: 50;
-    """
-    bcc_email_to: str | None = Field(default=None, alias='bccEmailTo')
-    """
-     Max length: 250;
-    """
-    email_errors_to: str = Field(..., alias='emailErrorsTo')
-    """
-     Max length: 50;
-    """
-    set_email_to_default_contact_flag: bool | None = Field(
-        default=None, alias='setEmailToDefaultContactFlag'
-    )
-    no_response_flag: bool | None = Field(default=None, alias='noResponseFlag')
-    never_respond_flag: bool | None = Field(default=None, alias='neverRespondFlag')
-    discard_duplicates_flag: bool | None = Field(
-        default=None, alias='discardDuplicatesFlag'
-    )
-    post_replies_to_ticket_flag: bool | None = Field(
-        default=None, alias='postRepliesToTicketFlag'
-    )
-    create_contact_flag: bool | None = Field(default=None, alias='createContactFlag')
-    response_email_for_new: str | None = Field(
-        default=None, alias='responseEmailForNew'
-    )
-    response_email_for_existing: str | None = Field(
-        default=None, alias='responseEmailForExisting'
-    )
-    source_override: ServiceSourceReference | None = Field(
-        default=None, alias='sourceOverride'
-    )
-    priority_override: PriorityReference | None = Field(
-        default=None, alias='priorityOverride'
-    )
-    type_override: ServiceTypeReference | None = Field(
-        default=None, alias='typeOverride'
-    )
-    sub_type_override: ServiceSubTypeReference | None = Field(
-        default=None, alias='subTypeOverride'
-    )
-    item_override: ServiceItemReference | None = Field(
-        default=None, alias='itemOverride'
-    )
-    status_override: ServiceStatusReference | None = Field(
-        default=None, alias='statusOverride'
-    )
-    add_cc_flag: bool | None = Field(default=None, alias='addCcFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProductRevenueReference(AgreementRevenueReference):
+    pass
 
 
-class EmailConnectorInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    imap_setup: ImapSetupReference | None = Field(default=None, alias='imapSetup')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProductSubCategoryReference(ActivityReference):
+    pass
 
 
-class EmailConnectorParsingRule(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProductType(ConnectWiseModel):
     id: int | None = None
-    parsing_style: EmailConnectorParsingStyleReference | None = Field(
-        default=None, alias='parsingStyle'
-    )
-    priority: int
-    parsing_variable: EmailConnectorParsingVariableReference | None = Field(
-        default=None, alias='parsingVariable'
-    )
-    search_term: str = Field(..., alias='searchTerm')
+    name: str
     """
-     Max length: 250;
+     Max length: 50;
     """
-    service_priority: PriorityReference | None = Field(
-        default=None, alias='servicePriority'
-    )
-    service_status: ServiceStatusReference | None = Field(
-        default=None, alias='serviceStatus'
-    )
-    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
-    service_sub_type: ServiceSubTypeReference | None = Field(
-        default=None, alias='serviceSubType'
-    )
-    service_item: ServiceItemReference | None = Field(default=None, alias='serviceItem')
-    service_board: BoardReference | None = Field(default=None, alias='serviceBoard')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    type_xref: Literal[
+        'InventoryPart', 'NonInventoryPart', 'OtherCharge', 'Service'
+    ] | None = Field(default=None, alias='typeXref')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class EmailConnectorParsingStyle(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    parsing_type: EmailConnectorParsingTypeReference | None = Field(
-        default=None, alias='parsingType'
-    )
-    parse_rule: str = Field(..., alias='parseRule')
-    """
-     Max length: 500;
-    """
-    priority: int
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProductTypeInfo(CategoryInfo):
+    pass
 
 
-class EmailConnectorParsingStyleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProductTypeReference(ActivityReference):
+    pass
 
 
-class EmailConnectorParsingTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProjectBoardReference(ActivityReference):
+    pass
 
 
-class EmailConnectorParsingVariableReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    identifier: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProjectBoardTeamInfo(ActivityReference):
+    pass
 
 
-class EmailConnectorReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectContact(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    project_id: int | None = Field(default=None, alias='projectId')
+    contact: ContactReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class EmailExclusion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectNote(ConnectWiseModel):
     id: int | None = None
-    description: str
-    """
-     Max length: 100;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    project_id: int | None = Field(default=None, alias='projectId')
+    text: str
+    type: NoteTypeReference | None = None
+    flagged: bool | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class EmailOpened(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    campaign_id: int | None = Field(default=None, alias='campaignId')
-    contact_id: int = Field(..., alias='contactId')
-    date_opened: datetime | None = Field(default=None, alias='dateOpened')
+class ProjectPhaseReference(ActivityReference):
+    pass
 
 
-class EmailServerType(Enum):
-    IMAP = 'IMAP'
-    OFFICE365 = 'Office365'
-    GOOGLE = 'Google'
-    ASIO365 = 'Asio365'
+class ProjectReference(ActivityReference):
+    pass
 
 
-class EmailTemplateReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ProjectRoleReference(AdjustmentTypeReference):
+    pass
 
 
-class EmailToken(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectSecurityRole(ConnectWiseModel):
     id: int | None = None
-    token: str | None = None
-    description: str | None = None
-    address_flag: bool | None = Field(default=None, alias='addressFlag')
-    agreement_flag: bool | None = Field(default=None, alias='agreementFlag')
-    company_flag: bool | None = Field(default=None, alias='companyFlag')
-    config_flag: bool | None = Field(default=None, alias='configFlag')
-    contact_flag: bool | None = Field(default=None, alias='contactFlag')
-    invoice_flag: bool | None = Field(default=None, alias='invoiceFlag')
-    purchase_order_flag: bool | None = Field(default=None, alias='purchaseOrderFlag')
-    purchase_order_status_flag: bool | None = Field(
-        default=None, alias='purchaseOrderStatusFlag'
+    name: str
+    """
+     Max length: 30;
+    """
+    manager_role_flag: bool | None = Field(default=None, alias='managerRoleFlag')
+    default_contact_flag: bool | None = Field(default=None, alias='defaultContactFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ProjectSecurityRoleSetting(ConnectWiseModel):
+    id: int | None = None
+    add_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='addLevel'
     )
-    rma_flag: bool | None = Field(default=None, alias='rmaFlag')
-    sales_flag: bool | None = Field(default=None, alias='salesFlag')
-    service_flag: bool | None = Field(default=None, alias='serviceFlag')
-    tracks_flag: bool | None = Field(default=None, alias='tracksFlag')
-    workflow_flag: bool | None = Field(default=None, alias='workflowFlag')
-    portal_password_flag: bool | None = Field(default=None, alias='portalPasswordFlag')
+    edit_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='editLevel'
+    )
+    delete_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='deleteLevel'
+    )
+    inquire_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='inquireLevel'
+    )
+    module_identifier: str | None = Field(default=None, alias='moduleIdentifier')
+    """
+     Max length: 50;
+    """
+    my_flag: bool | None = Field(default=None, alias='myFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class EmployeeCompNotExceed(Enum):
-    BILLING = 'Billing'
-    AMOUNT = 'Amount'
-    PERCENT = 'Percent'
+class ProjectStatusInfo(CategoryInfo):
+    pass
+
+
+class ProjectStatusReference(ActivityReference):
+    pass
+
+
+class ProjectTemplateWorkPlan(ConnectWiseModel):
+    tree_id: str | None = Field(default=None, alias='treeID')
+    i_d: int | None = Field(default=None, alias='iD')
+    rec_id: int | None = Field(default=None, alias='recID')
+    display_id: str | None = Field(default=None, alias='displayID')
+    s_r_service_rec_id: int | None = Field(default=None, alias='sR_Service_RecID')
+    description: str | None = None
+    project_name: str | None = Field(default=None, alias='projectName')
+    budget_amount: float | None = Field(default=None, alias='budgetAmount')
+    is_project: bool | None = Field(default=None, alias='isProject')
+    is_phase: bool | None = Field(default=None, alias='isPhase')
+    is_ticket: bool | None = Field(default=None, alias='isTicket')
+    is_new_item: bool | None = Field(default=None, alias='isNewItem')
+    wbs_code: str | None = Field(default=None, alias='wbsCode')
+    parent_phase_rec_id: int | None = Field(default=None, alias='parentPhaseRecID')
 
 
-class EmployeeCompRate(Enum):
+class ProjectType(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 30;
     """
-    Required On Updates;
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    integration_xref: str | None = Field(default=None, alias='integrationXref')
+    """
+     Max length: 50;
     """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
-    ACTUAL = 'Actual'
-    HOURLY = 'Hourly'
 
+class ProjectTypeInfo(ActivityReference):
+    pass
 
-class EmployeeCompRate1(Enum):
-    ACTUAL = 'Actual'
-    HOURLY = 'Hourly'
 
+class ProjectTypeReference(ActivityReference):
+    pass
 
-class EntityType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    code: str | None = None
+
+class PurchaseOrderLineItemReference(AdjustmentTypeReference):
+    pass
 
 
-class EntityTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
+class PurchaseOrderReference(ActivityReference):
+    pass
 
 
-class EntityTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
+class PurchaseOrderStatusEmailTemplateReference(ActivityReference):
+    pass
+
+
+class PurchaseOrderStatusReference(ActivityReference):
+    pass
+
+
+class RelationshipReference(ActivityReference):
+    pass
+
+
+class ReminderReference(ActivityReference):
+    pass
+
+
+class Report(ConnectWiseModel):
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class EntryMethod(Enum):
-    DATE = 'Date'
-    ENTRY_FIELD = 'EntryField'
-    LIST = 'List'
-    OPTION = 'Option'
+class ReportCard(ContactRelationship):
+    pass
 
 
-class EntryType(Enum):
-    DATE = 'Date'
-    ENTRY_FIELD = 'EntryField'
-    LIST = 'List'
-    OPTION = 'Option'
+class ReportCardInfo(ActivityReference):
+    pass
 
 
-class EntryTypeIdentifier(Enum):
-    DATE = 'Date'
-    ENTRY_FIELD = 'EntryField'
-    LIST = 'List'
-    OPTION = 'Option'
+class ReportCardReference(ActivityReference):
+    pass
 
 
-class ErrorResponseMessage(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    code: str | None = None
-    message: str | None = None
-    errors: list[ValidationError] | None = None
+class ReportColumnDefinition(ConnectWiseModel):
+    type: str | None = None
+    is_nullable: bool | None = Field(default=None, alias='isNullable')
+    identity_column: bool | None = Field(default=None, alias='identityColumn')
 
 
-class EscalationStatus(Enum):
-    NOT_RESPONDED = 'NotResponded'
-    RESPONDED = 'Responded'
-    RESOLUTION_PLAN = 'ResolutionPlan'
-    RESOLVED = 'Resolved'
-    NO_ESCALATION = 'NoEscalation'
+class ReportDataResponse(ConnectWiseModel):
+    column_definitions: list[dict[str, ReportColumnDefinition]] | None = None
+    row_values: list[list[dict[str, Any]]] | None = None
 
 
-class ExecutionTime(Enum):
+class ReportingService(ConnectWiseModel):
+    id: int | None = None
+    reporting_user_name: str | None = Field(default=None, alias='reportingUserName')
     """
-    Defaults to Once when not specified
+     Max length: 50;
     """
-
-    ONCE = 'Once'
-    MULTIPLE_TIMES = 'MultipleTimes'
-    CONTINUOUSLY = 'Continuously'
+    reporting_password: str | None = Field(default=None, alias='reportingPassword')
+    """
+    To blank out the password, enter an empty string here. Max length: 50;
+    """
+    reporting_domain: str | None = Field(default=None, alias='reportingDomain')
+    """
+     Max length: 50;
+    """
+    reporting_url: str | None = Field(default=None, alias='reportingUrl')
+    """
+     Max length: 100;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ExpenseDetailReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    amount: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class RequestPasswordRequest(ConnectWiseModel):
+    email: str
 
 
-class ExpenseEntry(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class RmaAction(ConnectWiseModel):
     id: int | None = None
-    expense_report: ExpenseReportReference | None = Field(
-        default=None, alias='expenseReport'
-    )
-    company: CompanyReference | None = None
-    charge_to_id: int | None = Field(default=None, alias='chargeToId')
-    charge_to_type: ChargeToType | None = Field(default=None, alias='chargeToType')
+    name: str
     """
-    Gets or sets
-                company or chargeToType is required.
+     Max length: 50;
     """
-    type: ExpenseTypeReference | None = None
-    member: MemberReference | None = None
-    payment_method: PaymentMethodReference | None = Field(
-        default=None, alias='paymentMethod'
-    )
-    classification: ClassificationReference | None = None
-    amount: float
-    billable_option: BillableOption | None = Field(default=None, alias='billableOption')
-    date: datetime
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    notes: str | None = None
-    agreement: AgreementReference | None = None
-    invoice_amount: float | None = Field(default=None, alias='invoiceAmount')
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    taxes: list[ExpenseTax] | None = None
-    invoice: InvoiceReference | None = None
-    currency: CurrencyReference | None = None
-    status: Status2 | None = None
-    bill_amount: float | None = Field(default=None, alias='billAmount')
-    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
-    odometer_start: float | None = Field(default=None, alias='odometerStart')
-    odometer_end: float | None = Field(default=None, alias='odometerEnd')
-    ticket: TicketReference | None = None
-    project: ProjectReference | None = None
-    phase: ProjectPhaseReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ExpenseEntryAudit(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    member: MemberReference | None = None
-    source: Source | None = None
-    type: Type4 | None = None
-    message: str | None = None
-    old_value: str | None = Field(default=None, alias='oldValue')
-    new_value: str | None = Field(default=None, alias='newValue')
-    value: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class RmaActionInfo(ActivityReference):
+    pass
 
 
-class ExpenseFormat(Enum):
-    DEFAULT = 'Default'
-    CONDENSED = 'Condensed'
+class RmaActionReference(ActivityReference):
+    pass
 
 
-class ExpenseReport(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    member: MemberReference | None = None
-    year: int | None = None
-    period: int | None = None
-    date_start: str | None = Field(default=None, alias='dateStart')
-    date_end: str | None = Field(default=None, alias='dateEnd')
-    status: Status2 | None = None
-    total: float | None = None
-    due_date: str | None = Field(default=None, alias='dueDate')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class RmaDisposition(RmaAction):
+    pass
 
 
-class ExpenseReportAudit(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    member: MemberReference | None = None
-    source: Source | None = None
-    type: Type4 | None = None
-    message: str | None = None
-    old_value: str | None = Field(default=None, alias='oldValue')
-    new_value: str | None = Field(default=None, alias='newValue')
-    value: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class RmaDispositionInfo(ActivityReference):
+    pass
 
 
-class ExpenseReportReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class RmaDispositionReference(ActivityReference):
+    pass
 
 
-class ExpenseReportTierUpdate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    approval_type: ApprovalType | None = Field(default=None, alias='approvalType')
+class RmaStatusEmailTemplateReference(ActivityReference):
+    pass
 
 
-class ExpenseRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class RmaStatusInfo(OpportunityRatingInfo):
+    pass
 
 
-class ExpenseTax(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    amount: float | None = None
-    type: ExpenseTaxTypeReference | None = None
+class RmaStatusReference(ActivityReference):
+    pass
 
 
-class ExpenseTaxTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Role(ContactRelationship):
+    pass
+
+
+class SalesOrderReference(AdjustmentTypeReference):
+    pass
+
+
+class SalesProbability(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    inactive: bool | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    probability: int
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ExpenseTaxTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SalesProbabilityInfo(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    probability: int | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ExpenseType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SalesTeamReference(AdjustmentTypeReference):
+    pass
+
+
+class ScheduleColor(ConnectWiseModel):
     id: int | None = None
-    name: str
+    start_percent: int | None = Field(default=None, alias='startPercent')
     """
-     Max length: 30;
+    A startPercent (0 or higher) is required if endPercent has value.
     """
-    amount_caption: str = Field(..., alias='amountCaption')
-    reimbursement_rate: float | None = Field(default=None, alias='reimbursementRate')
-    bill_expenses: BillExpenses1 = Field(..., alias='billExpenses')
-    invoice_markup_option: InvoiceMarkupOption = Field(..., alias='invoiceMarkupOption')
-    invoice_markup_amount: float | None = Field(
-        default=None, alias='invoiceMarkupAmount'
-    )
-    advanced_amount_flag: bool | None = Field(default=None, alias='advancedAmountFlag')
-    mileage_flag: bool | None = Field(default=None, alias='mileageFlag')
-    quantity_flag: bool | None = Field(default=None, alias='quantityFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    max_amount: float | None = Field(default=None, alias='maxAmount')
-    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
+    end_percent: int | None = Field(default=None, alias='endPercent')
     """
-     Max length: 50;
+    A endPercent is required if startPercent has value.
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    color: str
+    """
+    Must be a valid Hexadecimal Color Code.
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ExpenseTypeExemption(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    expense_type: ExpenseTypeReference = Field(..., alias='expenseType')
-    taxable_levels: list[int] | None = Field(default=None, alias='taxableLevels')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ScheduleEntryReference(InOutTypeInfo):
+    pass
 
 
-class ExpenseTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ScheduleReminderTime(ConnectWiseModel):
     id: int | None = None
+    time: int | None = None
+    """
+    Time is calculated in minutes.
+    """
     name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    amount_caption: str | None = Field(default=None, alias='amountCaption')
-    mileage_flag: bool | None = Field(default=None, alias='mileageFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    """
+     Max length: 10;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ExpenseTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ScheduleSpanReference(AdjustmentTypeReference):
+    pass
 
 
-class Experiment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ScheduleStatus(ConnectWiseModel):
     id: int | None = None
-    experiment_id: str | None = Field(default=None, alias='experimentId')
-    name: str | None = None
-    description: str | None = None
-    properties: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    member_inactive_flag: bool | None = Field(default=None, alias='memberInactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ExportAccountingBatchRequest(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    batch_identifier: str | None = Field(default=None, alias='batchIdentifier')
-    """
-     Max length: 50;
-    """
-    gl_interface_identifier: str | None = Field(
-        default=None, alias='glInterfaceIdentifier'
-    )
-    thru_date: datetime | None = Field(default=None, alias='thruDate')
-    location_id: int | None = Field(default=None, alias='locationId')
-    summarize_invoices: SummarizeInvoices | None = Field(
-        default=None, alias='summarizeInvoices'
-    )
-    export_invoices_flag: bool | None = Field(default=None, alias='exportInvoicesFlag')
-    """
-    Batch export must include invoices, expenses, or products (procurement).
-    """
-    included_invoice_ids: list[int] | None = Field(
-        default=None, alias='includedInvoiceIds'
-    )
-    excluded_invoice_ids: list[int] | None = Field(
-        default=None, alias='excludedInvoiceIds'
-    )
-    export_expenses_flag: bool | None = Field(default=None, alias='exportExpensesFlag')
-    """
-    Batch export must include invoices, expenses, or products (procurement).
-    """
-    included_expense_ids: list[int] | None = Field(
-        default=None, alias='includedExpenseIds'
-    )
-    excluded_expense_ids: list[int] | None = Field(
-        default=None, alias='excludedExpenseIds'
-    )
-    export_payments_flag: bool | None = Field(default=None, alias='exportPaymentsFlag')
-    """
-    Batch export must include invoices, expenses, or products (procurement).
-    """
-    included_payment_ids: list[int] | None = Field(
-        default=None, alias='includedPaymentIds'
-    )
-    export_products_flag: bool | None = Field(default=None, alias='exportProductsFlag')
+    name: str
     """
-    Batch export must include invoices, expenses, or products (procurement).
+     Max length: 30;
     """
-    included_product_ids: list[str] | None = Field(
-        default=None, alias='includedProductIds'
-    )
-    excluded_product_ids: list[str] | None = Field(
-        default=None, alias='excludedProductIds'
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    show_as_tentative_flag: bool | None = Field(
+        default=None, alias='showAsTentativeFlag'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Fax(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class FieldType(Enum):
-    TEXT_AREA = 'TextArea'
-    CURRENCY = 'Currency'
-    DATE = 'Date'
-    HYPERLINK = 'Hyperlink'
-    IP_ADDRESS = 'IPAddress'
-    CHECKBOX = 'Checkbox'
-    NUMBER = 'Number'
-    PERCENT = 'Percent'
-    TEXT = 'Text'
-    PASSWORD = 'Password'
-
-
-class FieldType3(Enum):
-    TEXT_AREA = 'TextArea'
-    BUTTON = 'Button'
-    CURRENCY = 'Currency'
-    DATE = 'Date'
-    HYPERLINK = 'Hyperlink'
-    IP_ADDRESS = 'IPAddress'
-    CHECKBOX = 'Checkbox'
-    NUMBER = 'Number'
-    PERCENT = 'Percent'
-    TEXT = 'Text'
-    PASSWORD = 'Password'
+class ScheduleStatusReference(ActivityReference):
+    pass
 
 
-class FieldTypeIdentifier(Enum):
-    TEXT_AREA = 'TextArea'
-    BUTTON = 'Button'
-    CURRENCY = 'Currency'
-    DATE = 'Date'
-    HYPERLINK = 'Hyperlink'
-    IP_ADDRESS = 'IPAddress'
-    CHECKBOX = 'Checkbox'
-    NUMBER = 'Number'
-    PERCENT = 'Percent'
-    TEXT = 'Text'
-    PASSWORD = 'Password'
+class ScheduleTypeReference(AdjustmentTypeReference):
+    pass
 
 
-class FileUploadSetting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SchedulingMemberInfo(ConnectWiseModel):
     id: int | None = None
-    restrict_file_types_flag: bool = Field(..., alias='restrictFileTypesFlag')
-    global_file_size_limit: int | None = Field(
-        default=None, alias='globalFileSizeLimit'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    identifier: str | None = None
+    first_name: str | None = Field(default=None, alias='firstName')
+    middle_initial: str | None = Field(default=None, alias='middleInitial')
+    last_name: str | None = Field(default=None, alias='lastName')
+    full_name: str | None = Field(default=None, alias='fullName')
+    default_email: str | None = Field(default=None, alias='defaultEmail')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class FilterValues(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    conditions: str | None = None
-    order_by: str | None = Field(default=None, alias='orderBy')
-    childconditions: str | None = None
-    customfieldconditions: str | None = None
+class SecurityRole(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 30;
+    """
+    role_type: str | None = Field(default=None, alias='roleType')
+    """
+     Max length: 30;
+    """
+    admin_flag: bool | None = Field(default=None, alias='adminFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class FinanceInformationSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
+class SecurityRoleInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    role_type: str | None = Field(default=None, alias='roleType')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class FiscalYearStart(Enum):
-    JANUARY = 'January'
-    FEBRUARY = 'February'
-    MARCH = 'March'
-    APRIL = 'April'
-    MAY = 'May'
-    JUNE = 'June'
-    JULY = 'July'
-    AUGUST = 'August'
-    SEPTEMBER = 'September'
-    OCTOBER = 'October'
-    NOVEMBER = 'November'
-    DECEMBER = 'December'
+class SecurityRoleReference(ActivityReference):
+    pass
 
 
-class Forecast(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SecurityRoleSetting(ConnectWiseModel):
     id: int | None = None
-    forecast_items: list[ForecastItem] | None = Field(
-        default=None, alias='forecastItems'
-    )
-    product_revenue: ProductRevenueReference | None = Field(
-        default=None, alias='productRevenue'
-    )
-    service_revenue: ServiceRevenueReference | None = Field(
-        default=None, alias='serviceRevenue'
-    )
-    agreement_revenue: AgreementRevenueReference | None = Field(
-        default=None, alias='agreementRevenue'
+    add_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='addLevel'
     )
-    time_revenue: TimeRevenueReference | None = Field(default=None, alias='timeRevenue')
-    expense_revenue: ExpenseRevenueReference | None = Field(
-        default=None, alias='expenseRevenue'
-    )
-    forecast_revenue_totals: ForecastRevenueReference | None = Field(
-        default=None, alias='forecastRevenueTotals'
-    )
-    inclusive_revenue_totals: InclusiveRevenueReference | None = Field(
-        default=None, alias='inclusiveRevenueTotals'
+    edit_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='editLevel'
     )
-    recurring_total: float | None = Field(default=None, alias='recurringTotal')
-    won_revenue: WonRevenueReference | None = Field(default=None, alias='wonRevenue')
-    lost_revenue: LostRevenueReference | None = Field(default=None, alias='lostRevenue')
-    open_revenue: OpenRevenueReference | None = Field(default=None, alias='openRevenue')
-    other_revenue1: Other1RevenueReference | None = Field(
-        default=None, alias='otherRevenue1'
+    delete_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='deleteLevel'
     )
-    other_revenue2: Other2RevenueReference | None = Field(
-        default=None, alias='otherRevenue2'
+    inquire_level: Literal['None', 'My', 'All'] | None = Field(
+        default=None, alias='inquireLevel'
     )
-    sales_tax_revenue: float | None = Field(default=None, alias='salesTaxRevenue')
-    forecast_total_with_taxes: float | None = Field(
-        default=None, alias='forecastTotalWithTaxes'
+    module_function_name: str | None = Field(default=None, alias='moduleFunctionName')
+    module_function_description: str | None = Field(
+        default=None, alias='moduleFunctionDescription'
     )
-    expected_probability: int | None = Field(default=None, alias='expectedProbability')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
+    my_all_flag: bool | None = Field(default=None, alias='myAllFlag')
+    module_function_identifier: str | None = Field(
+        default=None, alias='moduleFunctionIdentifier'
     )
-    currency: CurrencyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    report_flag: bool | None = Field(default=None, alias='reportFlag')
+    restrict_flag: bool | None = Field(default=None, alias='restrictFlag')
+    custom_flag: bool | None = Field(default=None, alias='customFlag')
+    module_description: str | None = Field(default=None, alias='moduleDescription')
+    module_identifier: str | None = Field(default=None, alias='moduleIdentifier')
+    module_name: str | None = Field(default=None, alias='moduleName')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ForecastItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Service(ConnectWiseModel):
     id: int | None = None
-    forecast_description: str | None = Field(default=None, alias='forecastDescription')
+    sr_notify: Literal[
+        'All', 'NewAndClosedRequests', 'ClosedRequestsOnly', 'NewRequestsOnly', 'None'
+    ] = Field(..., alias='srNotify')
+    schedule_span: Literal['Standard', 'OfficeHours', 'Overnight'] = Field(
+        ..., alias='scheduleSpan'
+    )
+    hide_delimiter_flag: bool | None = Field(default=None, alias='hideDelimiterFlag')
+    allow_cc_flag: bool | None = Field(default=None, alias='allowCCFlag')
+    allow_to_flag: bool | None = Field(default=None, alias='allowTOFlag')
+    header_color: str | None = Field(default=None, alias='headerColor')
     """
      Max length: 50;
     """
-    opportunity: OpportunityReference | None = None
-    quantity: float | None = None
-    status: OpportunityStatusReference | None = None
-    catalog_item: IvItemReference | None = Field(default=None, alias='catalogItem')
-    product_description: str | None = Field(default=None, alias='productDescription')
-    product_class: str | None = Field(default=None, alias='productClass')
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: int | None = None
-    include_flag: bool | None = Field(default=None, alias='includeFlag')
-    quote_werks_doc_no: str | None = Field(default=None, alias='quoteWerksDocNo')
+    member_color: str | None = Field(default=None, alias='memberColor')
     """
-     Max length: 20;
+     Max length: 50;
     """
-    quote_werks_doc_name: str | None = Field(default=None, alias='quoteWerksDocName')
+    contact_color: str | None = Field(default=None, alias='contactColor')
     """
-     Max length: 255;
+     Max length: 50;
     """
-    quote_werks_quantity: int | None = Field(default=None, alias='quoteWerksQuantity')
-    forecast_type: ForecastType = Field(..., alias='forecastType')
-    link_flag: bool | None = Field(default=None, alias='linkFlag')
-    recurring_revenue: float | None = Field(default=None, alias='recurringRevenue')
-    recurring_cost: float | None = Field(default=None, alias='recurringCost')
-    recurring_date_start: datetime | None = Field(
-        default=None, alias='recurringDateStart'
+    unknown_color: str | None = Field(default=None, alias='unknownColor')
+    """
+     Max length: 50;
+    """
+    calendar_setup: CalendarSetupReference | None = Field(
+        default=None, alias='calendarSetup'
     )
-    recurring_date_end: datetime | None = Field(default=None, alias='recurringDateEnd')
-    bill_cycle: BillingCycleReference | None = Field(default=None, alias='billCycle')
-    cycle_basis: str | None = Field(default=None, alias='cycleBasis')
-    cycles: int | None = None
-    recurring_flag: bool | None = Field(default=None, alias='recurringFlag')
-    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
-    sub_number: int | None = Field(default=None, alias='subNumber')
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    header_color_disable_flag: bool | None = Field(
+        default=None, alias='headerColorDisableFlag'
+    )
+    member_color_disable_flag: bool | None = Field(
+        default=None, alias='memberColorDisableFlag'
+    )
+    contact_color_disable_flag: bool | None = Field(
+        default=None, alias='contactColorDisableFlag'
+    )
+    unknown_color_disable_flag: bool | None = Field(
+        default=None, alias='unknownColorDisableFlag'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ForecastRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ServiceCodeReference(ActivityReference):
+    pass
+
+
+class ServiceEmailTemplateReference(ConnectWiseModel):
     id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    identifier: str | None = None
+    name: str | None = None
+    type: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceInfo(ConnectWiseModel):
+    id: int | None = None
+    header_color: str | None = Field(default=None, alias='headerColor')
+    member_color: str | None = Field(default=None, alias='memberColor')
+    contact_color: str | None = Field(default=None, alias='contactColor')
+    unknown_color: str | None = Field(default=None, alias='unknownColor')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ForecastType(Enum):
-    OTHER1 = 'Other1'
-    OTHER2 = 'Other2'
-    AGREEMENT = 'Agreement'
-    PRODUCT = 'Product'
-    SERVICE = 'Service'
+class ServiceItemReference(ActivityReference):
+    pass
 
 
-class FormSubmitted(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ServiceLocation(ConnectWiseModel):
     id: int | None = None
-    campaign_id: int | None = Field(default=None, alias='campaignId')
-    contact_id: int = Field(..., alias='contactId')
-    date_submitted: datetime | None = Field(default=None, alias='dateSubmitted')
-    url: str
+    name: str
     """
-     Max length: 2083;
+     Max length: 30;
     """
-    query_string: str | None = Field(default=None, alias='queryString')
-    page_type: str | None = Field(default=None, alias='pageType')
-    page_sub_type: str | None = Field(default=None, alias='pageSubType')
-    topic: str | None = None
-    version: str | None = None
-    status: str | None = None
+    where: Literal['OnSite', 'Remote', 'InHouse']
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class FrequencyUnit(Enum):
-    """
-    Required when exectionTimes is set to MultipleTimes or Continuously
-    """
+class ServiceLocationInfo(AddressFormatInfo):
+    pass
 
-    MINUTES = 'Minutes'
-    HOURS = 'Hours'
-    DAYS = 'Days'
-    MONTHS = 'Months'
 
+class ServiceLocationReference(ActivityReference):
+    pass
 
-class GLAccount(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+
+class ServiceNote(ConnectWiseModel):
     id: int | None = None
-    gl_type: GlType = Field(..., alias='glType')
-    mapped_type: MappedTypeReference = Field(..., alias='mappedType')
-    mapped_record: MappedRecordReference = Field(..., alias='mappedRecord')
-    segment1: str | None = None
-    """
-     Max length: 255;
-    """
-    segment2: str | None = None
-    """
-     Max length: 255;
-    """
-    segment3: str | None = None
-    """
-     Max length: 255;
-    """
-    segment4: str | None = None
-    """
-     Max length: 255;
-    """
-    segment5: str | None = None
-    """
-     Max length: 255;
-    """
-    segment6: str | None = None
-    """
-     Max length: 255;
-    """
-    segment7: str | None = None
+    ticket_id: int | None = Field(default=None, alias='ticketId')
+    text: str | None = None
+    detail_description_flag: bool | None = Field(
+        default=None, alias='detailDescriptionFlag'
+    )
+    internal_analysis_flag: bool | None = Field(
+        default=None, alias='internalAnalysisFlag'
+    )
+    resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
+    issue_flag: bool | None = Field(default=None, alias='issueFlag')
+    member: MemberReference | None = None
+    contact: ContactReference | None = None
+    customer_updated_flag: bool | None = Field(
+        default=None, alias='customerUpdatedFlag'
+    )
+    process_notifications: bool | None = Field(
+        default=None, alias='processNotifications'
+    )
+    date_created: str | None = Field(default=None, alias='dateCreated')
+    created_by: str | None = Field(default=None, alias='createdBy')
+    internal_flag: bool | None = Field(default=None, alias='internalFlag')
+    external_flag: bool | None = Field(default=None, alias='externalFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceRevenueReference(AgreementRevenueReference):
+    pass
+
+
+class ServiceSignoff(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 255;
+     Max length: 50;
     """
-    segment8: str | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    visible_logo_flag: bool | None = Field(default=None, alias='visibleLogoFlag')
+    company_info_flag: bool | None = Field(default=None, alias='companyInfoFlag')
+    billing_terms_flag: bool | None = Field(default=None, alias='billingTermsFlag')
+    summary_flag: bool | None = Field(default=None, alias='summaryFlag')
+    discussion_flag: bool | None = Field(default=None, alias='discussionFlag')
+    task_flag: bool | None = Field(default=None, alias='taskFlag')
     """
-     Max length: 255;
+    On add/post, if this is set to true but no value is set for task, task is defaulted to ServiceTasks.All.
     """
-    segment9: str | None = None
+    task: Literal['All', 'Closed', 'Open'] | None = None
     """
-     Max length: 255;
+    On add/post, if this is set but no value is set for taskFlag, taskFlag is set to true.
     """
-    segment10: str | None = None
+    configurations_flag: bool | None = Field(default=None, alias='configurationsFlag')
+    internal_notes_flag: bool | None = Field(default=None, alias='internalNotesFlag')
+    resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
+    time_flag: bool | None = Field(default=None, alias='timeFlag')
     """
-     Max length: 255;
+    On add/post, if any time related flag is set to true, this is also set to true.
     """
-    cogs1: str | None = None
+    time_member_flag: bool | None = Field(default=None, alias='timeMemberFlag')
+    time_date_flag: bool | None = Field(default=None, alias='timeDateFlag')
+    time_start_end_flag: bool | None = Field(default=None, alias='timeStartEndFlag')
+    time_bill_flag: bool | None = Field(default=None, alias='timeBillFlag')
+    time_hours_flag: bool | None = Field(default=None, alias='timeHoursFlag')
+    time_rate_flag: bool | None = Field(default=None, alias='timeRateFlag')
+    time_extended_amount_flag: bool | None = Field(
+        default=None, alias='timeExtendedAmountFlag'
+    )
+    time_work_type_flag: bool | None = Field(default=None, alias='timeWorkTypeFlag')
+    time_agreement_flag: bool | None = Field(default=None, alias='timeAgreementFlag')
+    time_notes_flag: bool | None = Field(default=None, alias='timeNotesFlag')
+    time_manual_flag: bool | None = Field(default=None, alias='timeManualFlag')
+    time_manual_entry: int | None = Field(default=None, alias='timeManualEntry')
+    time_tax_flag: bool | None = Field(default=None, alias='timeTaxFlag')
+    expense_flag: bool | None = Field(default=None, alias='expenseFlag')
     """
-     Max length: 255;
+    On add/post, if any expense related flag is set to true, this is also set to true.
     """
-    cogs2: str | None = None
+    expense_date_flag: bool | None = Field(default=None, alias='expenseDateFlag')
+    expense_member_flag: bool | None = Field(default=None, alias='expenseMemberFlag')
+    expense_type_flag: bool | None = Field(default=None, alias='expenseTypeFlag')
+    expense_bill_flag: bool | None = Field(default=None, alias='expenseBillFlag')
+    expense_amount_flag: bool | None = Field(default=None, alias='expenseAmountFlag')
+    expense_agreement_flag: bool | None = Field(
+        default=None, alias='expenseAgreementFlag'
+    )
+    expense_notes_flag: bool | None = Field(default=None, alias='expenseNotesFlag')
+    expense_tax_flag: bool | None = Field(default=None, alias='expenseTaxFlag')
+    expense_manual_flag: bool | None = Field(default=None, alias='expenseManualFlag')
+    expense_manual_entry: int | None = Field(default=None, alias='expenseManualEntry')
+    product_flag: bool | None = Field(default=None, alias='productFlag')
     """
-     Max length: 255;
+    On add/post, if any product related flag is set to true, this is also set to true.
     """
-    cogs3: str | None = None
+    product_description_flag: bool | None = Field(
+        default=None, alias='productDescriptionFlag'
+    )
+    product_bill_flag: bool | None = Field(default=None, alias='productBillFlag')
+    product_quantity_flag: bool | None = Field(
+        default=None, alias='productQuantityFlag'
+    )
+    product_price_flag: bool | None = Field(default=None, alias='productPriceFlag')
+    product_extended_amount_flag: bool | None = Field(
+        default=None, alias='productExtendedAmountFlag'
+    )
+    product_agreement_flag: bool | None = Field(
+        default=None, alias='productAgreementFlag'
+    )
+    product_manual_flag: bool | None = Field(default=None, alias='productManualFlag')
+    product_manual_entry: int | None = Field(default=None, alias='productManualEntry')
+    product_tax_flag: bool | None = Field(default=None, alias='productTaxFlag')
+    technician_signoff_flag: bool | None = Field(
+        default=None, alias='technicianSignoffFlag'
+    )
+    customer_signoff_text_flag: bool | None = Field(
+        default=None, alias='customerSignoffTextFlag'
+    )
     """
-     Max length: 255;
+    On add/post, if customerSignoffText.Length > 0, this is set to true.
     """
-    cogs4: str | None = None
+    customer_signoff_text: str | None = Field(default=None, alias='customerSignoffText')
     """
-     Max length: 255;
+     Max length: 4000;
     """
-    cogs5: str | None = None
+    customer_signoff_fields_flag: bool | None = Field(
+        default=None, alias='customerSignoffFieldsFlag'
+    )
+    billing_methods_text_flag: bool | None = Field(
+        default=None, alias='billingMethodsTextFlag'
+    )
     """
-     Max length: 255;
+    On add/post, if billingMethodsText.Length > 0, this is set to true.
     """
-    cogs6: str | None = None
+    billing_methods_text: str | None = Field(default=None, alias='billingMethodsText')
     """
-     Max length: 255;
+     Max length: 2000;
     """
-    cogs7: str | None = None
+    credit_card_fields_flag: bool | None = Field(
+        default=None, alias='creditCardFieldsFlag'
+    )
+    default_ff_flag: bool | None = Field(default=None, alias='defaultFFFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceSignoffInfo(AddressFormatInfo):
+    pass
+
+
+class ServiceSignoffReference(ActivityReference):
+    pass
+
+
+class ServiceSourceReference(ActivityReference):
+    pass
+
+
+class ServiceStatusReference(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    sort: int | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceSubTypeReference(ActivityReference):
+    pass
+
+
+class ServiceSurvey(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 255;
+     Max length: 50;
     """
-    cogs8: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    header_include_logo_flag: bool | None = Field(
+        default=None, alias='headerIncludeLogoFlag'
+    )
+    header_text: str | None = Field(default=None, alias='headerText')
     """
-     Max length: 255;
+     Max length: 4000;
     """
-    cogs9: str | None = None
+    header_text_visible_flag: bool | None = Field(
+        default=None, alias='headerTextVisibleFlag'
+    )
+    footer_text: str | None = Field(default=None, alias='footerText')
     """
-     Max length: 255;
+     Max length: 500;
     """
-    cogs10: str | None = None
+    footer_text_visible_flag: bool | None = Field(
+        default=None, alias='footerTextVisibleFlag'
+    )
+    thank_you_text: str | None = Field(default=None, alias='thankYouText')
     """
-     Max length: 255;
+     Max length: 4000;
     """
-    product_id: str | None = Field(default=None, alias='productId')
+    notify_who: GenericIdIdentifierReference | None = Field(
+        default=None, alias='notifyWho'
+    )
+    notify_who_visible_flag: bool | None = Field(
+        default=None, alias='notifyWhoVisibleFlag'
+    )
+    notify_member: MemberReference | None = Field(default=None, alias='notifyMember')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceSurveyQuestionOption(ConnectWiseModel):
+    include_flag: bool | None = Field(default=None, alias='includeFlag')
+    caption: str | None = None
+    points: int | None = None
+
+
+class ServiceSurveyReference(ActivityReference):
+    pass
+
+
+class ServiceTeamReference(ActivityReference):
+    pass
+
+
+class ServiceTemplateInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    template_flag: bool | None = Field(default=None, alias='templateFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceTemplateReference(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    summary: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceTicketLink(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 255;
+     Max length: 50;
     """
-    inventory: str | None = None
+    enabled_flag: bool | None = Field(default=None, alias='enabledFlag')
+    link_text: str = Field(..., alias='linkText')
     """
-     Max length: 255;
+     Max length: 50;
     """
-    sales_code: str | None = Field(default=None, alias='salesCode')
+    url: str
     """
-     Max length: 255;
+     Max length: 1000;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GLCaption(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ServiceTicketLinkInfo(ConnectWiseModel):
     id: int | None = None
-    segment1: str | None = None
-    """
-     Max length: 255;
-    """
-    segment2: str | None = None
+    name: str | None = None
+    link_text: str | None = Field(default=None, alias='linkText')
+    url: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceTypeReference(ActivityReference):
+    pass
+
+
+class SetupScreen(ConnectWiseModel):
+    id: int | None = None
+    category: str | None = None
+    name: str | None = None
+    description: str | None = None
+    module_description: str | None = Field(default=None, alias='moduleDescription')
+    module_identifier: str | None = Field(default=None, alias='moduleIdentifier')
+    module_name: str | None = Field(default=None, alias='moduleName')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Severity(Impact):
+    pass
+
+
+class ShipmentMethod(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 255;
+     Max length: 50;
     """
-    segment3: str | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    tracking_url: str | None = Field(default=None, alias='trackingUrl')
     """
-     Max length: 255;
+     Max length: 200;
     """
-    segment4: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ShipmentMethodInfo(ActivityReference):
+    pass
+
+
+class ShipmentMethodReference(ActivityReference):
+    pass
+
+
+class SicCodeReference(ActivityReference):
+    pass
+
+
+class SiteReference(ActivityReference):
+    pass
+
+
+class SkillCategory(ContactDepartment):
+    pass
+
+
+class SkillCategoryReference(ActivityReference):
+    pass
+
+
+class SkillInfo(ActivityReference):
+    pass
+
+
+class SkillReference(ActivityReference):
+    pass
+
+
+class SLA(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 255;
+     Max length: 25;
     """
-    segment5: str | None = None
+    based_on: Literal['AllHours', 'Customer', 'MyCalendar', 'Custom'] = Field(
+        ..., alias='basedOn'
+    )
+    custom_calendar: CalendarReference | None = Field(
+        default=None, alias='customCalendar'
+    )
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    application_order: int | None = Field(default=None, alias='applicationOrder')
+    hi_impact_hi_urgency: PriorityReference | None = Field(
+        default=None, alias='hiImpactHiUrgency'
+    )
+    hi_impact_med_urgency: PriorityReference | None = Field(
+        default=None, alias='hiImpactMedUrgency'
+    )
+    hi_impact_low_urgency: PriorityReference | None = Field(
+        default=None, alias='hiImpactLowUrgency'
+    )
+    med_impact_hi_urgency: PriorityReference | None = Field(
+        default=None, alias='medImpactHiUrgency'
+    )
+    med_impact_med_urgency: PriorityReference | None = Field(
+        default=None, alias='medImpactMedUrgency'
+    )
+    med_impact_low_urgency: PriorityReference | None = Field(
+        default=None, alias='medImpactLowUrgency'
+    )
+    low_impact_hi_urgency: PriorityReference | None = Field(
+        default=None, alias='lowImpactHiUrgency'
+    )
+    low_impact_med_urgency: PriorityReference | None = Field(
+        default=None, alias='lowImpactMedUrgency'
+    )
+    low_impact_low_urgency: PriorityReference | None = Field(
+        default=None, alias='lowImpactLowUrgency'
+    )
+    respond_hours: float | None = Field(default=None, alias='respondHours')
+    respond_percent: int | None = Field(default=None, alias='respondPercent')
+    plan_within: float | None = Field(default=None, alias='planWithin')
+    plan_within_percent: int | None = Field(default=None, alias='planWithinPercent')
+    resolution_hours: float | None = Field(default=None, alias='resolutionHours')
+    resolution_percent: int | None = Field(default=None, alias='resolutionPercent')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class SLAInfo(ActivityReference):
+    pass
+
+
+class SLAReference(ActivityReference):
+    pass
+
+
+class Source(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 255;
+     Max length: 50;
     """
-    segment6: str | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    entered_by: str | None = Field(default=None, alias='enteredBy')
+    date_entered: datetime | None = Field(default=None, alias='dateEntered')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class SourceInfo(ActivityReference):
+    pass
+
+
+class SsoConfiguration(ConnectWiseModel):
+    id: int | None = None
     """
-     Max length: 255;
+    Unique identifier of the SSO Configuration
     """
-    segment7: str | None = None
+    name: str
     """
-     Max length: 255;
+    Descriptor of the SSO Configuration Max length: 100;
     """
-    segment8: str | None = None
+    sso_type: Literal['CWSSO', 'SAML'] = Field(..., alias='ssoType')
     """
-     Max length: 255;
+    Type of SSO Configuration
     """
-    segment9: str | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
     """
-     Max length: 255;
+    Whether the SSO configuration is not active
     """
-    segment10: str | None = None
+    saml_entity_id: str | None = Field(default=None, alias='samlEntityId')
     """
-     Max length: 255;
+    SAML Identity Provider Id Max length: 1000;
     """
-    segment1type: Segment1type | None = None
-    segment2type: Segment2type | None = None
-    segment3type: Segment3type | None = None
-    segment4type: Segment4type | None = None
-    segment5type: Segment5type | None = None
-    segment6type: Segment6type | None = None
-    segment7type: Segment7type | None = None
-    segment8type: Segment8type | None = None
-    segment9type: Segment9type | None = None
-    segment10type: Segment10type | None = None
-    cogs1: str | None = None
+    saml_sign_in_url: str | None = Field(default=None, alias='samlSignInUrl')
     """
-     Max length: 255;
+    Sign in url for the SAML Identity Provider Max length: 1000;
     """
-    cogs2: str | None = None
+    saml_idp_certificate: str | None = Field(default=None, alias='samlIdpCertificate')
     """
-     Max length: 255;
+    Public certificate for Identity Provider signatures
     """
-    cogs3: str | None = None
+    saml_certificate_name: str | None = Field(default=None, alias='samlCertificateName')
     """
-     Max length: 255;
+    Name of the SAML certificate. Metadata on SAML_Idp_Certificate
     """
-    cogs4: str | None = None
+    saml_certificate_issued_to: str | None = Field(
+        default=None, alias='samlCertificateIssuedTo'
+    )
     """
-     Max length: 255;
+    Who the SAML certificate was issued to. Metadata on SAML_Idp_Certificate
     """
-    cogs5: str | None = None
+    saml_certificate_thumbprint: str | None = Field(
+        default=None, alias='samlCertificateThumbprint'
+    )
     """
-     Max length: 255;
+    Thumbprint of the SAML certificate. Metadata on SAML_Idp_Certificate
     """
-    cogs6: str | None = None
+    saml_certificate_valid_from: datetime | None = Field(
+        default=None, alias='samlCertificateValidFrom'
+    )
     """
-     Max length: 255;
+    Date when the SAML certificate becomes valid. Metadata on SAML_Idp_Certificate
     """
-    cogs7: str | None = None
+    saml_certificate_valid_to: datetime | None = Field(
+        default=None, alias='samlCertificateValidTo'
+    )
     """
-     Max length: 255;
+    Date when the SAML certificate is no longer valid. Metadata on SAML_Idp_Certificate
     """
-    cogs8: str | None = None
+    location_ids: list[int] = Field(..., alias='locationIds')
     """
-     Max length: 255;
+    The locations where the SAML Idp Configuration is used
     """
-    cogs9: str | None = None
+    client_id: str | None = Field(default=None, alias='clientId')
     """
-     Max length: 255;
+    Client identity for this configuration of ConnectWise SSO Max length: 1000;
     """
-    cogs10: str | None = None
+    sts_base_url: str | None = Field(default=None, alias='stsBaseUrl')
     """
-     Max length: 255;
+    Sign in URL for ConnectWise SSO
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class GLExport(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    export_settings: GLExportSettings | None = Field(
-        default=None, alias='exportSettings'
-    )
-    vendors: list[GLExportVendor] | None = None
-    customers: list[GLExportCustomer] | None = None
-    transactions: list[GLExportTransaction] | None = None
-    expenses: list[GLExportExpense] | None = None
-    expense_bills: list[GLExportExpenseBill] | None = Field(
-        default=None, alias='expenseBills'
-    )
-    purchase_transactions: list[GLExportPurchaseTransaction] | None = Field(
-        default=None, alias='purchaseTransactions'
-    )
-    adjustment_transactions: list[GLExportAdjustmentTransaction] | None = Field(
-        default=None, alias='adjustmentTransactions'
+    sts_user_admin_url: str | None = Field(default=None, alias='stsUserAdminUrl')
+    """
+    User Admin Url for ConnectWise SSO
+    """
+    token: str | None = None
+    submitted_member_count: int | None = Field(
+        default=None, alias='submittedMemberCount'
     )
-    inventory_transfers: list[GLExportInventoryTransfer] | None = Field(
-        default=None, alias='inventoryTransfers'
+    all_members_submitted: bool | None = Field(
+        default=None, alias='allMembersSubmitted'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    is_sso_on_by_default: bool | None = Field(default=None, alias='isSsoOnByDefault')
 
 
-class GLExportAdjustmentTransaction(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: str | None = None
-    document_type: str | None = Field(default=None, alias='documentType')
-    document_date: str | None = Field(default=None, alias='documentDate')
-    gl_type_id: str | None = Field(default=None, alias='glTypeID')
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    memo: str | None = None
-    gl_class: str | None = Field(default=None, alias='glClass')
-    adjustment_description: str | None = Field(
-        default=None, alias='adjustmentDescription'
-    )
-    adjustment_detail: list[GLExportAdjustmentTransactionDetail] | None = Field(
-        default=None, alias='adjustmentDetail'
-    )
+class SsoUser(ConnectWiseModel):
+    id: int | None = None
+    sso_user_id: str | None = Field(default=None, alias='ssoUserId')
+    user_name: str | None = Field(default=None, alias='userName')
+    first_name: str | None = Field(default=None, alias='firstName')
+    last_name: str | None = Field(default=None, alias='lastName')
+    email: str | None = None
+    email_confirmed: bool | None = Field(default=None, alias='emailConfirmed')
+    disabled_flag: bool | None = Field(default=None, alias='disabledFlag')
+    linked_flag: bool | None = Field(default=None, alias='linkedFlag')
+    date_entered: str | None = Field(default=None, alias='dateEntered')
+    last_updated: str | None = Field(default=None, alias='lastUpdated')
+    linked_member: MemberReference | None = Field(default=None, alias='linkedMember')
 
 
-class GLExportAdjustmentTransactionDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    gl_class: str | None = Field(default=None, alias='glClass')
-    description: str | None = None
-    memo: str | None = None
-    item: IvItemReference | None = None
-    quantity: int | None = None
-    total: float | None = None
-    cost: float | None = None
-    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
-    inventory_account_number: str | None = Field(
-        default=None, alias='inventoryAccountNumber'
-    )
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    product_account_number: str | None = Field(
-        default=None, alias='productAccountNumber'
-    )
+class State(ConnectWiseModel):
+    id: int | None = None
+    identifier: str
+    """
+     Max length: 50;
+    """
+    name: str
+    """
+     Max length: 50;
+    """
+    country: CountryReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GLExportCustomer(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    company: CompanyReference | None = None
-    company_type: CompanyTypeReference | None = Field(default=None, alias='companyType')
-    contact: ContactReference | None = None
-    site: SiteReference | None = None
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
-    )
-    billing_terms_xref: str | None = Field(default=None, alias='billingTermsXref')
-    due_days: int | None = Field(default=None, alias='dueDays')
-    taxable: bool | None = None
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    currency: CurrencyReference | None = None
-    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
-    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
-    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
-    country_tax_xref: str | None = Field(default=None, alias='countryTaxXref')
-    composite_tax_xref: str | None = Field(default=None, alias='compositeTaxXref')
-    state_tax_rate: float | None = Field(default=None, alias='stateTaxRate')
-    county_tax_rate: float | None = Field(default=None, alias='countyTaxRate')
-    city_tax_rate: float | None = Field(default=None, alias='cityTaxRate')
-    country_tax_rate: float | None = Field(default=None, alias='countryTaxRate')
-    composite_tax_rate: float | None = Field(default=None, alias='compositeTaxRate')
-    tax_group_rate: float | None = Field(default=None, alias='taxGroupRate')
-    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
-    state_tax_agency_xref: str | None = Field(default=None, alias='stateTaxAgencyXref')
-    county_tax_agency_xref: str | None = Field(
-        default=None, alias='countyTaxAgencyXref'
-    )
-    city_tax_agency_xref: str | None = Field(default=None, alias='cityTaxAgencyXref')
-    country_tax_agency_xref: str | None = Field(
-        default=None, alias='countryTaxAgencyXref'
-    )
-    composite_tax_agency_xref: str | None = Field(
-        default=None, alias='compositeTaxAgencyXref'
-    )
-    tax_levels: list[GLExportCustomerTaxLevel] | None = Field(
-        default=None, alias='taxLevels'
-    )
+class StateInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    identifier: str | None = None
+    country: CountryReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GLExportCustomerTaxLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    tax_rate: float | None = Field(default=None, alias='taxRate')
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
-    agency_xref: str | None = Field(default=None, alias='agencyXref')
-    tax_level: int | None = Field(default=None, alias='taxLevel')
+class StateReference(CatalogItemReference):
+    pass
 
 
-class GLExportExpense(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class StatusIndicator(ConnectWiseModel):
     id: int | None = None
-    document_date: str | None = Field(default=None, alias='documentDate')
-    document_type: str | None = Field(default=None, alias='documentType')
-    ap_account_number: str | None = Field(default=None, alias='apAccountNumber')
-    ap_class: str | None = Field(default=None, alias='apClass')
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    gl_class: str | None = Field(default=None, alias='glClass')
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
-    memo: str | None = None
-    description: str | None = None
-    period_start_date: str | None = Field(default=None, alias='periodStartDate')
-    period_end_date: str | None = Field(default=None, alias='periodEndDate')
-    member: MemberReference | None = None
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    company: CompanyReference | None = None
-    company_account_number: str | None = Field(
-        default=None, alias='companyAccountNumber'
-    )
-    project: ProjectReference | None = None
-    currency: CurrencyReference | None = None
-    total: float | None = None
-    offset: GLExportExpenseOffset | None = None
+    identifier: str | None = None
+    name: str | None = None
+    color: str | None = None
+    icon: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GLExportExpenseBill(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class StatusIndicatorReference(CatalogItemReference):
+    pass
+
+
+class StructureReference(ActivityReference):
+    pass
+
+
+class SubCategory(ConnectWiseModel):
     id: int | None = None
-    document_date: str | None = Field(default=None, alias='documentDate')
-    document_type: str | None = Field(default=None, alias='documentType')
-    document_number: str | None = Field(default=None, alias='documentNumber')
-    memo: str | None = None
-    gl_class: str | None = Field(default=None, alias='glClass')
-    ap_account_number: str | None = Field(default=None, alias='apAccountNumber')
-    member: MemberReference | None = None
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    currency: CurrencyReference | None = None
-    total: float | None = None
-    detail: list[GLExportExpenseBillDetail] | None = None
+    name: str
+    """
+     Max length: 50;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    integration_xref: str | None = Field(default=None, alias='integrationXref')
+    """
+     Max length: 50;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    category: ProductCategoryReference
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GLExportExpenseBillDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: list[int] | None = None
-    document_date: str | None = Field(default=None, alias='documentDate')
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
-    memo: str | None = None
-    company: CompanyReference | None = None
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    expense_class: ClassificationReference | None = Field(
-        default=None, alias='expenseClass'
-    )
-    currency: CurrencyReference | None = None
-    total: float | None = None
-    billable: bool | None = None
-    reimbursable: bool | None = None
-    company_advance: bool | None = Field(default=None, alias='companyAdvance')
+class SubCategoryInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    category: ProductCategoryReference | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GLExportExpenseOffset(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SuccessResponse(ConnectWiseModel):
+    success: bool | None = None
+    message: str | None = None
+
+
+class Survey(ConnectWiseModel):
     id: int | None = None
-    document_date: str | None = Field(default=None, alias='documentDate')
-    document_type: str | None = Field(default=None, alias='documentType')
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
-    gl_class: str | None = Field(default=None, alias='glClass')
-    member: MemberReference | None = None
-    memo: str | None = None
-    description: str | None = None
-    total: float | None = None
+    name: str
+    """
+     Max length: 50;
+    """
+    instructions: str | None = None
+    """
+     Max length: 1000;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GLExportInventoryTransfer(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: str | None = None
-    document_type: str | None = Field(default=None, alias='documentType')
-    document_date: str | None = Field(default=None, alias='documentDate')
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    gl_class: str | None = Field(default=None, alias='glClass')
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
-    description: str | None = None
-    sales_code: str | None = Field(default=None, alias='salesCode')
-    memo: str | None = None
-    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
-    inventory_account_number: str | None = Field(
-        default=None, alias='inventoryAccountNumber'
-    )
-    transfer_id: int | None = Field(default=None, alias='transferId')
-    item: IvItemReference | None = None
-    gl_item_id: str | None = Field(default=None, alias='glItemId')
-    sales_description: str | None = Field(default=None, alias='salesDescription')
-    item_description: str | None = Field(default=None, alias='itemDescription')
-    currency: CurrencyReference | None = None
-    item_price: float | None = Field(default=None, alias='itemPrice')
-    taxable: bool | None = None
-    unit_of_measure: UnitOfMeasureReference | None = Field(
-        default=None, alias='unitOfMeasure'
-    )
-    quantity: float | None = None
-    cost: float | None = None
-    total: float | None = None
-    sub_category: ProductSubCategoryReference | None = Field(
-        default=None, alias='subCategory'
-    )
-    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
-    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
-    bin: WarehouseBinReference | None = None
-    warehouse: WarehouseReference | None = None
-    transfer_from_bin: WarehouseBinReference | None = Field(
-        default=None, alias='transferFromBin'
-    )
-    transfer_from_location_xref: str | None = Field(
-        default=None, alias='transferFromLocationXref'
-    )
-    transfer_to_bin: WarehouseBinReference | None = Field(
-        default=None, alias='transferToBin'
-    )
-    transfer_to_location_xref: str | None = Field(
-        default=None, alias='transferToLocationXref'
-    )
-    location_xref: str | None = Field(default=None, alias='locationXref')
-    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
-    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
-    item_type_xref: str | None = Field(default=None, alias='itemTypeXref')
-    inventory_xref: str | None = Field(default=None, alias='inventoryXref')
-    cogs_xref: str | None = Field(default=None, alias='cogsXref')
-    tax_note: str | None = Field(default=None, alias='taxNote')
-    offset: GLExportInventoryTransferOffset | None = None
+class SurveyInfo(CategoryInfo):
+    pass
 
 
-class GLExportInventoryTransferOffset(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SurveyOption(ConnectWiseModel):
     id: int | None = None
-    document_type: str | None = Field(default=None, alias='documentType')
-    document_date: str | None = Field(default=None, alias='documentDate')
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    gl_class: str | None = Field(default=None, alias='glClass')
-    total: float | None = None
-    memo: str | None = None
-    description: str | None = None
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    caption: str
+    """
+     Max length: 100;
+    """
+    points: int
+    visibleflag: bool | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GLExportPurchaseTransaction(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: str | None = None
-    document_date: str | None = Field(default=None, alias='documentDate')
-    document_number: str | None = Field(default=None, alias='documentNumber')
-    description: str | None = None
-    memo: str | None = None
-    ap_account_number: str | None = Field(default=None, alias='apAccountNumber')
-    purchase_date: str | None = Field(default=None, alias='purchaseDate')
-    company: CompanyReference | None = None
-    company_type: CompanyTypeReference | None = Field(default=None, alias='companyType')
-    contact: ContactReference | None = None
-    site: SiteReference | None = None
-    purchase_class: str | None = Field(default=None, alias='purchaseClass')
-    freight_amount: float | None = Field(default=None, alias='freightAmount')
-    freight_packing_slip: str | None = Field(default=None, alias='freightPackingSlip')
-    packing_slip: str | None = Field(default=None, alias='packingSlip')
-    dropship_flag: bool | None = Field(default=None, alias='dropshipFlag')
-    currency: CurrencyReference | None = None
-    total: float | None = None
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
-    )
-    billing_terms_xref: str | None = Field(default=None, alias='billingTermsXref')
-    due_days: int | None = Field(default=None, alias='dueDays')
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    vendor_account_number: str | None = Field(default=None, alias='vendorAccountNumber')
-    vendor_invoice_date: str | None = Field(default=None, alias='vendorInvoiceDate')
-    vendor_invoice_number: str | None = Field(default=None, alias='vendorInvoiceNumber')
-    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
-    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
-    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
-    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
+class SurveyQuestionReference(ConfigurationTypeQuestionReference):
+    pass
+
+
+class SurveyReference(ActivityReference):
+    pass
+
+
+class SurveyResultDetail(ConnectWiseModel):
+    question_id: int | None = Field(default=None, alias='questionId')
+    answer: dict[str, Any] | None = None
+    """
+    If question type is Selection, this should be the option array index.
+    """
+
+
+class SystemDepartmentReference(CatalogItemReference):
+    pass
+
+
+class SystemLocationReference(ActivityReference):
+    pass
+
+
+class SystemMenuEntryReference(ActivityReference):
+    pass
+
+
+class SystemSetting(ConnectWiseModel):
+    id: int | None = None
+    description: str | None = None
+    value: str
+    value_type: str | None = Field(default=None, alias='valueType')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Task(ConnectWiseModel):
+    id: int | None = None
+    ticket_id: int | None = Field(default=None, alias='ticketId')
+    notes: str | None = None
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    priority: int | None = None
+    schedule: ScheduleEntryReference | None = None
+    code: ServiceCodeReference | None = None
+    resolution: str | None = None
+    child_schedule_action: Literal['Transfer', 'Delete', 'Done'] | None = Field(
+        default=None, alias='childScheduleAction'
     )
-    ship_to_company_account_number: str | None = Field(
-        default=None, alias='shipToCompanyAccountNumber'
+    child_ticket_id: int | None = Field(default=None, alias='childTicketId')
+    summary: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class TaxCode(ConnectWiseModel):
+    id: int | None = None
+    identifier: str
+    """
+     Max length: 8;
+    """
+    description: str
+    """
+     Max length: 50;
+    """
+    invoice_caption: str = Field(..., alias='invoiceCaption')
+    """
+     Max length: 25;
+    """
+    country: CountryReference | None = None
+    effective_date: datetime = Field(..., alias='effectiveDate')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    display_on_invoice_flag: bool | None = Field(
+        default=None, alias='displayOnInvoiceFlag'
     )
-    ship_to_company_type: CompanyTypeReference | None = Field(
-        default=None, alias='shipToCompanyType'
+    canada_calculate_gst_flag: bool | None = Field(
+        default=None, alias='canadaCalculateGSTFlag'
     )
-    ship_to_contact: ContactReference | None = Field(
-        default=None, alias='shipToContact'
+    cancel_date: datetime | None = Field(default=None, alias='cancelDate')
+    level_one_rate: float | None = Field(default=None, alias='levelOneRate')
+    level_one_rate_type: Literal['Amount', 'Percent'] | None = Field(
+        default=None, alias='levelOneRateType'
     )
-    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
-    ship_to_tax_group: str | None = Field(default=None, alias='shipToTaxGroup')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    tax_group_rate: float | None = Field(default=None, alias='taxGroupRate')
-    use_avalara_tax_flag: bool | None = Field(default=None, alias='useAvalaraTaxFlag')
-    purchase_header_tax_group: str | None = Field(
-        default=None, alias='purchaseHeaderTaxGroup'
+    level_one_taxable_max: float | None = Field(
+        default=None, alias='levelOneTaxableMax'
     )
-    purchase_header_taxable_flag: bool | None = Field(
-        default=None, alias='purchaseHeaderTaxableFlag'
+    level_one_caption: str | None = Field(default=None, alias='levelOneCaption')
+    """
+     Max length: 25;
+    """
+    level_one_tax_code_xref: str | None = Field(
+        default=None, alias='levelOneTaxCodeXref'
     )
-    purchase_header_freight_taxable_flag: bool | None = Field(
-        default=None, alias='purchaseHeaderFreightTaxableFlag'
+    """
+     Max length: 50;
+    """
+    level_one_agency_xref: str | None = Field(default=None, alias='levelOneAgencyXref')
+    """
+     Max length: 100;
+    """
+    level_one_services_flag: bool | None = Field(
+        default=None, alias='levelOneServicesFlag'
     )
-    tax_levels: list[GLExportPurchaseTransactionTaxLevel] | None = Field(
-        default=None, alias='taxLevels'
+    level_one_expenses_flag: bool | None = Field(
+        default=None, alias='levelOneExpensesFlag'
     )
-    purchase_detail: list[GLExportPurchaseTransactionDetail] | None = Field(
-        default=None, alias='purchaseDetail'
+    level_one_products_flag: bool | None = Field(
+        default=None, alias='levelOneProductsFlag'
     )
-    purchase_detail_tax: list[GLExportPurchaseTransactionDetailTax] | None = Field(
-        default=None, alias='purchaseDetailTax'
+    level_one_apply_single_unit_flag: bool | None = Field(
+        default=None, alias='levelOneApplySingleUnitFlag'
     )
-
-
-class GLExportPurchaseTransactionDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_one_apply_single_unit_min: float | None = Field(
+        default=None, alias='levelOneApplySingleUnitMin'
     )
-    id: int | None = None
-    document_date: str | None = Field(default=None, alias='documentDate')
-    gl_class: str | None = Field(default=None, alias='glClass')
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
-    gl_item_id: str | None = Field(default=None, alias='glItemId')
-    sales_code: str | None = Field(default=None, alias='salesCode')
-    description: str | None = None
-    cost: float | None = None
-    memo: str | None = None
-    tax_note: str | None = Field(default=None, alias='taxNote')
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
-    inventory_account_number: str | None = Field(
-        default=None, alias='inventoryAccountNumber'
+    level_one_apply_single_unit_max: float | None = Field(
+        default=None, alias='levelOneApplySingleUnitMax'
     )
-    vendor_account_number: str | None = Field(default=None, alias='vendorAccountNumber')
-    item: IvItemReference | None = None
-    item_description: str | None = Field(default=None, alias='itemDescription')
-    sales_description: str | None = Field(default=None, alias='salesDescription')
-    taxable: bool | None = None
-    item_price: float | None = Field(default=None, alias='itemPrice')
-    item_cost: float | None = Field(default=None, alias='itemCost')
-    unit_of_measure: UnitOfMeasureReference | None = Field(
-        default=None, alias='unitOfMeasure'
+    level_two_rate: float | None = Field(default=None, alias='levelTwoRate')
+    level_two_rate_type: Literal['Amount', 'Percent'] | None = Field(
+        default=None, alias='levelTwoRateType'
     )
-    quantity: float | None = None
-    total: float | None = None
-    currency: CurrencyReference | None = None
-    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
-    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
-    drop_shipped_flag: bool | None = Field(default=None, alias='dropShippedFlag')
-    line_number: int | None = Field(default=None, alias='lineNumber')
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
+    level_two_taxable_max: float | None = Field(
+        default=None, alias='levelTwoTaxableMax'
     )
-    warehouse_site: SiteReference | None = Field(default=None, alias='warehouseSite')
-    sub_category: ProductSubCategoryReference | None = Field(
-        default=None, alias='subCategory'
+    level_two_caption: str | None = Field(default=None, alias='levelTwoCaption')
+    """
+     Max length: 25;
+    """
+    level_two_tax_code_xref: str | None = Field(
+        default=None, alias='levelTwoTaxCodeXref'
     )
-    shipment_method: ShipmentMethodReference | None = Field(
-        default=None, alias='shipmentMethod'
+    """
+     Max length: 50;
+    """
+    level_two_agency_xref: str | None = Field(default=None, alias='levelTwoAgencyXref')
+    """
+     Max length: 100;
+    """
+    level_two_services_flag: bool | None = Field(
+        default=None, alias='levelTwoServicesFlag'
     )
-    item_type_xref: str | None = Field(default=None, alias='itemTypeXref')
-    inventory_xref: str | None = Field(default=None, alias='inventoryXref')
-    cogs_xref: str | None = Field(default=None, alias='cogsXref')
-    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
-    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
-    location_xref: str | None = Field(default=None, alias='locationXref')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    purchase_header_tax_group: str | None = Field(
-        default=None, alias='purchaseHeaderTaxGroup'
+    level_two_expenses_flag: bool | None = Field(
+        default=None, alias='levelTwoExpensesFlag'
     )
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
-    tax_rate: float | None = Field(default=None, alias='taxRate')
-    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
-
-
-class GLExportPurchaseTransactionDetailTax(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_two_products_flag: bool | None = Field(
+        default=None, alias='levelTwoProductsFlag'
     )
-    id: int | None = None
-    document_date: str | None = Field(default=None, alias='documentDate')
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    gl_class: str | None = Field(default=None, alias='glClass')
-    cost: float | None = None
-    sales_code: str | None = Field(default=None, alias='salesCode')
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
-    gl_item_id: str | None = Field(default=None, alias='glItemId')
-    memo: str | None = None
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    vendor_account_number: str | None = Field(default=None, alias='vendorAccountNumber')
-    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
-    inventory_account_number: str | None = Field(
-        default=None, alias='inventoryAccountNumber'
+    level_two_apply_single_unit_flag: bool | None = Field(
+        default=None, alias='levelTwoApplySingleUnitFlag'
     )
-    item_type_xref: str | None = Field(default=None, alias='itemTypeXref')
-    inventory_xref: str | None = Field(default=None, alias='inventoryXref')
-    cogs_xref: str | None = Field(default=None, alias='cogsXref')
-    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
-    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
-    location_xref: str | None = Field(default=None, alias='locationXref')
-    item: IvItemReference | None = None
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    sales_description: str | None = Field(default=None, alias='salesDescription')
-    item_description: str | None = Field(default=None, alias='itemDescription')
-    item_price: float | None = Field(default=None, alias='itemPrice')
-    item_cost: float | None = Field(default=None, alias='itemCost')
-    unit_of_measure: UnitOfMeasureReference | None = Field(
-        default=None, alias='unitOfMeasure'
+    level_two_apply_single_unit_min: float | None = Field(
+        default=None, alias='levelTwoApplySingleUnitMin'
     )
-    quantity: float | None = None
-    total: float | None = None
-    currency: CurrencyReference | None = None
-    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
-    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
-    drop_shipped_flag: bool | None = Field(default=None, alias='dropShippedFlag')
-    line_number: int | None = Field(default=None, alias='lineNumber')
-    warehouse_site: SiteReference | None = Field(default=None, alias='warehouseSite')
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
+    level_two_apply_single_unit_max: float | None = Field(
+        default=None, alias='levelTwoApplySingleUnitMax'
     )
-    shipment_method: ShipmentMethodReference | None = Field(
-        default=None, alias='shipmentMethod'
+    level_three_rate: float | None = Field(default=None, alias='levelThreeRate')
+    level_three_rate_type: Literal['Amount', 'Percent'] | None = Field(
+        default=None, alias='levelThreeRateType'
     )
-    sub_category: ProductSubCategoryReference | None = Field(
-        default=None, alias='subCategory'
+    level_three_taxable_max: float | None = Field(
+        default=None, alias='levelThreeTaxableMax'
     )
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    tax_rate: float | None = Field(default=None, alias='taxRate')
-    tax_rate_percent: float | None = Field(default=None, alias='taxRatePercent')
-    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
-    tax_note: str | None = Field(default=None, alias='taxNote')
-    purchase_header_tax_group: str | None = Field(
-        default=None, alias='purchaseHeaderTaxGroup'
-    )
-
-
-class GLExportPurchaseTransactionTaxLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
-    tax_level: int | None = Field(default=None, alias='taxLevel')
-
-
-class GLExportSettings(BaseModel):
-    pass
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-
-
-class GLExportTransaction(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    gl_class: str | None = Field(default=None, alias='glClass')
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
-    document_date: str | None = Field(default=None, alias='documentDate')
-    document_number: str | None = Field(default=None, alias='documentNumber')
-    document_type: str | None = Field(default=None, alias='documentType')
-    memo: str | None = None
-    description: str | None = None
-    attention: str | None = None
-    sales_territory: str | None = Field(default=None, alias='salesTerritory')
-    company: CompanyReference | None = None
-    company_type: CompanyTypeReference | None = Field(default=None, alias='companyType')
-    company_account_number: str | None = Field(
-        default=None, alias='companyAccountNumber'
-    )
-    site: SiteReference | None = None
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
-    )
-    billing_terms_xref: str | None = Field(default=None, alias='billingTermsXref')
-    due_days: int | None = Field(default=None, alias='dueDays')
-    due_date: str | None = Field(default=None, alias='dueDate')
-    email_delivery_flag: bool | None = Field(default=None, alias='emailDeliveryFlag')
-    print_delivery_flag: bool | None = Field(default=None, alias='printDeliveryFlag')
-    agreement_pre_payment_flag: bool | None = Field(
-        default=None, alias='agreementPrePaymentFlag'
+    level_three_caption: str | None = Field(default=None, alias='levelThreeCaption')
+    """
+     Max length: 25;
+    """
+    level_three_tax_code_xref: str | None = Field(
+        default=None, alias='levelThreeTaxCodeXref'
     )
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    billing_type: str | None = Field(default=None, alias='billingType')
-    gl_entry_ids: str | None = Field(default=None, alias='glEntryIds')
-    purchase_order: PurchaseOrderReference | None = Field(
-        default=None, alias='purchaseOrder'
+    """
+     Max length: 50;
+    """
+    level_three_agency_xref: str | None = Field(
+        default=None, alias='levelThreeAgencyXref'
     )
-    project: ProjectReference | None = None
-    currency: CurrencyReference | None = None
-    total: float | None = None
-    sales_rep_id: str | None = Field(default=None, alias='salesRepId')
-    sales_rep_name: str | None = Field(default=None, alias='salesRepName')
-    taxable: bool | None = None
-    taxable_total: float | None = Field(default=None, alias='taxableTotal')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    tax_group_rate: float | None = Field(default=None, alias='taxGroupRate')
-    piggy_back_flag: bool | None = Field(default=None, alias='piggyBackFlag')
-    tax_account_number: str | None = Field(default=None, alias='taxAccountNumber')
-    sales_tax: float | None = Field(default=None, alias='salesTax')
-    state_tax: float | None = Field(default=None, alias='stateTax')
-    county_tax: float | None = Field(default=None, alias='countyTax')
-    city_tax: float | None = Field(default=None, alias='cityTax')
-    taxable_amount1: float | None = Field(default=None, alias='taxableAmount1')
-    taxable_amount2: float | None = Field(default=None, alias='taxableAmount2')
-    taxable_amount3: float | None = Field(default=None, alias='taxableAmount3')
-    taxable_amount4: float | None = Field(default=None, alias='taxableAmount4')
-    taxable_amount5: float | None = Field(default=None, alias='taxableAmount5')
-    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
-    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
-    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
-    tax_id: str | None = Field(default=None, alias='taxId')
-    tax_dp_applied_flag: bool | None = Field(default=None, alias='taxDpAppliedFlag')
-    use_avalara_flag: bool | None = Field(default=None, alias='useAvalaraFlag')
-    send_avalara_tax_flag: bool | None = Field(default=None, alias='sendAvalaraTaxFlag')
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
+    """
+     Max length: 100;
+    """
+    level_three_services_flag: bool | None = Field(
+        default=None, alias='levelThreeServicesFlag'
     )
-    ship_to_company_account_number: str | None = Field(
-        default=None, alias='shipToCompanyAccountNumber'
+    level_three_expenses_flag: bool | None = Field(
+        default=None, alias='levelThreeExpensesFlag'
     )
-    ship_to_company_type: CompanyTypeReference | None = Field(
-        default=None, alias='shipToCompanyType'
+    level_three_products_flag: bool | None = Field(
+        default=None, alias='levelThreeProductsFlag'
     )
-    ship_to_tax_id: str | None = Field(default=None, alias='shipToTaxId')
-    ship_site: SiteReference | None = Field(default=None, alias='shipSite')
-    ship_contact: str | None = Field(default=None, alias='shipContact')
-    detail: list[GLExportTransactionDetail] | None = None
-    tax_levels: list[GLExportTransactionTaxLevel] | None = Field(
-        default=None, alias='taxLevels'
+    level_three_apply_single_unit_flag: bool | None = Field(
+        default=None, alias='levelThreeApplySingleUnitFlag'
     )
-
-
-class GLExportTransactionDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_three_apply_single_unit_min: float | None = Field(
+        default=None, alias='levelThreeApplySingleUnitMin'
     )
-    id: int | None = None
-    document_date: str | None = Field(default=None, alias='documentDate')
-    document_type: str | None = Field(default=None, alias='documentType')
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    gl_class: str | None = Field(default=None, alias='glClass')
-    gl_type_id: str | None = Field(default=None, alias='glTypeId')
-    gl_item_id: str | None = Field(default=None, alias='glItemId')
-    invoice_summary_option: str | None = Field(
-        default=None, alias='invoiceSummaryOption'
+    level_three_apply_single_unit_max: float | None = Field(
+        default=None, alias='levelThreeApplySingleUnitMax'
     )
-    cost: float | None = None
-    sales_code: str | None = Field(default=None, alias='salesCode')
-    memo: str | None = None
-    description: str | None = None
-    quantity: float | None = None
-    total: float | None = None
-    currency: CurrencyReference | None = None
-    time_entry: TimeEntryReference | None = Field(default=None, alias='timeEntry')
-    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
-    inventory_account_number: str | None = Field(
-        default=None, alias='inventoryAccountNumber'
+    level_four_rate: float | None = Field(default=None, alias='levelFourRate')
+    level_four_rate_type: Literal['Amount', 'Percent'] | None = Field(
+        default=None, alias='levelFourRateType'
     )
-    product_account_number: str | None = Field(
-        default=None, alias='productAccountNumber'
+    level_four_taxable_max: float | None = Field(
+        default=None, alias='levelFourTaxableMax'
     )
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
-    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
-    tax_note: str | None = Field(default=None, alias='taxNote')
-    tax_rate: float | None = Field(default=None, alias='taxRate')
-    tax_rate_percent: float | None = Field(default=None, alias='taxRatePercent')
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    taxable2_flag: bool | None = Field(default=None, alias='taxable2Flag')
-    taxable3_flag: bool | None = Field(default=None, alias='taxable3Flag')
-    taxable4_flag: bool | None = Field(default=None, alias='taxable4Flag')
-    taxable5_flag: bool | None = Field(default=None, alias='taxable5Flag')
-    item: IvItemReference | None = None
-    product: ProductReference | None = None
-    item_taxable_flag: bool | None = Field(default=None, alias='itemTaxableFlag')
-    item_price: float | None = Field(default=None, alias='itemPrice')
-    item_cost: float | None = Field(default=None, alias='itemCost')
-    item_description: str | None = Field(default=None, alias='itemDescription')
-    sales_description: str | None = Field(default=None, alias='salesDescription')
-    unit_of_measure: UnitOfMeasureReference | None = Field(
-        default=None, alias='unitOfMeasure'
+    level_four_caption: str | None = Field(default=None, alias='levelFourCaption')
+    """
+     Max length: 25;
+    """
+    level_four_tax_code_xref: str | None = Field(
+        default=None, alias='levelFourTaxCodeXref'
     )
-    sub_category: ProductSubCategoryReference | None = Field(
-        default=None, alias='subCategory'
+    """
+     Max length: 50;
+    """
+    level_four_agency_xref: str | None = Field(
+        default=None, alias='levelFourAgencyXref'
     )
-    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
-    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
-    warehouse_site: SiteReference | None = Field(default=None, alias='warehouseSite')
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
+    """
+     Max length: 100;
+    """
+    level_four_services_flag: bool | None = Field(
+        default=None, alias='levelFourServicesFlag'
     )
-    shipment_method: ShipmentMethodReference | None = Field(
-        default=None, alias='shipmentMethod'
+    level_four_expenses_flag: bool | None = Field(
+        default=None, alias='levelFourExpensesFlag'
     )
-    drop_shipped_flag: bool | None = Field(default=None, alias='dropShippedFlag')
-    item_type_xref: str | None = Field(default=None, alias='itemTypeXref')
-    inventory_xref: str | None = Field(default=None, alias='inventoryXref')
-    cogs_xref: str | None = Field(default=None, alias='cogsXref')
-    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
-    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
-    location_xref: str | None = Field(default=None, alias='locationXref')
-    tax_levels: list[GLExportTransactionDetailTaxLevel] | None = Field(
-        default=None, alias='taxLevels'
+    level_four_products_flag: bool | None = Field(
+        default=None, alias='levelFourProductsFlag'
     )
-
-
-class GLExportTransactionDetailTaxLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_four_apply_single_unit_flag: bool | None = Field(
+        default=None, alias='levelFourApplySingleUnitFlag'
     )
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    tax_level: int | None = Field(default=None, alias='taxLevel')
-
-
-class GLExportTransactionTaxLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_four_apply_single_unit_min: float | None = Field(
+        default=None, alias='levelFourApplySingleUnitMin'
     )
-    tax_amount: float | None = Field(default=None, alias='taxAmount')
-    taxable_amount: float | None = Field(default=None, alias='taxableAmount')
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
-    tax_level: int | None = Field(default=None, alias='taxLevel')
-
-
-class GLExportVendor(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_four_apply_single_unit_max: float | None = Field(
+        default=None, alias='levelFourApplySingleUnitMax'
     )
-    member: MemberReference | None = None
-    vendor: CompanyReference | None = None
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
+    level_five_rate: float | None = Field(default=None, alias='levelFiveRate')
+    level_five_rate_type: Literal['Amount', 'Percent'] | None = Field(
+        default=None, alias='levelFiveRateType'
     )
-    due_days: int | None = Field(default=None, alias='dueDays')
-    site: SiteReference | None = None
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-
-
-class GLPath(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_five_taxable_max: float | None = Field(
+        default=None, alias='levelFiveTaxableMax'
     )
-    id: int | None = None
-    location: SystemLocationReference | None = None
-    path: str | None = None
+    level_five_caption: str | None = Field(default=None, alias='levelFiveCaption')
     """
-     Max length: 255;
+     Max length: 25;
     """
-    sql_server_name: str | None = Field(default=None, alias='sqlServerName')
+    level_five_tax_code_xref: str | None = Field(
+        default=None, alias='levelFiveTaxCodeXref'
+    )
     """
-     Max length: 255;
+     Max length: 50;
     """
-    database_name: str | None = Field(default=None, alias='databaseName')
+    level_five_agency_xref: str | None = Field(
+        default=None, alias='levelFiveAgencyXref'
+    )
     """
      Max length: 100;
     """
-    last_payment_sync: datetime | None = Field(default=None, alias='lastPaymentSync')
-    last_payment_sync_by: MemberReference | None = Field(
-        default=None, alias='lastPaymentSyncBy'
+    level_five_services_flag: bool | None = Field(
+        default=None, alias='levelFiveServicesFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Gender(Enum):
-    FEMALE = 'Female'
-    MALE = 'Male'
-
-
-class GenericBoardTeamReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_five_expenses_flag: bool | None = Field(
+        default=None, alias='levelFiveExpensesFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    is_project_team_flag: bool | None = Field(default=None, alias='isProjectTeamFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class GenericIdIdentifierReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_five_products_flag: bool | None = Field(
+        default=None, alias='levelFiveProductsFlag'
     )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-
-
-class GenericNameIdDTO(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_five_apply_single_unit_flag: bool | None = Field(
+        default=None, alias='levelFiveApplySingleUnitFlag'
     )
-    id: int | None = None
-    tag: str | None = None
-    name: str | None = None
-
-
-class GlType(Enum):
-    AP = 'AP'
-    AR = 'AR'
-    EE = 'EE'
-    EI = 'EI'
-    EO = 'EO'
-    IA = 'IA'
-    IT = 'IT'
-    P = 'P'
-    PF = 'PF'
-    R = 'R'
-    RA = 'RA'
-    RD = 'RD'
-    RE = 'RE'
-    RP = 'RP'
-    ST = 'ST'
-    SD = 'SD'
-    ET = 'ET'
-    FT = 'FT'
-    PT = 'PT'
-    WP = 'WP'
-    WR = 'WR'
-
-
-class GlobalSearchDefaultSort(Enum):
-    NONE = 'None'
-    LAST_UPDATED_DESC = 'LastUpdatedDesc'
-    LAST_UPDATED_ASC = 'LastUpdatedAsc'
-    CREATED_DESC = 'CreatedDesc'
-    CREATED_ASC = 'CreatedAsc'
-
-
-class GlobalSearchDefaultTicketFilter(Enum):
-    OPEN_RECORDS = 'OpenRecords'
-    CLOSED_RECORDS = 'ClosedRecords'
-    ALL_RECORDS = 'AllRecords'
-
-
-class GoogleEmailSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_five_apply_single_unit_min: float | None = Field(
+        default=None, alias='levelFiveApplySingleUnitMin'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 200;
-    """
-    username: str
+    level_five_apply_single_unit_max: float | None = Field(
+        default=None, alias='levelFiveApplySingleUnitMax'
+    )
+    level_six_rate: float | None = Field(default=None, alias='levelSixRate')
+    level_six_rate_type: Literal['Amount', 'Percent'] | None = Field(
+        default=None, alias='levelSixRateType'
+    )
+    level_six_taxable_max: float | None = Field(
+        default=None, alias='levelSixTaxableMax'
+    )
+    level_six_caption: str | None = Field(default=None, alias='levelSixCaption')
     """
-     Max length: 100;
+     Max length: 25;
     """
-    inbox_folder: str = Field(..., alias='inboxFolder')
+    level_six_tax_code_xref: str | None = Field(
+        default=None, alias='levelSixTaxCodeXref'
+    )
     """
-     Max length: 40;
+     Max length: 50;
     """
-    processed_folder: str = Field(..., alias='processedFolder')
+    level_six_agency_xref: str | None = Field(default=None, alias='levelSixAgencyXref')
     """
-     Max length: 40;
+     Max length: 100;
     """
-    failed_folder: str = Field(..., alias='failedFolder')
+    level_six_services_flag: bool | None = Field(
+        default=None, alias='levelSixServicesFlag'
+    )
+    level_six_expenses_flag: bool | None = Field(
+        default=None, alias='levelSixExpensesFlag'
+    )
+    level_six_products_flag: bool | None = Field(
+        default=None, alias='levelSixProductsFlag'
+    )
+    level_six_apply_single_unit_flag: bool | None = Field(
+        default=None, alias='levelSixApplySingleUnitFlag'
+    )
+    level_six_apply_single_unit_min: float | None = Field(
+        default=None, alias='levelSixApplySingleUnitMin'
+    )
+    level_six_apply_single_unit_max: float | None = Field(
+        default=None, alias='levelSixApplySingleUnitMax'
+    )
+    work_role_ids: list[int] | None = Field(default=None, alias='workRoleIds')
     """
-     Max length: 40;
+    Array of work role exemptions for the tax code.
     """
-    client_id: str | None = Field(default=None, alias='clientId')
+    add_all_work_roles: bool | None = Field(default=None, alias='addAllWorkRoles')
+    remove_all_work_roles: bool | None = Field(default=None, alias='removeAllWorkRoles')
+    expense_type_ids: list[int] | None = Field(default=None, alias='expenseTypeIds')
     """
-     Max length: 200;
+    Array of expense type exemptions for the tax code.
     """
-    private_key: str | None = Field(default=None, alias='privateKey')
+    add_all_expense_types: bool | None = Field(default=None, alias='addAllExpenseTypes')
+    remove_all_expense_types: bool | None = Field(
+        default=None, alias='removeAllExpenseTypes'
+    )
+    product_type_ids: list[int] | None = Field(default=None, alias='productTypeIds')
     """
-     Max length: 4000;
+    Array of product type exemptions for the tax code.
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    email_connector: EmailConnectorReference | None = Field(
-        default=None, alias='emailConnector'
+    add_all_product_types: bool | None = Field(default=None, alias='addAllProductTypes')
+    remove_all_product_types: bool | None = Field(
+        default=None, alias='removeAllProductTypes'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class GoogleEmailSetupReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TaxCodeInfo(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class GraphUserCsv(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: str | None = None
-    display_name: str | None = Field(default=None, alias='displayName')
-    principal_name: str | None = Field(default=None, alias='principalName')
-    country: str | None = None
-    state: str | None = None
-    city: str | None = None
-    department: str | None = None
-    first_name: str | None = Field(default=None, alias='firstName')
-    last_name: str | None = Field(default=None, alias='lastName')
-    address: str | None = None
-    postal_code: str | None = Field(default=None, alias='postalCode')
-    mail: str | None = None
-    is_matched_contact: bool | None = Field(default=None, alias='isMatchedContact')
-    account_enabled: bool | None = Field(default=None, alias='accountEnabled')
-    manage_contact_rec_id: int | None = Field(default=None, alias='manageContactRecId')
-    manage_contact_name: str | None = Field(default=None, alias='manageContactName')
-    job_title: str | None = Field(default=None, alias='jobTitle')
-    proxy_addresses: list[str] | None = Field(default=None, alias='proxyAddresses')
-    nick_name: str | None = Field(default=None, alias='nickName')
-    manager: Manager | None = None
-    employee_type: str | None = Field(default=None, alias='employeeType')
+    identifier: str | None = None
+    description: str | None = None
+    effective_date: str | None = Field(default=None, alias='effectiveDate')
+    cancel_date: str | None = Field(default=None, alias='cancelDate')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Group(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TaxCodeLevel(ConnectWiseModel):
     id: int | None = None
-    name: str
-    public_description: str | None = Field(default=None, alias='publicDescription')
+    tax_level: int | None = Field(default=None, alias='taxLevel')
+    tax_rate: float = Field(..., alias='taxRate')
+    rate_type: Literal['Amount', 'Percent'] = Field(..., alias='rateType')
+    taxable_max: float | None = Field(default=None, alias='taxableMax')
+    caption: str | None = None
     """
-     Max length: 255;
+     Max length: 25;
     """
-    public_flag: bool | None = Field(default=None, alias='publicFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class GroupInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class GroupReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class HeaderAddressPosition(Enum):
-    CENTER = 'Center'
-    LEFT_SIDE = 'LeftSide'
-    RIGHT_SIDE = 'RightSide'
-
-
-class HeaderLogoPosition(Enum):
-    CENTER = 'Center'
-    LEFT_SIDE = 'LeftSide'
-    RIGHT_SIDE = 'RightSide'
-
-
-class HeaderTitleFont(Enum):
-    REGULAR = 'Regular'
-    REGULAR_BOLD = 'RegularBold'
-    LARGE = 'Large'
-    LARGE_BOLD = 'LargeBold'
-    EXTRA_LARGE = 'ExtraLarge'
-    EXTRA_LARGE_BOLD = 'ExtraLargeBold'
-
-
-class HeaderTitlePosition(Enum):
-    CENTER = 'Center'
-    LEFT_SIDE = 'LeftSide'
-    RIGHT_SIDE = 'RightSide'
-
-
-class Holiday(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
+    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
     """
      Max length: 50;
     """
-    all_day_flag: bool | None = Field(default=None, alias='allDayFlag')
+    agency_xref: str | None = Field(default=None, alias='agencyXref')
     """
-    Can be set to false to set a holiday for specific hours (Defaults to True).
+     Max length: 100;
     """
-    date: date
-    time_start: str | None = Field(default=None, alias='timeStart')
-    time_end: str | None = Field(default=None, alias='timeEnd')
-    holiday_list: HolidayListReference | None = Field(default=None, alias='holidayList')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    tax_services_flag: bool | None = Field(default=None, alias='taxServicesFlag')
+    tax_expenses_flag: bool | None = Field(default=None, alias='taxExpensesFlag')
+    tax_products_flag: bool | None = Field(default=None, alias='taxProductsFlag')
+    single_unit_flag: bool | None = Field(default=None, alias='singleUnitFlag')
+    single_unit_minimum: float | None = Field(default=None, alias='singleUnitMinimum')
+    single_unit_maximum: float | None = Field(default=None, alias='singleUnitMaximum')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class HolidayAvailableType(Enum):
-    ANNIVERSARY_YEAR = 'AnniversaryYear'
-    CALENDAR_YEAR = 'CalendarYear'
+class TaxCodeLevelReference(ActivityReference):
+    pass
 
 
-class HolidayInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    all_day_flag: bool | None = Field(default=None, alias='allDayFlag')
-    """
-    Can be set to false to set a holiday for specific hours (Defaults to True).
-    """
-    date: str | None = None
-    time_start: str | None = Field(default=None, alias='timeStart')
-    time_end: str | None = Field(default=None, alias='timeEnd')
-    holiday_list: HolidayListReference | None = Field(default=None, alias='holidayList')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class TaxCodeReference(ActivityReference):
+    pass
 
 
-class HolidayList(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TaxCodeXRef(ConnectWiseModel):
     id: int | None = None
-    name: str
+    description: str
     """
      Max length: 50;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class HolidayListInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    level_one: Literal['NonTaxable', 'Taxable'] | None = Field(
+        default=None, alias='levelOne'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class HolidayListReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_two: Literal['NonTaxable', 'Taxable'] | None = Field(
+        default=None, alias='levelTwo'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class IRestIdentifiedItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_three: Literal['NonTaxable', 'Taxable'] | None = Field(
+        default=None, alias='levelThree'
     )
-    id: int | None = None
-
-
-class IdCollection(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    level_four: Literal['NonTaxable', 'Taxable'] | None = Field(
+        default=None, alias='levelFour'
     )
-    ids: list[int] | None = None
-
-
-class Identifier(Enum):
-    QB99 = 'QB99'
-    MAS200 = 'Mas200'
-    G_PLAINS = 'GPlains'
-    SBA = 'SBA'
-    MAS200V4 = 'Mas200v4'
-    OTHER = 'Other'
-
-
-class Identifier1(Enum):
-    FROM_ = 'From'
-    TO = 'To'
+    level_five: Literal['NonTaxable', 'Taxable'] | None = Field(
+        default=None, alias='levelFive'
+    )
+    level_six: Literal['NonTaxable', 'Taxable'] | None = Field(
+        default=None, alias='levelSix'
+    )
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    taxable_levels: list[int] | None = Field(default=None, alias='taxableLevels')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Imap(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class TaxIntegration(ConnectWiseModel):
+    tax_integration_type: Literal['Avalara'] | None = Field(
+        default=None, alias='taxIntegrationType'
     )
     id: int | None = None
-    name: str
+    account_number: str | None = Field(default=None, alias='accountNumber')
     """
-     Max length: 200;
+     Max length: 50;
     """
-    imap_name: str = Field(..., alias='imapName')
+    license_key: str | None = Field(default=None, alias='licenseKey')
     """
-     Max length: 40;
+     Max length: 50;
     """
-    processed_name: str = Field(..., alias='processedName')
+    service_url: str | None = Field(default=None, alias='serviceUrl')
     """
-     Max length: 40;
+     Max length: 250;
     """
-    failed_folder: str = Field(..., alias='failedFolder')
+    company_code: str | None = Field(default=None, alias='companyCode')
     """
-     Max length: 40;
+     Max length: 50;
     """
-    server: str
+    time_tax_code: str | None = Field(default=None, alias='timeTaxCode')
     """
-     Max length: 200;
+     Max length: 50;
     """
-    user_name: str = Field(..., alias='userName')
+    expense_tax_code: str | None = Field(default=None, alias='expenseTaxCode')
     """
-     Max length: 80;
+     Max length: 50;
     """
-    password: str | None = None
+    product_tax_code: str | None = Field(default=None, alias='productTaxCode')
     """
-     Max length: 80;
+     Max length: 50;
     """
-    port: int
-    ssl_flag: bool | None = Field(default=None, alias='sslFlag')
-    email_connector: EmailConnectorReference | None = Field(
-        default=None, alias='emailConnector'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ImapInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    invoice_amount_tax_code: str | None = Field(
+        default=None, alias='invoiceAmountTaxCode'
     )
-    id: int | None = None
-    name: str | None = None
-    email_connector: EmailConnectorReference | None = Field(
-        default=None, alias='emailConnector'
+    """
+     Max length: 50;
+    """
+    enabled_flag: bool | None = Field(default=None, alias='enabledFlag')
+    commit_transactions_flag: bool | None = Field(
+        default=None, alias='commitTransactionsFlag'
+    )
+    sales_invoice_flag: bool | None = Field(default=None, alias='salesInvoiceFlag')
+    freight_tax_code: str | None = Field(default=None, alias='freightTaxCode')
+    """
+     Max length: 50;
+    """
+    accounting_integration_flag: bool | None = Field(
+        default=None, alias='accountingIntegrationFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    tax_line_flag: bool | None = Field(default=None, alias='taxLineFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ImapSetupReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TaxIntegrationInfo(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    enabled_flag: bool | None = Field(default=None, alias='enabledFlag')
+    tax_integration_type: Literal['Avalara'] | None = Field(
+        default=None, alias='taxIntegrationType'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Impact(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Team(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    description: str
-    """
-     Max length: 200;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    type: Literal['Individual', 'Team']
+    member: MemberReference | None = None
+    sales_team: SalesTeamReference | None = Field(default=None, alias='salesTeam')
+    commission_percent: int | None = Field(default=None, alias='commissionPercent')
+    referral_flag: bool | None = Field(default=None, alias='referralFlag')
+    opportunity_id: int | None = Field(default=None, alias='opportunityId')
+    responsible_flag: bool | None = Field(default=None, alias='responsibleFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Impact1(Enum):
-    LOW = 'Low'
-    MEDIUM = 'Medium'
-    HIGH = 'High'
+class TeamMember(ConnectWiseModel):
+    id: int | None = None
+    board: BoardReference | None = None
+    team: ServiceTeamReference | None = None
+    member: MemberReference | None = None
+    team_leader_flag: bool | None = Field(default=None, alias='teamLeaderFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Impact2(Enum):
+class TeamRole(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-    Required On Updates;
+     Max length: 20;
     """
-
-    LOW = 'Low'
-    MEDIUM = 'Medium'
-    HIGH = 'High'
+    account_manager_flag: bool | None = Field(default=None, alias='accountManagerFlag')
+    tech_flag: bool | None = Field(default=None, alias='techFlag')
+    sales_flag: bool | None = Field(default=None, alias='salesFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ImpactUrgencySetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
+class TeamRoleInfo(ActivityReference):
+    pass
 
 
-class ImportMassMaintenance(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    deleted_contact_count: int | None = Field(default=None, alias='deletedContactCount')
-    deleted_company_count: int | None = Field(default=None, alias='deletedCompanyCount')
-    message: str | None = None
-    success: bool | None = None
+class TeamRoleReference(ActivityReference):
+    pass
 
 
-class InOutBoard(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    member: MemberReference | None = None
-    in_out_type: InOutTypeReference | None = Field(default=None, alias='inOutType')
-    additional_info: str | None = Field(default=None, alias='additionalInfo')
-    """
-     Max length: 100;
-    """
-    date_back: datetime = Field(..., alias='dateBack')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class TemplateGeneratedCountsModel(ConnectWiseModel):
+    service_count: int | None = Field(default=None, alias='serviceCount')
+    schedule_count: int | None = Field(default=None, alias='scheduleCount')
 
 
-class InOutType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    description: str
-    """
-     Max length: 30;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class TicketBundle(ConnectWiseModel):
+    child_ticket_ids: list[int] | None = Field(default=None, alias='childTicketIds')
 
 
-class InOutTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TicketInfo(ConnectWiseModel):
     id: int | None = None
-    description: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    summary: str | None = None
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class InOutTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class TicketMerge(ConnectWiseModel):
+    merge_ticket_ids: list[int] = Field(..., alias='mergeTicketIds')
+    status: ServiceStatusReference | None = None
 
 
-class IncludeExcludeType(Enum):
-    ALL = 'All'
-    M365_PROPERTY = 'M365Property'
-    NONE = 'None'
+class TicketNote(ConnectWiseModel):
+    id: int | None = None
+    ticket_id: int | None = Field(default=None, alias='ticketId')
+    text: str | None = None
+    detail_description_flag: bool | None = Field(
+        default=None, alias='detailDescriptionFlag'
+    )
+    internal_analysis_flag: bool | None = Field(
+        default=None, alias='internalAnalysisFlag'
+    )
+    resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
+    issue_flag: bool | None = Field(default=None, alias='issueFlag')
+    member: MemberReference | None = None
+    contact: ContactReference | None = None
+    customer_updated_flag: bool | None = Field(
+        default=None, alias='customerUpdatedFlag'
+    )
+    process_notifications: bool | None = Field(
+        default=None, alias='processNotifications'
+    )
+    internal_flag: bool | None = Field(default=None, alias='internalFlag')
+    external_flag: bool | None = Field(default=None, alias='externalFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class InclusiveRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TicketReference(ConnectWiseModel):
     id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    summary: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Info(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class TicketSync(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 80;
+    """
+    vendor_type: Literal['Zenith'] = Field(..., alias='vendorType')
+    integrator_login: IntegratorLoginReference | None = Field(
+        default=None, alias='integratorLogin'
     )
-    version: str | None = None
-    is_cloud: bool | None = Field(default=None, alias='isCloud')
-    server_time_zone: str | None = Field(default=None, alias='serverTimeZone')
-    license_bits: list[LicenseBit] | None = Field(default=None, alias='licenseBits')
-    cloud_region: str | None = Field(default=None, alias='cloudRegion')
+    company: CompanyReference | None = None
+    url: str
+    user_name: str | None = Field(default=None, alias='userName')
+    password: str | None = None
+    psg: str | None = None
+    problem_description_flag: bool | None = Field(
+        default=None, alias='problemDescriptionFlag'
+    )
+    internal_analysis_flag: bool | None = Field(
+        default=None, alias='internalAnalysisFlag'
+    )
+    resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class InquireLevel(Enum):
-    NONE = 'None'
-    MY = 'My'
-    ALL = 'All'
+class TicketTask(ConnectWiseModel):
+    id: int | None = None
+    ticket_id: int | None = Field(default=None, alias='ticketId')
+    notes: str | None = None
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    priority: int | None = None
+    schedule: ScheduleEntryReference | None = None
+    code: ServiceCodeReference | None = None
+    resolution: str | None = None
+    summary: str | None = None
+    child_schedule_action: Literal['Transfer', 'Delete', 'Done'] | None = Field(
+        default=None, alias='childScheduleAction'
+    )
+    child_ticket_id: int | None = Field(default=None, alias='childTicketId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class IntegratorLogin(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TimeAccrual(ConnectWiseModel):
     id: int | None = None
-    username: str
-    """
-     Max length: 50;
-    """
-    password: str | None = None
+    location: SystemLocationReference | None = None
+    vacation_flag: bool | None = Field(default=None, alias='vacationFlag')
     """
-    The password will never be returned in response. Max length: 50;
+    if vacationFlag is set to false, system will clear out or ingore the values of vacationAvailableType, vacationCarryoverAllowedFlag, vacationCarryoverLimit
     """
-    can_access_all_records_flag: bool | None = Field(
-        default=None, alias='canAccessAllRecordsFlag'
+    vacation_available_type: Literal['AnniversaryYear', 'CalendarYear'] | None = Field(
+        default=None, alias='vacationAvailableType'
+    )
+    vacation_carryover_allowed_flag: bool | None = Field(
+        default=None, alias='vacationCarryoverAllowedFlag'
+    )
+    vacation_carryover_limit: float | None = Field(
+        default=None, alias='vacationCarryoverLimit'
     )
+    sick_flag: bool | None = Field(default=None, alias='sickFlag')
     """
-    This flag controls whether the integrator can access only the db records it created, or all system records.
+    if sickFlag is set to false, system will clear out or ignore the values of sickAvailableType, sickCarryoverAllowedFlag, sickCarryoverLimit
     """
-    can_access_all_apis_flag: bool | None = Field(
-        default=None, alias='canAccessAllApisFlag'
+    sick_available_type: Literal['AnniversaryYear', 'CalendarYear'] | None = Field(
+        default=None, alias='sickAvailableType'
+    )
+    sick_carryover_allowed_flag: bool | None = Field(
+        default=None, alias='sickCarryoverAllowedFlag'
     )
+    sick_carryover_limit: float | None = Field(default=None, alias='sickCarryoverLimit')
+    pto_flag: bool | None = Field(default=None, alias='ptoFlag')
     """
-    Setting this flag to true will create an integrator that can access all of the available apis in the system.
-                If this field is set to true, both the member and board fields are required.
+    if ptoFlag is set to false, system will clear out or ignore the values of ptoAvailableType, ptoCarryoverAllowedFlag, ptoCarryoverLimit
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    date_inactivated: datetime | None = Field(default=None, alias='dateInactivated')
-    inactivated_by: MemberReference | None = Field(default=None, alias='inactivatedBy')
-    service_ticket_api_flag: bool | None = Field(
-        default=None, alias='serviceTicketApiFlag'
+    pto_available_type: Literal['AnniversaryYear', 'CalendarYear'] | None = Field(
+        default=None, alias='ptoAvailableType'
     )
-    board: BoardReference | None = None
-    service_board_callback_url: str | None = Field(
-        default=None, alias='serviceBoardCallbackUrl'
+    pto_carryover_allowed_flag: bool | None = Field(
+        default=None, alias='ptoCarryoverAllowedFlag'
     )
+    pto_carryover_limit: float | None = Field(default=None, alias='ptoCarryoverLimit')
+    holiday_flag: bool | None = Field(default=None, alias='holidayFlag')
     """
-     Max length: 1000;
+    if holidayFlag is set to false, system will clear out or ignore the values of holidayAvailableType, holidayCarryoverAllowedFlag, holidayCarryoverLimit
     """
-    service_board_legacy_callback_flag: bool | None = Field(
-        default=None, alias='serviceBoardLegacyCallbackFlag'
+    holiday_available_type: Literal['AnniversaryYear', 'CalendarYear'] | None = Field(
+        default=None, alias='holidayAvailableType'
     )
-    time_entry_api_flag: bool | None = Field(default=None, alias='timeEntryApiFlag')
+    holiday_carryover_allowed_flag: bool | None = Field(
+        default=None, alias='holidayCarryoverAllowedFlag'
+    )
+    holiday_carryover_limit: float | None = Field(
+        default=None, alias='holidayCarryoverLimit'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class TimeAccrualReference(ActivityReference):
+    pass
+
+
+class TimeEntryAudit(ConnectWiseModel):
+    id: int | None = None
     member: MemberReference | None = None
-    time_entry_callback_url: str | None = Field(
-        default=None, alias='timeEntryCallbackUrl'
+    source: Literal[
+        'None',
+        'Member',
+        'API',
+        'Workflow',
+        'Portal',
+        'Mobile',
+        'Network',
+        'EmailConnector',
+        'MassMaintenance',
+        'Application',
+        'SystemAPI',
+        'Conversion',
+    ] | None = None
+    type: Literal[
+        'Activity',
+        'CloseDate',
+        'Company',
+        'Contact',
+        'Conversion',
+        'Document',
+        'Forecast',
+        'Note',
+        'Notes',
+        'Opportunity',
+        'Products',
+        'Stage',
+        'Status',
+        'Surveys',
+        'Team',
+        'Tracks',
+        'Configuration',
+        'ConfigurationQuestions',
+        'DeviceBackupDetails',
+        'Tickets',
+        'Subject',
+        'ActivityOverview',
+        'Schedule',
+        'Resources',
+        'ExpenseEntry',
+        'Member',
+        'Date',
+        'Classification',
+        'Amount',
+        'ExpenseType',
+        'WorkType',
+        'WorkRole',
+        'Mileage',
+        'Billing',
+        'ExpenseHeader',
+        'Project',
+        'TimeEntry',
+        'TicketStatus',
+        'DateTime',
+        'DeductHours',
+        'ActualHours',
+        'Invoice',
+        'CompanyFinance',
+        'Billable',
+        'SalesOrder',
+        'Shipping',
+        'Profile',
+        'Group',
+        'GroupContact',
+        'GroupCompany',
+        'Options',
+        'Site',
+        'Agreement',
+        'Addition',
+        'Adjustment',
+        'Microsoft365',
+        'API',
+        'ProjectFinance',
+        'CompanyProfile',
+        'CompanyTeam',
+        'CompanyMgmt',
+        'InvoiceTotal',
+        'BillingInformation',
+        'ShippingInformation',
+        'BillingStatus',
+        'Location',
+        'Department',
+        'Territory',
+        'Payment',
+        'Credit',
+        'SubcontractorInformation',
+        'InvoicingParameters',
+        'ApplicationParameters',
+        'Finance',
+        'Invoicing',
+        'Email',
+        'Batching',
+        'KnowledgeBase',
+        'KbArticle',
+        'KnowledgeBaseApproval',
+        'KnowledgeBaseTicket',
+        'ManageNetwork',
+        'Tasks',
+        'CustomField',
+        'ScreenConnect',
+        'SLA',
+        'Ticket',
+        'Workflow',
+        'Record',
+        'CombinedTickets',
+        'Template',
+        'PurchaseOrder',
+        'Meeting',
+        'RmaOverview',
+        'ReturnedBy',
+        'PurchasedFromVendor',
+        'WarrantyVendor',
+        'RepairVendor',
+        'AdditionalDetails',
+        'TicketTemplate',
+        'AutoGeneration',
+        'TimeInternalNote',
+        'TimeDiscussion',
+        'TimeInternal',
+        'TimeResolution',
+        'MemberTemplate',
+        'Delegation',
+        'Skill',
+        'Certification',
+        'Accrual',
+        'ApiKey',
+        'Login',
+        'Notifications',
+        'System',
+        'ServiceBoard',
+        'ProjectBoard',
+        'Scheduling',
+        'TimeBillingExpense',
+        'CRM',
+        'Procurement',
+        'JobRole',
+        'Details',
+        'Authentication',
+    ] | None = None
+    message: str | None = None
+    old_value: str | None = Field(default=None, alias='oldValue')
+    new_value: str | None = Field(default=None, alias='newValue')
+    value: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class TimeEntryReference(CalendarSetupReference):
+    pass
+
+
+class TimeExpense(ConnectWiseModel):
+    id: int | None = None
+    tier1_approval_flag: bool | None = Field(default=None, alias='tier1ApprovalFlag')
+    tier2_approval_flag: bool | None = Field(default=None, alias='tier2ApprovalFlag')
+    disable_time_entry_flag: bool | None = Field(
+        default=None, alias='disableTimeEntryFlag'
     )
-    """
-     Max length: 1000;
-    """
-    time_entry_legacy_callback_flag: bool | None = Field(
-        default=None, alias='timeEntryLegacyCallbackFlag'
+    require_time_note_flag: bool | None = Field(
+        default=None, alias='requireTimeNoteFlag'
     )
-    managed_services_api_flag: bool | None = Field(
-        default=None, alias='managedServicesApiFlag'
+    require_expense_note_flag: bool | None = Field(
+        default=None, alias='requireExpenseNoteFlag'
     )
-    managed_services_auto_child_flag: bool | None = Field(
-        default=None, alias='managedServicesAutoChildFlag'
+    rounding_factor: float | None = Field(default=None, alias='roundingFactor')
+    invoice_start: int | None = Field(default=None, alias='invoiceStart')
+    default_special_invoice_type: Literal[
+        'Agreement',
+        'CreditMemo',
+        'DownPayment',
+        'Miscellaneous',
+        'Progress',
+        'Standard',
+    ] | None = Field(default=None, alias='defaultSpecialInvoiceType')
+    internal_company: CompanyReference | None = Field(
+        default=None, alias='internalCompany'
     )
-    managed_services_childing_flag: bool | None = Field(
-        default=None, alias='managedServicesChildingFlag'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class TimePeriodSetup(ConnectWiseModel):
+    id: int | None = None
+    period_apply_to: Literal['Both', 'Expense', 'Time'] = Field(
+        ..., alias='periodApplyTo'
     )
+    year: int
+    number_future_periods: int = Field(..., alias='numberFuturePeriods')
+    type: Literal['Weekly', 'BiWeekly', 'SemiMonthly', 'Monthly']
+    description: str | None = None
     """
-    True if integrator is allowed to child configurations.
+     Max length: 100;
     """
-    contact_api_flag: bool | None = Field(default=None, alias='contactApiFlag')
-    contact_callback_url: str | None = Field(default=None, alias='contactCallbackUrl')
+    first_period_end_date: date = Field(..., alias='firstPeriodEndDate')
+    monthly_period_ends: int | None = Field(default=None, alias='monthlyPeriodEnds')
     """
-     Max length: 1000;
+    Only needed when type is monthly
     """
-    contact_legacy_callback_flag: bool | None = Field(
-        default=None, alias='contactLegacyCallbackFlag'
-    )
-    company_api_flag: bool | None = Field(default=None, alias='companyApiFlag')
-    company_callback_url: str | None = Field(default=None, alias='companyCallbackUrl')
-    """
-     Max length: 1000;
-    """
-    company_legacy_callback_flag: bool | None = Field(
-        default=None, alias='companyLegacyCallbackFlag'
-    )
-    activity_api_flag: bool | None = Field(default=None, alias='activityApiFlag')
-    activity_callback_url: str | None = Field(default=None, alias='activityCallbackUrl')
-    """
-     Max length: 1000;
-    """
-    activity_legacy_callback_flag: bool | None = Field(
-        default=None, alias='activityLegacyCallbackFlag'
-    )
-    invoice_api_flag: bool | None = Field(default=None, alias='invoiceApiFlag')
-    product_api_flag: bool | None = Field(default=None, alias='productApiFlag')
-    product_callback_url: str | None = Field(default=None, alias='productCallbackUrl')
-    """
-     Max length: 1000;
-    """
-    product_legacy_callback_flag: bool | None = Field(
-        default=None, alias='productLegacyCallbackFlag'
-    )
-    opportunity_api_flag: bool | None = Field(default=None, alias='opportunityApiFlag')
-    opportunity_callback_url: str | None = Field(
-        default=None, alias='opportunityCallbackUrl'
-    )
-    """
-     Max length: 1000;
-    """
-    opportunity_legacy_callback_flag: bool | None = Field(
-        default=None, alias='opportunityLegacyCallbackFlag'
-    )
-    opportunity_conversion_api_flag: bool | None = Field(
-        default=None, alias='opportunityConversionApiFlag'
+    semi_monthly_first_period: int | None = Field(
+        default=None, alias='semiMonthlyFirstPeriod'
     )
     """
-    True if the member has access to the Opportunity Conversion Api.
+    Only needed when type is semi-monthly
     """
-    member_api_flag: bool | None = Field(default=None, alias='memberApiFlag')
-    marketing_api_flag: bool | None = Field(default=None, alias='marketingApiFlag')
-    purchasing_api_flag: bool | None = Field(default=None, alias='purchasingApiFlag')
-    purchasing_callback_url: str | None = Field(
-        default=None, alias='purchasingCallbackUrl'
+    semi_monthly_second_period: int | None = Field(
+        default=None, alias='semiMonthlySecondPeriod'
     )
     """
-     Max length: 1000;
+    Only needed when type is semi-monthly
     """
-    purchasing_legacy_callback_flag: bool | None = Field(
-        default=None, alias='purchasingLegacyCallbackFlag'
+    semi_monthly_last_day_flag: bool | None = Field(
+        default=None, alias='semiMonthlyLastDayFlag'
     )
-    reporting_api_flag: bool | None = Field(default=None, alias='reportingApiFlag')
-    system_api_flag: bool | None = Field(default=None, alias='systemApiFlag')
-    project_api_flag: bool | None = Field(default=None, alias='projectApiFlag')
-    project_callback_url: str | None = Field(default=None, alias='projectCallbackUrl')
+    last_day_flag: bool | None = Field(default=None, alias='lastDayFlag')
     """
-     Max length: 1000;
+    Only needed when type is monthly
     """
-    project_legacy_callback_flag: bool | None = Field(
-        default=None, alias='projectLegacyCallbackFlag'
-    )
-    configuration_api_flag: bool | None = Field(
-        default=None, alias='configurationApiFlag'
-    )
-    configuration_auto_child_flag: bool | None = Field(
-        default=None, alias='configurationAutoChildFlag'
-    )
-    configuration_childling_flag: bool | None = Field(
-        default=None, alias='configurationChildlingFlag'
-    )
+    days_past_end_date: int = Field(..., alias='daysPastEndDate')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class TimePeriodSetupDefaults(GLExportSettings):
+    pass
+
+
+class TimePeriodSetupReference(CalendarSetupReference):
+    pass
+
+
+class TimeRevenueReference(AgreementRevenueReference):
+    pass
+
+
+class TimeSheet(ConnectWiseModel):
+    id: int | None = None
+    member: MemberReference | None = None
+    year: int | None = None
+    period: int | None = None
+    date_start: str | None = Field(default=None, alias='dateStart')
+    date_end: str | None = Field(default=None, alias='dateEnd')
+    status: Literal[
+        'Open',
+        'Rejected',
+        'PendingApproval',
+        'ErrorsCorrected',
+        'PendingProjectApproval',
+        'ApprovedByTierOne',
+        'RejectBySecondTier',
+        'ApprovedByTierTwo',
+        'ReadyToBill',
+        'Billed',
+        'WrittenOff',
+        'BilledAgreement',
+    ] | None = None
+    hours: float | None = None
+    deadline: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class TimeSheetAudit(TimeEntryAudit):
+    pass
+
+
+class TimeSheetReference(ActivityReference):
+    pass
+
+
+class TimeSheetTierUpdate(ExpenseReportTierUpdate):
+    pass
+
+
+class TimeZoneReference(ActivityReference):
+    pass
+
+
+class TimeZoneSetup(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-    True if integrator is allowed to child configurations.
+     Max length: 50;
     """
-    configuration_callback_url: str | None = Field(
-        default=None, alias='configurationCallbackUrl'
-    )
+    time_zone: TimeZoneReference | None = Field(default=None, alias='timeZone')
+    offset: float | None = None
     """
-     Max length: 1000;
+    The hours offset from UTC (+/-)
     """
-    configuration_legacy_callback_flag: bool | None = Field(
-        default=None, alias='configurationLegacyCallbackFlag'
-    )
-    schedule_api_flag: bool | None = Field(default=None, alias='scheduleApiFlag')
-    schedule_callback_url: str | None = Field(default=None, alias='scheduleCallbackUrl')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
     """
-     Max length: 1000;
+    Identifies the default system time zone setup
     """
-    schedule_legacy_callback_flag: bool | None = Field(
-        default=None, alias='scheduleLegacyCallbackFlag'
-    )
-    agreement_api_flag: bool | None = Field(default=None, alias='agreementApiFlag')
-    agreement_callback_url: str | None = Field(
-        default=None, alias='agreementCallbackUrl'
+    daylight_savings_flag: bool | None = Field(
+        default=None, alias='daylightSavingsFlag'
     )
     """
-     Max length: 1000;
+    Determined based on system library value for specified timeZone.
+                Not able to be used in query params at this time
     """
-    agreement_callback_legacy_flag: bool | None = Field(
-        default=None, alias='agreementCallbackLegacyFlag'
-    )
-    document_api_flag: bool | None = Field(default=None, alias='documentApiFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class IntegratorLoginReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TimeZoneSetupInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    offset: float | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class IntegratorTag(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TimeZoneSetupReference(ActivityReference):
+    pass
+
+
+class TodayPageCategory(ConnectWiseModel):
     id: int | None = None
-    text: str
+    name: str
     """
-     Max length: 50;
+     Max length: 30;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    sort_order: int = Field(..., alias='sortOrder')
+    location: SystemLocationReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class IntegratorTagCollection(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    tags: list[str] | None = None
+class Token(ConnectWiseModel):
+    public_key: str | None = Field(default=None, alias='publicKey')
+    private_key: str | None = Field(default=None, alias='privateKey')
+    expiration: str | None = None
 
 
-class InternalAnalysisSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
+class Track(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 100;
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    notify_action_ids: list[int] | None = Field(default=None, alias='notifyActionIds')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class InternalAnalysisSort(Enum):
-    ASCENDING = 'Ascending'
-    DESCENDING = 'Descending'
+class TrackReference(ActivityReference):
+    pass
 
 
-class InventoryOnHand(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TypeSubTypeCampaignSubType(ConnectWiseModel):
     id: int | None = None
-    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
-    )
-    on_hand: int | None = Field(default=None, alias='onHand')
-    serial_numbers: list[OnHandSerialNumberReference] | None = Field(
-        default=None, alias='serialNumbers'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    type_id: int | None = Field(default=None, alias='typeId')
+    name: str | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Invoice(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class UnitOfMeasure(ConnectWiseModel):
     id: int | None = None
-    invoice_number: str | None = Field(default=None, alias='invoiceNumber')
+    name: str
     """
-     Max length: 15; Required On Updates;
+     Max length: 50;
     """
-    type: Type6
-    status: BillingStatusReference | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
+    """
+     Max length: 31;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class UnitOfMeasureReference(ActivityReference):
+    pass
+
+
+class UnpostedExpense(ConnectWiseModel):
+    id: int | None = None
+    location_id: int | None = Field(default=None, alias='locationId')
+    department_id: int | None = Field(default=None, alias='departmentId')
     company: CompanyReference | None = None
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    credit_account: str | None = Field(default=None, alias='creditAccount')
+    expense_detail_id: int | None = Field(default=None, alias='expenseDetailId')
+    expense_type: ExpenseTypeReference | None = Field(default=None, alias='expenseType')
+    classification: Literal['NonReimbursable', 'Reimbursable', 'Personal'] | None = None
+    gl_type: Literal[
+        'AP',
+        'AR',
+        'EE',
+        'EI',
+        'EO',
+        'IA',
+        'IT',
+        'P',
+        'PF',
+        'R',
+        'RA',
+        'RD',
+        'RE',
+        'RP',
+        'ST',
+        'SD',
+        'ET',
+        'FT',
+        'PT',
+        'WP',
+        'WR',
+    ] | None = Field(default=None, alias='glType')
+    member: MemberReference | None = None
+    date_expense: str | None = Field(default=None, alias='dateExpense')
+    charge_code: ChargeCodeReference | None = Field(default=None, alias='chargeCode')
+    charge_description: str | None = Field(default=None, alias='chargeDescription')
+    in_policy: bool | None = Field(default=None, alias='inPolicy')
+    payment_method: PaymentMethodReference | None = Field(
+        default=None, alias='paymentMethod'
     )
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
+    currency: CurrencyReference | None = None
+    total: float | None = None
+    billable_amount: float | None = Field(default=None, alias='billableAmount')
+    non_billable_amount: float | None = Field(default=None, alias='nonBillableAmount')
+    agreement: AgreementReference | None = None
+    agreement_amount_covered: float | None = Field(
+        default=None, alias='agreementAmountCovered'
     )
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    apply_to_type: ApplyToType | None = Field(default=None, alias='applyToType')
-    apply_to_id: int | None = Field(default=None, alias='applyToId')
-    attention: str | None = None
+    ticket: TicketReference | None = None
+    project: ProjectReference | None = None
+    project_phase: ProjectPhaseReference | None = Field(
+        default=None, alias='projectPhase'
+    )
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    avalara_tax_flag: bool | None = Field(default=None, alias='avalaraTaxFlag')
     """
-     Max length: 60;
+    Used to determine if Avalara tax is enabled.
     """
-    ship_to_attention: str | None = Field(default=None, alias='shipToAttention')
+    item_taxable_flag: bool | None = Field(default=None, alias='itemTaxableFlag')
+    sales_tax_amount: float | None = Field(default=None, alias='salesTaxAmount')
+    state_tax_flag: bool | None = Field(default=None, alias='stateTaxFlag')
     """
-     Max length: 60;
+    Set to true if transaction is taxable at the state level.
     """
-    billing_site: SiteReference | None = Field(default=None, alias='billingSite')
-    billing_site_address_line1: str | None = Field(
-        default=None, alias='billingSiteAddressLine1'
-    )
-    billing_site_address_line2: str | None = Field(
-        default=None, alias='billingSiteAddressLine2'
-    )
-    billing_site_city: str | None = Field(default=None, alias='billingSiteCity')
-    billing_site_state: str | None = Field(default=None, alias='billingSiteState')
-    billing_site_zip: str | None = Field(default=None, alias='billingSiteZip')
-    billing_site_country: str | None = Field(default=None, alias='billingSiteCountry')
-    shipping_site: SiteReference | None = Field(default=None, alias='shippingSite')
-    shipping_site_address_line1: str | None = Field(
-        default=None, alias='shippingSiteAddressLine1'
-    )
-    shipping_site_address_line2: str | None = Field(
-        default=None, alias='shippingSiteAddressLine2'
-    )
-    shipping_site_city: str | None = Field(default=None, alias='shippingSiteCity')
-    shipping_site_state: str | None = Field(default=None, alias='shippingSiteState')
-    shipping_site_zip: str | None = Field(default=None, alias='shippingSiteZip')
-    shipping_site_country: str | None = Field(default=None, alias='shippingSiteCountry')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
-    )
-    reference: str | None = None
+    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
+    state_tax_amount: float | None = Field(default=None, alias='stateTaxAmount')
+    county_tax_flag: bool | None = Field(default=None, alias='countyTaxFlag')
     """
-     Max length: 50;
+    Set to true if transaction is taxable at the county level.
     """
-    customer_po: str | None = Field(default=None, alias='customerPO')
+    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
+    county_tax_amount: float | None = Field(default=None, alias='countyTaxAmount')
+    city_tax_flag: bool | None = Field(default=None, alias='cityTaxFlag')
     """
-     Max length: 50;
+    Set to true if transaction is taxable at the city level.
     """
-    template_setup_id: int | None = Field(default=None, alias='templateSetupId')
+    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
+    city_tax_amount: float | None = Field(default=None, alias='cityTaxAmount')
+    country_tax_flag: bool | None = Field(default=None, alias='countryTaxFlag')
     """
-    Can be obtained via InvoiceTemplate report.
+    Set to true if transaction is taxable at the country level.
     """
-    invoice_template: InvoiceTemplateDetailReference | None = Field(
-        default=None, alias='invoiceTemplate'
-    )
-    email_template_id: int | None = Field(default=None, alias='emailTemplateId')
+    country_tax_xref: str | None = Field(default=None, alias='countryTaxXref')
+    country_tax_amount: float | None = Field(default=None, alias='countryTaxAmount')
+    composite_tax_flag: bool | None = Field(default=None, alias='compositeTaxFlag')
     """
-    Can be obtained via InvoiceEmailTemplate report.
+    Set to true if transaction is taxable at the composite level.
     """
-    add_to_batch_email_list: bool | None = Field(
-        default=None, alias='addToBatchEmailList'
-    )
-    date: datetime | None = None
-    restrict_downpayment_flag: bool | None = Field(
-        default=None, alias='restrictDownpaymentFlag'
-    )
-    location_id: int | None = Field(default=None, alias='locationId')
+    composite_tax_xref: str | None = Field(default=None, alias='compositeTaxXref')
+    composite_tax_amount: float | None = Field(default=None, alias='compositeTaxAmount')
+    level_six_tax_flag: bool | None = Field(default=None, alias='levelSixTaxFlag')
     """
-     Required On Updates;
+    Set to true if transaction is taxable at level six.
     """
+    level_six_tax_xref: str | None = Field(default=None, alias='levelSixTaxXref')
+    level_six_tax_amount: float | None = Field(default=None, alias='levelSixTaxAmount')
+    date_closed: str | None = Field(default=None, alias='dateClosed')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class UnpostedExpenseTaxableLevel(ConnectWiseModel):
+    id: int | None = None
+    tax_level: int | None = Field(default=None, alias='taxLevel')
+    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
+    tax_amount: float | None = Field(default=None, alias='taxAmount')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class UnpostedInvoice(ConnectWiseModel):
+    id: int | None = None
+    billing_log_id: int | None = Field(default=None, alias='billingLogId')
+    location_id: int | None = Field(default=None, alias='locationId')
     department_id: int | None = Field(default=None, alias='departmentId')
-    """
-    departmentId is only required for special invoices.
-    """
-    territory_id: int | None = Field(default=None, alias='territoryId')
-    top_comment: str | None = Field(default=None, alias='topComment')
-    bottom_comment: str | None = Field(default=None, alias='bottomComment')
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    downpayment_previously_taxed_flag: bool | None = Field(
-        default=None, alias='downpaymentPreviouslyTaxedFlag'
-    )
-    service_total: float | None = Field(default=None, alias='serviceTotal')
-    override_down_payment_amount_flag: bool | None = Field(
-        default=None, alias='overrideDownPaymentAmountFlag'
+    company: CompanyReference | None = None
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    currency: CurrencyReference | None = None
-    due_date: datetime | None = Field(default=None, alias='dueDate')
-    expense_total: float | None = Field(default=None, alias='expenseTotal')
-    product_total: float | None = Field(default=None, alias='productTotal')
-    previous_progress_applied: float | None = Field(
-        default=None, alias='previousProgressApplied'
+    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
     )
-    service_adjustment_amount: float | None = Field(
-        default=None, alias='serviceAdjustmentAmount'
+    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
+    invoice_number: str | None = Field(default=None, alias='invoiceNumber')
+    invoice_date: str | None = Field(default=None, alias='invoiceDate')
+    invoice_type: Literal[
+        'Agreement',
+        'CreditMemo',
+        'DownPayment',
+        'Miscellaneous',
+        'Progress',
+        'Standard',
+    ] | None = Field(default=None, alias='invoiceType')
+    description: str | None = None
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
-    downpayment_applied: float | None = Field(default=None, alias='downpaymentApplied')
-    subtotal: float | None = None
+    due_days: str | None = Field(default=None, alias='dueDays')
+    due_date: str | None = Field(default=None, alias='dueDate')
+    currency: CurrencyReference | None = None
+    sub_total: float | None = Field(default=None, alias='subTotal')
     total: float | None = None
-    remaining_downpayment: float | None = Field(
-        default=None, alias='remainingDownpayment'
-    )
-    sales_tax: float | None = Field(default=None, alias='salesTax')
-    adjustment_reason: str | None = Field(default=None, alias='adjustmentReason')
-    adjusted_by: str | None = Field(default=None, alias='adjustedBy')
-    payments: float | None = None
-    credits: float | None = None
-    balance: float | None = None
-    special_invoice_flag: bool | None = Field(default=None, alias='specialInvoiceFlag')
-    billing_setup_reference: BillingSetupReference | None = Field(
-        default=None, alias='billingSetupReference'
-    )
-    ticket: TicketReference | None = None
-    project: ProjectReference | None = None
-    phase: ProjectPhaseReference | None = None
-    sales_order: SalesOrderReference | None = Field(default=None, alias='salesOrder')
-    agreement: AgreementReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
-
-
-class InvoiceEmailTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
+    invoice_taxable_flag: bool | None = Field(default=None, alias='invoiceTaxableFlag')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    avalara_tax_flag: bool | None = Field(default=None, alias='avalaraTaxFlag')
     """
-     Max length: 50;
+    Used to determine if Avalara tax is enabled.
     """
-    service_survey: ServiceSurveyReference | None = Field(
-        default=None, alias='serviceSurvey'
-    )
-    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
-    first_name: str | None = Field(default=None, alias='firstName')
+    item_taxable_flag: bool | None = Field(default=None, alias='itemTaxableFlag')
+    sales_tax_amount: float | None = Field(default=None, alias='salesTaxAmount')
+    state_tax_flag: bool | None = Field(default=None, alias='stateTaxFlag')
     """
-    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
+    Set to true if transaction is taxable at the state level.
     """
-    last_name: str | None = Field(default=None, alias='lastName')
+    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
+    state_tax_amount: float | None = Field(default=None, alias='stateTaxAmount')
+    county_tax_flag: bool | None = Field(default=None, alias='countyTaxFlag')
     """
-    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
+    Set to true if transaction is taxable at the county level.
     """
-    email_address: str | None = Field(default=None, alias='emailAddress')
+    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
+    county_tax_amount: float | None = Field(default=None, alias='countyTaxAmount')
+    city_tax_flag: bool | None = Field(default=None, alias='cityTaxFlag')
     """
-    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
+    Set to true if transaction is taxable at the city level.
     """
-    subject: str
+    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
+    city_tax_amount: float | None = Field(default=None, alias='cityTaxAmount')
+    country_tax_flag: bool | None = Field(default=None, alias='countryTaxFlag')
     """
-     Max length: 200;
+    Set to true if transaction is taxable at the country level.
     """
-    body: str | None = None
-    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
-    invoice_status: BillingStatusReference | None = Field(
-        default=None, alias='invoiceStatus'
-    )
-    attach_invoice_flag: bool | None = Field(default=None, alias='attachInvoiceFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class InvoiceEmailTemplateInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    country_tax_xref: str | None = Field(default=None, alias='countryTaxXref')
+    country_tax_amount: float | None = Field(default=None, alias='countryTaxAmount')
+    composite_tax_flag: bool | None = Field(default=None, alias='compositeTaxFlag')
+    """
+    Set to true if transaction is taxable at the composite level.
+    """
+    composite_tax_xref: str | None = Field(default=None, alias='compositeTaxXref')
+    composite_tax_amount: float | None = Field(default=None, alias='compositeTaxAmount')
+    level_six_tax_flag: bool | None = Field(default=None, alias='levelSixTaxFlag')
+    """
+    Set to true if transaction is taxable at level six.
+    """
+    level_six_tax_xref: str | None = Field(default=None, alias='levelSixTaxXref')
+    level_six_tax_amount: float | None = Field(default=None, alias='levelSixTaxAmount')
+    created_by: str | None = Field(default=None, alias='createdBy')
+    date_closed: str | None = Field(default=None, alias='dateClosed')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class InvoiceFormat(Enum):
-    DEFAULT = 'Default'
-    CONDENSED = 'Condensed'
-    DETAILED = 'Detailed'
+class UnpostedInvoiceTaxableLevel(UnpostedExpenseTaxableLevel):
+    pass
 
 
-class InvoiceGroupingReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class UnpostedProcurement(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
     description: str | None = None
-    show_price_flag: bool | None = Field(default=None, alias='showPriceFlag')
-    show_sub_items_flag: bool | None = Field(default=None, alias='showSubItemsFlag')
-    group_parent_child_additions_flag: bool | None = Field(
-        default=None, alias='groupParentChildAdditionsFlag'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class InvoiceInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    invoice: Invoice | None = None
-    invoice_template: InvoiceTemplate | None = Field(
-        default=None, alias='invoiceTemplate'
-    )
-    products: list[ProductItem] | None = None
-    bundled_components_info: list[ProductComponent] | None = Field(
-        default=None, alias='bundledComponentsInfo'
+    unposted_product_id: str | None = Field(default=None, alias='unpostedProductId')
+    location_id: int | None = Field(default=None, alias='locationId')
+    department_id: int | None = Field(default=None, alias='departmentId')
+    procurement_type: Literal['Purchase', 'Adjustment', 'Transfer'] | None = Field(
+        default=None, alias='procurementType'
     )
-    expenses: list[ExpenseEntry] | None = None
-    time_entries: list[TimeEntry] | None = Field(default=None, alias='timeEntries')
-    logo: DocumentInfo | None = None
-    billing_setup: BillingSetup | None = Field(default=None, alias='billingSetup')
-    agreement_billing_info: list[AgreementBillingInfo] | None = Field(
-        default=None, alias='agreementBillingInfo'
+    purchase_order: PurchaseOrderReference | None = Field(
+        default=None, alias='purchaseOrder'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class InvoiceMarkupOption(Enum):
-    AMOUNT = 'Amount'
-    MILE = 'Mile'
-    PERCENT = 'Percent'
-
-
-class InvoiceOption(Enum):
-    ALL_INVOICES = 'AllInvoices'
-    PAID_INVOICES = 'PaidInvoices'
-
-
-class InvoicePayment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    purchase_date: str | None = Field(default=None, alias='purchaseDate')
+    tracking_number: str | None = Field(default=None, alias='trackingNumber')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    id: int | None = None
-    type: str | None = None
-    source: Source2 | None = None
-    invoice: InvoiceReference | None = None
-    credit: InvoiceReference | None = None
-    amount: float | None = None
-    payment_date: datetime | None = Field(default=None, alias='paymentDate')
-    applied_by: str | None = Field(default=None, alias='appliedBy')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    wise_pay_payment: WisePayPayment | None = Field(
-        default=None, alias='wisePayPayment'
+    currency: CurrencyReference | None = None
+    total: float | None = None
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    avalara_tax_flag: bool | None = Field(default=None, alias='avalaraTaxFlag')
+    """
+    Used to determine if Avalara tax is enabled.
+    """
+    item_taxable_flag: bool | None = Field(default=None, alias='itemTaxableFlag')
+    purchase_order_taxable_flag: bool | None = Field(
+        default=None, alias='purchaseOrderTaxableFlag'
     )
-    payment_sync_status: str | None = Field(default=None, alias='paymentSyncStatus')
-    payment_sync_date: str | None = Field(default=None, alias='paymentSyncDate')
-    payment_account: str | None = Field(default=None, alias='paymentAccount')
-    a_r_payment_account: str | None = Field(default=None, alias='aRPaymentAccount')
-
+    state_tax_flag: bool | None = Field(default=None, alias='stateTaxFlag')
+    """
+    Set to true if transaction is taxable at the state level.
+    """
+    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
+    state_tax_amount: float | None = Field(default=None, alias='stateTaxAmount')
+    county_tax_flag: bool | None = Field(default=None, alias='countyTaxFlag')
+    """
+    Set to true if transaction is taxable at the county level.
+    """
+    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
+    county_tax_amount: float | None = Field(default=None, alias='countyTaxAmount')
+    city_tax_flag: bool | None = Field(default=None, alias='cityTaxFlag')
+    """
+    Set to true if transaction is taxable at the city level.
+    """
+    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
+    city_tax_amount: float | None = Field(default=None, alias='cityTaxAmount')
+    country_tax_flag: bool | None = Field(default=None, alias='countryTaxFlag')
+    """
+    Set to true if transaction is taxable at the country level.
+    """
+    country_tax_xref: str | None = Field(default=None, alias='countryTaxXref')
+    country_tax_amount: float | None = Field(default=None, alias='countryTaxAmount')
+    composite_tax_flag: bool | None = Field(default=None, alias='compositeTaxFlag')
+    """
+    Set to true if transaction is taxable at the composite level.
+    """
+    composite_tax_xref: str | None = Field(default=None, alias='compositeTaxXref')
+    composite_tax_amount: float | None = Field(default=None, alias='compositeTaxAmount')
+    level_six_tax_flag: bool | None = Field(default=None, alias='levelSixTaxFlag')
+    """
+    Set to true if transaction is taxable at level six.
+    """
+    level_six_tax_xref: str | None = Field(default=None, alias='levelSixTaxXref')
+    level_six_tax_amount: float | None = Field(default=None, alias='levelSixTaxAmount')
+    tax_total: float | None = Field(default=None, alias='taxTotal')
+    customer: CompanyReference | None = None
+    vendor: CompanyReference | None = None
+    vendor_account_number: str | None = Field(default=None, alias='vendorAccountNumber')
+    vendor_invoice_number: str | None = Field(default=None, alias='vendorInvoiceNumber')
+    vendor_invoice_date: str | None = Field(default=None, alias='vendorInvoiceDate')
+    tax_freight_flag: bool | None = Field(default=None, alias='taxFreightFlag')
+    freight_tax_total: float | None = Field(default=None, alias='freightTaxTotal')
+    freight_cost: float | None = Field(default=None, alias='freightCost')
+    date_closed: str | None = Field(default=None, alias='dateClosed')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
-class InvoiceReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+
+class UnpostedProcurementTaxableLevel(UnpostedExpenseTaxableLevel):
+    pass
+
+
+class Usage(ConnectWiseModel):
+    type: str | None = None
+    count: int | None = None
     id: int | None = None
-    identifier: str | None = None
-    billing_type: str | None = Field(default=None, alias='billingType')
-    apply_to_type: str | None = Field(default=None, alias='applyToType')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    description: str | None = None
+    hyperlink: str | None = None
+    type_key: str | None = Field(default=None, alias='typeKey')
 
 
-class InvoiceRule(Enum):
-    ALL = 'All'
-    STANDARD = 'Standard'
-    PROJECT = 'Project'
-    AGREEMENT = 'Agreement'
+class UserDefinedFieldOption(ConnectWiseModel):
+    id: int | None = None
+    option_value: str | None = Field(default=None, alias='optionValue')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
 
 
-class InvoiceScreenDefaultTabFormat(Enum):
-    SHOW_INVOICING_TAB = 'ShowInvoicingTab'
-    SHOW_AGREEMENT_INVOICING_TAB = 'ShowAgreementInvoicingTab'
+class UserDefinedFieldReference(ActivityReference):
+    pass
 
 
-class InvoiceTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class UserDefinedFieldValueModel(ConnectWiseModel):
+    user_defined_field_rec_id: int | None = Field(
+        default=None, alias='userDefinedFieldRecId'
+    )
+    value: str | None = None
+    row_num: int | None = Field(default=None, alias='rowNum')
+    skip_location_and_billing_unit: bool | None = Field(
+        default=None, alias='skipLocationAndBillingUnit'
     )
+    filtered: bool | None = None
+
+
+class ValidatePortalRequest(ConnectWiseModel):
+    email: str
+    password: str
+
+
+class ValidatePortalResponse(ConnectWiseModel):
+    success: bool | None = None
+    contact_id: int | None = Field(default=None, alias='contactId')
+
+
+class ValidationError(ConnectWiseModel):
+    code: str | None = None
+    message: str | None = None
+    resource: str | None = None
+    field: str | None = None
+    details: str | None = None
+
+
+class Warehouse(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 50;
     """
-    margin_left: float | None = Field(default=None, alias='marginLeft')
-    margin_right: float | None = Field(default=None, alias='marginRight')
-    margin_top: float | None = Field(default=None, alias='marginTop')
-    margin_bottom: float | None = Field(default=None, alias='marginBottom')
-    logo_visible_flag: bool | None = Field(default=None, alias='logoVisibleFlag')
-    header_logo_position: HeaderLogoPosition | None = Field(
-        default=None, alias='headerLogoPosition'
-    )
-    remit_to_visible_flag: bool | None = Field(default=None, alias='remitToVisibleFlag')
-    header_address_position: HeaderAddressPosition | None = Field(
-        default=None, alias='headerAddressPosition'
-    )
-    header_title_visible_flag: bool | None = Field(
-        default=None, alias='headerTitleVisibleFlag'
-    )
-    header_title_caption: str | None = Field(default=None, alias='headerTitleCaption')
+    company: CompanyReference | None = None
+    location: SystemLocationReference | None = None
+    contact: ContactReference | None = None
+    department: SystemDepartmentReference | None = None
+    manager: MemberReference | None = None
+    site: SiteReference | None = None
+    location_xref: str | None = Field(default=None, alias='locationXref')
     """
-     Max length: 50;
+     Max length: 10;
     """
-    header_title_position: HeaderTitlePosition | None = Field(
-        default=None, alias='headerTitlePosition'
-    )
-    header_title_font: HeaderTitleFont | None = Field(
-        default=None, alias='headerTitleFont'
+    location_default_flag: bool | None = Field(
+        default=None, alias='locationDefaultFlag'
     )
-    header_terms_visible_flag: bool | None = Field(
-        default=None, alias='headerTermsVisibleFlag'
+    overall_default_flag: bool | None = Field(default=None, alias='overallDefaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    locked_flag: bool | None = Field(default=None, alias='lockedFlag')
+    currency: CurrencyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WarehouseBinReference(ActivityReference):
+    pass
+
+
+class WarehouseInfo(CategoryInfo):
+    pass
+
+
+class WarehouseReference(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    locked_flag: bool | None = Field(default=None, alias='lockedFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WisePayBatchPayment(ConnectWiseModel):
+    amount: float | None = None
+    wise_pay_href: str | None = Field(default=None, alias='wisePayHref')
+
+
+class WisePayFeeInvoice(ConnectWiseModel):
+    id: int | None = None
+    invoice_number: str | None = Field(default=None, alias='invoiceNumber')
+    amount: float | None = None
+    invoice_href: str | None = Field(default=None, alias='invoiceHref')
+
+
+class WisePayPayment(ConnectWiseModel):
+    payment_date_utc: str | None = Field(default=None, alias='paymentDateUtc')
+    wise_pay_reference: str | None = Field(default=None, alias='wisePayReference')
+    batch_payment: WisePayBatchPayment | None = Field(
+        default=None, alias='batchPayment'
     )
-    header_terms_caption: str | None = Field(default=None, alias='headerTermsCaption')
-    """
-     Max length: 50;
-    """
-    header_due_date_visible_flag: bool | None = Field(
-        default=None, alias='headerDueDateVisibleFlag'
+    fee_invoice: WisePayFeeInvoice | None = Field(default=None, alias='feeInvoice')
+
+
+class WonRevenueReference(AgreementRevenueReference):
+    pass
+
+
+class WorkflowAction(ConnectWiseModel):
+    id: int | None = None
+    notify_type: NotifyTypeReference = Field(..., alias='notifyType')
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
     )
-    header_due_date_caption: str | None = Field(
-        default=None, alias='headerDueDateCaption'
+    specific_member_to: MemberReference | None = Field(
+        default=None, alias='specificMemberTo'
     )
+    email_recipient: str | None = Field(default=None, alias='emailRecipient')
     """
-     Max length: 50;
+    Required when notifyWho is set to: "Email Address" Max length: 250;
     """
-    header_po_number_visible_flag: bool | None = Field(
-        default=None, alias='headerPoNumberVisibleFlag'
+    notify_from: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyFrom'
     )
-    header_po_number_caption: str | None = Field(
-        default=None, alias='headerPoNumberCaption'
+    specific_member_from: MemberReference | None = Field(
+        default=None, alias='specificMemberFrom'
     )
+    email_from: str | None = Field(default=None, alias='emailFrom')
     """
-     Max length: 50;
+    Required when notifyFrom is set to: "Email Address" Max length: 250;
     """
-    header_reference_visible_flag: bool | None = Field(
-        default=None, alias='headerReferenceVisibleFlag'
-    )
-    header_reference_caption: str | None = Field(
-        default=None, alias='headerReferenceCaption'
-    )
+    cc_contact: ContactReference | None = Field(default=None, alias='ccContact')
+    bcc_contact: ContactReference | None = Field(default=None, alias='bccContact')
+    subject: str | None = None
     """
-     Max length: 50;
+    Required when notifyType is set to: "Create Activity", "Send Email", "Assign Resource" Max length: 100;
     """
-    header_account_visible_flag: bool | None = Field(
-        default=None, alias='headerAccountVisibleFlag'
-    )
-    header_account_caption: str | None = Field(
-        default=None, alias='headerAccountCaption'
+    notes: str | None = None
+    activity_status: ActivityStatusReference | None = Field(
+        default=None, alias='activityStatus'
     )
-    """
-     Max length: 50;
-    """
-    header_tax_id_visible_flag: bool | None = Field(
-        default=None, alias='headerTaxIdVisibleFlag'
+    activity_type: ActivityTypeReference | None = Field(
+        default=None, alias='activityType'
     )
-    header_tax_id_caption: str | None = Field(default=None, alias='headerTaxIdCaption')
-    """
-     Max length: 50;
-    """
-    header_ship_to_visible_flag: bool | None = Field(
-        default=None, alias='headerShipToVisibleFlag'
+    attached_track: TrackReference | None = Field(default=None, alias='attachedTrack')
+    days_to_execute: int | None = Field(default=None, alias='daysToExecute')
+    board: BoardReference | None = None
+    board_status: ServiceStatusReference | None = Field(
+        default=None, alias='boardStatus'
     )
-    header_ship_to_caption: str | None = Field(
-        default=None, alias='headerShipToCaption'
+    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
+    service_sub_type: ServiceSubTypeReference | None = Field(
+        default=None, alias='serviceSubType'
     )
-    """
-     Max length: 50;
-    """
-    header_hours_based_extended_amount_visible_flag: bool | None = Field(
-        default=None, alias='headerHoursBasedExtendedAmountVisibleFlag'
+    service_item: ServiceItemReference | None = Field(default=None, alias='serviceItem')
+    group: GroupReference | None = None
+    service_template: ServiceTemplateReference | None = Field(
+        default=None, alias='serviceTemplate'
     )
-    payable_caption: str | None = Field(default=None, alias='payableCaption')
-    """
-     Max length: 1000;
-    """
-    service_header_ticket_number_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderTicketNumberVisibleFlag'
+    invoice_min_days: int | None = Field(default=None, alias='invoiceMinDays')
+    automate_script: AutomateScriptReference | None = Field(
+        default=None, alias='automateScript'
     )
-    service_header_ticket_number_caption: str | None = Field(
-        default=None, alias='serviceHeaderTicketNumberCaption'
+    script_success_status: ServiceStatusReference | None = Field(
+        default=None, alias='scriptSuccessStatus'
     )
-    """
-     Max length: 50;
-    """
-    service_header_company_name_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderCompanyNameVisibleFlag'
+    script_fail_status: ServiceStatusReference | None = Field(
+        default=None, alias='scriptFailStatus'
     )
-    service_header_company_name_caption: str | None = Field(
-        default=None, alias='serviceHeaderCompanyNameCaption'
+    detail_notes_flag: bool | None = Field(default=None, alias='detailNotesFlag')
+    internal_notes_flag: bool | None = Field(default=None, alias='internalNotesFlag')
+    audit_notes_flag: bool | None = Field(default=None, alias='auditNotesFlag')
+    service_priority: PriorityReference | None = Field(
+        default=None, alias='servicePriority'
     )
-    """
-     Max length: 50;
-    """
-    service_header_summary_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderSummaryVisibleFlag'
+    update_owner_flag: bool | None = Field(default=None, alias='updateOwnerFlag')
+    sales_order_status: OrderStatusReference | None = Field(
+        default=None, alias='salesOrderStatus'
     )
-    service_header_summary_caption: str | None = Field(
-        default=None, alias='serviceHeaderSummaryCaption'
+    project_status: ProjectStatusReference | None = Field(
+        default=None, alias='projectStatus'
     )
-    """
-     Max length: 50;
-    """
-    service_header_contact_name_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderContactNameVisibleFlag'
+    company_status: CompanyStatusReference | None = Field(
+        default=None, alias='companyStatus'
     )
-    service_header_contact_name_caption: str | None = Field(
-        default=None, alias='serviceHeaderContactNameCaption'
+    attachments: list[int] | None = None
+    service_survey: ServiceSurveyReference | None = Field(
+        default=None, alias='serviceSurvey'
     )
-    """
-     Max length: 50;
-    """
-    service_header_detail_description_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderDetailDescriptionVisibleFlag'
+    specific_team_to: GenericBoardTeamReference | None = Field(
+        default=None, alias='specificTeamTo'
     )
-    service_header_detail_description_caption: str | None = Field(
-        default=None, alias='serviceHeaderDetailDescriptionCaption'
+    attach_configurations_for: Literal['Company', 'Contact'] | None = Field(
+        default=None, alias='attachConfigurationsFor'
     )
     """
-     Max length: 50;
+    Required when notifyType is set to: "Attach Configuration"
     """
-    service_header_resolution_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderResolutionVisibleFlag'
-    )
-    service_header_resolution_caption: str | None = Field(
-        default=None, alias='serviceHeaderResolutionCaption'
+    configuration_type: ConfigurationTypeReference | None = Field(
+        default=None, alias='configurationType'
     )
-    """
-     Max length: 50;
-    """
-    service_header_amount_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderAmountVisibleFlag'
+    configuration_status: ConfigurationStatusReference | None = Field(
+        default=None, alias='configurationStatus'
     )
-    service_header_amount_caption: str | None = Field(
-        default=None, alias='serviceHeaderAmountCaption'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkflowActionAutomateParameter(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    value: str | None = None
+
+
+class WorkflowActionUserDefinedField(ConnectWiseModel):
+    id: int | None = None
+    event_id: int | None = Field(default=None, alias='eventId')
+    action_id: int | None = Field(default=None, alias='actionId')
+    caption: str | None = None
+    user_defined_field_id: int | None = Field(default=None, alias='userDefinedFieldId')
+    value: str | None = None
+    overwrite_flag: bool | None = Field(default=None, alias='overwriteFlag')
+    pod_description: str | None = Field(default=None, alias='podDescription')
+    field_type_id: str | None = Field(default=None, alias='fieldTypeId')
+    entry_type_id: str | None = Field(default=None, alias='entryTypeId')
+    required_flag: bool | None = Field(default=None, alias='requiredFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkflowAttachment(ActivityReference):
+    pass
+
+
+class WorkflowEvent(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    event_condition: str = Field(..., alias='eventCondition')
+    frequency_unit: Literal['Minutes', 'Hours', 'Days', 'Months'] | None = Field(
+        default=None, alias='frequencyUnit'
     )
     """
-     Max length: 50;
+    Required when exectionTimes is set to MultipleTimes or Continuously
     """
-    service_header_billing_method_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderBillingMethodVisibleFlag'
-    )
-    service_header_billing_method_caption: str | None = Field(
-        default=None, alias='serviceHeaderBillingMethodCaption'
+    frequency_of_execution: int | None = Field(
+        default=None, alias='frequencyOfExecution'
     )
     """
-     Max length: 50;
+    Required when exectionTimes is set to MultipleTimes or Continuously
     """
-    service_header_closed_tasks_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderClosedTasksVisibleFlag'
-    )
-    service_header_open_tasks_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderOpenTasksVisibleFlag'
-    )
-    service_header_bundled_tickets_visible_flag: bool | None = Field(
-        default=None, alias='serviceHeaderBundledTicketsVisibleFlag'
-    )
-    project_header_project_name_visible_flag: bool | None = Field(
-        default=None, alias='projectHeaderProjectNameVisibleFlag'
-    )
-    project_header_project_name_caption: str | None = Field(
-        default=None, alias='projectHeaderProjectNameCaption'
+    max_number_of_execution: int | None = Field(
+        default=None, alias='maxNumberOfExecution'
     )
     """
-     Max length: 50;
+    Required when exectionTimes is set to MultipleTimes
     """
-    project_header_company_name_visible_flag: bool | None = Field(
-        default=None, alias='projectHeaderCompanyNameVisibleFlag'
-    )
-    project_header_company_name_caption: str | None = Field(
-        default=None, alias='projectHeaderCompanyNameCaption'
+    execution_time: Literal['Once', 'MultipleTimes', 'Continuously'] | None = Field(
+        default=None, alias='executionTime'
     )
     """
-     Max length: 50;
+    Defaults to Once when not specified
     """
-    project_header_original_downpayment_visible_flag: bool | None = Field(
-        default=None, alias='projectHeaderOriginalDownpaymentVisibleFlag'
-    )
-    project_header_original_downpayment_caption: str | None = Field(
-        default=None, alias='projectHeaderOriginalDownpaymentCaption'
-    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkflowNotifyType(ConnectWiseModel):
+    id: int | None = None
+    identifier: str | None = None
+    name: str | None = None
+    is_setup_flag: bool | None = Field(default=None, alias='isSetupFlag')
     """
-     Max length: 50;
+    If the current action is available because it is already set up. Pertains to integrations such as Automate
     """
-    project_header_contact_name_visible_flag: bool | None = Field(
-        default=None, alias='projectHeaderContactNameVisibleFlag'
-    )
-    project_header_contact_name_caption: str | None = Field(
-        default=None, alias='projectHeaderContactNameCaption'
-    )
+    external_flag: bool | None = Field(default=None, alias='externalFlag')
     """
-     Max length: 50;
+    If the current action effects external objects e.g. integrations or sending an email
     """
-    project_header_amount_visible_flag: bool | None = Field(
-        default=None, alias='projectHeaderAmountVisibleFlag'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkflowNotifyTypeInfo(ConnectWiseModel):
+    id: int | None = None
+    identifier: str | None = None
+    name: str | None = None
+    is_setup_flag: bool | None = Field(default=None, alias='isSetupFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkflowTableType(CatalogItemReference):
+    pass
+
+
+class WorkflowTableTypeInfo(CatalogItemReference):
+    pass
+
+
+class WorkflowTableTypeReference(CatalogItemReference):
+    pass
+
+
+class WorkflowTrigger(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    description: str | None = None
+    has_options_flag: bool | None = Field(default=None, alias='hasOptionsFlag')
+    has_operator_flag: bool | None = Field(default=None, alias='hasOperatorFlag')
+    custom_field: UserDefinedFieldReference | None = Field(
+        default=None, alias='customField'
     )
-    project_header_amount_caption: str | None = Field(
-        default=None, alias='projectHeaderAmountCaption'
+    expected_type: str | None = Field(default=None, alias='expectedType')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkflowTriggerOption(ConnectWiseModel):
+    value: str | None = None
+    name: str | None = None
+    custom_field: UserDefinedFieldReference | None = Field(
+        default=None, alias='customField'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkRole(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
      Max length: 50;
     """
-    project_header_billing_method_visible_flag: bool | None = Field(
-        default=None, alias='projectHeaderBillingMethodVisibleFlag'
-    )
-    project_header_billing_method_caption: str | None = Field(
-        default=None, alias='projectHeaderBillingMethodCaption'
-    )
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    integration_xref: str | None = Field(default=None, alias='integrationXref')
     """
      Max length: 50;
     """
-    project_header_billing_type_visible_flag: bool | None = Field(
-        default=None, alias='projectHeaderBillingTypeVisibleFlag'
-    )
-    project_header_billing_type_caption: str | None = Field(
-        default=None, alias='projectHeaderBillingTypeCaption'
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    add_all_locations: bool | None = Field(default=None, alias='addAllLocations')
+    remove_all_locations: bool | None = Field(default=None, alias='removeAllLocations')
+    add_all_agreement_exclusions: bool | None = Field(
+        default=None, alias='addAllAgreementExclusions'
     )
     """
-     Max length: 50;
+    Used only on create to add the work role to all agreement and agreement type exclusion lists
     """
-    invoice_payment_amount_visible_flag: bool | None = Field(
-        default=None, alias='invoicePaymentAmountVisibleFlag'
-    )
-    invoice_payment_amount_caption: str | None = Field(
-        default=None, alias='invoicePaymentAmountCaption'
-    )
+    location_ids: list[int] | None = Field(default=None, alias='locationIds')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkRoleInfo(CategoryInfo):
+    pass
+
+
+class WorkRoleReference(ActivityReference):
+    pass
+
+
+class WorkType(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
      Max length: 50;
     """
-    invoice_credit_amount_visible_flag: bool | None = Field(
-        default=None, alias='invoiceCreditAmountVisibleFlag'
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge'] = Field(
+        ..., alias='billTime'
     )
-    invoice_credit_amount_caption: str | None = Field(
-        default=None, alias='invoiceCreditAmountCaption'
+    rate_type: Literal['AdjAmount', 'Custom', 'Multiplier'] = Field(
+        ..., alias='rateType'
     )
-    """
-     Max length: 50;
-    """
-    invoice_balance_due_visible_flag: bool | None = Field(
-        default=None, alias='invoiceBalanceDueVisibleFlag'
+    rate: float
+    hours_min: float | None = Field(default=None, alias='hoursMin')
+    hours_max: float | None = Field(default=None, alias='hoursMax')
+    round_bill_hours_to: float | None = Field(default=None, alias='roundBillHoursTo')
+    accrual_type: Literal['Holiday', 'PTO', 'Sick', 'Vacation'] | None = Field(
+        default=None, alias='accrualType'
     )
-    invoice_balance_due_caption: str | None = Field(
-        default=None, alias='invoiceBalanceDueCaption'
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    overall_default_flag: bool | None = Field(default=None, alias='overallDefaultFlag')
+    activity_default_flag: bool | None = Field(
+        default=None, alias='activityDefaultFlag'
     )
+    utilization_flag: bool | None = Field(default=None, alias='utilizationFlag')
+    cost_multiplier: float | None = Field(default=None, alias='costMultiplier')
+    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
     """
      Max length: 50;
     """
-    credit_credit_amount_visible_flag: bool | None = Field(
-        default=None, alias='creditCreditAmountVisibleFlag'
-    )
-    credit_credit_amount_caption: str | None = Field(
-        default=None, alias='creditCreditAmountCaption'
+    add_all_agreement_exclusions: bool | None = Field(
+        default=None, alias='addAllAgreementExclusions'
     )
     """
-     Max length: 50;
+    Used only on create to add the work type to all agreement and agreement type exclusion lists
     """
-    credit_remaining_amount_visible_flag: bool | None = Field(
-        default=None, alias='creditRemainingAmountVisibleFlag'
-    )
-    credit_remaining_amount_caption: str | None = Field(
-        default=None, alias='creditRemainingAmountCaption'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkTypeInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    activity_default_flag: bool | None = Field(
+        default=None, alias='activityDefaultFlag'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class WorkTypeReference(ActivityReference):
+    pass
+
+
+class Activity(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 50;
+     Max length: 100;
     """
-    time_detail_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailVisibleFlag'
-    )
-    time_detail_primary_sort_field: str | None = Field(
-        default=None, alias='timeDetailPrimarySortField'
-    )
-    time_detail_primary_sort_direction: str | None = Field(
-        default=None, alias='timeDetailPrimarySortDirection'
-    )
-    time_detail_secondary_sort_field: str | None = Field(
-        default=None, alias='timeDetailSecondarySortField'
-    )
-    time_detail_secondary_sort_direction: str | None = Field(
-        default=None, alias='timeDetailSecondarySortDirection'
-    )
-    time_detail_subtotal_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailSubtotalVisibleFlag'
-    )
-    time_detail_start_end_time_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailStartEndTimeVisibleFlag'
-    )
-    time_detail_hours_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailHoursVisibleFlag'
-    )
-    time_detail_members_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailMembersVisibleFlag'
-    )
-    time_detail_billable_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailBillableVisibleFlag'
-    )
-    time_detail_extended_amount_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailExtendedAmountVisibleFlag'
-    )
-    time_detail_dollar_amounts_on_hourse_based_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailDollarAmountsOnHourseBasedVisibleFlag'
-    )
-    time_detail_hourly_rate_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailHourlyRateVisibleFlag'
-    )
-    time_detail_contacts_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailContactsVisibleFlag'
+    type: ActivityTypeReference | None = None
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    phone_number: str | None = Field(default=None, alias='phoneNumber')
+    """
+     Max length: 30;
+    """
+    email: str | None = None
+    """
+     Max length: 250;
+    """
+    status: ActivityStatusReference | None = None
+    opportunity: OpportunityReference | None = None
+    ticket: TicketReference | None = None
+    agreement: AgreementReference | None = None
+    campaign: CampaignReference | None = None
+    notes: str | None = None
+    date_start: datetime | None = Field(default=None, alias='dateStart')
+    date_end: datetime | None = Field(default=None, alias='dateEnd')
+    assigned_by: MemberReference | None = Field(default=None, alias='assignedBy')
+    assign_to: MemberReference | None = Field(default=None, alias='assignTo')
+    schedule_status: ScheduleStatusReference | None = Field(
+        default=None, alias='scheduleStatus'
     )
-    time_detail_notes_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailNotesVisibleFlag'
+    reminder: ReminderReference | None = None
+    where: ServiceLocationReference | None = None
+    notify_flag: bool | None = Field(default=None, alias='notifyFlag')
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    currency: CurrencyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    time_detail_non_billable_caption: str | None = Field(
-        default=None, alias='timeDetailNonBillableCaption'
+
+
+class ActivityStopwatch(ConnectWiseModel):
+    activity_id: int = Field(..., alias='activityId')
+    activity_mobile_guid: UUID | None = Field(default=None, alias='activityMobileGuid')
+    agreement: AgreementReference | None = None
+    billable_option: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billableOption')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    date_entered: datetime | None = Field(default=None, alias='dateEntered')
+    end_time: datetime | None = Field(default=None, alias='endTime')
+    id: int | None = None
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    location_id: int | None = Field(default=None, alias='locationId')
+    member: MemberReference | None = None
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    notes: str | None = None
+    """
+     Max length: 4000;
+    """
+    start_time: datetime | None = Field(default=None, alias='startTime')
+    status: Literal['Reset', 'Running', 'Paused', 'Stopped']
+    total_pause_time: int | None = Field(default=None, alias='totalPauseTime')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Addition(ConnectWiseModel):
+    id: int | None = None
+    product: IvItemReference | None = None
+    quantity: float | None = None
+    less_included: float | None = Field(default=None, alias='lessIncluded')
+    unit_price: float | None = Field(default=None, alias='unitPrice')
+    unit_cost: float | None = Field(default=None, alias='unitCost')
+    bill_customer: Literal['Billable', 'DoNotBill', 'NoCharge'] = Field(
+        ..., alias='billCustomer'
     )
+    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
+    cancelled_date: datetime | None = Field(default=None, alias='cancelledDate')
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    serial_number: str | None = Field(default=None, alias='serialNumber')
     """
      Max length: 50;
     """
-    time_detail_agreement_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailAgreementVisibleFlag'
-    )
-    time_detail_hours_based_hours_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailHoursBasedHoursVisibleFlag'
-    )
-    time_detail_hours_based_ext_amount_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailHoursBasedExtAmountVisibleFlag'
-    )
-    time_detail_hoursbased_hourly_rate_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailHoursbasedHourlyRateVisibleFlag'
-    )
-    time_detail_amount_based_hours_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailAmountBasedHoursVisibleFlag'
-    )
-    time_detail_amount_based_ext_amount_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailAmountBasedExtAmountVisibleFlag'
-    )
-    time_detail_amount_based_hourly_rate_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailAmountBasedHourlyRateVisibleFlag'
-    )
-    time_detail_sr_ticket_summary_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailSRTicketSummaryVisibleFlag'
-    )
-    time_detail_sr_contact_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailSRContactVisibleFlag'
-    )
-    time_detail_sr_address_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailSRAddressVisibleFlag'
-    )
-    time_detail_pm_phase_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailPmPhaseVisibleFlag'
+    invoice_description: str | None = Field(default=None, alias='invoiceDescription')
+    """
+     Max length: 6000;
+    """
+    purchase_item_flag: bool | None = Field(default=None, alias='purchaseItemFlag')
+    special_order_flag: bool | None = Field(default=None, alias='specialOrderFlag')
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    description: str | None = None
+    billed_quantity: float | None = Field(default=None, alias='billedQuantity')
+    uom: str | None = None
+    ext_price: float | None = Field(default=None, alias='extPrice')
+    ext_cost: float | None = Field(default=None, alias='extCost')
+    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
+    margin: float | None = None
+    prorate_cost: float | None = Field(default=None, alias='prorateCost')
+    prorate_price: float | None = Field(default=None, alias='proratePrice')
+    extended_prorate_cost: float | None = Field(
+        default=None, alias='extendedProrateCost'
     )
-    time_detail_pm_summary_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailPmSummaryVisibleFlag'
+    extended_prorate_price: float | None = Field(
+        default=None, alias='extendedProratePrice'
     )
-    time_detail_ticket_number_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailTicketNumberVisibleFlag'
+    prorate_current_period_flag: bool | None = Field(
+        default=None, alias='prorateCurrentPeriodFlag'
     )
-    time_detail_dates_visible_flag: bool | None = Field(
-        default=None, alias='timeDetailDatesVisibleFlag'
+    opportunity: OpportunityReference | None = None
+    agreement_status: Literal[
+        'Active', 'Cancelled', 'Expired', 'Inactive'
+    ] | None = Field(default=None, alias='agreementStatus')
+    invoice_grouping: InvoiceGroupingReference | None = Field(
+        default=None, alias='invoiceGrouping'
     )
-    services_staff_caption: str | None = Field(
-        default=None, alias='servicesStaffCaption'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
+
+
+class AdjustmentDetail(ConnectWiseModel):
+    id: int | None = None
+    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
+    description: str | None = None
     """
      Max length: 50;
     """
-    services_staff_visible_flag: bool | None = Field(
-        default=None, alias='servicesStaffVisibleFlag'
-    )
-    services_amount_caption: str | None = Field(
-        default=None, alias='servicesAmountCaption'
+    quantity_on_hand: float | None = Field(default=None, alias='quantityOnHand')
+    unit_cost: float | None = Field(default=None, alias='unitCost')
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
     )
+    quantity_adjusted: int = Field(..., alias='quantityAdjusted')
+    serial_number: str | None = Field(default=None, alias='serialNumber')
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    services_amount_visible_flag: bool | None = Field(
-        default=None, alias='servicesAmountVisibleFlag'
-    )
-    services_hours_caption: str | None = Field(
-        default=None, alias='servicesHoursCaption'
-    )
+    adjustment: AdjustmentReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Agreement(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 50;
+     Max length: 100;
     """
-    services_hours_visible_flag: bool | None = Field(
-        default=None, alias='servicesHoursVisibleFlag'
+    type: AgreementTypeReference | None = None
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    site: SiteReference | None = None
+    sub_contract_company: CompanyReference | None = Field(
+        default=None, alias='subContractCompany'
     )
-    services_rate_caption: str | None = Field(default=None, alias='servicesRateCaption')
-    """
-     Max length: 50;
-    """
-    services_rate_visible_flag: bool | None = Field(
-        default=None, alias='servicesRateVisibleFlag'
+    sub_contract_contact: ContactReference | None = Field(
+        default=None, alias='subContractContact'
     )
-    services_work_role_caption: str | None = Field(
-        default=None, alias='servicesWorkRoleCaption'
+    parent_agreement: AgreementReference | None = Field(
+        default=None, alias='parentAgreement'
     )
+    customer_po: str | None = Field(default=None, alias='customerPO')
     """
      Max length: 50;
     """
-    services_work_role_visible_flag: bool | None = Field(
-        default=None, alias='servicesWorkRoleVisibleFlag'
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    restrict_location_flag: bool | None = Field(
+        default=None, alias='restrictLocationFlag'
     )
-    services_work_type_caption: str | None = Field(
-        default=None, alias='servicesWorkTypeCaption'
+    restrict_department_flag: bool | None = Field(
+        default=None, alias='restrictDepartmentFlag'
     )
+    start_date: datetime | None = Field(default=None, alias='startDate')
+    end_date: datetime | None = Field(default=None, alias='endDate')
+    no_ending_date_flag: bool | None = Field(default=None, alias='noEndingDateFlag')
+    opportunity: OpportunityReference | None = None
+    cancelled_flag: bool | None = Field(default=None, alias='cancelledFlag')
+    date_cancelled: datetime | None = Field(default=None, alias='dateCancelled')
+    reason_cancelled: str | None = Field(default=None, alias='reasonCancelled')
     """
-     Max length: 50;
-    """
-    services_work_type_visible_flag: bool | None = Field(
-        default=None, alias='servicesWorkTypeVisibleFlag'
-    )
-    services_total_visible_flag: bool | None = Field(
-        default=None, alias='servicesTotalVisibleFlag'
-    )
-    services_member_name_visible_flag: bool | None = Field(
-        default=None, alias='servicesMemberNameVisibleFlag'
-    )
-    services_member_name_caption: str | None = Field(
-        default=None, alias='servicesMemberNameCaption'
-    )
+     Max length: 100;
     """
-     Max length: 50;
+    sla: SLAReference | None = None
+    work_order: str | None = Field(default=None, alias='workOrder')
     """
-    currency_id_visible_flag: bool | None = Field(
-        default=None, alias='currencyIdVisibleFlag'
+     Max length: 20;
+    """
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    application_units: Literal['Amount', 'Hours', 'Incidents'] | None = Field(
+        default=None, alias='applicationUnits'
     )
-    currency_symbol_visible_flag: bool | None = Field(
-        default=None, alias='currencySymbolVisibleFlag'
+    application_limit: float | None = Field(default=None, alias='applicationLimit')
+    application_cycle: Literal[
+        'Contract2Weeks',
+        'Contract4Weeks',
+        'ContractYear',
+        'CalendarMonth',
+        'CalendarQuarter',
+        'CalendarWeek',
+        'ContractQuarter',
+        'CalendarYear',
+    ] | None = Field(default=None, alias='applicationCycle')
+    application_unlimited_flag: bool | None = Field(
+        default=None, alias='applicationUnlimitedFlag'
     )
-    portal_flag: bool | None = Field(default=None, alias='portalFlag')
-    services_collapsed_flag: bool | None = Field(
-        default=None, alias='servicesCollapsedFlag'
+    one_time_flag: bool | None = Field(default=None, alias='oneTimeFlag')
+    cover_agreement_time: bool | None = Field(default=None, alias='coverAgreementTime')
+    cover_agreement_product: bool | None = Field(
+        default=None, alias='coverAgreementProduct'
     )
-    expenses_collapsed_flag: bool | None = Field(
-        default=None, alias='expensesCollapsedFlag'
+    cover_agreement_expense: bool | None = Field(
+        default=None, alias='coverAgreementExpense'
     )
-    other_charges_collapsed_flag: bool | None = Field(
-        default=None, alias='otherChargesCollapsedFlag'
+    cover_sales_tax: bool | None = Field(default=None, alias='coverSalesTax')
+    carry_over_unused: bool | None = Field(default=None, alias='carryOverUnused')
+    allow_overruns: bool | None = Field(default=None, alias='allowOverruns')
+    expired_days: int | None = Field(default=None, alias='expiredDays')
+    limit: int | None = None
+    expire_when_zero: bool | None = Field(default=None, alias='expireWhenZero')
+    charge_to_firm: bool | None = Field(default=None, alias='chargeToFirm')
+    employee_comp_rate: Literal['Actual', 'Hourly'] | None = Field(
+        default=None, alias='employeeCompRate'
     )
-    expenses_type_caption: str | None = Field(default=None, alias='expensesTypeCaption')
     """
-     Max length: 50;
+     Required On Updates;
     """
-    expenses_staff_caption: str | None = Field(
-        default=None, alias='expensesStaffCaption'
+    employee_comp_not_exceed: Literal['Billing', 'Amount', 'Percent'] | None = Field(
+        default=None, alias='employeeCompNotExceed'
     )
-    """
-     Max length: 50;
-    """
-    expenses_amount_caption: str | None = Field(
-        default=None, alias='expensesAmountCaption'
+    comp_hourly_rate: float | None = Field(default=None, alias='compHourlyRate')
+    comp_limit_amount: float | None = Field(default=None, alias='compLimitAmount')
+    billing_cycle: BillingCycleReference | None = Field(
+        default=None, alias='billingCycle'
+    )
+    bill_one_time_flag: bool | None = Field(default=None, alias='billOneTimeFlag')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
+    )
+    invoicing_cycle: Literal['ContractYear', 'CalendarYear'] | None = Field(
+        default=None, alias='invoicingCycle'
     )
     """
-     Max length: 50;
+     Required On Updates;
     """
-    expenses_type_visible_flag: bool | None = Field(
-        default=None, alias='expensesTypeVisibleFlag'
-    )
-    expenses_staff_visible_flag: bool | None = Field(
-        default=None, alias='expensesStaffVisibleFlag'
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    expenses_amount_visible_flag: bool | None = Field(
-        default=None, alias='expensesAmountVisibleFlag'
+    bill_to_contact: ContactReference | None = Field(
+        default=None, alias='billToContact'
     )
-    expenses_total_visible_flag: bool | None = Field(
-        default=None, alias='expensesTotalVisibleFlag'
+    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
+    bill_amount: float | None = Field(default=None, alias='billAmount')
+    taxable: bool | None = None
+    prorate_first_bill: float | None = Field(default=None, alias='prorateFirstBill')
+    bill_start_date: datetime | None = Field(default=None, alias='billStartDate')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    restrict_down_payment: bool | None = Field(
+        default=None, alias='restrictDownPayment'
     )
-    expense_detail_subtotal_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailSubtotalVisibleFlag'
+    prorate_flag: bool | None = Field(default=None, alias='prorateFlag')
+    invoice_prorated_additions_flag: bool | None = Field(
+        default=None, alias='invoiceProratedAdditionsFlag'
     )
-    expense_detail_members_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailMembersVisibleFlag'
+    invoice_description: str | None = Field(default=None, alias='invoiceDescription')
+    top_comment: bool | None = Field(default=None, alias='topComment')
+    bottom_comment: bool | None = Field(default=None, alias='bottomComment')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    project_type: ProjectTypeReference | None = Field(default=None, alias='projectType')
+    invoice_template: InvoiceTemplateReference | None = Field(
+        default=None, alias='invoiceTemplate'
     )
-    expense_detail_contacts_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailContactsVisibleFlag'
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] | None = Field(
+        default=None, alias='billTime'
     )
-    expense_detail_billable_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailBillableVisibleFlag'
+    """
+     Required On Updates;
+    """
+    bill_expenses: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billExpenses')
+    """
+     Required On Updates;
+    """
+    bill_products: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billProducts')
+    """
+     Required On Updates;
+    """
+    billable_time_invoice: bool | None = Field(
+        default=None, alias='billableTimeInvoice'
     )
-    expense_detail_ext_amount_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailExtAmountVisibleFlag'
+    billable_expense_invoice: bool | None = Field(
+        default=None, alias='billableExpenseInvoice'
     )
-    expense_detail_notes_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailNotesVisibleFlag'
+    billable_product_invoice: bool | None = Field(
+        default=None, alias='billableProductInvoice'
     )
-    expense_detail_primary_sort_field: str | None = Field(
-        default=None, alias='expenseDetailPrimarySortField'
+    currency: CurrencyReference | None = None
+    period_type: Literal['Current', 'Future', 'Both', 'Undefined'] | None = Field(
+        default=None, alias='periodType'
     )
-    expense_detail_primary_sort_direction: str | None = Field(
-        default=None, alias='expenseDetailPrimarySortDirection'
+    auto_invoice_flag: bool | None = Field(default=None, alias='autoInvoiceFlag')
+    next_invoice_date: str | None = Field(default=None, alias='nextInvoiceDate')
+    company_location: SystemLocationReference | None = Field(
+        default=None, alias='companyLocation'
     )
-    expense_detail_secondary_sort_field: str | None = Field(
-        default=None, alias='expenseDetailSecondarySortField'
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
     )
-    expense_detail_secondary_sort_direction: str | None = Field(
-        default=None, alias='expenseDetailSecondarySortDirection'
+    ship_to_contact: ContactReference | None = Field(
+        default=None, alias='shipToContact'
     )
-    expense_detail_nonbillable_caption: str | None = Field(
-        default=None, alias='expenseDetailNonbillableCaption'
+    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
+    agreement_status: Literal[
+        'Active', 'Cancelled', 'Expired', 'Inactive'
+    ] | None = Field(default=None, alias='agreementStatus')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
+
+
+class AgreementAdjustment(ConnectWiseModel):
+    id: int | None = None
+    amount: float | None = None
+    description: str | None = None
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    expense_detail_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailVisibleFlag'
+    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    expense_detail_agreement_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailAgreementVisibleFlag'
+
+
+class AgreementApplicationParameters(ConnectWiseModel):
+    application_unit: AgreementApplicationUnit | None = Field(
+        default=None, alias='applicationUnit'
     )
-    expense_detail_agreement_ext_amount_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailAgreementExtAmountVisibleFlag'
+    application_limit: AgreementApplicationLimit | None = Field(
+        default=None, alias='applicationLimit'
     )
-    expense_detail_ticket_number_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailTicketNumberVisibleFlag'
+    application_limit_amount: float | None = Field(
+        default=None, alias='applicationLimitAmount'
     )
-    expense_detail_sr_ticket_summary_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailSrTicketSummaryVisibleFlag'
+    available_per: AgreementApplicationAviablePer | None = Field(
+        default=None, alias='availablePer'
     )
-    expense_detail_sr_contact_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailSrContactVisibleFlag'
+    covers_time_flag: bool | None = Field(default=None, alias='coversTimeFlag')
+    covers_expenses_flag: bool | None = Field(default=None, alias='coversExpensesFlag')
+    covers_products_flag: bool | None = Field(default=None, alias='coversProductsFlag')
+    covers_tax_flag: bool | None = Field(default=None, alias='coversTaxFlag')
+    carryover_unused_flag: bool | None = Field(
+        default=None, alias='carryoverUnusedFlag'
     )
-    expense_detail_sr_address_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailSrAddressVisibleFlag'
+    carry_over_days: int | None = Field(default=None, alias='carryOverDays')
+    allow_overruns_flag: bool | None = Field(default=None, alias='allowOverrunsFlag')
+    overrun_limit: int | None = Field(default=None, alias='overrunLimit')
+    agreement_expires_flag: bool | None = Field(
+        default=None, alias='agreementExpiresFlag'
     )
-    expense_detail_pm_phase_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailPmPhaseVisibleFlag'
+    charge_adjustments_flag: bool | None = Field(
+        default=None, alias='chargeAdjustmentsFlag'
     )
-    expense_detail_pm_summary_visible_flag: bool | None = Field(
-        default=None, alias='expenseDetailPmSummaryVisibleFlag'
+    prepay_flag: bool | None = Field(default=None, alias='prepayFlag')
+    agr_billing_cycle: AgreementApplicationBillingCycle | None = Field(
+        default=None, alias='agrBillingCycle'
     )
-    other_charges_amount_caption: str | None = Field(
-        default=None, alias='otherChargesAmountCaption'
+    user_defined_field_values: list[UserDefinedFieldValueModel] | None = Field(
+        default=None, alias='userDefinedFieldValues'
+    )
+
+
+class AgreementRecurringParameters(ConnectWiseModel):
+    billing_cycle: GenericNameIdDTO | None = Field(default=None, alias='billingCycle')
+    cycle_base: GenericNameIdDTO | None = Field(default=None, alias='cycleBase')
+    a_gr_amount: float | None = Field(default=None, alias='aGRAmount')
+    taxable: bool | None = None
+    children_amount: float | None = Field(default=None, alias='childrenAmount')
+    additions_amount: float | None = Field(default=None, alias='additionsAmount')
+    total_amount: float | None = Field(default=None, alias='totalAmount')
+    a_gr_prorate: float | None = Field(default=None, alias='aGRProrate')
+    bill_start_date: str | None = Field(default=None, alias='billStartDate')
+    tax_code: GenericNameIdDTO | None = Field(default=None, alias='taxCode')
+    terms: GenericNameIdDTO | None = None
+    prorate_flag: bool | None = Field(default=None, alias='prorateFlag')
+    invoice_prorated_additions_flag: bool | None = Field(
+        default=None, alias='invoiceProratedAdditionsFlag'
+    )
+    restrict_downpayment: bool | None = Field(default=None, alias='restrictDownpayment')
+    currency: GenericNameIdDTO | None = None
+    auto_invoice_flag: bool | None = Field(default=None, alias='autoInvoiceFlag')
+    user_defined_field_values: list[UserDefinedFieldValueModel] | None = Field(
+        default=None, alias='userDefinedFieldValues'
+    )
+
+
+class AgreementSite(ConnectWiseModel):
+    id: int | None = None
+    company: CompanyReference | None = None
+    site: SiteReference | None = None
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
+
+
+class AgreementType(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
      Max length: 50;
     """
-    other_charges_amount_visible_flag: bool | None = Field(
-        default=None, alias='otherChargesAmountVisibleFlag'
-    )
-    other_charges_description_caption: str | None = Field(
-        default=None, alias='otherChargesDescriptionCaption'
+    prefix_suffix_option: Literal['Prefix', 'Suffix'] | None = Field(
+        default=None, alias='prefixSuffixOption'
     )
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    pre_payment_flag: bool | None = Field(default=None, alias='prePaymentFlag')
+    invoice_pre_suffix: str | None = Field(default=None, alias='invoicePreSuffix')
     """
-     Max length: 50;
+     Max length: 5;
     """
-    other_charges_description_visible_flag: bool | None = Field(
-        default=None, alias='otherChargesDescriptionVisibleFlag'
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    restrict_location_flag: bool | None = Field(
+        default=None, alias='restrictLocationFlag'
     )
-    other_charges_display_six_decimals: bool | None = Field(
-        default=None, alias='otherChargesDisplaySixDecimals'
+    restrict_department_flag: bool | None = Field(
+        default=None, alias='restrictDepartmentFlag'
     )
-    other_charges_item_id_visible_flag: bool | None = Field(
-        default=None, alias='otherChargesItemIdVisibleFlag'
+    sla: SLAReference | None = None
+    application_units: Literal['Amount', 'Hours', 'Incidents'] | None = Field(
+        default=None, alias='applicationUnits'
     )
-    other_charges_price_caption: str | None = Field(
-        default=None, alias='otherChargesPriceCaption'
+    application_limit: float | None = Field(default=None, alias='applicationLimit')
+    application_cycle: Literal[
+        'Contract2Weeks',
+        'Contract4Weeks',
+        'ContractYear',
+        'CalendarMonth',
+        'CalendarQuarter',
+        'CalendarWeek',
+        'ContractQuarter',
+        'CalendarYear',
+    ] | None = Field(default=None, alias='applicationCycle')
+    application_unlimited_flag: bool | None = Field(
+        default=None, alias='applicationUnlimitedFlag'
     )
-    """
-     Max length: 50;
-    """
-    other_charges_price_visible_flag: bool | None = Field(
-        default=None, alias='otherChargesPriceVisibleFlag'
+    one_time_flag: bool | None = Field(default=None, alias='oneTimeFlag')
+    cover_agreement_time_flag: bool | None = Field(
+        default=None, alias='coverAgreementTimeFlag'
     )
-    other_charges_quantity_caption: str | None = Field(
-        default=None, alias='otherChargesQuantityCaption'
+    cover_agreement_product_flag: bool | None = Field(
+        default=None, alias='coverAgreementProductFlag'
     )
-    """
-     Max length: 50;
-    """
-    other_charges_quantity_visible_flag: bool | None = Field(
-        default=None, alias='otherChargesQuantityVisibleFlag'
+    cover_agreement_expense_flag: bool | None = Field(
+        default=None, alias='coverAgreementExpenseFlag'
     )
-    other_charges_serial_number_visible_flag: bool | None = Field(
-        default=None, alias='otherChargesSerialNumberVisibleFlag'
+    cover_sales_tax_flag: bool | None = Field(default=None, alias='coverSalesTaxFlag')
+    carry_over_unused_flag: bool | None = Field(
+        default=None, alias='carryOverUnusedFlag'
     )
-    other_charges_total_visible_flag: bool | None = Field(
-        default=None, alias='otherChargesTotalVisibleFlag'
+    allow_overruns_flag: bool | None = Field(default=None, alias='allowOverrunsFlag')
+    expired_days: int | None = Field(default=None, alias='expiredDays')
+    limit: int | None = None
+    expire_when_zero: bool | None = Field(default=None, alias='expireWhenZero')
+    charge_to_firm_flag: bool | None = Field(default=None, alias='chargeToFirmFlag')
+    employee_comp_rate: Literal['Actual', 'Hourly'] = Field(
+        ..., alias='employeeCompRate'
     )
-    adjustment_description_visible_flag: bool | None = Field(
-        default=None, alias='adjustmentDescriptionVisibleFlag'
+    employee_comp_not_exceed: Literal['Billing', 'Amount', 'Percent'] = Field(
+        ..., alias='employeeCompNotExceed'
     )
-    adjustment_description_caption: str | None = Field(
-        default=None, alias='adjustmentDescriptionCaption'
+    comp_hourly_rate: float | None = Field(default=None, alias='compHourlyRate')
+    comp_limit_amount: float | None = Field(default=None, alias='compLimitAmount')
+    billing_cycle: BillingCycleReference | None = Field(
+        default=None, alias='billingCycle'
     )
-    """
-     Max length: 50;
-    """
-    adjustment_quantity_visible_flag: bool | None = Field(
-        default=None, alias='adjustmentQuantityVisibleFlag'
+    bill_one_time_flag: bool | None = Field(default=None, alias='billOneTimeFlag')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    adjustment_quantity_caption: str | None = Field(
-        default=None, alias='adjustmentQuantityCaption'
+    invoicing_cycle: Literal['ContractYear', 'CalendarYear'] = Field(
+        ..., alias='invoicingCycle'
+    )
+    bill_amount: float | None = Field(default=None, alias='billAmount')
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    restrict_down_payment_flag: bool | None = Field(
+        default=None, alias='restrictDownPaymentFlag'
     )
+    invoice_description: str | None = Field(default=None, alias='invoiceDescription')
     """
-     Max length: 50;
+     Max length: 4000;
     """
-    adjustment_amount_visible_flag: bool | None = Field(
-        default=None, alias='adjustmentAmountVisibleFlag'
+    top_comment_flag: bool | None = Field(default=None, alias='topCommentFlag')
+    bottom_comment_flag: bool | None = Field(default=None, alias='bottomCommentFlag')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    project_type: ProjectTypeReference | None = Field(default=None, alias='projectType')
+    invoice_template: InvoiceTemplateReference | None = Field(
+        default=None, alias='invoiceTemplate'
     )
-    adjustment_amount_caption: str | None = Field(
-        default=None, alias='adjustmentAmountCaption'
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] = Field(
+        ..., alias='billTime'
     )
-    """
-     Max length: 50;
-    """
-    adjustment_agr_type_visible_flag: bool | None = Field(
-        default=None, alias='adjustmentAgrTypeVisibleFlag'
+    bill_expenses: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] = Field(
+        ..., alias='billExpenses'
     )
-    adjustment_total_visible_flag: bool | None = Field(
-        default=None, alias='adjustmentTotalVisibleFlag'
+    bill_products: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] = Field(
+        ..., alias='billProducts'
     )
-    adjustment_price_visible_flag: bool | None = Field(
-        default=None, alias='adjustmentPriceVisibleFlag'
+    billable_time_invoice_flag: bool | None = Field(
+        default=None, alias='billableTimeInvoiceFlag'
     )
-    adjustment_price_caption: str | None = Field(
-        default=None, alias='adjustmentPriceCaption'
+    billable_expense_invoice_flag: bool | None = Field(
+        default=None, alias='billableExpenseInvoiceFlag'
+    )
+    billable_product_invoice_flag: bool | None = Field(
+        default=None, alias='billableProductInvoiceFlag'
+    )
+    copy_work_roles_flag: bool | None = Field(default=None, alias='copyWorkRolesFlag')
+    copy_work_types_flag: bool | None = Field(default=None, alias='copyWorkTypesFlag')
+    exclusion_work_role_ids: list[int] | None = Field(
+        default=None, alias='exclusionWorkRoleIds'
+    )
+    add_all_work_role_exclusions: bool | None = Field(
+        default=None, alias='addAllWorkRoleExclusions'
+    )
+    remove_all_work_role_exclusions: bool | None = Field(
+        default=None, alias='removeAllWorkRoleExclusions'
+    )
+    exclusion_work_type_ids: list[int] | None = Field(
+        default=None, alias='exclusionWorkTypeIds'
+    )
+    add_all_work_type_exclusions: bool | None = Field(
+        default=None, alias='addAllWorkTypeExclusions'
+    )
+    remove_all_work_type_exclusions: bool | None = Field(
+        default=None, alias='removeAllWorkTypeExclusions'
     )
+    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
     """
      Max length: 50;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class InvoiceTemplateDetailReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    prorate_flag: bool | None = Field(default=None, alias='prorateFlag')
+    email_template: EmailTemplateReference | None = Field(
+        default=None, alias='emailTemplate'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class InvoiceTemplateReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    auto_invoice_flag: bool | None = Field(default=None, alias='autoInvoiceFlag')
+    invoice_prorated_additions_flag: bool | None = Field(
+        default=None, alias='invoiceProratedAdditionsFlag'
     )
-    id: int | None = None
-    """
-    Gets or sets invoice Template Setup Id.
-    """
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class InvoiceTemplateSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AgreementTypeBoardDefault(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    custom_flag: bool | None = Field(default=None, alias='customFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class InvoiceTimeTabFormat(Enum):
-    SUMMARY_LIST = 'SummaryList'
-    DETAIL_LIST = 'DetailList'
-
-
-class InvoiceType(Enum):
-    AGREEMENT = 'Agreement'
-    CREDIT_MEMO = 'CreditMemo'
-    DOWN_PAYMENT = 'DownPayment'
-    MISCELLANEOUS = 'Miscellaneous'
-    PROGRESS = 'Progress'
-    STANDARD = 'Standard'
-
+    type: AgreementTypeReference | None = None
+    location: SystemLocationReference
+    department: SystemDepartmentReference | None = None
+    board: BoardReference | None = None
+    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
-class InvoicingCycle(Enum):
-    """
-    Required On Updates;
-    """
 
-    CONTRACT_YEAR = 'ContractYear'
-    CALENDAR_YEAR = 'CalendarYear'
+class AgreementTypeWorkRole(ConnectWiseModel):
+    id: int | None = None
+    type: AgreementTypeReference | None = None
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
+    ending_date: datetime | None = Field(default=None, alias='endingDate')
+    rate: float | None = None
+    rate_type: Literal['AdjAmount', 'Custom', 'Multiplier'] = Field(
+        ..., alias='rateType'
+    )
+    limit_to: float | None = Field(default=None, alias='limitTo')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class InvoicingCycle1(Enum):
-    CONTRACT_YEAR = 'ContractYear'
-    CALENDAR_YEAR = 'CalendarYear'
+class AgreementTypeWorkRoleExclusion(ConnectWiseModel):
+    id: int | None = None
+    type: AgreementTypeReference | None = None
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class InvoicingDisplayOptions(Enum):
-    REMAIN_ON_INVOICING_SCREEN = 'RemainOnInvoicingScreen'
-    SHOW_RECENT_INVOICES = 'ShowRecentInvoices'
+class AgreementTypeWorkRoleInfo(AgreementTypeWorkRoleExclusion):
+    pass
 
 
-class IvItemReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AgreementTypeWorkType(ConnectWiseModel):
     id: int | None = None
-    identifier: str | None = None
-    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class KBCategoryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    type: AgreementTypeReference | None = None
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
+    ending_date: datetime | None = Field(default=None, alias='endingDate')
+    rate: float | None = None
+    rate_type: Literal['AdjAmount', 'Custom', 'Multiplier'] = Field(
+        ..., alias='rateType'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class KPI(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] = Field(
+        ..., alias='billTime'
     )
-    id: int | None = None
-    name: str | None = None
-    category: KPICategoryReference | None = None
-    date_filter: str | None = Field(default=None, alias='dateFilter')
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    hours_min: float | None = Field(default=None, alias='hoursMin')
+    hours_max: float | None = Field(default=None, alias='hoursMax')
+    round_bill_hours: float | None = Field(default=None, alias='roundBillHours')
+    overage_rate: float | None = Field(default=None, alias='overageRate')
+    overage_rate_type: Literal['AdjAmount', 'Custom', 'Multiplier'] = Field(
+        ..., alias='overageRateType'
+    )
+    limit_to: float | None = Field(default=None, alias='limitTo')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class KPICategory(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AgreementTypeWorkTypeExclusion(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    sort_order: int | None = Field(default=None, alias='sortOrder')
+    type: AgreementTypeReference | None = None
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class KPICategoryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AgreementWorkRole(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    location_id: int | None = Field(default=None, alias='locationId')
+    rate_type: Literal['AdjAmount', 'Custom', 'Multiplier'] = Field(
+        ..., alias='rateType'
+    )
+    rate: float | None = None
+    limit_to: float | None = Field(default=None, alias='limitTo')
+    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
+    ending_date: datetime | None = Field(default=None, alias='endingDate')
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class KPIReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AgreementWorkRoleExclusion(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class KnowledgeBaseArticle(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AgreementWorkType(ConnectWiseModel):
     id: int | None = None
-    title: str
-    issue: str
-    resolution: str
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    location: OwnerLevelReference | None = None
     location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    board: BoardReference | None = None
-    category_id: int | None = Field(default=None, alias='categoryId')
-    sub_category_id: int | None = Field(default=None, alias='subCategoryId')
-    date_created: str | None = Field(default=None, alias='dateCreated')
-    created_by: str | None = Field(default=None, alias='createdBy')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    rate_type: Literal['AdjAmount', 'Custom', 'Multiplier'] = Field(
+        ..., alias='rateType'
+    )
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] = Field(
+        ..., alias='billTime'
+    )
+    rate: float | None = None
+    hours_max: float | None = Field(default=None, alias='hoursMax')
+    hours_min: float | None = Field(default=None, alias='hoursMin')
+    round_bill_hours: float | None = Field(default=None, alias='roundBillHours')
+    overage_rate: float | None = Field(default=None, alias='overageRate')
+    overage_rate_type: Literal['AdjAmount', 'Custom', 'Multiplier'] | None = Field(
+        default=None, alias='overageRateType'
+    )
+    agreement_limit: float | None = Field(default=None, alias='agreementLimit')
+    site: SiteReference | None = None
+    effective_date: datetime | None = Field(default=None, alias='effectiveDate')
+    ending_date: datetime | None = Field(default=None, alias='endingDate')
+    agreement: AgreementReference | None = None
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class KnowledgeBaseCategory(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AgreementWorkTypeExclusion(ConnectWiseModel):
     id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    approver: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class KnowledgeBaseLinkType(Enum):
-    ACTIVITY = 'Activity'
-    PROJECT_ISSUE = 'ProjectIssue'
-    KNOWLEDGE_BASE_ARTICLE = 'KnowledgeBaseArticle'
-    PROJECT_TICKET = 'ProjectTicket'
-    SERVICE_TICKET = 'ServiceTicket'
-    TIME = 'Time'
-
-
-class KnowledgeBaseSettings(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    require_approval: bool = Field(..., alias='requireApproval')
-    default_approver: MemberReference | None = Field(
-        default=None, alias='defaultApprover'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class KnowledgeBaseSubCategory(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    category: KBCategoryReference
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Language(Enum):
-    ENGLISH = 'English'
-    SPANISH = 'Spanish'
-    FRENCH = 'French'
-    BRITISH = 'British'
-    AUSTRALIAN = 'Australian'
-    BRAZILIAN_PORTUGUESE = 'BrazilianPortuguese'
-    CANADIAN_FRENCH = 'CanadianFrench'
-    GERMAN = 'German'
-    NEW_ZEALAND = 'NewZealand'
-    DUTCH = 'Dutch'
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class LdapConfiguration(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ApiMember(ConnectWiseModel):
     id: int | None = None
-    name: str
+    identifier: str
     """
-     Max length: 100;
+     Max length: 15;
     """
-    server: str
+    name: str | None = None
     """
-    FQDN of the Server. Max length: 200;
+     Max length: 30; Required On Updates;
     """
-    domain: str
+    email_address: str | None = Field(default=None, alias='emailAddress')
     """
-    Domain Name of the server. Max length: 50;
+     Max length: 250;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LdapConfigurationInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    inactive_date: datetime | None = Field(default=None, alias='inactiveDate')
+    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
+    security_role: SecurityRoleReference | None = Field(
+        default=None, alias='securityRole'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LdapConfigurationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    structure_level: StructureReference | None = Field(
+        default=None, alias='structureLevel'
     )
-    id: int | None = None
-    name: str | None = None
-    server: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LdapConfigurationTestLink(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    security_location: SystemLocationReference | None = Field(
+        default=None, alias='securityLocation'
     )
-    server: str | None = None
-    """
-     Max length: 200;
-    """
-
-
-class LegacySubCategory(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    default_location: SystemLocationReference | None = Field(
+        default=None, alias='defaultLocation'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LegacySubCategoryInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='defaultDepartment'
     )
-    id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Level(Enum):
-    CRITICAL = 'Critical'
-    HIGH = 'High'
-    MEDIUM = 'Medium'
-    LOW = 'Low'
-
-
-class LevelCount(Enum):
-    LEVEL1 = 'Level1'
-    LEVEL2 = 'Level2'
-    LEVEL3 = 'Level3'
-    LEVEL4 = 'Level4'
-    LEVEL5 = 'Level5'
-
-
-class LevelFive(Enum):
-    NON_TAXABLE = 'NonTaxable'
-    TAXABLE = 'Taxable'
-
-
-class LevelFiveRateType(Enum):
-    AMOUNT = 'Amount'
-    PERCENT = 'Percent'
-
-
-class LevelFour(Enum):
-    NON_TAXABLE = 'NonTaxable'
-    TAXABLE = 'Taxable'
-
-
-class LevelFourRateType(Enum):
-    AMOUNT = 'Amount'
-    PERCENT = 'Percent'
-
-
-class LevelOne(Enum):
-    NON_TAXABLE = 'NonTaxable'
-    TAXABLE = 'Taxable'
-
-
-class LevelOneRateType(Enum):
-    AMOUNT = 'Amount'
-    PERCENT = 'Percent'
-
-
-class LevelSix(Enum):
-    NON_TAXABLE = 'NonTaxable'
-    TAXABLE = 'Taxable'
-
-
-class LevelSixRateType(Enum):
-    AMOUNT = 'Amount'
-    PERCENT = 'Percent'
-
-
-class LevelThree(Enum):
-    NON_TAXABLE = 'NonTaxable'
-    TAXABLE = 'Taxable'
-
-
-class LevelThreeRateType(Enum):
-    AMOUNT = 'Amount'
-    PERCENT = 'Percent'
-
-
-class LevelTwo(Enum):
-    NON_TAXABLE = 'NonTaxable'
-    TAXABLE = 'Taxable'
-
-
-class LevelTwoRateType(Enum):
-    AMOUNT = 'Amount'
-    PERCENT = 'Percent'
-
-
-class LicenseBit(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    sales_default_location: SystemLocationReference | None = Field(
+        default=None, alias='salesDefaultLocation'
     )
-    name: str | None = None
-    active_flag: bool | None = Field(default=None, alias='activeFlag')
-
-
-class LicenseClass(Enum):
-    """
-    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
-    """
-
-    A = 'A'
-    C = 'C'
-    F = 'F'
-    X = 'X'
-
-
-class Link(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_default_board: BoardReference | None = Field(
+        default=None, alias='serviceDefaultBoard'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    table_reference_id: int | None = Field(default=None, alias='tableReferenceId')
-    url: str | None = None
-    """
-     Max length: 1000;
-    """
-    screen_link: ScreenLink | None = Field(default=None, alias='screenLink')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LinkClicked(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    notes: str | None = None
+    excluded_service_board_ids: list[int] | None = Field(
+        default=None, alias='excludedServiceBoardIds'
     )
-    id: int | None = None
-    campaign_id: int | None = Field(default=None, alias='campaignId')
-    contact_id: int = Field(..., alias='contactId')
-    date_clicked: datetime | None = Field(default=None, alias='dateClicked')
-    url: str
-    """
-     Max length: 2083;
-    """
-    query_string: str | None = Field(default=None, alias='queryString')
+    block_price_flag: bool | None = Field(default=None, alias='blockPriceFlag')
+    block_cost_flag: bool | None = Field(default=None, alias='blockCostFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class LinkInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ApiRequest(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    screen_link: ScreenLink | None = Field(default=None, alias='screenLink')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LinkResolveUrlInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    external_id: str | None = Field(default=None, alias='externalId')
+    parent_id: int | None = Field(default=None, alias='parentId')
+    grand_parent_id: int | None = Field(default=None, alias='grandParentId')
+    entity: IRestIdentifiedItem | None = None
+    filters: FilterValues | None = None
+    page: PageValues | None = None
+    format: str | None = None
+    fields: str | None = None
+    misc_properties: dict[str, dict[str, Any]] | None = Field(
+        default=None, alias='miscProperties'
+    )
+    member_context: str | None = Field(default=None, alias='memberContext')
+    update_only_ces_properties: bool | None = Field(
+        default=None, alias='updateOnlyCesProperties'
     )
-    reference_id: int = Field(..., alias='referenceId')
-    url: str | None = None
 
 
-class LocaleInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class AutoSyncTime(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    locale_code: str | None = Field(default=None, alias='localeCode')
+    sync_time: str = Field(..., alias='syncTime')
+    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class LocaleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BatchEntry(ConnectWiseModel):
     id: int | None = None
+    account_type: str | None = Field(default=None, alias='accountType')
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Location(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    debit: float | None = None
+    credit: float | None = None
+    cost: float | None = None
+    item: str | None = None
+    sales_code: str | None = Field(default=None, alias='salesCode')
+    cost_of_goods_sold_account_number: str | None = Field(
+        default=None, alias='costOfGoodsSoldAccountNumber'
     )
-    id: int | None = None
-    owner_level_id: int | None = Field(default=None, alias='ownerLevelId')
-    structure_level: CorporateStructureLevelReference | None = Field(
-        default=None, alias='structureLevel'
+    invoice: InvoiceReference | None = None
+    purchase_order: PurchaseOrderReference | None = Field(
+        default=None, alias='purchaseOrder'
     )
-    name: str
-    """
-     Max length: 50;
-    """
-    manager: MemberReference | None = None
-    reports_to: SystemLocationReference | None = Field(default=None, alias='reportsTo')
-    sales_rep: str | None = Field(default=None, alias='salesRep')
-    """
-     Max length: 50;
-    """
-    time_zone_setup: TimeZoneSetupReference | None = Field(
-        default=None, alias='timeZoneSetup'
+    line_item: PurchaseOrderLineItemReference | None = Field(
+        default=None, alias='lineItem'
     )
-    calendar: CalendarReference | None = None
-    override_address_line1: str | None = Field(
-        default=None, alias='overrideAddressLine1'
+    transfer: str | None = None
+    expense: ExpenseDetailReference | None = None
+    adjustment_detail: AdjustmentDetailReference | None = Field(
+        default=None, alias='adjustmentDetail'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BillingSetup(ConnectWiseModel):
+    id: int | None = None
+    remit_name: str = Field(..., alias='remitName')
     """
      Max length: 50;
     """
-    override_address_line2: str | None = Field(
-        default=None, alias='overrideAddressLine2'
-    )
+    location: SystemLocationReference
+    address_one: str | None = Field(default=None, alias='addressOne')
     """
      Max length: 50;
     """
-    override_city: str | None = Field(default=None, alias='overrideCity')
+    address_two: str | None = Field(default=None, alias='addressTwo')
     """
      Max length: 50;
     """
-    override_state: str | None = Field(default=None, alias='overrideState')
+    city: str | None = None
     """
      Max length: 50;
     """
-    override_zip: str | None = Field(default=None, alias='overrideZip')
+    state: StateReference | None = None
+    zip: str | None = None
     """
      Max length: 12;
     """
-    override_country: CountryReference | None = Field(
-        default=None, alias='overrideCountry'
-    )
-    override_phone_number: str | None = Field(default=None, alias='overridePhoneNumber')
+    country: CountryReference | None = None
+    phone: str | None = None
     """
      Max length: 15;
     """
-    override_fax_number: str | None = Field(default=None, alias='overrideFaxNumber')
+    invoice_title: str = Field(..., alias='invoiceTitle')
     """
-     Max length: 15;
+     Max length: 50;
     """
-    owa_url: str | None = Field(default=None, alias='owaUrl')
+    payable_name: str = Field(..., alias='payableName')
     """
-     Max length: 100;
+     Max length: 50;
     """
-    payroll_xref: str | None = Field(default=None, alias='payrollXref')
+    topcomment: str | None = None
     """
-     Max length: 10;
+     Max length: 4000;
     """
-    location_flag: bool | None = Field(default=None, alias='locationFlag')
-    client_flag: bool | None = Field(default=None, alias='clientFlag')
-    work_role_ids: list[int] | None = Field(default=None, alias='workRoleIds')
-    department_ids: list[int] | None = Field(default=None, alias='departmentIds')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LocationDepartment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    invoice_footer: str | None = Field(default=None, alias='invoiceFooter')
+    """
+     Max length: 500;
+    """
+    quote_footer: str | None = Field(default=None, alias='quoteFooter')
+    """
+     Max length: 1000;
+    """
+    overall_invoice_default: InvoiceTemplateReference | None = Field(
+        default=None, alias='overallInvoiceDefault'
     )
-    id: int | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LocationInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    standard_invoice_actual: InvoiceTemplateReference | None = Field(
+        default=None, alias='standardInvoiceActual'
     )
-    id: int | None = None
-    name: str | None = None
-    location_flag: bool | None = None
-    structure_level: CorporateStructureLevelReference | None = Field(
-        default=None, alias='structureLevel'
+    standard_invoice_fixed: InvoiceTemplateReference | None = Field(
+        default=None, alias='standardInvoiceFixed'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LocationWorkRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    progress_invoice: InvoiceTemplateReference | None = Field(
+        default=None, alias='progressInvoice'
     )
-    id: int | None = None
-    location: SystemLocationReference | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_role_inactive_flag: bool | None = Field(
-        default=None, alias='workRoleInactiveFlag'
+    agreement_invoice: InvoiceTemplateReference | None = Field(
+        default=None, alias='agreementInvoice'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class LogType(Enum):
-    ALL = 'All'
-    ERROR = 'Error'
-    NEW_MANAGED_SOLUTION = 'NewManagedSolution'
-    NEW_DEVICE_TYPE = 'NewDeviceType'
-    NEW_CONFIGURATION = 'NewConfiguration'
-    NEW_ADDITION = 'NewAddition'
-    INFO = 'Info'
-
-
-class LoginBy(Enum):
-    GLOBAL_ = 'Global'
-    MEMBER = 'Member'
-
-
-class LostRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    credit_memo_invoice: InvoiceTemplateReference | None = Field(
+        default=None, alias='creditMemoInvoice'
     )
-    id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class M365Contact(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    down_payment_invoice: InvoiceTemplateReference | None = Field(
+        default=None, alias='downPaymentInvoice'
     )
-    id: int | None = None
-    user_principal_name: str | None = Field(default=None, alias='userPrincipalName')
-    display_name: str | None = Field(default=None, alias='displayName')
-    contact_rec_id: int | None = Field(default=None, alias='contactRecId')
-    tenant_id: str | None = Field(default=None, alias='tenantId')
-    m365_contact_id: str | None = Field(default=None, alias='m365ContactId')
-    department: str | None = None
-    employee_type: str | None = Field(default=None, alias='employeeType')
-    manager_id: str | None = Field(default=None, alias='managerId')
-    proxy_addresses: str | None = Field(default=None, alias='proxyAddresses')
-    proxy_addresses_plain: str | None = Field(default=None, alias='proxyAddressesPlain')
-    groups: str | None = None
-    directory_roles: str | None = Field(default=None, alias='directoryRoles')
-    assigned_licenses: str | None = Field(default=None, alias='assignedLicenses')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class M365ContactSync(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    misc_invoice: InvoiceTemplateReference | None = Field(
+        default=None, alias='miscInvoice'
     )
-    id: int | None = None
-    tenant_id: str | None = Field(default=None, alias='tenantId')
-    client_id: str | None = Field(default=None, alias='clientId')
-    client_secret: str | None = Field(default=None, alias='clientSecret')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    primary_domain: str | None = Field(default=None, alias='primaryDomain')
-    display_name: str | None = Field(default=None, alias='displayName')
-    authorized_flag: bool | None = Field(default=None, alias='authorizedFlag')
-    server_url: str | None = Field(default=None, alias='serverUrl')
-    username: str | None = None
-    password: str | None = None
-    domain: str | None = None
-    company_contacts_folder: str | None = Field(
-        default=None, alias='companyContactsFolder'
+    sales_order_invoice: InvoiceTemplateReference | None = Field(
+        default=None, alias='salesOrderInvoice'
     )
-    service_account_email: str | None = Field(default=None, alias='serviceAccountEmail')
-    credential_file: str | None = Field(default=None, alias='credentialFile')
-    credential_file_name: str | None = Field(default=None, alias='credentialFileName')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class M365ContactSyncCompany(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    exclude_do_not_bill_time_flag: bool | None = Field(
+        default=None, alias='excludeDoNotBillTimeFlag'
     )
-    id: int | None = None
-    company_rec_id: int | None = Field(default=None, alias='companyRecId')
-    tenant_id: str | None = Field(default=None, alias='tenantId')
-    parent_tenant_id: str | None = Field(default=None, alias='parentTenantId')
-    m365_tenant: M365Tenant | None = Field(default=None, alias='m365Tenant')
-    display_name: str | None = Field(default=None, alias='displayName')
-    sync_flag: bool | None = Field(default=None, alias='syncFlag')
-    company_id: str | None = Field(default=None, alias='companyId')
-    contacts: list[GraphUserCsv] | None = None
-    inactive_flag_tenant: bool | None = Field(default=None, alias='inactiveFlagTenant')
-    are_all_microsoft365_contact_sync_inactive: bool | None = Field(
-        default=None, alias='areAllMicrosoft365ContactSyncInactive'
+    exclude_do_not_bill_expense_flag: bool | None = Field(
+        default=None, alias='excludeDoNotBillExpenseFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class M365ContactSyncInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    exclude_do_not_bill_product_flag: bool | None = Field(
+        default=None, alias='excludeDoNotBillProductFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class M365ContactSyncMonitoring(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    prefix_suffix_flag: Literal['Prefix', 'Suffix'] | None = Field(
+        default=None, alias='prefixSuffixFlag'
     )
-    id: int | None = None
-    monitoring_type_id: int | None = Field(default=None, alias='monitoringTypeId')
-    email_address: str | None = Field(default=None, alias='emailAddress')
-    service_board_id: int | None = Field(default=None, alias='serviceBoardId')
-    service_board_status_id: int | None = Field(
-        default=None, alias='serviceBoardStatusId'
+    prefix_suffix_text: str | None = Field(default=None, alias='prefixSuffixText')
+    """
+     Max length: 5;
+    """
+    charge_adj_to_firm_flag: bool | None = Field(
+        default=None, alias='chargeAdjToFirmFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class M365ContactSyncMonitoringNotificationInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    no_watermark_flag: bool | None = Field(default=None, alias='noWatermarkFlag')
+    display_tax_flag: bool | None = Field(default=None, alias='displayTaxFlag')
+    allow_restricted_dept_on_routing_flag: bool | None = Field(
+        default=None, alias='allowRestrictedDeptOnRoutingFlag'
     )
-    company_rec_id: int | None = Field(default=None, alias='companyRecId')
-    company_name: str | None = Field(default=None, alias='companyName')
-    address_rec_id: int | None = Field(default=None, alias='addressRecId')
-    primary_contact_rec_id: int | None = Field(
-        default=None, alias='primaryContactRecId'
+    bill_ticket_separately_flag: bool | None = Field(
+        default=None, alias='billTicketSeparatelyFlag'
     )
-    primary_contact_full_name: str | None = Field(
-        default=None, alias='primaryContactFullName'
+    bill_ticket_complete_flag: bool | None = Field(
+        default=None, alias='billTicketCompleteFlag'
     )
-    tenant_id: str | None = Field(default=None, alias='tenantId')
-    tenant_name: str | None = Field(default=None, alias='tenantName')
-
-
-class M365ContactSyncProperty(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_ticket_unapproved_flag: bool | None = Field(
+        default=None, alias='billTicketUnapprovedFlag'
     )
-    id: int | None = None
-    include_exclude_type: IncludeExcludeType | None = Field(
-        default=None, alias='includeExcludeType'
+    bill_project_complete_flag: bool | None = Field(
+        default=None, alias='billProjectCompleteFlag'
     )
-    property_type: PropertyType | None = Field(default=None, alias='propertyType')
-    exclude_include_flag: bool | None = Field(default=None, alias='excludeIncludeFlag')
-    wild_card: str | None = Field(default=None, alias='wildCard')
-    company_rec_id: int | None = Field(default=None, alias='companyRecID')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class M365License(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_project_unapproved_flag: bool | None = Field(
+        default=None, alias='billProjectUnapprovedFlag'
     )
-    id: str | None = None
-    description: str | None = None
-
-
-class M365Tenant(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    progress_time_flag: bool | None = Field(default=None, alias='progressTimeFlag')
+    restrict_project_downpayment_flag: bool | None = Field(
+        default=None, alias='restrictProjectDownpaymentFlag'
     )
-    id: str | None = None
-    name: str | None = None
-
-
-class ManagedDeviceAccount(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_sales_order_complete_flag: bool | None = Field(
+        default=None, alias='billSalesOrderCompleteFlag'
     )
-    id: int | None = None
-    username: str | None = None
-    password: str | None = None
-    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
-        default=None, alias='managedDevicesIntegration'
+    bill_product_after_ship_flag: bool | None = Field(
+        default=None, alias='billProductAfterShipFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagedDevicesIntegration(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_downpayment_flag: bool | None = Field(
+        default=None, alias='restrictDownpaymentFlag'
     )
-    id: int | None = None
-    name: str
+    copy_non_service_products_flag: bool | None = Field(
+        default=None, alias='copyNonServiceProductsFlag'
+    )
+    copy_service_products_flag: bool | None = Field(
+        default=None, alias='copyServiceProductsFlag'
+    )
+    copy_agreement_products_flag: bool | None = Field(
+        default=None, alias='copyAgreementProductsFlag'
+    )
+    print_logo_flag: bool | None = Field(default=None, alias='printLogoFlag')
+    read_receipt_flag: bool | None = Field(default=None, alias='readReceiptFlag')
+    delivery_receipt_flag: bool | None = Field(
+        default=None, alias='deliveryReceiptFlag'
+    )
+    attach_xml_invoice_flag: bool | None = Field(
+        default=None, alias='attachXmlInvoiceFlag'
+    )
+    disable_routing_email_flag: bool | None = Field(
+        default=None, alias='disableRoutingEmailFlag'
+    )
+    email_template: EmailTemplateReference = Field(..., alias='emailTemplate')
+    localized_country: CountryReference | None = Field(
+        default=None, alias='localizedCountry'
+    )
+    business_number: str | None = Field(default=None, alias='businessNumber')
     """
-     Max length: 30;
+     Max length: 50;
     """
-    solution: str
+    currency: CurrencyReference | None = None
+    custom_label: str | None = Field(default=None, alias='customLabel')
     """
-     Max length: 30;
+     Max length: 50;
     """
-    portal_url: str | None = Field(default=None, alias='portalUrl')
+    custom_text: str | None = Field(default=None, alias='customText')
     """
-     Max length: 200;
+     Max length: 500;
     """
-    login_by: LoginBy = Field(..., alias='loginBy')
-    global_login_username: str | None = Field(default=None, alias='globalLoginUsername')
+    company_code: str | None = Field(default=None, alias='companyCode')
     """
-    Gets or sets
-                this is only required when globalLoginFlag = true. Max length: 50;
+     Max length: 250;
     """
-    global_login_password: str | None = Field(default=None, alias='globalLoginPassword')
+    exclude_avalara_flag: bool | None = Field(default=None, alias='excludeAvalaraFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BillingSetupInfo(ConnectWiseModel):
+    id: int | None = None
+    remit_name: str | None = Field(default=None, alias='remitName')
+    location: SystemLocationReference | None = None
+    currency: CurrencyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BillingSetupRouting(ConnectWiseModel):
+    id: int | None = None
+    sequence_number: int = Field(..., alias='sequenceNumber')
+    invoice_rule: Literal['All', 'Standard', 'Project', 'Agreement'] = Field(
+        ..., alias='invoiceRule'
+    )
+    routing_rule: Literal[
+        'Account',
+        'Territory',
+        'Creator',
+        'Department',
+        'Location',
+        'Member',
+        'Project',
+        'Sales',
+    ] = Field(..., alias='routingRule')
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Board(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-    Gets or sets
-                this is only required when globalLoginFlag = true. Max length: 50;
+     Max length: 50;
     """
-    default_billing_level: DefaultBillingLevel = Field(..., alias='defaultBillingLevel')
-    management_it_setup_type: str | None = Field(
-        default=None, alias='managementItSetupType'
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    sign_off_template: ServiceSignoffReference | None = Field(
+        default=None, alias='signOffTemplate'
     )
-    default_location: SystemLocationReference | None = Field(
-        default=None, alias='defaultLocation'
+    send_to_contact_flag: bool | None = Field(default=None, alias='sendToContactFlag')
+    contact_template: ServiceEmailTemplateReference | None = Field(
+        default=None, alias='contactTemplate'
     )
-    default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='defaultDepartment'
+    send_to_resource_flag: bool | None = Field(default=None, alias='sendToResourceFlag')
+    resource_template: ServiceEmailTemplateReference | None = Field(
+        default=None, alias='resourceTemplate'
     )
-    integrator_login: IntegratorLoginReference | None = Field(
-        default=None, alias='integratorLogin'
+    project_flag: bool | None = Field(default=None, alias='projectFlag')
+    show_dependencies_flag: bool | None = Field(
+        default=None, alias='showDependenciesFlag'
     )
-    match_on_serial_number_flag: bool | None = Field(
-        default=None, alias='matchOnSerialNumberFlag'
+    """
+    This field only shows if it is Project Board.
+    """
+    show_estimates_flag: bool | None = Field(default=None, alias='showEstimatesFlag')
+    """
+    This field only shows if it is Project Board.
+    """
+    board_icon: DocumentReference | None = Field(default=None, alias='boardIcon')
+    bill_tickets_after_closed_flag: bool | None = Field(
+        default=None, alias='billTicketsAfterClosedFlag'
     )
-    disable_new_cross_references_flag: bool | None = Field(
-        default=None, alias='disableNewCrossReferencesFlag'
+    bill_ticket_separately_flag: bool | None = Field(
+        default=None, alias='billTicketSeparatelyFlag'
     )
-    config_bill_customer_flag: bool | None = Field(
-        default=None, alias='configBillCustomerFlag'
+    bill_unapproved_time_expense_flag: bool | None = Field(
+        default=None, alias='billUnapprovedTimeExpenseFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagedDevicesIntegrationCrossReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    override_billing_setup_flag: bool | None = Field(
+        default=None, alias='overrideBillingSetupFlag'
     )
-    id: int | None = None
-    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
-        default=None, alias='managedDevicesIntegration'
+    dispatch_member: MemberReference | None = Field(
+        default=None, alias='dispatchMember'
     )
-    vendor_type: str | None = Field(default=None, alias='vendorType')
-    """
-     Max length: 255;
-    """
-    vendor_level: str | None = Field(default=None, alias='vendorLevel')
-    """
-     Max length: 255;
-    """
-    agreement_type: AgreementTypeReference | None = Field(
-        default=None, alias='agreementType'
+    service_manager_member: MemberReference | None = Field(
+        default=None, alias='serviceManagerMember'
     )
-    product: IvItemReference | None = None
-    configuration_type: ConfigurationTypeReference | None = Field(
-        default=None, alias='configurationType'
+    duty_manager_member: MemberReference | None = Field(
+        default=None, alias='dutyManagerMember'
     )
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagedDevicesIntegrationInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    oncall_member: MemberReference | None = Field(default=None, alias='oncallMember')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] | None = Field(
+        default=None, alias='billTime'
+    )
+    bill_expense: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billExpense')
+    bill_product: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billProduct')
+    auto_close_status: ServiceStatusReference | None = Field(
+        default=None, alias='autoCloseStatus'
     )
-    id: int | None = None
-    name: str | None = None
-    solution: str | None = None
-    management_it_setup_type: str | None = Field(
-        default=None, alias='managementItSetupType'
+    auto_assign_new_tickets_flag: bool | None = Field(
+        default=None, alias='autoAssignNewTicketsFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagedDevicesIntegrationLogin(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    auto_assign_new_ec_tickets_flag: bool | None = Field(
+        default=None, alias='autoAssignNewECTicketsFlag'
     )
-    id: int | None = None
-    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
-        default=None, alias='managedDevicesIntegration'
+    auto_assign_new_portal_tickets_flag: bool | None = Field(
+        default=None, alias='autoAssignNewPortalTicketsFlag'
     )
-    username: str
+    discussions_locked_flag: bool | None = Field(
+        default=None, alias='discussionsLockedFlag'
+    )
+    time_entry_locked_flag: bool | None = Field(
+        default=None, alias='timeEntryLockedFlag'
+    )
+    notify_email_from: str | None = Field(default=None, alias='notifyEmailFrom')
     """
      Max length: 50;
     """
-    password: str | None = None
+    notify_email_from_name: str | None = Field(
+        default=None, alias='notifyEmailFromName'
+    )
     """
-     Max length: 50;
+     Max length: 60;
     """
-    member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagedDevicesIntegrationNotification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
-        default=None, alias='managedDevicesIntegration'
-    )
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
-    )
-    member: MemberReference | None = None
-    log_type: LogType = Field(..., alias='logType')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagedDevicesIntegrationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    closed_loop_discussions_flag: bool | None = Field(
+        default=None, alias='closedLoopDiscussionsFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagedInformation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    closed_loop_resolution_flag: bool | None = Field(
+        default=None, alias='closedLoopResolutionFlag'
     )
-    management_solution_name: str | None = Field(
-        default=None, alias='managementSolutionName'
+    closed_loop_internal_analysis_flag: bool | None = Field(
+        default=None, alias='closedLoopInternalAnalysisFlag'
     )
-    managed_identifier: str | None = Field(default=None, alias='managedIdentifier')
-    type: str | None = None
-    level: str | None = None
-    child_configurations_matching_on: str | None = Field(
-        default=None, alias='childConfigurationsMatchingOn'
+    time_entry_discussion_flag: bool | None = Field(
+        default=None, alias='timeEntryDiscussionFlag'
     )
-    inactivate_configurations_matching_on: str | None = Field(
-        default=None, alias='inactivateConfigurationsMatchingOn'
+    time_entry_resolution_flag: bool | None = Field(
+        default=None, alias='timeEntryResolutionFlag'
     )
-    inactive_configuration_status_id: int | None = Field(
-        default=None, alias='inactiveConfigurationStatusId'
+    time_entry_internal_analysis_flag: bool | None = Field(
+        default=None, alias='timeEntryInternalAnalysisFlag'
     )
-
-
-class Management(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    problem_sort: Literal['Ascending', 'Descending'] | None = Field(
+        default=None, alias='problemSort'
     )
-    id: int | None = None
-    run_time: datetime | None = Field(default=None, alias='runTime')
-    added_configuration_status: ConfigurationStatusReference | None = Field(
-        default=None, alias='addedConfigurationStatus'
+    resolution_sort: Literal['Ascending', 'Descending'] | None = Field(
+        default=None, alias='resolutionSort'
     )
-    deleted_configuration_status: ConfigurationStatusReference | None = Field(
-        default=None, alias='deletedConfigurationStatus'
+    internal_analysis_sort: Literal['Ascending', 'Descending'] | None = Field(
+        default=None, alias='internalAnalysisSort'
     )
-    integrator_login: IntegratorLoginReference | None = Field(
-        default=None, alias='integratorLogin'
+    email_connector_allow_reopen_closed_flag: bool | None = Field(
+        default=None, alias='emailConnectorAllowReopenClosedFlag'
     )
-    schedule_executive_summary_report_flag: bool = Field(
-        ..., alias='scheduleExecutiveSummaryReportFlag'
+    email_connector_reopen_status: ServiceStatusReference | None = Field(
+        default=None, alias='emailConnectorReopenStatus'
     )
-    executive_summary_report_schedule_day: int | None = Field(
-        default=None, alias='executiveSummaryReportScheduleDay'
+    email_connector_reopen_resources_flag: bool | None = Field(
+        default=None, alias='emailConnectorReopenResourcesFlag'
     )
     """
-    Gets or sets
-                this is only required when scheduleExecutiveSummaryReportFlag = true.
+    This field can only be set when emailConnectorAllowReopenClosed is true.
     """
-    executive_summary_report_schedule_hour: int | None = Field(
-        default=None, alias='executiveSummaryReportScheduleHour'
+    email_connector_new_ticket_no_match_flag: bool | None = Field(
+        default=None, alias='emailConnectorNewTicketNoMatchFlag'
     )
     """
-    Gets or sets
-                this is only required when scheduleExecutiveSummaryReportFlag = true. Input should be in 24 hour format, ie 2pm is 14.
+    This field can only be set when emailConnectorAllowReopenClosed is true.
     """
-    executive_summary_report_schedule_minute: int | None = Field(
-        default=None, alias='executiveSummaryReportScheduleMinute'
+    email_connector_never_reopen_by_days_flag: bool | None = Field(
+        default=None, alias='emailConnectorNeverReopenByDaysFlag'
     )
     """
-    Gets or sets
-                this is only required when scheduleExecutiveSummaryReportFlag = true.
+    This field can only be set when emailConnectorAllowReopenClosed is true.
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagementBackup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    type: AgreementTypeReference | None = None
-    item: CatalogItemReference | None = None
-    billing_level: BillingLevel = Field(..., alias='billingLevel')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManagementItSolution(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    email_connector_reopen_days_limit: int | None = Field(
+        default=None, alias='emailConnectorReopenDaysLimit'
     )
-    id: int | None = None
-    name: str
     """
-     Max length: 30;
+    This field can only be set when emailConnectorNeverReopenByDaysFlag and emailConnectorAllowReopenClosed are both true
+                This field is required when emailConnectorNeverReopenByDaysFlag is true.
     """
-    management_it_solution_type: ManagementItSolutionType = Field(
-        ..., alias='managementItSolutionType'
-    )
-    management_solution_name: str | None = Field(
-        default=None, alias='managementSolutionName'
+    email_connector_never_reopen_by_days_closed_flag: bool | None = Field(
+        default=None, alias='emailConnectorNeverReopenByDaysClosedFlag'
     )
     """
-    Gets or sets
-                this is only required when managementItSolutionType is Custom. Max length: 30;
-    """
-    management_server_url: str | None = Field(default=None, alias='managementServerUrl')
-    """
-    Gets or sets
-                this is only required for Level Platforms. Max length: 200;
+    This field can only be set when emailConnectorAllowReopenClosed is true.
     """
-    webservice_override_url: str | None = Field(
-        default=None, alias='webserviceOverrideUrl'
+    email_connector_reopen_days_closed_limit: int | None = Field(
+        default=None, alias='emailConnectorReopenDaysClosedLimit'
     )
     """
-    Gets or sets
-                this is only required for Level Platforms when overrideWebServiceLocationFlag is true. Max length: 200;
+    This field can only be set when emailConnectorNeverReopenByDaysClosedFlag and emailConnectorAllowReopenClosed are both true
+                This field is required when emailConnectorNeverReopenByDaysClosedFlag is true.
     """
-    portal_override_login_url: str | None = Field(
-        default=None, alias='portalOverrideLoginUrl'
+    use_member_display_name_flag: bool | None = Field(
+        default=None, alias='useMemberDisplayNameFlag'
+    )
+    send_to_cc_flag: bool | None = Field(default=None, alias='sendToCCFlag')
+    auto_assign_ticket_owner_flag: bool | None = Field(
+        default=None, alias='autoAssignTicketOwnerFlag'
+    )
+    auto_assign_limit_flag: bool | None = Field(
+        default=None, alias='autoAssignLimitFlag'
+    )
+    auto_assign_limit_amount: int | None = Field(
+        default=None, alias='autoAssignLimitAmount'
     )
     """
-    Gets or sets
-                this is only required for Level Platforms when overrideLoginLocationFlag is true. Max length: 200;
-    """
-    global_login_flag: bool | None = Field(default=None, alias='globalLoginFlag')
-    global_login_username: str | None = Field(default=None, alias='globalLoginUsername')
-    """
-    Gets or sets
-                this is only required when globalLoginFlag = true. Max length: 50;
-    """
-    global_login_password: str | None = Field(default=None, alias='globalLoginPassword')
-    """
-    Gets or sets
-                this is only required when globalLoginFlag = true. Max length: 50;
-    """
-    using_ssl_flag: bool | None = Field(default=None, alias='usingSslFlag')
-    n_able_username: str | None = Field(default=None, alias='nAbleUsername')
-    """
-    Gets or sets
-                this is only required for N-Able solution. Max length: 50;
-    """
-    n_able_password: str | None = Field(default=None, alias='nAblePassword')
+    This field can only be set when autoAssignLimitFlag is true
     """
-    Gets or sets
-                this is only required for N-Able solution. Max length: 50;
-    """
-    override_web_service_location_flag: bool | None = Field(
-        default=None, alias='overrideWebServiceLocationFlag'
-    )
-    override_login_location_flag: bool | None = Field(
-        default=None, alias='overrideLoginLocationFlag'
+    closed_loop_all_flag: bool | None = Field(default=None, alias='closedLoopAllFlag')
+    percentage_calculation: Literal[
+        'ActualHours', 'Manual', 'ClosedPhases', 'ClosedTickets'
+    ] | None = Field(default=None, alias='percentageCalculation')
+    all_sort: Literal['Ascending', 'Descending'] | None = Field(
+        default=None, alias='allSort'
     )
-    continuum_api_username: str | None = Field(
-        default=None, alias='continuumApiUsername'
+    mark_first_note_issue_flag: bool | None = Field(
+        default=None, alias='markFirstNoteIssueFlag'
     )
-    """
-    Gets or sets
-                this is only required for Continuum solution. Max length: 100;
-    """
-    continuum_api_password: str | None = Field(
-        default=None, alias='continuumApiPassword'
+    restrict_board_by_default_flag: bool | None = Field(
+        default=None, alias='restrictBoardByDefaultFlag'
     )
-    """
-    Gets or sets
-                this is only required for Continuum solution. Max length: 100;
-    """
-    level_api_username: str | None = Field(default=None, alias='levelApiUsername')
-    """
-    Gets or sets
-                this is only required for Level Platforms solution. Max length: 100;
-    """
-    level_api_password: str | None = Field(default=None, alias='levelApiPassword')
-    """
-    Gets or sets
-                this is only required for Level Platforms solution. Max length: 100;
-    """
-    level_var_domain: str | None = Field(default=None, alias='levelVarDomain')
-    """
-    Gets or sets
-                this is only required for Level Platforms solution. Max length: 100;
-    """
-    no_display_flag: bool | None = Field(default=None, alias='noDisplayFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ManagementItSolutionAgreementInterfaceParameter(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class BoardAutoAssignResource(ConnectWiseModel):
+    id: int | None = None
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
     )
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BoardAutoTemplate(ConnectWiseModel):
     id: int | None = None
-    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
-        default=None, alias='managedDevicesIntegration'
+    type: ServiceTypeReference | None = None
+    subtype: ServiceSubTypeReference | None = None
+    item: ServiceItemReference | None = None
+    service_template: ServiceTemplateReference | None = Field(
+        default=None, alias='serviceTemplate'
     )
-    agreement_type: AgreementTypeReference | None = Field(
-        default=None, alias='agreementType'
+    board: BoardReference | None = None
+    summary_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='summarySetting'
     )
-    server_product: IvItemReference | None = Field(default=None, alias='serverProduct')
-    workstation_product: IvItemReference | None = Field(
-        default=None, alias='workstationProduct'
+    discussion_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='discussionSetting'
     )
-    spam_stats_product: IvItemReference | None = Field(
-        default=None, alias='spamStatsProduct'
+    internal_analysis_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='internalAnalysisSetting'
+    )
+    resolution_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='resolutionSetting'
+    )
+    tasks_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='tasksSetting'
+    )
+    documents_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='documentsSetting'
+    )
+    resources_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='resourcesSetting'
+    )
+    budget_hours_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='budgetHoursSetting'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    finance_information_setting: Literal[
+        'Append', 'Overwrite', 'Ignore'
+    ] | None = Field(default=None, alias='financeInformationSetting')
+    send_notes_as_email_setting: Literal[
+        'Append', 'Overwrite', 'Ignore'
+    ] | None = Field(default=None, alias='sendNotesAsEmailSetting')
+    impact_urgency_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='impactUrgencySetting'
+    )
+    template_priority_setting: Literal['Append', 'Overwrite', 'Ignore'] | None = Field(
+        default=None, alias='templatePrioritySetting'
+    )
+    auto_apply_flag: bool | None = Field(default=None, alias='autoApplyFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ManagementItSolutionType(Enum):
-    LEVEL_PLATFORMS = 'LevelPlatforms'
-    N_ABLE = 'NAble'
-    CONTINUUM = 'Continuum'
-    CUSTOM = 'Custom'
+class BoardDefault(ConnectWiseModel):
+    id: int | None = None
+    board: BoardReference | None = None
+    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    agreement_id: int | None = Field(default=None, alias='agreementId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ManagementLogDocumentInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class BoardInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    project_flag: bool | None = Field(default=None, alias='projectFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    closed_loop_discussions_flag: bool | None = Field(
+        default=None, alias='closedLoopDiscussionsFlag'
     )
-    full_path_file_name: str | None = Field(default=None, alias='fullPathFileName')
-    file_size: str | None = Field(default=None, alias='fileSize')
+    closed_loop_internal_analysis_flag: bool | None = Field(
+        default=None, alias='closedLoopInternalAnalysisFlag'
+    )
+    closed_loop_resolution_flag: bool | None = Field(
+        default=None, alias='closedLoopResolutionFlag'
+    )
+    closed_loop_all_flag: bool | None = Field(default=None, alias='closedLoopAllFlag')
+    problem_sort: Literal['Ascending', 'Descending'] | None = Field(
+        default=None, alias='problemSort'
+    )
+    internal_analysis_sort: Literal['Ascending', 'Descending'] | None = Field(
+        default=None, alias='internalAnalysisSort'
+    )
+    resolution_sort: Literal['Ascending', 'Descending'] | None = Field(
+        default=None, alias='resolutionSort'
+    )
+    all_sort: Literal['Ascending', 'Descending'] | None = Field(
+        default=None, alias='allSort'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ManagementNetworkSecurity(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BoardItem(ConnectWiseModel):
     id: int | None = None
     name: str
-    """
-     Max length: 30;
-    """
-    username: str | None = None
-    """
-     Max length: 50;
-    """
-    password: str | None = None
     """
      Max length: 50;
     """
-    site: str
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    board: BoardReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class BoardItemAssociation(ConnectWiseModel):
+    id: int
+    sub_type_association_ids: list[int] | None = Field(
+        default=None, alias='subTypeAssociationIds'
+    )
     """
-     Max length: 100;
+    If addAllSubTypesFlag and removeAllSubTypesFlag are both false, this field is required.
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    add_all_sub_types_flag: bool | None = Field(
+        default=None, alias='addAllSubTypesFlag'
+    )
+    remove_all_sub_types_flag: bool | None = Field(
+        default=None, alias='removeAllSubTypesFlag'
+    )
+    item: ServiceItemReference | None = None
+    board: BoardReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ManagementReportNotification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BoardNotification(ConnectWiseModel):
     id: int | None = None
     notify_who: NotificationRecipientReference | None = Field(
         default=None, alias='notifyWho'
@@ -10276,7054 +8722,5901 @@ class ManagementReportNotification(BaseModel):
     """
      Max length: 50;
     """
-    global_flag: bool | None = Field(default=None, alias='globalFlag')
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ManagementReportSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BoardStatus(ConnectWiseModel):
     id: int | None = None
-    scheduled_report_disabled_flag: bool = Field(
-        ..., alias='scheduledReportDisabledFlag'
+    name: str
+    """
+     Max length: 50;
+    """
+    board: BoardReference | None = None
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    display_on_board: bool | None = Field(default=None, alias='displayOnBoard')
+    inactive: bool | None = None
+    closed_status: bool | None = Field(default=None, alias='closedStatus')
+    time_entry_not_allowed: bool | None = Field(
+        default=None, alias='timeEntryNotAllowed'
+    )
+    round_robin_catchall: bool | None = Field(default=None, alias='roundRobinCatchall')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    escalation_status: Literal[
+        'NotResponded', 'Responded', 'ResolutionPlan', 'Resolved', 'NoEscalation'
+    ] | None = Field(default=None, alias='escalationStatus')
+    customer_portal_description: str | None = Field(
+        default=None, alias='customerPortalDescription'
+    )
+    """
+     Max length: 500;
+    """
+    customer_portal_flag: bool | None = Field(default=None, alias='customerPortalFlag')
+    email_template: ServiceEmailTemplateReference | None = Field(
+        default=None, alias='emailTemplate'
+    )
+    status_indicator: StatusIndicatorReference | None = Field(
+        default=None, alias='statusIndicator'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_status_indicator_name: str | None = Field(
+        default=None, alias='customStatusIndicatorName'
+    )
+    """
+     Max length: 30;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    save_time_as_note: bool | None = Field(default=None, alias='saveTimeAsNote')
 
 
-class ManagementSolutionReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BoardStatusNotification(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    setup_name: str | None = Field(default=None, alias='setupName')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
+    )
+    status: ServiceStatusReference | None = None
+    member: MemberReference | None = None
+    email: str | None = None
+    """
+    Service Status Notification email must be entered if the notify type is "Email Address". Max length: 255;
+    """
+    workflow_step: int | None = Field(default=None, alias='workflowStep')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Manager(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class BoardTeam(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 30;
+    """
+    team_leader: MemberReference | None = Field(default=None, alias='teamLeader')
+    members: list[int] | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    notify_on_ticket_delete: bool | None = Field(
+        default=None, alias='notifyOnTicketDelete'
     )
-    manager_id: str | None = None
-    user_type: str | None = Field(default=None, alias='userType')
-    microsoft_365_contact_rec_id: int | None = Field(
-        default=None, alias='microsoft_365_Contact_RecID'
+    default_round_robin_flag: bool | None = Field(
+        default=None, alias='defaultRoundRobinFlag'
     )
-    principal_name: str | None = Field(default=None, alias='principalName')
-    display_name: str | None = Field(default=None, alias='displayName')
-    contact_rec_id: int | None = Field(default=None, alias='contact_RecID')
-    tenant_id: str | None = Field(default=None, alias='tenant_ID')
-    id: str | None = None
-    department: str | None = None
-    manager_id_1: str | None = Field(default=None, alias='manager_ID')
-    employee_type: str | None = Field(default=None, alias='employeeType')
-    manager: Manager | None = None
-    date_entered_utc: datetime | None = Field(default=None, alias='date_Entered_UTC')
-    entered_by: str | None = Field(default=None, alias='entered_By')
-    last_update_utc: datetime | None = Field(default=None, alias='last_Update_UTC')
-    updated_by: str | None = Field(default=None, alias='updated_By')
-    first_name: str | None = Field(default=None, alias='firstName')
-    last_name: str | None = Field(default=None, alias='lastName')
-    groups: list[str] | None = None
-    directory_roles: list[str] | None = Field(default=None, alias='directoryRoles')
-    proxy_addresses: list[str] | None = Field(default=None, alias='proxyAddresses')
-    mail_nickname: str | None = Field(default=None, alias='mailNickname')
-    mail: str | None = None
-    country: str | None = None
-    state: str | None = None
-    city: str | None = None
-    address: str | None = None
-    fax: str | None = None
-    title: str | None = None
-    mobile_phone: str | None = Field(default=None, alias='mobilePhone')
-    office: str | None = None
-    phone_number: str | None = Field(default=None, alias='phoneNumber')
-    language: str | None = None
-    usage_location: str | None = Field(default=None, alias='usageLocation')
-    postal_code: str | None = Field(default=None, alias='postalCode')
-    licenses: list[M365License] | None = None
-    account_enabled: bool | None = Field(default=None, alias='accountEnabled')
+    round_robin_flag: bool | None = Field(default=None, alias='roundRobinFlag')
+    board_id: int | None = Field(default=None, alias='boardId')
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Manufacturer(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BoardType(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 50;
     """
+    category: Literal['Reactive', 'Proactive'] | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
     inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    request_for_change_flag: bool | None = Field(
+        default=None, alias='requestForChangeFlag'
+    )
+    integration_xref: str | None = Field(default=None, alias='integrationXref')
+    """
+     Max length: 50;
+    """
+    skill_category: SkillCategoryReference | None = Field(
+        default=None, alias='skillCategory'
+    )
+    skill: SkillReference | None = None
+    board: BoardReference | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ManufacturerInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class BoardTypeSubTypeItemAssociation(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ManufacturerReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    type: ServiceTypeReference | None = None
+    sub_type: ServiceSubTypeReference | None = Field(default=None, alias='subType')
+    item: ServiceItemReference | None = None
+    board: BoardReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MappedRecordReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
+class BundleRequest(ConnectWiseModel):
+    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
+    resource_type: str | None = Field(default=None, alias='resourceType')
+    version: str | None = None
+    api_request: ApiRequest | None = Field(default=None, alias='apiRequest')
 
 
-class MappedType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    table: str | None = None
-    rec_id_field: str | None = Field(default=None, alias='recIdField')
-    gl_type: GlType | None = Field(default=None, alias='glType')
-    sort_order: int | None = Field(default=None, alias='sortOrder')
+class BundleRequestsCollection(ConnectWiseModel):
+    requests: list[BundleRequest]
 
 
-class MappedTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Calendar(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Market(Enum):
-    FROM_ = 'From'
-    TO = 'To'
+    name: str
+    holiday_list: HolidayListReference | None = Field(default=None, alias='holidayList')
+    monday_start_time: str | None = Field(default=None, alias='mondayStartTime')
+    monday_end_time: str | None = Field(default=None, alias='mondayEndTime')
+    tuesday_start_time: str | None = Field(default=None, alias='tuesdayStartTime')
+    tuesday_end_time: str | None = Field(default=None, alias='tuesdayEndTime')
+    wednesday_start_time: str | None = Field(default=None, alias='wednesdayStartTime')
+    wednesday_end_time: str | None = Field(default=None, alias='wednesdayEndTime')
+    thursday_start_time: str | None = Field(default=None, alias='thursdayStartTime')
+    thursday_end_time: str | None = Field(default=None, alias='thursdayEndTime')
+    friday_start_time: str | None = Field(default=None, alias='fridayStartTime')
+    friday_end_time: str | None = Field(default=None, alias='fridayEndTime')
+    saturday_start_time: str | None = Field(default=None, alias='saturdayStartTime')
+    saturday_end_time: str | None = Field(default=None, alias='saturdayEndTime')
+    sunday_start_time: str | None = Field(default=None, alias='sundayStartTime')
+    sunday_end_time: str | None = Field(default=None, alias='sundayEndTime')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MarketDescription(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Campaign(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 50;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MarketDescriptionInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    type: CampaignTypeReference | None = None
+    sub_type: CampaignSubTypeReference | None = Field(default=None, alias='subType')
+    status: CampaignStatusReference | None = None
+    start_date: datetime = Field(..., alias='startDate')
+    end_date: datetime | None = Field(default=None, alias='endDate')
+    location_id: int | None = Field(default=None, alias='locationId')
+    member: MemberReference | None = None
+    inactive: bool | None = None
+    inactive_days_after_end: int | None = Field(
+        default=None, alias='inactiveDaysAfterEnd'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MarketDescriptionReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    notes: str | None = None
+    default_group: GroupReference | None = Field(default=None, alias='defaultGroup')
+    marketing_manager_default_track_id: int | None = Field(
+        default=None, alias='marketingManagerDefaultTrackId'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    opportunity_default_track_id: int | None = Field(
+        default=None, alias='opportunityDefaultTrackId'
+    )
+    impressions: int | None = None
+    budget_revenue: float | None = Field(default=None, alias='budgetRevenue')
+    budget_cost: float | None = Field(default=None, alias='budgetCost')
+    actual_cost: float | None = Field(default=None, alias='actualCost')
+    budget_gross_margin: float | None = Field(default=None, alias='budgetGrossMargin')
+    budget_roi: float | None = Field(default=None, alias='budgetROI')
+    actual_revenue: float | None = Field(default=None, alias='actualRevenue')
+    actual_gross_margin: float | None = Field(default=None, alias='actualGrossMargin')
+    actual_roi: float | None = Field(default=None, alias='actualROI')
+    emails_sent: int | None = Field(default=None, alias='emailsSent')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MarketingCompany(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CampaignSubTypeCampaignSubType(ConnectWiseModel):
     id: int | None = None
-    group_id: int | None = Field(default=None, alias='groupId')
-    default_contact_flag: bool | None = Field(default=None, alias='defaultContactFlag')
-    all_contacts_flag: bool | None = Field(default=None, alias='allContactsFlag')
-    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    type: CampaignTypeReference | None = None
+    name: str
+    """
+     Max length: 100;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MarketingContact(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CampaignAudit(ConnectWiseModel):
     id: int | None = None
-    group_id: int | None = Field(default=None, alias='groupId')
-    note: str | None = None
+    emails_sent: int = Field(..., alias='emailsSent')
+    emails_unsent: int | None = Field(default=None, alias='emailsUnsent')
+    documents_created: int | None = Field(default=None, alias='documentsCreated')
+    email_subject: str | None = Field(default=None, alias='emailSubject')
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    group: GroupReference | None = None
+    campaign_id: int | None = Field(default=None, alias='campaignId')
+    created_by: str | None = Field(default=None, alias='createdBy')
+    date_created: str | None = Field(default=None, alias='dateCreated')
 
 
-class MarketplaceImport(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CatalogComponent(ConnectWiseModel):
     id: int | None = None
-    marketplace_import_type: MarketplaceImportType | None = Field(
-        default=None, alias='marketplaceImportType'
+    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
+    quantity: float
+    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
+    hide_price_flag: bool | None = Field(default=None, alias='hidePriceFlag')
+    hide_item_identifier_flag: bool | None = Field(
+        default=None, alias='hideItemIdentifierFlag'
     )
-    marketplace_object: list | None = Field(default=None, alias='marketplaceObject')
-    required_fields: list[str] | None = Field(default=None, alias='requiredFields')
+    hide_description_flag: bool | None = Field(
+        default=None, alias='hideDescriptionFlag'
+    )
+    hide_quantity_flag: bool | None = Field(default=None, alias='hideQuantityFlag')
+    hide_extended_price_flag: bool | None = Field(
+        default=None, alias='hideExtendedPriceFlag'
+    )
+    parent_catalog_item: CatalogItemReference | None = Field(
+        default=None, alias='parentCatalogItem'
+    )
+    price: float | None = None
+    cost: float | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MarketplaceImportType(Enum):
-    AGREEMENTS = 'Agreements'
-    CONFIGURATIONS = 'Configurations'
-    CRM_SURVEYS = 'CRMSurveys'
-    CUSTOM_REPORTS = 'CustomReports'
-    CUSTOMER_PORTAL_TYPES = 'CustomerPortalTypes'
-    HTML_EMAIL_TEMPLATES = 'HTMLEmailTemplates'
-    PRODUCTS = 'Products'
-    PROJECT_BOARDS = 'ProjectBoards'
-    PROJECT_TEMPLATES = 'ProjectTemplates'
-    REPORT_WRITER_REPORTS = 'ReportWriterReports'
-    SERVICE_BOARDS = 'ServiceBoards'
-    TICKET_TEMPLATES = 'TicketTemplates'
-    VIEWS = 'Views'
+class CatalogInventory(ConnectWiseModel):
+    id: int | None = None
+    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
+    )
+    on_hand: int | None = Field(default=None, alias='onHand')
+    serial_numbers: list[OnHandSerialNumberReference] | None = Field(
+        default=None, alias='serialNumbers'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Member(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class CatalogItem(ConnectWiseModel):
     id: int | None = None
     identifier: str
     """
-     Max length: 15;
+     Max length: 60;
     """
-    password: str | None = None
+    description: str
     """
-    ConditionallyRequired. API Member will get random password generated Max length: 60;
+     Max length: 60;
     """
-    disable_online_flag: bool | None = Field(default=None, alias='disableOnlineFlag')
-    license_class: LicenseClass = Field(..., alias='licenseClass')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    subcategory: ProductSubCategoryReference | None = None
+    type: ProductTypeReference | None = None
+    product_class: Literal[
+        'Agreement', 'Bundle', 'Inventory', 'NonInventory', 'Service'
+    ] | None = Field(default=None, alias='productClass')
     """
-    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
+    Defaults to Non-Inventory.
     """
-    notes: str | None = None
-    employee_identifer: str | None = Field(default=None, alias='employeeIdentifer')
+    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
+    serialized_cost_flag: bool | None = Field(default=None, alias='serializedCostFlag')
+    phase_product_flag: bool | None = Field(default=None, alias='phaseProductFlag')
+    unit_of_measure: UnitOfMeasureReference | None = Field(
+        default=None, alias='unitOfMeasure'
+    )
+    min_stock_level: int | None = Field(default=None, alias='minStockLevel')
+    price: float | None = None
+    cost: float | None = None
+    price_attribute: Literal[
+        'FixedFee', 'NotToExceed', 'OverrideRate', 'TimeAndMaterials'
+    ] | None = Field(default=None, alias='priceAttribute')
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    drop_ship_flag: bool | None = Field(default=None, alias='dropShipFlag')
+    special_order_flag: bool | None = Field(default=None, alias='specialOrderFlag')
+    customer_description: str = Field(..., alias='customerDescription')
     """
-     Max length: 10;
+     Max length: 6000;
     """
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    enable_mobile_gps_flag: bool | None = Field(
-        default=None, alias='enableMobileGpsFlag'
+    manufacturer: ManufacturerReference | None = None
+    manufacturer_part_number: str | None = Field(
+        default=None, alias='manufacturerPartNumber'
     )
-    inactive_date: datetime | None = Field(default=None, alias='inactiveDate')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    last_login: str | None = Field(default=None, alias='lastLogin')
-    client_id: str | None = Field(default=None, alias='clientId')
-    token: str | None = None
-    first_name: str = Field(..., alias='firstName')
-    """
-     Max length: 30;
     """
-    middle_initial: str | None = Field(default=None, alias='middleInitial')
+     Max length: 50;
     """
-     Max length: 1;
+    vendor: CompanyReference | None = None
+    vendor_sku: str | None = Field(default=None, alias='vendorSku')
     """
-    last_name: str = Field(..., alias='lastName')
+     Max length: 50;
     """
-     Max length: 30;
+    notes: str | None = None
+    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
     """
-    hire_date: datetime = Field(..., alias='hireDate')
-    country: CountryReference | None = None
-    photo: DocumentReference | None = None
-    office_email: str | None = Field(default=None, alias='officeEmail')
+     Max length: 50;
     """
-     Max length: 250;
+    sla: SLAReference | None = None
+    entity_type: EntityTypeReference | None = Field(default=None, alias='entityType')
+    recurring_flag: bool | None = Field(default=None, alias='recurringFlag')
+    recurring_revenue: float | None = Field(default=None, alias='recurringRevenue')
+    recurring_cost: float | None = Field(default=None, alias='recurringCost')
+    recurring_one_time_flag: bool | None = Field(
+        default=None, alias='recurringOneTimeFlag'
+    )
+    recurring_bill_cycle: BillingCycleReference | None = Field(
+        default=None, alias='recurringBillCycle'
+    )
+    recurring_cycle_type: Literal['ContractYear', 'CalendarYear'] | None = Field(
+        default=None, alias='recurringCycleType'
+    )
+    date_entered: str | None = Field(default=None, alias='dateEntered')
+    calculated_price_flag: bool | None = Field(
+        default=None, alias='calculatedPriceFlag'
+    )
+    calculated_cost_flag: bool | None = Field(default=None, alias='calculatedCostFlag')
+    category: ProductCategoryReference | None = None
+    calculated_price: float | None = Field(default=None, alias='calculatedPrice')
+    calculated_cost: float | None = Field(default=None, alias='calculatedCost')
+    billable_option: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billableOption')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
+    )
+
+
+class CatalogPricing(ConnectWiseModel):
+    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
+    company: CompanyReference | None = None
+    location: SystemLocationReference | None = None
+    quantity: int | None = None
+    date: str | None = None
+    price: float | None = None
+
+
+class Certification(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-    mobile_email: str | None = Field(default=None, alias='mobileEmail')
+     Max length: 50;
     """
-     Max length: 250;
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ChargeCode(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-    home_email: str | None = Field(default=None, alias='homeEmail')
+     Max length: 50;
     """
-     Max length: 250;
+    company: CompanyReference | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] | None = Field(
+        default=None, alias='billTime'
+    )
+    expense_entry_flag: bool | None = Field(default=None, alias='expenseEntryFlag')
+    allow_all_expense_type_flag: bool | None = Field(
+        default=None, alias='allowAllExpenseTypeFlag'
+    )
+    time_entry_flag: bool | None = Field(default=None, alias='timeEntryFlag')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    integration_xref: str | None = Field(default=None, alias='integrationXref')
     """
-    default_email: DefaultEmail = Field(..., alias='defaultEmail')
-    primary_email: str | None = Field(default=None, alias='primaryEmail')
+     Max length: 50;
     """
-     Max length: 250;
+    expense_type_ids: list[int] | None = Field(default=None, alias='expenseTypeIds')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ChargeCodeExpenseType(ConnectWiseModel):
+    id: int | None = None
+    type: ExpenseTypeReference | None = None
+    charge_code: ChargeCodeReference | None = Field(default=None, alias='chargeCode')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ChargeCodeInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    expense_entry_flag: bool | None = Field(default=None, alias='expenseEntryFlag')
+    allow_all_expense_type_flag: bool | None = Field(
+        default=None, alias='allowAllExpenseTypeFlag'
+    )
+    time_entry_flag: bool | None = Field(default=None, alias='timeEntryFlag')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    expense_type_ids: list[int] | None = Field(default=None, alias='expenseTypeIds')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ClearPickerRequest(ConnectWiseModel):
+    member: MemberReference | None = None
+    type: Literal['Company', 'Vendor'] | None = None
+
+
+class Commission(ConnectWiseModel):
+    id: int | None = None
+    member: MemberReference | None = None
+    commission_percent: float | None = Field(default=None, alias='commissionPercent')
+    date_start: datetime | None = Field(default=None, alias='dateStart')
+    date_end: datetime | None = Field(default=None, alias='dateEnd')
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    company: CompanyReference | None = None
+    site: SiteReference | None = None
+    agreement: AgreementReference | None = None
+    project: ProjectReference | None = None
+    service_board: BoardReference | None = Field(default=None, alias='serviceBoard')
+    ticket: TicketReference | None = None
+    territory: SystemLocationReference | None = None
+    billing_method: Literal[
+        'Agreement',
+        'CreditMemo',
+        'DownPayment',
+        'Miscellaneous',
+        'Progress',
+        'Standard',
+    ] | None = Field(default=None, alias='billingMethod')
+    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
+    project_board: ProjectBoardReference | None = Field(
+        default=None, alias='projectBoard'
+    )
+    project_type: ProjectTypeReference | None = Field(default=None, alias='projectType')
+    agreement_type: AgreementTypeReference | None = Field(
+        default=None, alias='agreementType'
+    )
+    number_of_months: int | None = Field(default=None, alias='numberOfMonths')
+    product_category: ProductCategoryReference | None = Field(
+        default=None, alias='productCategory'
+    )
+    product_sub_category: ProductSubCategoryReference | None = Field(
+        default=None, alias='productSubCategory'
+    )
+    item: IvItemReference | None = None
+    commission_basis: Literal['GrossProfit', 'SalesAmount'] | None = Field(
+        default=None, alias='commissionBasis'
+    )
+    invoice_option: Literal['AllInvoices', 'PaidInvoices'] | None = Field(
+        default=None, alias='invoiceOption'
+    )
+    services_flag: bool | None = Field(default=None, alias='servicesFlag')
+    agreements_flag: bool | None = Field(default=None, alias='agreementsFlag')
+    products_flag: bool | None = Field(default=None, alias='productsFlag')
+    my_opportunities_flag: bool | None = Field(
+        default=None, alias='myOpportunitiesFlag'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Company(ConnectWiseModel):
+    id: int | None = None
+    identifier: str
     """
-    office_phone: str | None = Field(default=None, alias='officePhone')
+     Max length: 30;
     """
-     Max length: 15;
+    name: str
     """
-    office_extension: str | None = Field(default=None, alias='officeExtension')
+     Max length: 50;
     """
-     Max length: 10;
+    status: CompanyStatusReference | None = None
+    address_line1: str | None = Field(default=None, alias='addressLine1')
     """
-    mobile_phone: str | None = Field(default=None, alias='mobilePhone')
+    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 50;
     """
-     Max length: 15;
+    address_line2: str | None = Field(default=None, alias='addressLine2')
     """
-    mobile_extension: str | None = Field(default=None, alias='mobileExtension')
+    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 50;
     """
-     Max length: 10;
+    city: str | None = None
     """
-    home_phone: str | None = Field(default=None, alias='homePhone')
+    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 50;
     """
-     Max length: 15;
+    state: str | None = None
     """
-    home_extension: str | None = Field(default=None, alias='homeExtension')
+    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 50;
     """
-     Max length: 10;
+    zip: str | None = None
     """
-    default_phone: DefaultPhone = Field(..., alias='defaultPhone')
-    security_role: SecurityRoleReference | None = Field(
-        default=None, alias='securityRole'
-    )
-    office365: MemberOffice365 | None = None
-    mapi_name: str | None = Field(default=None, alias='mapiName')
-    calendar_sync_integration_flag: bool | None = Field(
-        default=None, alias='calendarSyncIntegrationFlag'
-    )
-    authentication_service_type: AuthenticationServiceType | None = Field(
-        default=None, alias='authenticationServiceType'
-    )
-    timebased_one_time_password_activated: bool | None = Field(
-        default=None, alias='timebasedOneTimePasswordActivated'
+    Gets or sets at least one address field is required -- addressLine1, addressLine2, city, state, zip and/or country. Max length: 12;
+    """
+    country: CountryReference | None = None
+    phone_number: str | None = Field(default=None, alias='phoneNumber')
+    """
+     Max length: 30;
+    """
+    fax_number: str | None = Field(default=None, alias='faxNumber')
+    """
+     Max length: 30;
+    """
+    website: str | None = None
+    """
+     Max length: 255;
+    """
+    territory: SystemLocationReference | None = None
+    market: MarketDescriptionReference | None = None
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    default_contact: ContactReference | None = Field(
+        default=None, alias='defaultContact'
     )
-    enable_ldap_authentication_flag: bool | None = Field(
-        default=None, alias='enableLdapAuthenticationFlag'
+    date_acquired: datetime | None = Field(default=None, alias='dateAcquired')
+    sic_code: SicCodeReference | None = Field(default=None, alias='sicCode')
+    parent_company: CompanyReference | None = Field(default=None, alias='parentCompany')
+    annual_revenue: float | None = Field(default=None, alias='annualRevenue')
+    number_of_employees: int | None = Field(default=None, alias='numberOfEmployees')
+    year_established: int | None = Field(default=None, alias='yearEstablished')
+    revenue_year: int | None = Field(default=None, alias='revenueYear')
+    ownership_type: OwnershipTypeReference | None = Field(
+        default=None, alias='ownershipType'
     )
-    ldap_configuration: LdapConfigurationReference | None = Field(
-        default=None, alias='ldapConfiguration'
+    time_zone_setup: TimeZoneSetupReference | None = Field(
+        default=None, alias='timeZoneSetup'
     )
-    ldap_user_name: str | None = Field(default=None, alias='ldapUserName')
+    lead_source: str | None = Field(default=None, alias='leadSource')
     """
      Max length: 50;
     """
-    directional_sync: DirectionalSyncReference | None = Field(
-        default=None, alias='directionalSync'
-    )
-    sso_settings: MemberSsoSettingsReference | None = Field(
-        default=None, alias='ssoSettings'
-    )
-    signature: str | None = None
-    phone_integration_type: PhoneIntegrationType | None = Field(
-        default=None, alias='phoneIntegrationType'
+    lead_flag: bool | None = Field(default=None, alias='leadFlag')
+    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
+    calendar: CalendarReference | None = None
+    user_defined_field1: str | None = Field(default=None, alias='userDefinedField1')
+    """
+     Max length: 50;
+    """
+    user_defined_field2: str | None = Field(default=None, alias='userDefinedField2')
+    """
+     Max length: 50;
+    """
+    user_defined_field3: str | None = Field(default=None, alias='userDefinedField3')
+    """
+     Max length: 50;
+    """
+    user_defined_field4: str | None = Field(default=None, alias='userDefinedField4')
+    """
+     Max length: 50;
+    """
+    user_defined_field5: str | None = Field(default=None, alias='userDefinedField5')
+    """
+     Max length: 50;
+    """
+    user_defined_field6: str | None = Field(default=None, alias='userDefinedField6')
+    """
+     Max length: 50;
+    """
+    user_defined_field7: str | None = Field(default=None, alias='userDefinedField7')
+    """
+     Max length: 50;
+    """
+    user_defined_field8: str | None = Field(default=None, alias='userDefinedField8')
+    """
+     Max length: 50;
+    """
+    user_defined_field9: str | None = Field(default=None, alias='userDefinedField9')
+    """
+     Max length: 50;
+    """
+    user_defined_field10: str | None = Field(default=None, alias='userDefinedField10')
+    """
+     Max length: 50;
+    """
+    vendor_identifier: str | None = Field(default=None, alias='vendorIdentifier')
+    tax_identifier: str | None = Field(default=None, alias='taxIdentifier')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    use_browser_language_flag: bool | None = Field(
-        default=None, alias='useBrowserLanguageFlag'
+    invoice_template: InvoiceTemplateReference | None = Field(
+        default=None, alias='invoiceTemplate'
     )
-    title: str | None = None
-    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
-    enable_mobile_flag: bool | None = Field(default=None, alias='enableMobileFlag')
-    type: MemberTypeReference | None = None
-    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
-    partner_portal_flag: bool | None = Field(default=None, alias='partnerPortalFlag')
-    sts_user_admin_url: str | None = Field(default=None, alias='stsUserAdminUrl')
-    toast_notification_flag: bool | None = Field(
-        default=None, alias='toastNotificationFlag'
+    pricing_schedule: PricingScheduleReference | None = Field(
+        default=None, alias='pricingSchedule'
     )
-    member_personas: list[int] | None = Field(default=None, alias='memberPersonas')
-    admin_flag: bool | None = Field(default=None, alias='adminFlag')
-    structure_level: StructureReference | None = Field(
-        default=None, alias='structureLevel'
+    company_entity_type: EntityTypeReference | None = Field(
+        default=None, alias='companyEntityType'
     )
-    security_location: SystemLocationReference | None = Field(
-        default=None, alias='securityLocation'
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    default_location: SystemLocationReference | None = Field(
-        default=None, alias='defaultLocation'
+    billing_site: SiteReference | None = Field(default=None, alias='billingSite')
+    billing_contact: ContactReference | None = Field(
+        default=None, alias='billingContact'
     )
-    default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='defaultDepartment'
+    invoice_delivery_method: BillingDeliveryReference | None = Field(
+        default=None, alias='invoiceDeliveryMethod'
     )
-    reports_to: MemberReference | None = Field(default=None, alias='reportsTo')
-    restrict_location_flag: bool | None = Field(
-        default=None, alias='restrictLocationFlag'
+    invoice_to_email_address: str | None = Field(
+        default=None, alias='invoiceToEmailAddress'
     )
-    restrict_department_flag: bool | None = Field(
-        default=None, alias='restrictDepartmentFlag'
+    invoice_cc_email_address: str | None = Field(
+        default=None, alias='invoiceCCEmailAddress'
     )
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
-    expense_approver: MemberReference | None = Field(
-        default=None, alias='expenseApprover'
+    deleted_flag: bool | None = Field(default=None, alias='deletedFlag')
+    date_deleted: datetime | None = Field(default=None, alias='dateDeleted')
+    deleted_by: str | None = Field(default=None, alias='deletedBy')
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    facebook_url: str | None = Field(default=None, alias='facebookUrl')
+    twitter_url: str | None = Field(default=None, alias='twitterUrl')
+    linked_in_url: str | None = Field(default=None, alias='linkedInUrl')
+    currency: CurrencyReference | None = None
+    territory_manager: MemberReference | None = Field(
+        default=None, alias='territoryManager'
     )
-    billable_forecast: float | None = Field(default=None, alias='billableForecast')
-    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
-    hourly_cost: float | None = Field(default=None, alias='hourlyCost')
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    include_in_utilization_reporting_flag: bool | None = Field(
-        default=None, alias='includeInUtilizationReportingFlag'
-    )
-    require_expense_entry_flag: bool | None = Field(
-        default=None, alias='requireExpenseEntryFlag'
-    )
-    require_time_sheet_entry_flag: bool | None = Field(
-        default=None, alias='requireTimeSheetEntryFlag'
+    reseller_identifier: str | None = Field(default=None, alias='resellerIdentifier')
+    is_vendor_flag: bool | None = Field(default=None, alias='isVendorFlag')
+    types: list[CompanyTypeReference] | None = None
+    """
+    Gets or sets integrer array of Company_Type_Recids to be assigned to company that can be passed in only during new company creation (post)
+                To update existing companies type, use the /company/companyTypeAssociations or /company/companies/{ID}/typeAssociations endpoints.
+    """
+    site: SiteReference | None = None
+    integrator_tags: list[str] | None = Field(default=None, alias='integratorTags')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
-        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
+
+
+class CompanyCompanyTypeAssociation(ConnectWiseModel):
+    id: int | None = None
+    type: CompanyTypeReference | None = None
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CompanyConfiguration(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 100;
+    """
+    type: ConfigurationTypeReference | None = None
+    status: ConfigurationStatusReference | None = None
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    site: SiteReference | None = None
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    device_identifier: str | None = Field(default=None, alias='deviceIdentifier')
+    """
+     Max length: 100;
+    """
+    serial_number: str | None = Field(default=None, alias='serialNumber')
+    """
+     Max length: 250;
+    """
+    model_number: str | None = Field(default=None, alias='modelNumber')
+    """
+     Max length: 50;
+    """
+    tag_number: str | None = Field(default=None, alias='tagNumber')
+    """
+     Max length: 50;
+    """
+    purchase_date: datetime | None = Field(default=None, alias='purchaseDate')
+    installation_date: datetime | None = Field(default=None, alias='installationDate')
+    installed_by: MemberReference | None = Field(default=None, alias='installedBy')
+    warranty_expiration_date: datetime | None = Field(
+        default=None, alias='warrantyExpirationDate'
     )
-    allow_in_cell_entry_on_time_sheet: bool | None = Field(
-        default=None, alias='allowInCellEntryOnTimeSheet'
+    vendor_notes: str | None = Field(default=None, alias='vendorNotes')
+    notes: str | None = None
+    mac_address: str | None = Field(default=None, alias='macAddress')
+    """
+     Max length: 25;
+    """
+    last_login_name: str | None = Field(default=None, alias='lastLoginName')
+    """
+     Max length: 100;
+    """
+    bill_flag: bool | None = Field(default=None, alias='billFlag')
+    backup_successes: int | None = Field(default=None, alias='backupSuccesses')
+    backup_incomplete: int | None = Field(default=None, alias='backupIncomplete')
+    backup_failed: int | None = Field(default=None, alias='backupFailed')
+    backup_restores: int | None = Field(default=None, alias='backupRestores')
+    last_backup_date: datetime | None = Field(default=None, alias='lastBackupDate')
+    backup_server_name: str | None = Field(default=None, alias='backupServerName')
+    """
+     Max length: 50;
+    """
+    backup_billable_space_gb: float | None = Field(
+        default=None, alias='backupBillableSpaceGb'
     )
-    enter_time_against_company_flag: bool | None = Field(
-        default=None, alias='enterTimeAgainstCompanyFlag'
+    backup_protected_device_list: str | None = Field(
+        default=None, alias='backupProtectedDeviceList'
     )
-    allow_expenses_entered_against_companies_flag: bool | None = Field(
-        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
+    backup_year: int | None = Field(default=None, alias='backupYear')
+    backup_month: int | None = Field(default=None, alias='backupMonth')
+    ip_address: str | None = Field(default=None, alias='ipAddress')
+    """
+     Max length: 50;
+    """
+    default_gateway: str | None = Field(default=None, alias='defaultGateway')
+    """
+     Max length: 50;
+    """
+    os_type: str | None = Field(default=None, alias='osType')
+    """
+     Max length: 250;
+    """
+    os_info: str | None = Field(default=None, alias='osInfo')
+    """
+     Max length: 250;
+    """
+    cpu_speed: str | None = Field(default=None, alias='cpuSpeed')
+    """
+     Max length: 100;
+    """
+    ram: str | None = None
+    """
+     Max length: 25;
+    """
+    local_hard_drives: str | None = Field(default=None, alias='localHardDrives')
+    parent_configuration_id: int | None = Field(
+        default=None, alias='parentConfigurationId'
     )
-    time_reminder_email_flag: bool | None = Field(
-        default=None, alias='timeReminderEmailFlag'
+    vendor: CompanyReference | None = None
+    manufacturer: ManufacturerReference | None = None
+    questions: list[ConfigurationQuestion] | None = None
+    active_flag: bool | None = Field(default=None, alias='activeFlag')
+    management_link: str | None = Field(default=None, alias='managementLink')
+    """
+     Max length: 1000;
+    """
+    remote_link: str | None = Field(default=None, alias='remoteLink')
+    """
+     Max length: 1000;
+    """
+    sla: SLAReference | None = None
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    display_vendor_flag: bool | None = Field(default=None, alias='displayVendorFlag')
+    company_location_id: int | None = Field(default=None, alias='companyLocationId')
+    show_remote_flag: bool | None = Field(default=None, alias='showRemoteFlag')
+    show_automate_flag: bool | None = Field(default=None, alias='showAutomateFlag')
+    needs_renewal_flag: bool | None = Field(default=None, alias='needsRenewalFlag')
+    manufacturer_part_number: str | None = Field(
+        default=None, alias='manufacturerPartNumber'
     )
-    days_tolerance: int | None = Field(default=None, alias='daysTolerance')
-    minimum_hours: float | None = Field(default=None, alias='minimumHours')
-    time_sheet_start_date: str | None = Field(default=None, alias='timeSheetStartDate')
-    service_default_location: SystemLocationReference | None = Field(
-        default=None, alias='serviceDefaultLocation'
+    """
+     Max length: 50;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    service_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='serviceDefaultDepartment'
+
+
+class CompanyContactTypeAssociation(ConnectWiseModel):
+    id: int | None = None
+    type: ContactTypeReference | None = None
+    contact: ContactReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CompanyCompanyTypeAssociationCompanyTypeAssociation(
+    CompanyCompanyTypeAssociation
+):
+    pass
+
+
+class CompanyCustomNote(ConnectWiseModel):
+    id: int | None = None
+    custom_note: str = Field(..., alias='customNote')
+    """
+     Max length: 1500;
+    """
+    status: CompanyStatusReference | None = None
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CompanyFinance(ConnectWiseModel):
+    id: int | None = None
+    bill_override_flag: bool | None = Field(default=None, alias='billOverrideFlag')
+    bill_sr_flag: bool | None = Field(default=None, alias='billSrFlag')
+    bill_complete_sr_flag: bool | None = Field(default=None, alias='billCompleteSrFlag')
+    bill_unapproved_sr_flag: bool | None = Field(
+        default=None, alias='billUnapprovedSrFlag'
     )
-    service_default_board: BoardReference | None = Field(
-        default=None, alias='serviceDefaultBoard'
+    bill_restrict_pm_flag: bool | None = Field(default=None, alias='billRestrictPmFlag')
+    bill_complete_pm_flag: bool | None = Field(default=None, alias='billCompletePmFlag')
+    bill_unapproved_pm_flag: bool | None = Field(
+        default=None, alias='billUnapprovedPmFlag'
     )
-    restrict_service_default_location_flag: bool | None = Field(
-        default=None, alias='restrictServiceDefaultLocationFlag'
+    email_template: EmailTemplateReference | None = Field(
+        default=None, alias='emailTemplate'
     )
-    restrict_service_default_department_flag: bool | None = Field(
-        default=None, alias='restrictServiceDefaultDepartmentFlag'
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    excluded_service_board_ids: list[int] | None = Field(
-        default=None, alias='excludedServiceBoardIds'
+
+
+class CompanyGroup(ConnectWiseModel):
+    id: int | None = None
+    """
+     Required On Updates;
+    """
+    group: GroupReference | None = None
+    company: CompanyReference | None = None
+    default_contact_flag: bool | None = Field(default=None, alias='defaultContactFlag')
+    all_contacts_flag: bool | None = Field(default=None, alias='allContactsFlag')
+    remove_all_contacts_flag: bool | None = Field(
+        default=None, alias='removeAllContactsFlag'
     )
-    teams: list[int] | None = None
-    service_board_team_ids: list[int] | None = Field(
-        default=None, alias='serviceBoardTeamIds'
+    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
+    contact_ids: list[int] | None = Field(default=None, alias='contactIds')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CompanyManagementSummary(ConnectWiseModel):
+    id: int | None = None
+    management_solution: ManagementSolutionReference | None = Field(
+        default=None, alias='managementSolution'
     )
-    project_default_location: SystemLocationReference | None = Field(
-        default=None, alias='projectDefaultLocation'
+    group_identifier: str = Field(..., alias='groupIdentifier')
+    """
+     Max length: 100;
+    """
+    device_type: Literal[
+        'WorkstationsAndServers', 'BackupStats', 'Servers', 'Workstations'
+    ] | None = Field(default=None, alias='deviceType')
+    """
+    Gets or sets deviceType is required if the managementSolution is Legacy.
+    """
+    agreement: AgreementReference | None = None
+    snmp_machines: int | None = Field(default=None, alias='snmpMachines')
+    total_workstations: int | None = Field(default=None, alias='totalWorkstations')
+    total_servers: int | None = Field(default=None, alias='totalServers')
+    total_windows_servers: int | None = Field(default=None, alias='totalWindowsServers')
+    total_windows_workstations: int | None = Field(
+        default=None, alias='totalWindowsWorkstations'
     )
-    project_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='projectDefaultDepartment'
+    total_managed_machines: int | None = Field(
+        default=None, alias='totalManagedMachines'
     )
-    project_default_board: ProjectBoardReference | None = Field(
-        default=None, alias='projectDefaultBoard'
+    servers_offline: int | None = Field(default=None, alias='serversOffline')
+    servers_disk_space_low: int | None = Field(
+        default=None, alias='serversDiskSpaceLow'
     )
-    restrict_project_default_location_flag: bool | None = Field(
-        default=None, alias='restrictProjectDefaultLocationFlag'
+    failed_backup_jobs: int | None = Field(default=None, alias='failedBackupJobs')
+    total_notifications: int | None = Field(default=None, alias='totalNotifications')
+    successful_backup_jobs: int | None = Field(
+        default=None, alias='successfulBackupJobs'
     )
-    restrict_project_default_department_flag: bool | None = Field(
-        default=None, alias='restrictProjectDefaultDepartmentFlag'
+    server_availability: int | None = Field(default=None, alias='serverAvailability')
+    viruses_removed: int | None = Field(default=None, alias='virusesRemoved')
+    spyware_items_removed: int | None = Field(default=None, alias='spywareItemsRemoved')
+    windows_patches_installed: int | None = Field(
+        default=None, alias='windowsPatchesInstalled'
     )
-    excluded_project_board_ids: list[int] | None = Field(
-        default=None, alias='excludedProjectBoardIds'
+    disk_cleanups: int | None = Field(default=None, alias='diskCleanups')
+    disk_defragmentations: int | None = Field(
+        default=None, alias='diskDefragmentations'
     )
-    schedule_default_location: SystemLocationReference | None = Field(
-        default=None, alias='scheduleDefaultLocation'
+    fully_patched_machines: int | None = Field(
+        default=None, alias='fullyPatchedMachines'
     )
-    schedule_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='scheduleDefaultDepartment'
+    missing_one_two_patches_machines: int | None = Field(
+        default=None, alias='missingOneTwoPatchesMachines'
     )
-    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
-    service_location: ServiceLocationReference | None = Field(
-        default=None, alias='serviceLocation'
+    missing_three_five_patches_machines: int | None = Field(
+        default=None, alias='missingThreeFivePatchesMachines'
     )
-    restrict_schedule_flag: bool | None = Field(
-        default=None, alias='restrictScheduleFlag'
+    missing_more_five_patches_machines: int | None = Field(
+        default=None, alias='missingMoreFivePatchesMachines'
     )
-    hide_member_in_dispatch_portal_flag: bool | None = Field(
-        default=None, alias='hideMemberInDispatchPortalFlag'
+    missing_unscanned_patches_machines: int | None = Field(
+        default=None, alias='missingUnscannedPatchesMachines'
     )
-    calendar: CalendarReference | None = None
-    sales_default_location: SystemLocationReference | None = Field(
-        default=None, alias='salesDefaultLocation'
+    alerts_generated: str | None = Field(default=None, alias='alertsGenerated')
+    internet_connectivity: float | None = Field(
+        default=None, alias='internetConnectivity'
     )
-    restrict_default_sales_territory_flag: bool | None = Field(
-        default=None, alias='restrictDefaultSalesTerritoryFlag'
+    disk_space_cleaned_mb: int | None = Field(default=None, alias='diskSpaceCleanedMb')
+    missing_security_patches: str | None = Field(
+        default=None, alias='missingSecurityPatches'
     )
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
-    )
-    restrict_default_warehouse_flag: bool | None = Field(
-        default=None, alias='restrictDefaultWarehouseFlag'
-    )
-    restrict_default_warehouse_bin_flag: bool | None = Field(
-        default=None, alias='restrictDefaultWarehouseBinFlag'
-    )
-    company_activity_tab_format: CompanyActivityTabFormat | None = Field(
-        default=None, alias='companyActivityTabFormat'
-    )
-    invoice_time_tab_format: InvoiceTimeTabFormat | None = Field(
-        default=None, alias='invoiceTimeTabFormat'
-    )
-    invoice_screen_default_tab_format: InvoiceScreenDefaultTabFormat | None = Field(
-        default=None, alias='invoiceScreenDefaultTabFormat'
-    )
-    invoicing_display_options: InvoicingDisplayOptions | None = Field(
-        default=None, alias='invoicingDisplayOptions'
-    )
-    agreement_invoicing_display_options: AgreementInvoicingDisplayOptions | None = (
-        Field(default=None, alias='agreementInvoicingDisplayOptions')
-    )
-    auto_start_stopwatch: bool | None = Field(default=None, alias='autoStartStopwatch')
-    auto_popup_quick_notes_with_stopwatch: bool | None = Field(
-        default=None, alias='autoPopupQuickNotesWithStopwatch'
-    )
-    global_search_default_ticket_filter: GlobalSearchDefaultTicketFilter | None = Field(
-        default=None, alias='globalSearchDefaultTicketFilter'
+    cpu_utilization: float | None = Field(default=None, alias='cpuUtilization')
+    memory_utilization: float | None = Field(default=None, alias='memoryUtilization')
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CompanyNote(ConnectWiseModel):
+    id: int | None = None
+    text: str
+    type: NoteTypeReference | None = None
+    flagged: bool | None = None
+    entered_by: str | None = Field(default=None, alias='enteredBy')
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CompanyPickerItem(ConnectWiseModel):
+    id: int | None = None
+    member: MemberReference | None = None
+    company: CompanyReference | None = None
+    company_status: CompanyStatusReference | None = Field(
+        default=None, alias='companyStatus'
     )
-    global_search_default_sort: GlobalSearchDefaultSort | None = Field(
-        default=None, alias='globalSearchDefaultSort'
+    company_type: CompanyTypeReference | None = Field(default=None, alias='companyType')
+    company_site: SiteReference | None = Field(default=None, alias='companySite')
+    company_location: SystemLocationReference | None = Field(
+        default=None, alias='companyLocation'
     )
-    phone_source: str | None = Field(default=None, alias='phoneSource')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    copy_pod_layouts: bool | None = Field(default=None, alias='copyPodLayouts')
-    copy_shared_default_views: bool | None = Field(
-        default=None, alias='copySharedDefaultViews'
+    company_country: CountryReference | None = Field(
+        default=None, alias='companyCountry'
     )
-    copy_column_layouts_and_filters: bool | None = Field(
-        default=None, alias='copyColumnLayoutsAndFilters'
+    vendor_picker_flag: bool | None = Field(default=None, alias='vendorPickerFlag')
+    """
+    Gets or sets if true, this record was created by the vendor picker component. Otherwise, the record was created by the company picker component.
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CompanySite(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 50;
+    """
+    address_line1: str | None = Field(default=None, alias='addressLine1')
+    """
+     Max length: 50;
+    """
+    address_line2: str | None = Field(default=None, alias='addressLine2')
+    """
+     Max length: 50;
+    """
+    city: str | None = None
+    """
+     Max length: 50;
+    """
+    state_reference: StateReference | None = Field(default=None, alias='stateReference')
+    zip: str | None = None
+    """
+     Max length: 12;
+    """
+    country: CountryReference | None = None
+    address_format: str | None = Field(default=None, alias='addressFormat')
+    phone_number: str | None = Field(default=None, alias='phoneNumber')
+    """
+     Max length: 30;
+    """
+    phone_number_ext: str | None = Field(default=None, alias='phoneNumberExt')
+    """
+     Max length: 30;
+    """
+    fax_number: str | None = Field(default=None, alias='faxNumber')
+    """
+     Max length: 30;
+    """
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    entity_type: EntityTypeReference | None = Field(default=None, alias='entityType')
+    expense_reimbursement: float | None = Field(
+        default=None, alias='expenseReimbursement'
     )
-    from_member_rec_id: int | None = Field(default=None, alias='fromMemberRecId')
-    from_member_template_rec_id: int | None = Field(
-        default=None, alias='fromMemberTemplateRecId'
+    primary_address_flag: bool | None = Field(default=None, alias='primaryAddressFlag')
+    default_shipping_flag: bool | None = Field(
+        default=None, alias='defaultShippingFlag'
     )
+    default_billing_flag: bool | None = Field(default=None, alias='defaultBillingFlag')
+    default_mailing_flag: bool | None = Field(default=None, alias='defaultMailingFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    bill_separate_flag: bool | None = Field(default=None, alias='billSeparateFlag')
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    calendar: CalendarReference | None = None
+    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
     custom_fields: list[CustomFieldValue] | None = Field(
         default=None, alias='customFields'
     )
 
 
-class MemberAccrual(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class CompanyStatus(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 50;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    notify_flag: bool | None = Field(default=None, alias='notifyFlag')
+    disallow_saving_flag: bool | None = Field(default=None, alias='disallowSavingFlag')
+    notification_message: str | None = Field(default=None, alias='notificationMessage')
+    """
+     Max length: 500;
+    """
+    custom_note_flag: bool | None = Field(default=None, alias='customNoteFlag')
+    cancel_open_tracks_flag: bool | None = Field(
+        default=None, alias='cancelOpenTracksFlag'
     )
+    track: TrackReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class CompanyTeam(ConnectWiseModel):
     id: int | None = None
-    accrual_type: AccrualType = Field(..., alias='accrualType')
-    year: int
-    hours: float
-    reason: str
+    company: CompanyReference | None = None
+    team_role: TeamRoleReference | None = Field(default=None, alias='teamRole')
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    contact: ContactReference | None = None
     member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    account_manager_flag: bool | None = Field(default=None, alias='accountManagerFlag')
+    tech_flag: bool | None = Field(default=None, alias='techFlag')
+    sales_flag: bool | None = Field(default=None, alias='salesFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberCertification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ConfigurationTypeQuestion(ConnectWiseModel):
     id: int | None = None
-    certification: CertificationReference
-    percent_complete: int | None = Field(default=None, alias='percentComplete')
-    date_received: datetime | None = Field(default=None, alias='dateReceived')
-    date_expires: datetime | None = Field(default=None, alias='dateExpires')
-    certification_number: str | None = Field(default=None, alias='certificationNumber')
+    configuration_type: ConfigurationTypeReference | None = Field(
+        default=None, alias='configurationType'
+    )
+    field_type: Literal[
+        'TextArea',
+        'Currency',
+        'Date',
+        'Hyperlink',
+        'IPAddress',
+        'Checkbox',
+        'Number',
+        'Percent',
+        'Text',
+        'Password',
+    ] = Field(..., alias='fieldType')
+    entry_type: Literal['Date', 'EntryField', 'List', 'Option'] = Field(
+        ..., alias='entryType'
+    )
+    sequence_number: float = Field(..., alias='sequenceNumber')
+    question: str
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    notes: str | None = None
-    member: MemberReference | None = None
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
+    required_flag: bool | None = Field(default=None, alias='requiredFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class ConfigurationTypeQuestionInfo(ConnectWiseModel):
+    id: int | None = None
+    configuration_type: ConfigurationTypeReference | None = Field(
+        default=None, alias='configurationType'
     )
-    activity: MemberDeactivationSalesActivity | None = None
-    service_team: MemberDeactivationServiceTeam | None = Field(
-        default=None, alias='serviceTeam'
+    field_type: Literal[
+        'TextArea',
+        'Currency',
+        'Date',
+        'Hyperlink',
+        'IPAddress',
+        'Checkbox',
+        'Number',
+        'Percent',
+        'Text',
+        'Password',
+    ] | None = Field(default=None, alias='fieldType')
+    entry_type: Literal['Date', 'EntryField', 'List', 'Option'] | None = Field(
+        default=None, alias='entryType'
     )
-    company_team: list[MemberDeactivationCompanyTeam] | None = Field(
-        default=None, alias='companyTeam'
+    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
+    question: str | None = None
+    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
+    required_flag: bool | None = Field(default=None, alias='requiredFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ConfigurationTypeQuestionValue(ConnectWiseModel):
+    id: int | None = None
+    configuration_type: ConfigurationTypeReference | None = Field(
+        default=None, alias='configurationType'
     )
+    question: ConfigurationTypeQuestionReference | None = None
+    value: str
     """
-    A list of customers for which the member holds a team role
+     Max length: 1000;
     """
-    workflow_email: MemberDeactivationWorkflow | None = Field(
-        default=None, alias='workflowEmail'
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ConfigurationTypeQuestionValueInfo(ConnectWiseModel):
+    id: int | None = None
+    configuration_type: ConfigurationTypeReference | None = Field(
+        default=None, alias='configurationType'
     )
-    service_status_workflow: list[MemberDeactivationStatusWorkflow] | None = Field(
-        default=None, alias='serviceStatusWorkflow'
+    question: ConfigurationTypeQuestionReference | None = None
+    value: str | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Contact(ConnectWiseModel):
+    id: int | None = None
+    first_name: str | None = Field(default=None, alias='firstName')
+    last_name: str | None = Field(default=None, alias='lastName')
+    company: CompanyReference | None = None
+    site: SiteReference | None = None
+    address_line1: str | None = Field(default=None, alias='addressLine1')
+    address_line2: str | None = Field(default=None, alias='addressLine2')
+    city: str | None = None
+    state: str | None = None
+    zip: str | None = None
+    country: CountryReference | None = None
+    relationship: RelationshipReference | None = None
+    relationship_override: str | None = Field(
+        default=None, alias='relationshipOverride'
     )
-    ticket_template: MemberDeactivationServiceTemplate | None = Field(
-        default=None, alias='ticketTemplate'
+    department: ContactDepartmentReference | None = None
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    default_merge_contact_id: int | None = Field(
+        default=None, alias='defaultMergeContactId'
     )
-    opportunity: MemberDeactivationOpportunity | None = None
-    sales_team: MemberDeactivationSalesTeam | None = Field(
-        default=None, alias='salesTeam'
+    security_identifier: str | None = Field(default=None, alias='securityIdentifier')
+    manager_contact: ContactReference | None = Field(
+        default=None, alias='managerContact'
     )
-    project_manager: MemberDeactivationProjectManager | None = Field(
-        default=None, alias='projectManager'
+    assistant_contact: ContactReference | None = Field(
+        default=None, alias='assistantContact'
     )
-    project_time_approver: MemberDeactivationProjectManager | None = Field(
-        default=None, alias='projectTimeApprover'
+    title: str | None = None
+    school: str | None = None
+    nick_name: str | None = Field(default=None, alias='nickName')
+    married_flag: bool | None = Field(default=None, alias='marriedFlag')
+    children_flag: bool | None = Field(default=None, alias='childrenFlag')
+    children: str | None = None
+    significant_other: str | None = Field(default=None, alias='significantOther')
+    portal_password: str | None = Field(default=None, alias='portalPassword')
+    portal_security_level: int | None = Field(default=None, alias='portalSecurityLevel')
+    disable_portal_login_flag: bool | None = Field(
+        default=None, alias='disablePortalLoginFlag'
     )
-    project_expense_approver: MemberDeactivationProjectManager | None = Field(
-        default=None, alias='projectExpenseApprover'
+    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
+    gender: Literal['Female', 'Male'] | None = None
+    birth_day: str | None = Field(default=None, alias='birthDay')
+    anniversary: str | None = None
+    presence: Literal[
+        'NoAgent', 'Online', 'DoNotDisturb', 'Away', 'Offline'
+    ] | None = None
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    facebook_url: str | None = Field(default=None, alias='facebookUrl')
+    twitter_url: str | None = Field(default=None, alias='twitterUrl')
+    linked_in_url: str | None = Field(default=None, alias='linkedInUrl')
+    default_phone_type: str | None = Field(default=None, alias='defaultPhoneType')
+    default_phone_nbr: str | None = Field(default=None, alias='defaultPhoneNbr')
+    default_phone_extension: str | None = Field(
+        default=None, alias='defaultPhoneExtension'
     )
-    knowledge_base_article: MemberDeactivationKnowledgebaseArticle | None = Field(
-        default=None, alias='knowledgeBaseArticle'
-    )
-    my_company_president: MemberDeactivationMyCompanyPresidentRole | None = Field(
-        default=None, alias='myCompanyPresident'
-    )
-    my_company_coo: MemberDeactivationMyCompanyCOORole | None = Field(
-        default=None, alias='myCompanyCOO'
-    )
-    my_company_controller: MemberDeactivationMyCompanyControllerRole | None = Field(
-        default=None, alias='myCompanyController'
-    )
-    my_company_dispatch: MemberDeactivationMyCompanyDispatchRole | None = Field(
-        default=None, alias='myCompanyDispatch'
-    )
-    my_company_service_manager: MemberDeactivationMyCompanyServiceManagerRole | None = (
-        Field(default=None, alias='myCompanyServiceManager')
-    )
-    my_company_duty_manager_role: MemberDeactivationMyCompanyDutyManagerRole | None = (
-        Field(default=None, alias='myCompanyDutyManagerRole')
-    )
-    department_manager: MemberDeactivationDepartmentMananager | None = Field(
-        default=None, alias='departmentManager'
-    )
-    dispatch_member: MemberDeactivationDispatchMember | None = Field(
-        default=None, alias='dispatchMember'
-    )
-    service_manager: MemberDeactivationServiceManger | None = Field(
-        default=None, alias='serviceManager'
-    )
-    duty_manager: MemberDeactivationDutyManager | None = Field(
-        default=None, alias='dutyManager'
+    default_billing_flag: bool | None = Field(default=None, alias='defaultBillingFlag')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    user_defined_field1: str | None = Field(default=None, alias='userDefinedField1')
+    """
+     Max length: 50;
+    """
+    user_defined_field2: str | None = Field(default=None, alias='userDefinedField2')
+    """
+     Max length: 50;
+    """
+    user_defined_field3: str | None = Field(default=None, alias='userDefinedField3')
+    """
+     Max length: 50;
+    """
+    user_defined_field4: str | None = Field(default=None, alias='userDefinedField4')
+    """
+     Max length: 50;
+    """
+    user_defined_field5: str | None = Field(default=None, alias='userDefinedField5')
+    """
+     Max length: 50;
+    """
+    user_defined_field6: str | None = Field(default=None, alias='userDefinedField6')
+    """
+     Max length: 50;
+    """
+    user_defined_field7: str | None = Field(default=None, alias='userDefinedField7')
+    """
+     Max length: 50;
+    """
+    user_defined_field8: str | None = Field(default=None, alias='userDefinedField8')
+    """
+     Max length: 50;
+    """
+    user_defined_field9: str | None = Field(default=None, alias='userDefinedField9')
+    """
+     Max length: 50;
+    """
+    user_defined_field10: str | None = Field(default=None, alias='userDefinedField10')
+    """
+     Max length: 50;
+    """
+    company_location: SystemLocationReference | None = Field(
+        default=None, alias='companyLocation'
     )
-    send_from_email_notify: MemberDeactivationSendFromEmailNotify | None = Field(
-        default=None, alias='sendFromEmailNotify'
+    communication_items: list[ContactCommunicationItem] | None = Field(
+        default=None, alias='communicationItems'
     )
-    delete_open_time_sheets_flag: bool | None = Field(
-        default=None, alias='deleteOpenTimeSheetsFlag'
+    types: list[ContactTypeReference] | None = None
+    integrator_tags: list[str] | None = Field(default=None, alias='integratorTags')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
+    photo: DocumentReference | None = None
+    ignore_duplicates: bool | None = Field(default=None, alias='ignoreDuplicates')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    type_ids: list[int] | None = Field(default=None, alias='typeIds')
     """
-    By default, this is set to false
-                If there is any open timesheets, system will return error message
-                that there is open timesheets still attached to this member
-                If user would like to delete member with open timesheets, they can set this boolean to TRUE
-                System will delete member and any associated open timesheets
+    Gets or sets integrer array of Contact_Type_Recids to be assigned to contact that can be passed in only during new contact creation (post)
+                To update existing contacts type, use the /company/contactTypeAssociations or /company/contacts/{ID}/typeAssociations endpoints.
     """
 
 
-class MemberDeactivationCompanyTeam(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    id: int | None = None
-    name: str | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
-    )
-    re_assign_to_contact: ContactReference | None = Field(
-        default=None, alias='reAssignToContact'
-    )
+class ContactContactTypeAssociationContactTypeAssociation(
+    CompanyContactTypeAssociation
+):
+    pass
 
 
-class MemberDeactivationDepartmentMananager(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class ContactGroup(ConnectWiseModel):
+    id: int | None = None
+    group: GroupReference | None = None
+    contact: ContactReference | None = None
+    description: str | None = None
+    """
+     Max length: 50;
+    """
+    unsubscribe_flag: bool | None = Field(default=None, alias='unsubscribeFlag')
+    company_unsubcribed_email_message: str | None = Field(
+        default=None, alias='companyUnsubcribedEmailMessage'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    company_group_unsubscribed_email_message: str | None = Field(
+        default=None, alias='companyGroupUnsubscribedEmailMessage'
     )
-
-
-class MemberDeactivationDispatchMember(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    contact_unsubscribed_email_message: str | None = Field(
+        default=None, alias='contactUnsubscribedEmailMessage'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    contact_group_unsubscribed_email_message: str | None = Field(
+        default=None, alias='contactGroupUnsubscribedEmailMessage'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationDutyManager(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
-    )
+class ContactNote(ConnectWiseModel):
+    id: int | None = None
+    contact_id: int | None = Field(default=None, alias='contactId')
+    text: str
+    type: NoteTypeReference | None = None
+    flagged: bool | None = None
+    entered_by: str | None = Field(default=None, alias='enteredBy')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationKnowledgebaseArticle(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
-    )
+class Conversion(ConnectWiseModel):
+    id: int | None = None
+    quantity: float | None = None
+    uom_type: UnitOfMeasureReference | None = Field(default=None, alias='uomType')
+    parent_uom: UnitOfMeasureReference | None = Field(default=None, alias='parentUOM')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationMyCompanyCOORole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+class ConvertItem(ConnectWiseModel):
+    id: int | None = None
+    record_type: Literal['ProjectIssue', 'ProjectTicket', 'ServiceTicket'] = Field(
+        ..., alias='recordType'
     )
+    project: ProjectReference | None = None
+    phase: ProjectPhaseReference | None = None
+    wbs_code: str | None = Field(default=None, alias='wbsCode')
 
 
-class MemberDeactivationMyCompanyControllerRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
-    )
+class ConvertToProject(ConnectWiseModel):
+    id: int | None = None
+    record_type: Literal[
+        'ProjectIssue', 'ProjectTicket', 'ServiceTicket'
+    ] | None = Field(default=None, alias='recordType')
+    project: ProjectReference | None = None
+    phase: ProjectPhaseReference | None = None
+    wbs_code: str = Field(..., alias='wbsCode')
 
 
-class MemberDeactivationMyCompanyDispatchRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class CorporateStructure(ConnectWiseModel):
+    id: int | None = None
+    level_count: Literal[
+        'Level1', 'Level2', 'Level3', 'Level4', 'Level5'
+    ] | None = Field(default=None, alias='levelCount')
+    level1_name: str | None = Field(default=None, alias='level1Name')
+    """
+     Max length: 20;
+    """
+    level2_name: str | None = Field(default=None, alias='level2Name')
+    """
+     Max length: 20;
+    """
+    level3_name: str | None = Field(default=None, alias='level3Name')
+    """
+     Max length: 20;
+    """
+    level4_name: str | None = Field(default=None, alias='level4Name')
+    """
+     Max length: 20;
+    """
+    level5_name: str | None = Field(default=None, alias='level5Name')
+    """
+     Max length: 20;
+    """
+    fiscal_year_start: Literal[
+        'January',
+        'February',
+        'March',
+        'April',
+        'May',
+        'June',
+        'July',
+        'August',
+        'September',
+        'October',
+        'November',
+        'December',
+    ] = Field(..., alias='fiscalYearStart')
+    location_caption: str = Field(..., alias='locationCaption')
+    """
+     Max length: 50;
+    """
+    group_caption: str = Field(..., alias='groupCaption')
+    """
+     Max length: 50;
+    """
+    base_currency: CurrencyReference = Field(..., alias='baseCurrency')
+    president: MemberReference | None = None
+    chief_operating_officer: MemberReference | None = Field(
+        default=None, alias='chiefOperatingOfficer'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    controller: MemberReference | None = None
+    dispatcher: MemberReference | None = None
+    service_manager: MemberReference | None = Field(
+        default=None, alias='serviceManager'
     )
+    duty_manager: MemberReference | None = Field(default=None, alias='dutyManager')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationMyCompanyDutyManagerRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
-    )
+class CorporateStructureInfo(ConnectWiseModel):
+    id: int | None = None
+    location_caption: str | None = Field(default=None, alias='locationCaption')
+    group_caption: str | None = Field(default=None, alias='groupCaption')
+    base_currency: CurrencyReference | None = Field(default=None, alias='baseCurrency')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationMyCompanyPresidentRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+class Country(ConnectWiseModel):
+    id: int | None = None
+    name: str
+    """
+     Max length: 50;
+    """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    currency: CurrencyReference | None = None
+    city_caption: str | None = Field(default=None, alias='cityCaption')
+    """
+     Max length: 25;
+    """
+    state_caption: str | None = Field(default=None, alias='stateCaption')
+    """
+     Max length: 25;
+    """
+    zip_caption: str | None = Field(default=None, alias='zipCaption')
+    """
+     Max length: 25;
+    """
+    zip_minimum_length: int | None = Field(default=None, alias='zipMinimumLength')
+    dialing_prefix: str | None = Field(default=None, alias='dialingPrefix')
+    """
+     Max length: 5;
+    """
+    address_format: AddressFormatReference | None = Field(
+        default=None, alias='addressFormat'
     )
-
-
-class MemberDeactivationMyCompanyServiceManagerRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    country_code: str | None = Field(default=None, alias='countryCode')
+    """
+     Max length: 2;
+    """
+    core_entity_country_code: Literal[
+        'AF',
+        'AX',
+        'AL',
+        'DZ',
+        'AS',
+        'AD',
+        'AO',
+        'AI',
+        'AQ',
+        'AR',
+        'AM',
+        'AW',
+        'AT',
+        'AZ',
+        'BH',
+        'BD',
+        'BB',
+        'BY',
+        'BZ',
+        'BJ',
+        'BM',
+        'BT',
+        'BO',
+        'BQ',
+        'BA',
+        'BW',
+        'BV',
+        'IO',
+        'BN',
+        'BG',
+        'BF',
+        'BI',
+        'CM',
+        'CV',
+        'KY',
+        'CF',
+        'TD',
+        'CL',
+        'CX',
+        'CC',
+        'CO',
+        'KM',
+        'CG',
+        'CK',
+        'CI',
+        'HR',
+        'CU',
+        'CW',
+        'CY',
+        'CZ',
+        'CD',
+        'DK',
+        'DJ',
+        'DM',
+        'EC',
+        'EG',
+        'GQ',
+        'ER',
+        'EE',
+        'ET',
+        'FK',
+        'FO',
+        'FJ',
+        'FI',
+        'FR',
+        'GF',
+        'PF',
+        'TF',
+        'GA',
+        'GM',
+        'GE',
+        'GH',
+        'GI',
+        'GR',
+        'GL',
+        'GD',
+        'GP',
+        'GU',
+        'GT',
+        'GG',
+        'GN',
+        'GW',
+        'GY',
+        'HT',
+        'HM',
+        'HN',
+        'HK',
+        'HU',
+        'IS',
+        'IN',
+        'IR',
+        'IQ',
+        'IE',
+        'IM',
+        'IT',
+        'JM',
+        'JP',
+        'JE',
+        'JO',
+        'KZ',
+        'KE',
+        'KI',
+        'XK',
+        'KW',
+        'KG',
+        'LA',
+        'LV',
+        'LB',
+        'LS',
+        'LR',
+        'LY',
+        'LI',
+        'LT',
+        'LU',
+        'MO',
+        'MK',
+        'MG',
+        'MW',
+        'MY',
+        'ML',
+        'MT',
+        'MH',
+        'MQ',
+        'MR',
+        'MU',
+        'YT',
+        'FM',
+        'MD',
+        'MC',
+        'MN',
+        'ME',
+        'MS',
+        'MZ',
+        'NA',
+        'NR',
+        'NP',
+        'NC',
+        'NZ',
+        'NI',
+        'NE',
+        'NG',
+        'NU',
+        'NF',
+        'KP',
+        'MP',
+        'OM',
+        'PK',
+        'PW',
+        'PS',
+        'PG',
+        'PY',
+        'PE',
+        'PN',
+        'PL',
+        'PT',
+        'PR',
+        'RE',
+        'RO',
+        'RU',
+        'RW',
+        'BL',
+        'SH',
+        'PM',
+        'VC',
+        'WS',
+        'SM',
+        'ST',
+        'SN',
+        'RS',
+        'SC',
+        'SL',
+        'SX',
+        'SK',
+        'SI',
+        'SB',
+        'SO',
+        'ZA',
+        'GS',
+        'KR',
+        'SS',
+        'ES',
+        'LK',
+        'SD',
+        'SR',
+        'SJ',
+        'SZ',
+        'SE',
+        'SY',
+        'TJ',
+        'TZ',
+        'TH',
+        'TL',
+        'TG',
+        'TK',
+        'TO',
+        'TN',
+        'TR',
+        'TV',
+        'UG',
+        'UA',
+        'GB',
+        'UM',
+        'UZ',
+        'VU',
+        'VN',
+        'WF',
+        'EH',
+        'YE',
+        'ZM',
+        'ZW',
+        'US',
+        'CR',
+        'MX',
+        'AE',
+        'VI',
+        'VG',
+        'SA',
+        'KH',
+        'AU',
+        'ID',
+        'CA',
+        'BR',
+        'TW',
+        'TM',
+        'TC',
+        'QA',
+        'MM',
+        'CN',
+        'SG',
+        'IL',
+        'VA',
+        'DE',
+        'NL',
+        'AG',
+        'BE',
+        'LC',
+        'UY',
+        'PH',
+        'BS',
+        'VE',
+        'CH',
+        'MF',
+        'KN',
+        'TT',
+        'DO',
+        'PA',
+        'MV',
+        'SV',
+        'NO',
+        'MA',
+        'AC',
+        'TA',
+    ] | None = Field(default=None, alias='coreEntityCountryCode')
+    localization_caption_one: str | None = Field(
+        default=None, alias='localizationCaptionOne'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    """
+     Max length: 25;
+    """
+    localization_value_one: str | None = Field(
+        default=None, alias='localizationValueOne'
     )
+    """
+     Max length: 50;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationOpportunity(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class Crm(ConnectWiseModel):
+    id: int | None = None
+    company_list_count: int | None = Field(default=None, alias='companyListCount')
+    lock_probability_flag: bool | None = Field(
+        default=None, alias='lockProbabilityFlag'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    account_manager_role: TeamRoleReference | None = Field(
+        default=None, alias='accountManagerRole'
     )
-
-
-class MemberDeactivationProjectManager(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    technical_contact_role: TeamRoleReference | None = Field(
+        default=None, alias='technicalContactRole'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    sales_rep_role: TeamRoleReference | None = Field(default=None, alias='salesRepRole')
+    company_id_generation_flag: bool | None = Field(
+        default=None, alias='companyIdGenerationFlag'
     )
+    exclude_spaces_flag: bool | None = Field(default=None, alias='excludeSpacesFlag')
+    field1_caption: str | None = Field(default=None, alias='field1Caption')
+    """
+     Max length: 25;
+    """
+    field2_caption: str | None = Field(default=None, alias='field2Caption')
+    """
+     Max length: 25;
+    """
+    field3_caption: str | None = Field(default=None, alias='field3Caption')
+    """
+     Max length: 25;
+    """
+    field4_caption: str | None = Field(default=None, alias='field4Caption')
+    """
+     Max length: 25;
+    """
+    field5_caption: str | None = Field(default=None, alias='field5Caption')
+    """
+     Max length: 25;
+    """
+    field6_caption: str | None = Field(default=None, alias='field6Caption')
+    """
+     Max length: 25;
+    """
+    field7_caption: str | None = Field(default=None, alias='field7Caption')
+    """
+     Max length: 25;
+    """
+    field8_caption: str | None = Field(default=None, alias='field8Caption')
+    """
+     Max length: 25;
+    """
+    field9_caption: str | None = Field(default=None, alias='field9Caption')
+    """
+     Max length: 25;
+    """
+    field10_caption: str | None = Field(default=None, alias='field10Caption')
+    """
+     Max length: 25;
+    """
+    primary_rep_caption: str | None = Field(default=None, alias='primaryRepCaption')
+    """
+     Max length: 50;
+    """
+    secondary_rep_caption: str | None = Field(default=None, alias='secondaryRepCaption')
+    """
+     Max length: 50;
+    """
+    other1_caption: str | None = Field(default=None, alias='other1Caption')
+    """
+     Max length: 50;
+    """
+    other2_caption: str | None = Field(default=None, alias='other2Caption')
+    """
+     Max length: 50;
+    """
+    default_year: bool | None = Field(default=None, alias='defaultYear')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationSalesActivity(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class CrmInfo(ConnectWiseModel):
+    id: int | None = None
+    account_manager_role: TeamRoleReference | None = Field(
+        default=None, alias='accountManagerRole'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    technical_contact_role: TeamRoleReference | None = Field(
+        default=None, alias='technicalContactRole'
     )
+    sales_rep_role: TeamRoleReference | None = Field(default=None, alias='salesRepRole')
+    field1_caption: str | None = Field(default=None, alias='field1Caption')
+    field2_caption: str | None = Field(default=None, alias='field2Caption')
+    field3_caption: str | None = Field(default=None, alias='field3Caption')
+    field4_caption: str | None = Field(default=None, alias='field4Caption')
+    field5_caption: str | None = Field(default=None, alias='field5Caption')
+    field6_caption: str | None = Field(default=None, alias='field6Caption')
+    field7_caption: str | None = Field(default=None, alias='field7Caption')
+    field8_caption: str | None = Field(default=None, alias='field8Caption')
+    field9_caption: str | None = Field(default=None, alias='field9Caption')
+    field10_caption: str | None = Field(default=None, alias='field10Caption')
+    primary_rep_caption: str | None = Field(default=None, alias='primaryRepCaption')
+    secondary_rep_caption: str | None = Field(default=None, alias='secondaryRepCaption')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationSalesTeam(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+class CustomReportParameter(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    """
+    Either a caption name or parameter name is required. Max length: 50;
+    """
+    caption_name: str | None = Field(default=None, alias='captionName')
+    """
+    Either a caption name or parameter name is required. Max length: 50;
+    """
+    custom_report: CustomReportReference | None = Field(
+        default=None, alias='customReport'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationSendFromEmailNotify(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+class DepartmentLocation(ConnectWiseModel):
+    id: int | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    department_manager: MemberReference | None = Field(
+        default=None, alias='departmentManager'
     )
-
-
-class MemberDeactivationServiceManger(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    dispatch: MemberReference | None = None
+    service_manager: MemberReference | None = Field(
+        default=None, alias='serviceManager'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    duty_manager: MemberReference | None = Field(default=None, alias='dutyManager')
+    ldap_config: LdapConfigurationReference | None = Field(
+        default=None, alias='ldapConfig'
     )
+    add_all_locations: bool | None = Field(default=None, alias='addAllLocations')
+    remove_all_locations: bool | None = Field(default=None, alias='removeAllLocations')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationServiceTeam(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
-    )
+class DepartmentLocationInfo(ConnectWiseModel):
+    id: int | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationServiceTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class DocumentInfo(ConnectWiseModel):
+    id: int | None = None
+    title: str | None = None
+    file_name: str | None = Field(default=None, alias='fileName')
+    server_file_name: str | None = Field(default=None, alias='serverFileName')
+    owner: str | None = None
+    link_flag: bool | None = Field(default=None, alias='linkFlag')
+    image_flag: bool | None = Field(default=None, alias='imageFlag')
+    public_flag: bool | None = Field(default=None, alias='publicFlag')
+    html_template_flag: bool | None = Field(default=None, alias='htmlTemplateFlag')
+    read_only_flag: bool | None = Field(default=None, alias='readOnlyFlag')
+    size: int | None = None
+    url_flag: bool | None = Field(default=None, alias='urlFlag')
+    created_on_date: str | None = Field(default=None, alias='createdOnDate')
+    document_type: DocumentTypeReference | None = Field(
+        default=None, alias='documentType'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    guid: UUID | None = Field(
+        default=None, example='00000000-0000-0000-0000-000000000000'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberDeactivationStatusWorkflow(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    count: int | None = None
+class EmailConnector(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    email_server_type: Literal['IMAP', 'Office365', 'Google', 'Asio365'] | None = Field(
+        default=None, alias='emailServerType'
     )
-
-
-class MemberDeactivationWorkflow(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    imap_setup: ImapSetupReference | None = Field(default=None, alias='imapSetup')
+    office365_email_setup: Office365EmailSetupReference | None = Field(
+        default=None, alias='office365EmailSetup'
     )
-    count: int | None = None
-    re_assign_to_member: MemberReference | None = Field(
-        default=None, alias='reAssignToMember'
+    asio365_email_setup: Office365EmailSetupReference | None = Field(
+        default=None, alias='asio365EmailSetup'
     )
-
-
-class MemberDelegation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    google_email_setup: GoogleEmailSetupReference | None = Field(
+        default=None, alias='googleEmailSetup'
     )
-    id: int | None = None
-    delegation_type: DelegationType = Field(..., alias='delegationType')
-    delegated_to: MemberReference | None = Field(default=None, alias='delegatedTo')
-    date_start: datetime = Field(..., alias='dateStart')
-    date_end: datetime = Field(..., alias='dateEnd')
-    member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_board: BoardReference | None = Field(default=None, alias='serviceBoard')
+    default_company: CompanyReference | None = Field(
+        default=None, alias='defaultCompany'
     )
-    id: int | None = None
-    identifier: str | None = None
-    first_name: str | None = Field(default=None, alias='firstName')
-    middle_initial: str | None = Field(default=None, alias='middleInitial')
-    last_name: str | None = Field(default=None, alias='lastName')
-    full_name: str | None = Field(default=None, alias='fullName')
-    default_email: str | None = Field(default=None, alias='defaultEmail')
-    photo: DocumentReference | None = None
-    license_class: LicenseClass | None = Field(default=None, alias='licenseClass')
+    default_member: MemberReference | None = Field(default=None, alias='defaultMember')
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    email_notify_from: str | None = Field(default=None, alias='emailNotifyFrom')
     """
-    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
+     Max length: 50;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberLinkSsoUser(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    sso_user_id: str | None = Field(default=None, alias='ssoUserId')
+    bcc_email_to: str | None = Field(default=None, alias='bccEmailTo')
     """
-     Max length: 100;
+     Max length: 250;
     """
-
-
-class MemberNotificationSetting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    notification_type: NotificationType = Field(..., alias='notificationType')
-    notification_trigger: NotificationTrigger = Field(..., alias='notificationTrigger')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberOffice365(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    email_errors_to: str = Field(..., alias='emailErrorsTo')
+    """
+     Max length: 50;
+    """
+    set_email_to_default_contact_flag: bool | None = Field(
+        default=None, alias='setEmailToDefaultContactFlag'
     )
-    id: str | None = None
-    name: str | None = None
-
-
-class MemberPersona(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    no_response_flag: bool | None = Field(default=None, alias='noResponseFlag')
+    never_respond_flag: bool | None = Field(default=None, alias='neverRespondFlag')
+    discard_duplicates_flag: bool | None = Field(
+        default=None, alias='discardDuplicatesFlag'
     )
-    id: int | None = None
-    job_role_percentage: int | None = Field(default=None, alias='jobRolePercentage')
-    name: str | None = None
-    persona_id: int = Field(..., alias='personaId')
-    member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    post_replies_to_ticket_flag: bool | None = Field(
+        default=None, alias='postRepliesToTicketFlag'
     )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberSkill(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    skill: SkillReference
-    skill_level: SkillLevel = Field(..., alias='skillLevel')
-    certified_flag: bool | None = Field(default=None, alias='certifiedFlag')
-    years_experience: int | None = Field(default=None, alias='yearsExperience')
-    notes: str | None = None
-    member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberSsoSettingsReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    sso_user_id: str | None = Field(default=None, alias='ssoUserId')
-    user_name: str | None = Field(default=None, alias='userName')
-    email: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberSsoToken(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    token: str | None = None
-
-
-class MemberTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str
-    """
-     Max length: 50;
-    """
-    template_description: str | None = Field(default=None, alias='templateDescription')
-    """
-     Max length: 1024;
-    """
-    title: str | None = None
-    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
-    enable_mobile_flag: bool | None = Field(default=None, alias='enableMobileFlag')
-    type: MemberTypeReference | None = None
-    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
-    partner_portal_flag: bool | None = Field(default=None, alias='partnerPortalFlag')
-    sts_user_admin_url: str | None = Field(default=None, alias='stsUserAdminUrl')
-    toast_notification_flag: bool | None = Field(
-        default=None, alias='toastNotificationFlag'
-    )
-    member_personas: list[int] | None = Field(default=None, alias='memberPersonas')
-    admin_flag: bool | None = Field(default=None, alias='adminFlag')
-    structure_level: StructureReference | None = Field(
-        default=None, alias='structureLevel'
-    )
-    security_location: SystemLocationReference | None = Field(
-        default=None, alias='securityLocation'
-    )
-    default_location: SystemLocationReference | None = Field(
-        default=None, alias='defaultLocation'
-    )
-    default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='defaultDepartment'
-    )
-    reports_to: MemberReference | None = Field(default=None, alias='reportsTo')
-    restrict_location_flag: bool | None = Field(
-        default=None, alias='restrictLocationFlag'
-    )
-    restrict_department_flag: bool | None = Field(
-        default=None, alias='restrictDepartmentFlag'
-    )
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
-    expense_approver: MemberReference | None = Field(
-        default=None, alias='expenseApprover'
-    )
-    billable_forecast: float | None = Field(default=None, alias='billableForecast')
-    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
-    hourly_cost: float | None = Field(default=None, alias='hourlyCost')
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    include_in_utilization_reporting_flag: bool | None = Field(
-        default=None, alias='includeInUtilizationReportingFlag'
-    )
-    require_expense_entry_flag: bool | None = Field(
-        default=None, alias='requireExpenseEntryFlag'
-    )
-    require_time_sheet_entry_flag: bool | None = Field(
-        default=None, alias='requireTimeSheetEntryFlag'
-    )
-    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
-        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
-    )
-    allow_in_cell_entry_on_time_sheet: bool | None = Field(
-        default=None, alias='allowInCellEntryOnTimeSheet'
-    )
-    enter_time_against_company_flag: bool | None = Field(
-        default=None, alias='enterTimeAgainstCompanyFlag'
-    )
-    allow_expenses_entered_against_companies_flag: bool | None = Field(
-        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
-    )
-    time_reminder_email_flag: bool | None = Field(
-        default=None, alias='timeReminderEmailFlag'
-    )
-    days_tolerance: int | None = Field(default=None, alias='daysTolerance')
-    minimum_hours: float | None = Field(default=None, alias='minimumHours')
-    time_sheet_start_date: str | None = Field(default=None, alias='timeSheetStartDate')
-    service_default_location: SystemLocationReference | None = Field(
-        default=None, alias='serviceDefaultLocation'
-    )
-    service_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='serviceDefaultDepartment'
-    )
-    service_default_board: BoardReference | None = Field(
-        default=None, alias='serviceDefaultBoard'
-    )
-    restrict_service_default_location_flag: bool | None = Field(
-        default=None, alias='restrictServiceDefaultLocationFlag'
-    )
-    restrict_service_default_department_flag: bool | None = Field(
-        default=None, alias='restrictServiceDefaultDepartmentFlag'
-    )
-    excluded_service_board_ids: list[int] | None = Field(
-        default=None, alias='excludedServiceBoardIds'
-    )
-    teams: list[int] | None = None
-    service_board_team_ids: list[int] | None = Field(
-        default=None, alias='serviceBoardTeamIds'
-    )
-    project_default_location: SystemLocationReference | None = Field(
-        default=None, alias='projectDefaultLocation'
-    )
-    project_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='projectDefaultDepartment'
-    )
-    project_default_board: ProjectBoardReference | None = Field(
-        default=None, alias='projectDefaultBoard'
-    )
-    restrict_project_default_location_flag: bool | None = Field(
-        default=None, alias='restrictProjectDefaultLocationFlag'
-    )
-    restrict_project_default_department_flag: bool | None = Field(
-        default=None, alias='restrictProjectDefaultDepartmentFlag'
-    )
-    excluded_project_board_ids: list[int] | None = Field(
-        default=None, alias='excludedProjectBoardIds'
-    )
-    schedule_default_location: SystemLocationReference | None = Field(
-        default=None, alias='scheduleDefaultLocation'
-    )
-    schedule_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='scheduleDefaultDepartment'
-    )
-    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
-    service_location: ServiceLocationReference | None = Field(
-        default=None, alias='serviceLocation'
-    )
-    restrict_schedule_flag: bool | None = Field(
-        default=None, alias='restrictScheduleFlag'
-    )
-    hide_member_in_dispatch_portal_flag: bool | None = Field(
-        default=None, alias='hideMemberInDispatchPortalFlag'
-    )
-    calendar: CalendarReference | None = None
-    sales_default_location: SystemLocationReference | None = Field(
-        default=None, alias='salesDefaultLocation'
-    )
-    restrict_default_sales_territory_flag: bool | None = Field(
-        default=None, alias='restrictDefaultSalesTerritoryFlag'
-    )
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
-    )
-    restrict_default_warehouse_flag: bool | None = Field(
-        default=None, alias='restrictDefaultWarehouseFlag'
-    )
-    restrict_default_warehouse_bin_flag: bool | None = Field(
-        default=None, alias='restrictDefaultWarehouseBinFlag'
+    create_contact_flag: bool | None = Field(default=None, alias='createContactFlag')
+    response_email_for_new: str | None = Field(
+        default=None, alias='responseEmailForNew'
     )
-    company_activity_tab_format: CompanyActivityTabFormat | None = Field(
-        default=None, alias='companyActivityTabFormat'
+    response_email_for_existing: str | None = Field(
+        default=None, alias='responseEmailForExisting'
     )
-    invoice_time_tab_format: InvoiceTimeTabFormat | None = Field(
-        default=None, alias='invoiceTimeTabFormat'
+    source_override: ServiceSourceReference | None = Field(
+        default=None, alias='sourceOverride'
     )
-    invoice_screen_default_tab_format: InvoiceScreenDefaultTabFormat | None = Field(
-        default=None, alias='invoiceScreenDefaultTabFormat'
+    priority_override: PriorityReference | None = Field(
+        default=None, alias='priorityOverride'
     )
-    invoicing_display_options: InvoicingDisplayOptions | None = Field(
-        default=None, alias='invoicingDisplayOptions'
+    type_override: ServiceTypeReference | None = Field(
+        default=None, alias='typeOverride'
     )
-    agreement_invoicing_display_options: AgreementInvoicingDisplayOptions | None = (
-        Field(default=None, alias='agreementInvoicingDisplayOptions')
+    sub_type_override: ServiceSubTypeReference | None = Field(
+        default=None, alias='subTypeOverride'
     )
-    auto_start_stopwatch: bool | None = Field(default=None, alias='autoStartStopwatch')
-    auto_popup_quick_notes_with_stopwatch: bool | None = Field(
-        default=None, alias='autoPopupQuickNotesWithStopwatch'
+    item_override: ServiceItemReference | None = Field(
+        default=None, alias='itemOverride'
     )
-    global_search_default_ticket_filter: GlobalSearchDefaultTicketFilter | None = Field(
-        default=None, alias='globalSearchDefaultTicketFilter'
+    status_override: ServiceStatusReference | None = Field(
+        default=None, alias='statusOverride'
     )
-    global_search_default_sort: GlobalSearchDefaultSort | None = Field(
-        default=None, alias='globalSearchDefaultSort'
+    add_cc_flag: bool | None = Field(default=None, alias='addCcFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class EmailConnectorInfo(ConnectWiseModel):
+    id: int | None = None
+    imap_setup: ImapSetupReference | None = Field(default=None, alias='imapSetup')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class EmailConnectorParsingRule(ConnectWiseModel):
+    id: int | None = None
+    parsing_style: EmailConnectorParsingStyleReference | None = Field(
+        default=None, alias='parsingStyle'
     )
-    phone_source: str | None = Field(default=None, alias='phoneSource')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    copy_pod_layouts: bool | None = Field(default=None, alias='copyPodLayouts')
-    copy_shared_default_views: bool | None = Field(
-        default=None, alias='copySharedDefaultViews'
+    priority: int
+    parsing_variable: EmailConnectorParsingVariableReference | None = Field(
+        default=None, alias='parsingVariable'
     )
-    copy_column_layouts_and_filters: bool | None = Field(
-        default=None, alias='copyColumnLayoutsAndFilters'
+    search_term: str = Field(..., alias='searchTerm')
+    """
+     Max length: 250;
+    """
+    service_priority: PriorityReference | None = Field(
+        default=None, alias='servicePriority'
     )
-    from_member_rec_id: int | None = Field(default=None, alias='fromMemberRecId')
-    from_member_template_rec_id: int | None = Field(
-        default=None, alias='fromMemberTemplateRecId'
+    service_status: ServiceStatusReference | None = Field(
+        default=None, alias='serviceStatus'
     )
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
+    service_sub_type: ServiceSubTypeReference | None = Field(
+        default=None, alias='serviceSubType'
     )
+    service_item: ServiceItemReference | None = Field(default=None, alias='serviceItem')
+    service_board: BoardReference | None = Field(default=None, alias='serviceBoard')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MemberType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class EmailConnectorParsingStyle(ConnectWiseModel):
     id: int | None = None
-    name: str
+    parsing_type: EmailConnectorParsingTypeReference | None = Field(
+        default=None, alias='parsingType'
+    )
+    parse_rule: str = Field(..., alias='parseRule')
     """
-     Max length: 30;
+     Max length: 500;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MemberTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    priority: int
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MenuEntry(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class EPayConfiguration(ConnectWiseModel):
     id: int | None = None
-    menu_location: MenuLocationReference | None = Field(
-        default=None, alias='menuLocation'
-    )
-    caption: str
+    location: SystemLocationReference | None = None
+    currency: CurrencyReference | None = None
+    url: str
     """
-     Max length: 50;
+     Max length: 400;
     """
-    link: str
+    store_identifier: str = Field(..., alias='storeIdentifier')
     """
-     Max length: 2000;
+     Max length: 500;
     """
-    new_window_flag: bool = Field(..., alias='newWindowFlag')
-    location_ids: list[int] | None = Field(default=None, alias='locationIds')
-    origin: str | None = None
+    encryption_key: str | None = Field(default=None, alias='encryptionKey')
     """
-     Max length: 2000;
+     Max length: 500;
     """
-    client_id: str | None = Field(default=None, alias='clientId')
+    initialization_vector: str | None = Field(
+        default=None, alias='initializationVector'
+    )
     """
-    Only required if not already set Max length: 36;
+     Max length: 500;
     """
-    add_all_locations: bool | None = Field(default=None, alias='addAllLocations')
-    remove_all_locations: bool | None = Field(default=None, alias='removeAllLocations')
-    small_menu_icon_id: int | None = Field(default=None, alias='smallMenuIconId')
-    large_menu_icon_id: int | None = Field(default=None, alias='largeMenuIconId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MenuEntryLocation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ErrorResponseMessage(ConnectWiseModel):
+    code: str | None = None
+    message: str | None = None
+    errors: list[ValidationError] | None = None
+
+
+class ExpenseEntryAudit(TimeEntryAudit):
+    pass
+
+
+class ExpenseReport(ConnectWiseModel):
     id: int | None = None
-    location: SystemLocationReference | None = None
-    menu_entry: SystemMenuEntryReference | None = Field(default=None, alias='menuEntry')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    member: MemberReference | None = None
+    year: int | None = None
+    period: int | None = None
+    date_start: str | None = Field(default=None, alias='dateStart')
+    date_end: str | None = Field(default=None, alias='dateEnd')
+    status: Literal[
+        'Open',
+        'Rejected',
+        'PendingApproval',
+        'ErrorsCorrected',
+        'PendingProjectApproval',
+        'ApprovedByTierOne',
+        'RejectBySecondTier',
+        'ApprovedByTierTwo',
+        'ReadyToBill',
+        'Billed',
+        'WrittenOff',
+        'BilledAgreement',
+    ] | None = None
+    total: float | None = None
+    due_date: str | None = Field(default=None, alias='dueDate')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MenuLocationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ExpenseReportAudit(TimeEntryAudit):
+    pass
+
+
+class ExpenseTax(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    amount: float | None = None
+    type: ExpenseTaxTypeReference | None = None
 
 
-class MinimumStockByWarehouse(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ExpenseTypeExemption(ConnectWiseModel):
     id: int | None = None
-    warehouse: WarehouseReference
-    minimum_stock: int = Field(..., alias='minimumStock')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    expense_type: ExpenseTypeReference = Field(..., alias='expenseType')
+    taxable_levels: list[int] | None = Field(default=None, alias='taxableLevels')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Module(Enum):
+class ForecastItem(ConnectWiseModel):
+    id: int | None = None
+    forecast_description: str | None = Field(default=None, alias='forecastDescription')
     """
-    The Module Name.
+     Max length: 50;
     """
-
-    COMPANIES = 'Companies'
-    FINANCE = 'Finance'
-    MARKETING = 'Marketing'
-    PROCUREMENT = 'Procurement'
-    PROJECT = 'Project'
-    SALES = 'Sales'
-    SERVICE_DESK = 'ServiceDesk'
-    TIME_EXPENSE = 'TimeExpense'
-
-
-class MyAccount(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    opportunity: OpportunityReference | None = None
+    quantity: float | None = None
+    status: OpportunityStatusReference | None = None
+    catalog_item: IvItemReference | None = Field(default=None, alias='catalogItem')
+    product_description: str | None = Field(default=None, alias='productDescription')
+    product_class: str | None = Field(default=None, alias='productClass')
+    revenue: float | None = None
+    cost: float | None = None
+    margin: float | None = None
+    percentage: int | None = None
+    include_flag: bool | None = Field(default=None, alias='includeFlag')
+    quote_werks_doc_no: str | None = Field(default=None, alias='quoteWerksDocNo')
+    """
+     Max length: 20;
+    """
+    quote_werks_doc_name: str | None = Field(default=None, alias='quoteWerksDocName')
+    """
+     Max length: 255;
+    """
+    quote_werks_quantity: int | None = Field(default=None, alias='quoteWerksQuantity')
+    forecast_type: Literal[
+        'Other1', 'Other2', 'Agreement', 'Product', 'Service'
+    ] = Field(..., alias='forecastType')
+    link_flag: bool | None = Field(default=None, alias='linkFlag')
+    recurring_revenue: float | None = Field(default=None, alias='recurringRevenue')
+    recurring_cost: float | None = Field(default=None, alias='recurringCost')
+    recurring_date_start: datetime | None = Field(
+        default=None, alias='recurringDateStart'
     )
-    id: int | None = None
-    identifier: str
+    recurring_date_end: datetime | None = Field(default=None, alias='recurringDateEnd')
+    bill_cycle: BillingCycleReference | None = Field(default=None, alias='billCycle')
+    cycle_basis: str | None = Field(default=None, alias='cycleBasis')
+    cycles: int | None = None
+    recurring_flag: bool | None = Field(default=None, alias='recurringFlag')
+    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
+    sub_number: int | None = Field(default=None, alias='subNumber')
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class GLAccount(ConnectWiseModel):
+    id: int | None = None
+    gl_type: Literal[
+        'AP',
+        'AR',
+        'EE',
+        'EI',
+        'EO',
+        'IA',
+        'IT',
+        'P',
+        'PF',
+        'R',
+        'RA',
+        'RD',
+        'RE',
+        'RP',
+        'ST',
+        'SD',
+        'ET',
+        'FT',
+        'PT',
+        'WP',
+        'WR',
+    ] = Field(..., alias='glType')
+    mapped_type: MappedTypeReference = Field(..., alias='mappedType')
+    mapped_record: MappedRecordReference = Field(..., alias='mappedRecord')
+    segment1: str | None = None
     """
-     Max length: 15;
+     Max length: 255;
     """
-    password: str | None = None
+    segment2: str | None = None
     """
-    ConditionallyRequired. API Member will get random password generated Max length: 60;
+     Max length: 255;
     """
-    first_name: str = Field(..., alias='firstName')
+    segment3: str | None = None
     """
-     Max length: 30;
+     Max length: 255;
     """
-    middle_initial: str | None = Field(default=None, alias='middleInitial')
+    segment4: str | None = None
     """
-     Max length: 1;
+     Max length: 255;
     """
-    last_name: str = Field(..., alias='lastName')
+    segment5: str | None = None
     """
-     Max length: 30;
+     Max length: 255;
     """
-    title: str | None = None
+    segment6: str | None = None
     """
-     Max length: 50;
+     Max length: 255;
     """
-    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
-    license_class: LicenseClass = Field(..., alias='licenseClass')
+    segment7: str | None = None
     """
-    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
+     Max length: 255;
     """
-    disable_online_flag: bool | None = Field(default=None, alias='disableOnlineFlag')
-    enable_mobile_flag: bool | None = Field(default=None, alias='enableMobileFlag')
-    type: MemberTypeReference | None = None
-    employee_identifer: str | None = Field(default=None, alias='employeeIdentifer')
+    segment8: str | None = None
     """
-     Max length: 10;
+     Max length: 255;
     """
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    notes: str | None = None
-    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
-    country: CountryReference | None = None
-    service_board_team_ids: list[int] | None = Field(
-        default=None, alias='serviceBoardTeamIds'
-    )
-    enable_mobile_gps_flag: bool | None = Field(
-        default=None, alias='enableMobileGpsFlag'
-    )
-    inactive_date: datetime | None = Field(default=None, alias='inactiveDate')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    last_login: str | None = Field(default=None, alias='lastLogin')
-    photo: DocumentReference | None = None
-    partner_portal_flag: bool | None = Field(default=None, alias='partnerPortalFlag')
-    client_id: str | None = Field(default=None, alias='clientId')
-    sts_user_admin_url: str | None = Field(default=None, alias='stsUserAdminUrl')
-    token: str | None = None
-    toast_notification_flag: bool | None = Field(
-        default=None, alias='toastNotificationFlag'
-    )
-    member_personas: list[int] | None = Field(default=None, alias='memberPersonas')
-    office365: MemberOffice365 | None = None
-    office_email: str | None = Field(default=None, alias='officeEmail')
+    segment9: str | None = None
     """
-     Max length: 250;
+     Max length: 255;
     """
-    office_phone: str | None = Field(default=None, alias='officePhone')
+    segment10: str | None = None
     """
-     Max length: 15;
+     Max length: 255;
     """
-    office_extension: str | None = Field(default=None, alias='officeExtension')
+    cogs1: str | None = None
     """
-     Max length: 10;
+     Max length: 255;
     """
-    mobile_email: str | None = Field(default=None, alias='mobileEmail')
+    cogs2: str | None = None
     """
-     Max length: 250;
+     Max length: 255;
     """
-    mobile_phone: str | None = Field(default=None, alias='mobilePhone')
+    cogs3: str | None = None
     """
-     Max length: 15;
+     Max length: 255;
     """
-    mobile_extension: str | None = Field(default=None, alias='mobileExtension')
+    cogs4: str | None = None
     """
-     Max length: 10;
+     Max length: 255;
     """
-    home_email: str | None = Field(default=None, alias='homeEmail')
+    cogs5: str | None = None
     """
-     Max length: 250;
+     Max length: 255;
     """
-    home_phone: str | None = Field(default=None, alias='homePhone')
+    cogs6: str | None = None
     """
-     Max length: 15;
+     Max length: 255;
     """
-    home_extension: str | None = Field(default=None, alias='homeExtension')
+    cogs7: str | None = None
     """
-     Max length: 10;
+     Max length: 255;
     """
-    default_email: DefaultEmail = Field(..., alias='defaultEmail')
-    primary_email: str | None = Field(default=None, alias='primaryEmail')
+    cogs8: str | None = None
     """
-     Max length: 250;
+     Max length: 255;
     """
-    default_phone: DefaultPhone = Field(..., alias='defaultPhone')
-    default_location: SystemLocationReference | None = Field(
-        default=None, alias='defaultLocation'
-    )
-    default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='defaultDepartment'
-    )
-    reports_to: MemberReference | None = Field(default=None, alias='reportsTo')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
-    expense_approver: MemberReference | None = Field(
-        default=None, alias='expenseApprover'
-    )
-    billable_forecast: float | None = Field(default=None, alias='billableForecast')
-    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
-    include_in_utilization_reporting_flag: bool | None = Field(
-        default=None, alias='includeInUtilizationReportingFlag'
-    )
-    require_expense_entry_flag: bool | None = Field(
-        default=None, alias='requireExpenseEntryFlag'
-    )
-    require_time_sheet_entry_flag: bool | None = Field(
-        default=None, alias='requireTimeSheetEntryFlag'
-    )
-    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
-        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
-    )
-    allow_in_cell_entry_on_time_sheet: bool | None = Field(
-        default=None, alias='allowInCellEntryOnTimeSheet'
-    )
-    enter_time_against_company_flag: bool | None = Field(
-        default=None, alias='enterTimeAgainstCompanyFlag'
-    )
-    allow_expenses_entered_against_companies_flag: bool | None = Field(
-        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
-    )
-    time_reminder_email_flag: bool | None = Field(
-        default=None, alias='timeReminderEmailFlag'
-    )
-    days_tolerance: int | None = Field(default=None, alias='daysTolerance')
-    minimum_hours: float | None = Field(default=None, alias='minimumHours')
-    time_sheet_start_date: datetime | None = Field(
-        default=None, alias='timeSheetStartDate'
-    )
-    hire_date: datetime = Field(..., alias='hireDate')
-    service_default_location: SystemLocationReference | None = Field(
-        default=None, alias='serviceDefaultLocation'
-    )
-    service_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='serviceDefaultDepartment'
-    )
-    service_default_board: BoardReference | None = Field(
-        default=None, alias='serviceDefaultBoard'
-    )
-    project_default_location: SystemLocationReference | None = Field(
-        default=None, alias='projectDefaultLocation'
-    )
-    project_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='projectDefaultDepartment'
-    )
-    project_default_board: ProjectBoardReference | None = Field(
-        default=None, alias='projectDefaultBoard'
-    )
-    schedule_default_location: SystemLocationReference | None = Field(
-        default=None, alias='scheduleDefaultLocation'
-    )
-    schedule_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='scheduleDefaultDepartment'
-    )
-    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
-    service_location: ServiceLocationReference | None = Field(
-        default=None, alias='serviceLocation'
-    )
-    hide_member_in_dispatch_portal_flag: bool | None = Field(
-        default=None, alias='hideMemberInDispatchPortalFlag'
-    )
-    calendar: CalendarReference | None = None
-    sales_default_location: SystemLocationReference | None = Field(
-        default=None, alias='salesDefaultLocation'
-    )
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
-    )
-    mapi_name: str | None = Field(default=None, alias='mapiName')
-    calendar_sync_integration_flag: bool | None = Field(
-        default=None, alias='calendarSyncIntegrationFlag'
-    )
-    company_activity_tab_format: CompanyActivityTabFormat = Field(
-        ..., alias='companyActivityTabFormat'
-    )
-    invoice_time_tab_format: InvoiceTimeTabFormat = Field(
-        ..., alias='invoiceTimeTabFormat'
-    )
-    invoice_screen_default_tab_format: InvoiceScreenDefaultTabFormat = Field(
-        ..., alias='invoiceScreenDefaultTabFormat'
-    )
-    invoicing_display_options: InvoicingDisplayOptions = Field(
-        ..., alias='invoicingDisplayOptions'
-    )
-    agreement_invoicing_display_options: AgreementInvoicingDisplayOptions = Field(
-        ..., alias='agreementInvoicingDisplayOptions'
-    )
-    authentication_service_type: AuthenticationServiceType | None = Field(
-        default=None, alias='authenticationServiceType'
-    )
-    timebased_one_time_password_activated: bool | None = Field(
-        default=None, alias='timebasedOneTimePasswordActivated'
-    )
-    directional_sync: DirectionalSyncReference | None = Field(
-        default=None, alias='directionalSync'
-    )
-    auto_start_stopwatch: bool | None = Field(default=None, alias='autoStartStopwatch')
-    auto_popup_quick_notes_with_stopwatch: bool | None = Field(
-        default=None, alias='autoPopupQuickNotesWithStopwatch'
-    )
-    signature: str | None = None
-    global_search_default_ticket_filter: GlobalSearchDefaultTicketFilter | None = Field(
-        default=None, alias='globalSearchDefaultTicketFilter'
-    )
-    global_search_default_sort: GlobalSearchDefaultSort | None = Field(
-        default=None, alias='globalSearchDefaultSort'
-    )
-    phone_source: str | None = Field(default=None, alias='phoneSource')
-    phone_integration_type: PhoneIntegrationType | None = Field(
-        default=None, alias='phoneIntegrationType'
-    )
-    use_browser_language_flag: bool | None = Field(
-        default=None, alias='useBrowserLanguageFlag'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    copy_pod_layouts: bool | None = Field(default=None, alias='copyPodLayouts')
-    copy_shared_default_views: bool | None = Field(
-        default=None, alias='copySharedDefaultViews'
-    )
-    copy_column_layouts_and_filters: bool | None = Field(
-        default=None, alias='copyColumnLayoutsAndFilters'
-    )
-    from_member_rec_id: int | None = Field(default=None, alias='fromMemberRecId')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
-
-
-class MyMember(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    password: str | None = None
+    cogs9: str | None = None
     """
-    ConditionallyRequired. API Member will get random password generated
+     Max length: 255;
     """
-    first_name: str | None = Field(default=None, alias='firstName')
-    middle_initial: str | None = Field(default=None, alias='middleInitial')
-    last_name: str | None = Field(default=None, alias='lastName')
-    title: str | None = None
-    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
-    license_class: LicenseClass | None = Field(default=None, alias='licenseClass')
+    cogs10: str | None = None
     """
-    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
+     Max length: 255;
     """
-    disable_online_flag: bool | None = Field(default=None, alias='disableOnlineFlag')
-    enable_mobile_flag: bool | None = Field(default=None, alias='enableMobileFlag')
-    type: MemberTypeReference | None = None
-    employee_identifer: str | None = Field(default=None, alias='employeeIdentifer')
-    vendor_number: str | None = Field(default=None, alias='vendorNumber')
-    notes: str | None = None
-    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
-    country: CountryReference | None = None
-    service_board_team_ids: list[int] | None = Field(
-        default=None, alias='serviceBoardTeamIds'
-    )
-    enable_mobile_gps_flag: bool | None = Field(
-        default=None, alias='enableMobileGpsFlag'
-    )
-    inactive_date: str | None = Field(default=None, alias='inactiveDate')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    last_login: str | None = Field(default=None, alias='lastLogin')
-    photo: DocumentReference | None = None
-    toast_notification_flag: bool | None = Field(
-        default=None, alias='toastNotificationFlag'
-    )
-    office_email: str | None = Field(default=None, alias='officeEmail')
-    office_phone: str | None = Field(default=None, alias='officePhone')
-    office_extension: str | None = Field(default=None, alias='officeExtension')
-    mobile_email: str | None = Field(default=None, alias='mobileEmail')
-    mobile_phone: str | None = Field(default=None, alias='mobilePhone')
-    mobile_extension: str | None = Field(default=None, alias='mobileExtension')
-    home_email: str | None = Field(default=None, alias='homeEmail')
-    home_phone: str | None = Field(default=None, alias='homePhone')
-    home_extension: str | None = Field(default=None, alias='homeExtension')
-    default_email: DefaultEmail | None = Field(default=None, alias='defaultEmail')
-    default_phone: DefaultPhone | None = Field(default=None, alias='defaultPhone')
-    security_role: SecurityRoleReference | None = Field(
-        default=None, alias='securityRole'
-    )
-    admin_flag: bool | None = Field(default=None, alias='adminFlag')
-    structure_level: StructureReference | None = Field(
-        default=None, alias='structureLevel'
-    )
-    security_location: SystemLocationReference | None = Field(
-        default=None, alias='securityLocation'
-    )
-    default_location: SystemLocationReference | None = Field(
-        default=None, alias='defaultLocation'
-    )
-    default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='defaultDepartment'
-    )
-    reports_to: MemberReference | None = Field(default=None, alias='reportsTo')
-    restrict_location_flag: bool | None = Field(
-        default=None, alias='restrictLocationFlag'
-    )
-    restrict_department_flag: bool | None = Field(
-        default=None, alias='restrictDepartmentFlag'
-    )
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
-    expense_approver: MemberReference | None = Field(
-        default=None, alias='expenseApprover'
-    )
-    billable_forecast: float | None = Field(default=None, alias='billableForecast')
-    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
-    hourly_cost: float | None = Field(default=None, alias='hourlyCost')
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    include_in_utilization_reporting_flag: bool | None = Field(
-        default=None, alias='includeInUtilizationReportingFlag'
-    )
-    require_expense_entry_flag: bool | None = Field(
-        default=None, alias='requireExpenseEntryFlag'
-    )
-    require_time_sheet_entry_flag: bool | None = Field(
-        default=None, alias='requireTimeSheetEntryFlag'
-    )
-    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
-        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
-    )
-    allow_in_cell_entry_on_time_sheet: bool | None = Field(
-        default=None, alias='allowInCellEntryOnTimeSheet'
-    )
-    enter_time_against_company_flag: bool | None = Field(
-        default=None, alias='enterTimeAgainstCompanyFlag'
-    )
-    allow_expenses_entered_against_companies_flag: bool | None = Field(
-        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
-    )
-    time_reminder_email_flag: bool | None = Field(
-        default=None, alias='timeReminderEmailFlag'
-    )
-    days_tolerance: int | None = Field(default=None, alias='daysTolerance')
-    minimum_hours: float | None = Field(default=None, alias='minimumHours')
-    time_sheet_start_date: str | None = Field(default=None, alias='timeSheetStartDate')
-    hire_date: str | None = Field(default=None, alias='hireDate')
-    service_default_location: SystemLocationReference | None = Field(
-        default=None, alias='serviceDefaultLocation'
-    )
-    service_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='serviceDefaultDepartment'
-    )
-    service_default_board: BoardReference | None = Field(
-        default=None, alias='serviceDefaultBoard'
-    )
-    restrict_service_default_location_flag: bool | None = Field(
-        default=None, alias='restrictServiceDefaultLocationFlag'
-    )
-    restrict_service_default_department_flag: bool | None = Field(
-        default=None, alias='restrictServiceDefaultDepartmentFlag'
-    )
-    excluded_service_board_ids: list[int] | None = Field(
-        default=None, alias='excludedServiceBoardIds'
-    )
-    project_default_location: SystemLocationReference | None = Field(
-        default=None, alias='projectDefaultLocation'
-    )
-    project_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='projectDefaultDepartment'
-    )
-    project_default_board: ProjectBoardReference | None = Field(
-        default=None, alias='projectDefaultBoard'
-    )
-    restrict_project_default_location_flag: bool | None = Field(
-        default=None, alias='restrictProjectDefaultLocationFlag'
-    )
-    restrict_project_default_department_flag: bool | None = Field(
-        default=None, alias='restrictProjectDefaultDepartmentFlag'
-    )
-    excluded_project_board_ids: list[int] | None = Field(
-        default=None, alias='excludedProjectBoardIds'
-    )
-    schedule_default_location: SystemLocationReference | None = Field(
-        default=None, alias='scheduleDefaultLocation'
-    )
-    schedule_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='scheduleDefaultDepartment'
-    )
-    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
-    service_location: ServiceLocationReference | None = Field(
-        default=None, alias='serviceLocation'
-    )
-    restrict_schedule_flag: bool | None = Field(
-        default=None, alias='restrictScheduleFlag'
-    )
-    hide_member_in_dispatch_portal_flag: bool | None = Field(
-        default=None, alias='hideMemberInDispatchPortalFlag'
-    )
-    calendar: CalendarReference | None = None
-    sales_default_location: SystemLocationReference | None = Field(
-        default=None, alias='salesDefaultLocation'
-    )
-    restrict_default_sales_territory_flag: bool | None = Field(
-        default=None, alias='restrictDefaultSalesTerritoryFlag'
-    )
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
-    )
-    restrict_default_warehouse_flag: bool | None = Field(
-        default=None, alias='restrictDefaultWarehouseFlag'
-    )
-    restrict_default_warehouse_bin_flag: bool | None = Field(
-        default=None, alias='restrictDefaultWarehouseBinFlag'
-    )
-    mapi_name: str | None = Field(default=None, alias='mapiName')
-    calendar_sync_integration_flag: bool | None = Field(
-        default=None, alias='calendarSyncIntegrationFlag'
-    )
-    enable_ldap_authentication_flag: bool | None = Field(
-        default=None, alias='enableLdapAuthenticationFlag'
-    )
-    ldap_configuration: LdapConfigurationReference | None = Field(
-        default=None, alias='ldapConfiguration'
-    )
-    ldap_user_name: str | None = Field(default=None, alias='ldapUserName')
-    company_activity_tab_format: CompanyActivityTabFormat | None = Field(
-        default=None, alias='companyActivityTabFormat'
-    )
-    invoice_time_tab_format: InvoiceTimeTabFormat | None = Field(
-        default=None, alias='invoiceTimeTabFormat'
-    )
-    invoice_screen_default_tab_format: InvoiceScreenDefaultTabFormat | None = Field(
-        default=None, alias='invoiceScreenDefaultTabFormat'
-    )
-    invoicing_display_options: InvoicingDisplayOptions | None = Field(
-        default=None, alias='invoicingDisplayOptions'
-    )
-    agreement_invoicing_display_options: AgreementInvoicingDisplayOptions | None = (
-        Field(default=None, alias='agreementInvoicingDisplayOptions')
-    )
-    corelytics_username: str | None = Field(default=None, alias='corelyticsUsername')
-    corelytics_password: str | None = Field(default=None, alias='corelyticsPassword')
-    authentication_service_type: AuthenticationServiceType | None = Field(
-        default=None, alias='authenticationServiceType'
-    )
-    timebased_one_time_password_activated: bool | None = Field(
-        default=None, alias='timebasedOneTimePasswordActivated'
-    )
-    directional_sync: DirectionalSyncReference | None = Field(
-        default=None, alias='directionalSync'
-    )
-    sso_session_flag: bool | None = Field(default=None, alias='ssoSessionFlag')
-    sso_client_id: str | None = Field(default=None, alias='ssoClientId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class MyMemberInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    first_name: str | None = Field(default=None, alias='firstName')
-    middle_initial: str | None = Field(default=None, alias='middleInitial')
-    last_name: str | None = Field(default=None, alias='lastName')
-    full_name: str | None = Field(default=None, alias='fullName')
-    default_email: str | None = Field(default=None, alias='defaultEmail')
-    photo: DocumentReference | None = None
-    license_class: LicenseClass | None = Field(default=None, alias='licenseClass')
+    product_id: str | None = Field(default=None, alias='productId')
     """
-    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
+     Max length: 255;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
-    use_browser_language_flag: bool | None = Field(
-        default=None, alias='useBrowserLanguageFlag'
-    )
-    default_location: SystemLocationReference | None = Field(
-        default=None, alias='defaultLocation'
-    )
-    default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='defaultDepartment'
-    )
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
-    require_expense_entry_flag: bool | None = Field(
-        default=None, alias='requireExpenseEntryFlag'
-    )
-    require_time_sheet_entry_flag: bool | None = Field(
-        default=None, alias='requireTimeSheetEntryFlag'
-    )
-    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
-        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
-    )
-    enter_time_against_company_flag: bool | None = Field(
-        default=None, alias='enterTimeAgainstCompanyFlag'
-    )
-    allow_expenses_entered_against_companies_flag: bool | None = Field(
-        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
-    )
-    service_default_board: BoardReference | None = Field(
-        default=None, alias='serviceDefaultBoard'
-    )
-    service_default_location: SystemLocationReference | None = Field(
-        default=None, alias='serviceDefaultLocation'
-    )
-    service_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='serviceDefaultDepartment'
-    )
-    restrict_service_default_location_flag: bool | None = Field(
-        default=None, alias='restrictServiceDefaultLocationFlag'
-    )
-    restrict_service_default_department_flag: bool | None = Field(
-        default=None, alias='restrictServiceDefaultDepartmentFlag'
-    )
-    excluded_service_board_ids: list[int] | None = Field(
-        default=None, alias='excludedServiceBoardIds'
-    )
-    project_default_location: SystemLocationReference | None = Field(
-        default=None, alias='projectDefaultLocation'
-    )
-    project_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='projectDefaultDepartment'
-    )
-    project_default_board: ProjectBoardReference | None = Field(
-        default=None, alias='projectDefaultBoard'
-    )
-    restrict_project_default_location_flag: bool | None = Field(
-        default=None, alias='restrictProjectDefaultLocationFlag'
-    )
-    restrict_project_default_department_flag: bool | None = Field(
-        default=None, alias='restrictProjectDefaultDepartmentFlag'
-    )
-    excluded_project_board_ids: list[int] | None = Field(
-        default=None, alias='excludedProjectBoardIds'
-    )
-    schedule_default_location: SystemLocationReference | None = Field(
-        default=None, alias='scheduleDefaultLocation'
+    inventory: str | None = None
+    """
+     Max length: 255;
+    """
+    sales_code: str | None = Field(default=None, alias='salesCode')
+    """
+     Max length: 255;
+    """
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class GLExportAdjustmentTransactionDetail(ConnectWiseModel):
+    gl_class: str | None = Field(default=None, alias='glClass')
+    description: str | None = None
+    memo: str | None = None
+    item: IvItemReference | None = None
+    quantity: int | None = None
+    total: float | None = None
+    cost: float | None = None
+    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
+    inventory_account_number: str | None = Field(
+        default=None, alias='inventoryAccountNumber'
     )
-    schedule_default_department: SystemDepartmentReference | None = Field(
-        default=None, alias='scheduleDefaultDepartment'
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    product_account_number: str | None = Field(
+        default=None, alias='productAccountNumber'
     )
-    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
-    service_location: ServiceLocationReference | None = Field(
-        default=None, alias='serviceLocation'
+
+
+class GLExportCustomer(ConnectWiseModel):
+    company: CompanyReference | None = None
+    company_type: CompanyTypeReference | None = Field(default=None, alias='companyType')
+    contact: ContactReference | None = None
+    site: SiteReference | None = None
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    sales_default_location: SystemLocationReference | None = Field(
-        default=None, alias='salesDefaultLocation'
+    billing_terms_xref: str | None = Field(default=None, alias='billingTermsXref')
+    due_days: int | None = Field(default=None, alias='dueDays')
+    taxable: bool | None = None
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    currency: CurrencyReference | None = None
+    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
+    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
+    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
+    country_tax_xref: str | None = Field(default=None, alias='countryTaxXref')
+    composite_tax_xref: str | None = Field(default=None, alias='compositeTaxXref')
+    state_tax_rate: float | None = Field(default=None, alias='stateTaxRate')
+    county_tax_rate: float | None = Field(default=None, alias='countyTaxRate')
+    city_tax_rate: float | None = Field(default=None, alias='cityTaxRate')
+    country_tax_rate: float | None = Field(default=None, alias='countryTaxRate')
+    composite_tax_rate: float | None = Field(default=None, alias='compositeTaxRate')
+    tax_group_rate: float | None = Field(default=None, alias='taxGroupRate')
+    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
+    state_tax_agency_xref: str | None = Field(default=None, alias='stateTaxAgencyXref')
+    county_tax_agency_xref: str | None = Field(
+        default=None, alias='countyTaxAgencyXref'
     )
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
+    city_tax_agency_xref: str | None = Field(default=None, alias='cityTaxAgencyXref')
+    country_tax_agency_xref: str | None = Field(
+        default=None, alias='countryTaxAgencyXref'
     )
-    restrict_default_warehouse_flag: bool | None = Field(
-        default=None, alias='restrictDefaultWarehouseFlag'
+    composite_tax_agency_xref: str | None = Field(
+        default=None, alias='compositeTaxAgencyXref'
     )
-    restrict_default_warehouse_bin_flag: bool | None = Field(
-        default=None, alias='restrictDefaultWarehouseBinFlag'
+    tax_levels: list[GLExportCustomerTaxLevel] | None = Field(
+        default=None, alias='taxLevels'
     )
-    sso_session_flag: bool | None = Field(default=None, alias='ssoSessionFlag')
-    sso_client_id: str | None = Field(default=None, alias='ssoClientId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class MySecurity(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GLExportExpenseBill(ConnectWiseModel):
     id: int | None = None
-    add_level: AddLevel | None = Field(default=None, alias='addLevel')
-    edit_level: EditLevel | None = Field(default=None, alias='editLevel')
-    delete_level: DeleteLevel | None = Field(default=None, alias='deleteLevel')
-    inquire_level: InquireLevel | None = Field(default=None, alias='inquireLevel')
-    module_function_name: str | None = Field(default=None, alias='moduleFunctionName')
-    module_function_description: str | None = Field(
-        default=None, alias='moduleFunctionDescription'
-    )
-    my_all_flag: bool | None = Field(default=None, alias='myAllFlag')
-    module_function_identifier: str | None = Field(
-        default=None, alias='moduleFunctionIdentifier'
-    )
-    report_flag: bool | None = Field(default=None, alias='reportFlag')
-    restrict_flag: bool | None = Field(default=None, alias='restrictFlag')
-    custom_flag: bool | None = Field(default=None, alias='customFlag')
-    module_description: str | None = Field(default=None, alias='moduleDescription')
-    module_identifier: str | None = Field(default=None, alias='moduleIdentifier')
-    module_name: str | None = Field(default=None, alias='moduleName')
-    sort_order: int | None = Field(default=None, alias='sortOrder')
+    document_date: str | None = Field(default=None, alias='documentDate')
+    document_type: str | None = Field(default=None, alias='documentType')
+    document_number: str | None = Field(default=None, alias='documentNumber')
+    memo: str | None = None
+    gl_class: str | None = Field(default=None, alias='glClass')
+    ap_account_number: str | None = Field(default=None, alias='apAccountNumber')
     member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    currency: CurrencyReference | None = None
+    total: float | None = None
+    detail: list[GLExportExpenseBillDetail] | None = None
 
 
-class MySecurityCustomizeItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GLExportExpenseOffset(ConnectWiseModel):
     id: int | None = None
-    customize_identifier: CustomizeIdentifier | None = Field(
-        default=None, alias='customizeIdentifier'
-    )
-    item_identifier: str | None = Field(default=None, alias='itemIdentifier')
-
-
-class Name(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class NoteType(Enum):
-    TICKET_NOTE = 'TicketNote'
-    TIME_ENTRY_NOTE = 'TimeEntryNote'
-    MEETING_NOTE = 'MeetingNote'
+    document_date: str | None = Field(default=None, alias='documentDate')
+    document_type: str | None = Field(default=None, alias='documentType')
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    gl_class: str | None = Field(default=None, alias='glClass')
+    member: MemberReference | None = None
+    memo: str | None = None
+    description: str | None = None
+    total: float | None = None
 
 
-class NoteTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class GLExportInventoryTransfer(ConnectWiseModel):
+    id: str | None = None
+    document_type: str | None = Field(default=None, alias='documentType')
+    document_date: str | None = Field(default=None, alias='documentDate')
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    gl_class: str | None = Field(default=None, alias='glClass')
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    description: str | None = None
+    sales_code: str | None = Field(default=None, alias='salesCode')
+    memo: str | None = None
+    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
+    inventory_account_number: str | None = Field(
+        default=None, alias='inventoryAccountNumber'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Notes(Enum):
-    DISCARD = 'Discard'
-    MERGE = 'Merge'
-
-
-class NotificationRecipient(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    transfer_id: int | None = Field(default=None, alias='transferId')
+    item: IvItemReference | None = None
+    gl_item_id: str | None = Field(default=None, alias='glItemId')
+    sales_description: str | None = Field(default=None, alias='salesDescription')
+    item_description: str | None = Field(default=None, alias='itemDescription')
+    currency: CurrencyReference | None = None
+    item_price: float | None = Field(default=None, alias='itemPrice')
+    taxable: bool | None = None
+    unit_of_measure: UnitOfMeasureReference | None = Field(
+        default=None, alias='unitOfMeasure'
     )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    external_flag: bool | None = Field(default=None, alias='externalFlag')
-    service_flag: bool | None = Field(default=None, alias='serviceFlag')
-    sales_flag: bool | None = Field(default=None, alias='salesFlag')
-    invoice_flag: bool | None = Field(default=None, alias='invoiceFlag')
-    agreement_flag: bool | None = Field(default=None, alias='agreementFlag')
-    member_flag: bool | None = Field(default=None, alias='memberFlag')
-    config_flag: bool | None = Field(default=None, alias='configFlag')
-    msp_flag: bool | None = Field(default=None, alias='mspFlag')
-    track_flag: bool | None = Field(default=None, alias='trackFlag')
-    project_flag: bool | None = Field(default=None, alias='projectFlag')
-    procurement_flag: bool | None = Field(default=None, alias='procurementFlag')
-    knowledge_base_flag: bool | None = Field(default=None, alias='knowledgeBaseFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class NotificationRecipientReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    quantity: float | None = None
+    cost: float | None = None
+    total: float | None = None
+    sub_category: ProductSubCategoryReference | None = Field(
+        default=None, alias='subCategory'
     )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class NotificationTrigger(Enum):
-    ACTIVITY_STATUS_REQ = 'ActivityStatusReq'
-    CUSTOMER_UPDATED = 'CustomerUpdated'
-    EXPENSE_REPORT = 'ExpenseReport'
-    TICKET_STATUS_CHANGE = 'TicketStatusChange'
-    TICKET_STATUS_REQUEST = 'TicketStatusRequest'
-    TIME_NAG_APPROVER = 'TimeNagApprover'
-    TIME_NAG_MEMBER = 'TimeNagMember'
-    TIME_SHEET = 'TimeSheet'
-    WORKFLOW_RULES = 'WorkflowRules'
-
-
-class NotificationType(Enum):
-    EMAIL = 'Email'
-    PUSH = 'Push'
-
-
-class NotifyType(Enum):
-    CREATE_ACTIVITY = 'CreateActivity'
-    SEND_EMAIL = 'SendEmail'
-    ADD_TO_GROUP = 'AddToGroup'
-    ATTACH_TRACK = 'AttachTrack'
-    CHANGE_COMPANY_STATUS = 'ChangeCompanyStatus'
-    CREATE_SERVICE_TICKET = 'CreateServiceTicket'
-
-
-class NotifyTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
+    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
+    bin: WarehouseBinReference | None = None
+    warehouse: WarehouseReference | None = None
+    transfer_from_bin: WarehouseBinReference | None = Field(
+        default=None, alias='transferFromBin'
     )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class NumberOfEmployees(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class Office365EmailSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    transfer_from_location_xref: str | None = Field(
+        default=None, alias='transferFromLocationXref'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 200;
-    """
-    username: str
-    """
-     Max length: 100;
-    """
-    inbox_folder: str = Field(..., alias='inboxFolder')
-    """
-     Max length: 40;
-    """
-    processed_folder: str = Field(..., alias='processedFolder')
-    """
-     Max length: 40;
-    """
-    failed_folder: str = Field(..., alias='failedFolder')
-    """
-     Max length: 40;
-    """
-    tenant_id: str | None = Field(default=None, alias='tenantId')
-    """
-     Max length: 36;
-    """
-    client_id: str | None = Field(default=None, alias='clientId')
-    """
-     Max length: 36;
-    """
-    client_secret: str | None = Field(default=None, alias='clientSecret')
-    """
-     Max length: 4000;
-    """
-    authorized_flag: bool | None = Field(default=None, alias='authorizedFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    source: int | None = None
-    email_connector: EmailConnectorReference | None = Field(
-        default=None, alias='emailConnector'
+    transfer_to_bin: WarehouseBinReference | None = Field(
+        default=None, alias='transferToBin'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Office365EmailSetupReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    transfer_to_location_xref: str | None = Field(
+        default=None, alias='transferToLocationXref'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    location_xref: str | None = Field(default=None, alias='locationXref')
+    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
+    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
+    item_type_xref: str | None = Field(default=None, alias='itemTypeXref')
+    inventory_xref: str | None = Field(default=None, alias='inventoryXref')
+    cogs_xref: str | None = Field(default=None, alias='cogsXref')
+    tax_note: str | None = Field(default=None, alias='taxNote')
+    offset: GLExportInventoryTransferOffset | None = None
 
 
-class OnHandSerialNumber(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class GLExportPurchaseTransactionDetail(ConnectWiseModel):
+    id: int | None = None
+    document_date: str | None = Field(default=None, alias='documentDate')
+    gl_class: str | None = Field(default=None, alias='glClass')
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    gl_item_id: str | None = Field(default=None, alias='glItemId')
+    sales_code: str | None = Field(default=None, alias='salesCode')
+    description: str | None = None
+    cost: float | None = None
+    memo: str | None = None
+    tax_note: str | None = Field(default=None, alias='taxNote')
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
+    inventory_account_number: str | None = Field(
+        default=None, alias='inventoryAccountNumber'
+    )
+    vendor_account_number: str | None = Field(default=None, alias='vendorAccountNumber')
+    item: IvItemReference | None = None
+    item_description: str | None = Field(default=None, alias='itemDescription')
+    sales_description: str | None = Field(default=None, alias='salesDescription')
+    taxable: bool | None = None
+    item_price: float | None = Field(default=None, alias='itemPrice')
+    item_cost: float | None = Field(default=None, alias='itemCost')
+    unit_of_measure: UnitOfMeasureReference | None = Field(
+        default=None, alias='unitOfMeasure'
     )
-    id: int | None = None
-    serial: str | None = None
-    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
-    warehouse: WarehouseReference | None = None
+    quantity: float | None = None
+    total: float | None = None
+    currency: CurrencyReference | None = None
+    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
+    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
+    drop_shipped_flag: bool | None = Field(default=None, alias='dropShippedFlag')
+    line_number: int | None = Field(default=None, alias='lineNumber')
     warehouse_bin: WarehouseBinReference | None = Field(
         default=None, alias='warehouseBin'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OnHandSerialNumberReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    warehouse_site: SiteReference | None = Field(default=None, alias='warehouseSite')
+    sub_category: ProductSubCategoryReference | None = Field(
+        default=None, alias='subCategory'
     )
-    id: int | None = None
-    serial_number: str | None = Field(default=None, alias='serialNumber')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OnPremiseSearchSetting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    shipment_method: ShipmentMethodReference | None = Field(
+        default=None, alias='shipmentMethod'
     )
-    id: int | None = None
-    password: str
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OnlyDisplay(Enum):
-    DO_NOT_DISPLAY = 'DoNotDisplay'
-    CLOSED30_DAYS = 'Closed30Days'
-    CLOSED60_DAYS = 'Closed60Days'
-    CLOSED90_DAYS = 'Closed90Days'
-    CLOSED120_DAYS = 'Closed120Days'
-    ALL_CLOSED = 'AllClosed'
-
-
-class OpenRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    item_type_xref: str | None = Field(default=None, alias='itemTypeXref')
+    inventory_xref: str | None = Field(default=None, alias='inventoryXref')
+    cogs_xref: str | None = Field(default=None, alias='cogsXref')
+    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
+    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
+    location_xref: str | None = Field(default=None, alias='locationXref')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    purchase_header_tax_group: str | None = Field(
+        default=None, alias='purchaseHeaderTaxGroup'
     )
-    id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Opportunities(Enum):
-    DISCARD = 'Discard'
-    MERGE = 'Merge'
+    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
+    tax_rate: float | None = Field(default=None, alias='taxRate')
+    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
 
 
-class Opportunity(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GLExportPurchaseTransactionDetailTax(ConnectWiseModel):
     id: int | None = None
-    name: str
-    """
-     Max length: 100;
-    """
-    expected_close_date: datetime | None = Field(
-        default=None, alias='expectedCloseDate'
-    )
-    """
-     Required On Updates;
-    """
-    type: OpportunityTypeReference | None = None
-    stage: OpportunityStageReference | None = None
-    status: OpportunityStatusReference | None = None
-    priority: OpportunityPriorityReference | None = None
-    notes: str | None = None
-    probability: OpportunityProbabilityReference | None = None
-    source: str | None = None
-    """
-     Max length: 50;
-    """
-    rating: OpportunityRatingReference | None = None
-    campaign: CampaignReference | None = None
-    primary_sales_rep: MemberReference | None = Field(
-        default=None, alias='primarySalesRep'
-    )
-    secondary_sales_rep: MemberReference | None = Field(
-        default=None, alias='secondarySalesRep'
+    document_date: str | None = Field(default=None, alias='documentDate')
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    gl_class: str | None = Field(default=None, alias='glClass')
+    cost: float | None = None
+    sales_code: str | None = Field(default=None, alias='salesCode')
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    gl_item_id: str | None = Field(default=None, alias='glItemId')
+    memo: str | None = None
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    vendor_account_number: str | None = Field(default=None, alias='vendorAccountNumber')
+    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
+    inventory_account_number: str | None = Field(
+        default=None, alias='inventoryAccountNumber'
     )
-    location_id: int | None = Field(default=None, alias='locationId')
-    """
-     Required On Updates;
-    """
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    """
-     Required On Updates;
-    """
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    site: SiteReference | None = None
-    customer_po: str | None = Field(default=None, alias='customerPO')
-    """
-     Max length: 25;
-    """
-    pipeline_change_date: datetime | None = Field(
-        default=None, alias='pipelineChangeDate'
+    item_type_xref: str | None = Field(default=None, alias='itemTypeXref')
+    inventory_xref: str | None = Field(default=None, alias='inventoryXref')
+    cogs_xref: str | None = Field(default=None, alias='cogsXref')
+    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
+    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
+    location_xref: str | None = Field(default=None, alias='locationXref')
+    item: IvItemReference | None = None
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    sales_description: str | None = Field(default=None, alias='salesDescription')
+    item_description: str | None = Field(default=None, alias='itemDescription')
+    item_price: float | None = Field(default=None, alias='itemPrice')
+    item_cost: float | None = Field(default=None, alias='itemCost')
+    unit_of_measure: UnitOfMeasureReference | None = Field(
+        default=None, alias='unitOfMeasure'
     )
-    date_became_lead: datetime | None = Field(default=None, alias='dateBecameLead')
-    closed_date: datetime | None = Field(default=None, alias='closedDate')
-    closed_by: MemberReference | None = Field(default=None, alias='closedBy')
-    total_sales_tax: float | None = Field(default=None, alias='totalSalesTax')
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
+    quantity: float | None = None
+    total: float | None = None
+    currency: CurrencyReference | None = None
+    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
+    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
+    drop_shipped_flag: bool | None = Field(default=None, alias='dropShippedFlag')
+    line_number: int | None = Field(default=None, alias='lineNumber')
+    warehouse_site: SiteReference | None = Field(default=None, alias='warehouseSite')
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
     )
-    ship_to_contact: ContactReference | None = Field(
-        default=None, alias='shipToContact'
+    shipment_method: ShipmentMethodReference | None = Field(
+        default=None, alias='shipmentMethod'
     )
-    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
+    sub_category: ProductSubCategoryReference | None = Field(
+        default=None, alias='subCategory'
     )
-    bill_to_contact: ContactReference | None = Field(
-        default=None, alias='billToContact'
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    tax_rate: float | None = Field(default=None, alias='taxRate')
+    tax_rate_percent: float | None = Field(default=None, alias='taxRatePercent')
+    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
+    tax_note: str | None = Field(default=None, alias='taxNote')
+    purchase_header_tax_group: str | None = Field(
+        default=None, alias='purchaseHeaderTaxGroup'
     )
-    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
+
+
+class GLExportTransactionDetail(ConnectWiseModel):
+    id: int | None = None
+    document_date: str | None = Field(default=None, alias='documentDate')
+    document_type: str | None = Field(default=None, alias='documentType')
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    gl_class: str | None = Field(default=None, alias='glClass')
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    gl_item_id: str | None = Field(default=None, alias='glItemId')
+    invoice_summary_option: str | None = Field(
+        default=None, alias='invoiceSummaryOption'
     )
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    cost: float | None = None
+    sales_code: str | None = Field(default=None, alias='salesCode')
+    memo: str | None = None
+    description: str | None = None
+    quantity: float | None = None
+    total: float | None = None
     currency: CurrencyReference | None = None
-    company_location_id: int | None = Field(default=None, alias='companyLocationId')
-    technical_contact: ContactReference | None = Field(
-        default=None, alias='technicalContact'
+    time_entry: TimeEntryReference | None = Field(default=None, alias='timeEntry')
+    cost_account_number: str | None = Field(default=None, alias='costAccountNumber')
+    inventory_account_number: str | None = Field(
+        default=None, alias='inventoryAccountNumber'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    product_account_number: str | None = Field(
+        default=None, alias='productAccountNumber'
     )
-
-
-class OpportunityContact(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
+    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
+    tax_note: str | None = Field(default=None, alias='taxNote')
+    tax_rate: float | None = Field(default=None, alias='taxRate')
+    tax_rate_percent: float | None = Field(default=None, alias='taxRatePercent')
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    taxable2_flag: bool | None = Field(default=None, alias='taxable2Flag')
+    taxable3_flag: bool | None = Field(default=None, alias='taxable3Flag')
+    taxable4_flag: bool | None = Field(default=None, alias='taxable4Flag')
+    taxable5_flag: bool | None = Field(default=None, alias='taxable5Flag')
+    item: IvItemReference | None = None
+    product: ProductReference | None = None
+    item_taxable_flag: bool | None = Field(default=None, alias='itemTaxableFlag')
+    item_price: float | None = Field(default=None, alias='itemPrice')
+    item_cost: float | None = Field(default=None, alias='itemCost')
+    item_description: str | None = Field(default=None, alias='itemDescription')
+    sales_description: str | None = Field(default=None, alias='salesDescription')
+    unit_of_measure: UnitOfMeasureReference | None = Field(
+        default=None, alias='unitOfMeasure'
     )
-    id: int | None = None
-    contact: ContactReference | None = None
-    company: CompanyReference | None = None
-    role: OpportunitySalesRoleReference | None = None
-    notes: str | None = None
-    referral_flag: bool | None = Field(default=None, alias='referralFlag')
-    opportunity_id: int | None = Field(default=None, alias='opportunityId')
-    phone_number: str | None = Field(default=None, alias='phoneNumber')
-    email_address: str | None = Field(default=None, alias='emailAddress')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OpportunityNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    sub_category: ProductSubCategoryReference | None = Field(
+        default=None, alias='subCategory'
     )
-    id: int | None = None
-    opportunity_id: int | None = Field(default=None, alias='opportunityId')
-    type: NoteTypeReference | None = None
-    text: str
-    flagged: bool | None = None
-    entered_by: str | None = Field(default=None, alias='enteredBy')
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OpportunityPriorityReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    serialized_flag: bool | None = Field(default=None, alias='serializedFlag')
+    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
+    warehouse_site: SiteReference | None = Field(default=None, alias='warehouseSite')
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OpportunityProbabilityReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    shipment_method: ShipmentMethodReference | None = Field(
+        default=None, alias='shipmentMethod'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OpportunityRating(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    drop_shipped_flag: bool | None = Field(default=None, alias='dropShippedFlag')
+    item_type_xref: str | None = Field(default=None, alias='itemTypeXref')
+    inventory_xref: str | None = Field(default=None, alias='inventoryXref')
+    cogs_xref: str | None = Field(default=None, alias='cogsXref')
+    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
+    price_level_xref: str | None = Field(default=None, alias='priceLevelXref')
+    location_xref: str | None = Field(default=None, alias='locationXref')
+    tax_levels: list[GLExportTransactionDetailTaxLevel] | None = Field(
+        default=None, alias='taxLevels'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class OpportunityRatingInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class GLExportVendor(ConnectWiseModel):
+    member: MemberReference | None = None
+    vendor: CompanyReference | None = None
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    id: int | None = None
-    name: str | None = None
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    due_days: int | None = Field(default=None, alias='dueDays')
+    site: SiteReference | None = None
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
 
 
-class OpportunityRatingReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GLPath(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OpportunityReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    location: SystemLocationReference | None = None
+    path: str | None = None
+    """
+     Max length: 255;
+    """
+    sql_server_name: str | None = Field(default=None, alias='sqlServerName')
+    """
+     Max length: 255;
+    """
+    database_name: str | None = Field(default=None, alias='databaseName')
+    """
+     Max length: 100;
+    """
+    last_payment_sync: datetime | None = Field(default=None, alias='lastPaymentSync')
+    last_payment_sync_by: MemberReference | None = Field(
+        default=None, alias='lastPaymentSyncBy'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class OpportunitySalesRoleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class GraphUserCsv(ConnectWiseModel):
+    id: str | None = None
+    display_name: str | None = Field(default=None, alias='displayName')
+    principal_name: str | None = Field(default=None, alias='principalName')
+    country: str | None = None
+    state: str | None = None
+    city: str | None = None
+    department: str | None = None
+    first_name: str | None = Field(default=None, alias='firstName')
+    last_name: str | None = Field(default=None, alias='lastName')
+    address: str | None = None
+    postal_code: str | None = Field(default=None, alias='postalCode')
+    mail: str | None = None
+    is_matched_contact: bool | None = Field(default=None, alias='isMatchedContact')
+    account_enabled: bool | None = Field(default=None, alias='accountEnabled')
+    manage_contact_rec_id: int | None = Field(default=None, alias='manageContactRecId')
+    manage_contact_name: str | None = Field(default=None, alias='manageContactName')
+    job_title: str | None = Field(default=None, alias='jobTitle')
+    proxy_addresses: list[str] | None = Field(default=None, alias='proxyAddresses')
+    nick_name: str | None = Field(default=None, alias='nickName')
+    manager: Manager | None = None
+    employee_type: str | None = Field(default=None, alias='employeeType')
 
 
-class OpportunityStage(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Holiday(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 50;
     """
-    probability: OpportunityProbabilityReference | None = None
-    color: str | None = None
+    all_day_flag: bool | None = Field(default=None, alias='allDayFlag')
     """
-     Max length: 25;
+    Can be set to false to set a holiday for specific hours (Defaults to True).
     """
-    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    date: date
+    time_start: str | None = Field(default=None, alias='timeStart')
+    time_end: str | None = Field(default=None, alias='timeEnd')
+    holiday_list: HolidayListReference | None = Field(default=None, alias='holidayList')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class OpportunityStageInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class HolidayInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    probability: OpportunityProbabilityReference | None = None
-    color: str | None = None
-    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    all_day_flag: bool | None = Field(default=None, alias='allDayFlag')
+    """
+    Can be set to false to set a holiday for specific hours (Defaults to True).
+    """
+    date: str | None = None
+    time_start: str | None = Field(default=None, alias='timeStart')
+    time_end: str | None = Field(default=None, alias='timeEnd')
+    holiday_list: HolidayListReference | None = Field(default=None, alias='holidayList')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class OpportunityStageReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class Info(ConnectWiseModel):
+    version: str | None = None
+    is_cloud: bool | None = Field(default=None, alias='isCloud')
+    server_time_zone: str | None = Field(default=None, alias='serverTimeZone')
+    license_bits: list[LicenseBit] | None = Field(default=None, alias='licenseBits')
+    cloud_region: str | None = Field(default=None, alias='cloudRegion')
 
 
-class OpportunityStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InOutBoard(ConnectWiseModel):
     id: int | None = None
-    name: str
+    member: MemberReference | None = None
+    in_out_type: InOutTypeReference | None = Field(default=None, alias='inOutType')
+    additional_info: str | None = Field(default=None, alias='additionalInfo')
     """
-     Max length: 30;
+     Max length: 100;
     """
-    won_flag: bool | None = Field(default=None, alias='wonFlag')
-    lost_flag: bool | None = Field(default=None, alias='lostFlag')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    entered_by: str | None = Field(default=None, alias='enteredBy')
-    date_entered: datetime | None = Field(default=None, alias='dateEntered')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    date_back: datetime = Field(..., alias='dateBack')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class OpportunityStatusInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class IntegratorLogin(ConnectWiseModel):
     id: int | None = None
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OpportunityStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    username: str
+    """
+     Max length: 50;
+    """
+    password: str | None = None
+    """
+    The password will never be returned in response. Max length: 50;
+    """
+    can_access_all_records_flag: bool | None = Field(
+        default=None, alias='canAccessAllRecordsFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OpportunityToAgreementConversion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    """
+    This flag controls whether the integrator can access only the db records it created, or all system records.
+    """
+    can_access_all_apis_flag: bool | None = Field(
+        default=None, alias='canAccessAllApisFlag'
     )
-    agreement_id: int | None = Field(default=None, alias='agreementId')
-    name: str | None = None
-    type: AgreementTypeReference | None = None
-    start_date: str | None = Field(default=None, alias='startDate')
-    end_date: str | None = Field(default=None, alias='endDate')
-    no_ending_date_flag: bool | None = Field(default=None, alias='noEndingDateFlag')
-    bill_cycle_id: int | None = Field(default=None, alias='billCycleId')
-    bill_one_time_flag: bool | None = Field(default=None, alias='billOneTimeFlag')
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    include_all_notes_flag: bool | None = Field(
-        default=None, alias='includeAllNotesFlag'
+    """
+    Setting this flag to true will create an integrator that can access all of the available apis in the system.
+                If this field is set to true, both the member and board fields are required.
+    """
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    date_inactivated: datetime | None = Field(default=None, alias='dateInactivated')
+    inactivated_by: MemberReference | None = Field(default=None, alias='inactivatedBy')
+    service_ticket_api_flag: bool | None = Field(
+        default=None, alias='serviceTicketApiFlag'
     )
-    include_all_documents_flag: bool | None = Field(
-        default=None, alias='includeAllDocumentsFlag'
+    board: BoardReference | None = None
+    service_board_callback_url: str | None = Field(
+        default=None, alias='serviceBoardCallbackUrl'
     )
-    include_all_products_flag: bool | None = Field(
-        default=None, alias='includeAllProductsFlag'
+    """
+     Max length: 1000;
+    """
+    service_board_legacy_callback_flag: bool | None = Field(
+        default=None, alias='serviceBoardLegacyCallbackFlag'
     )
-    include_note_ids: list[int] | None = Field(default=None, alias='includeNoteIds')
-    include_document_ids: list[int] | None = Field(
-        default=None, alias='includeDocumentIds'
+    time_entry_api_flag: bool | None = Field(default=None, alias='timeEntryApiFlag')
+    member: MemberReference | None = None
+    time_entry_callback_url: str | None = Field(
+        default=None, alias='timeEntryCallbackUrl'
     )
-    include_product_ids: list[int] | None = Field(
-        default=None, alias='includeProductIds'
+    """
+     Max length: 1000;
+    """
+    time_entry_legacy_callback_flag: bool | None = Field(
+        default=None, alias='timeEntryLegacyCallbackFlag'
     )
-
-
-class OpportunityToProjectConversion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    managed_services_api_flag: bool | None = Field(
+        default=None, alias='managedServicesApiFlag'
     )
-    project_id: int | None = Field(default=None, alias='projectId')
-    name: str | None = None
-    status: ProjectStatusReference | None = None
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    board: ProjectBoardReference | None = None
-    manager: MemberReference | None = None
-    estimated_start: str | None = Field(default=None, alias='estimatedStart')
-    estimated_end: str | None = Field(default=None, alias='estimatedEnd')
-    include_all_notes_flag: bool | None = Field(
-        default=None, alias='includeAllNotesFlag'
+    managed_services_auto_child_flag: bool | None = Field(
+        default=None, alias='managedServicesAutoChildFlag'
     )
-    include_all_documents_flag: bool | None = Field(
-        default=None, alias='includeAllDocumentsFlag'
+    managed_services_childing_flag: bool | None = Field(
+        default=None, alias='managedServicesChildingFlag'
     )
-    include_all_products_flag: bool | None = Field(
-        default=None, alias='includeAllProductsFlag'
+    """
+    True if integrator is allowed to child configurations.
+    """
+    contact_api_flag: bool | None = Field(default=None, alias='contactApiFlag')
+    contact_callback_url: str | None = Field(default=None, alias='contactCallbackUrl')
+    """
+     Max length: 1000;
+    """
+    contact_legacy_callback_flag: bool | None = Field(
+        default=None, alias='contactLegacyCallbackFlag'
     )
-    include_note_ids: list[int] | None = Field(default=None, alias='includeNoteIds')
-    include_document_ids: list[int] | None = Field(
-        default=None, alias='includeDocumentIds'
+    company_api_flag: bool | None = Field(default=None, alias='companyApiFlag')
+    company_callback_url: str | None = Field(default=None, alias='companyCallbackUrl')
+    """
+     Max length: 1000;
+    """
+    company_legacy_callback_flag: bool | None = Field(
+        default=None, alias='companyLegacyCallbackFlag'
     )
-    include_product_ids: list[int] | None = Field(
-        default=None, alias='includeProductIds'
+    activity_api_flag: bool | None = Field(default=None, alias='activityApiFlag')
+    activity_callback_url: str | None = Field(default=None, alias='activityCallbackUrl')
+    """
+     Max length: 1000;
+    """
+    activity_legacy_callback_flag: bool | None = Field(
+        default=None, alias='activityLegacyCallbackFlag'
     )
-
-
-class OpportunityToSalesOrderConversion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    invoice_api_flag: bool | None = Field(default=None, alias='invoiceApiFlag')
+    product_api_flag: bool | None = Field(default=None, alias='productApiFlag')
+    product_callback_url: str | None = Field(default=None, alias='productCallbackUrl')
+    """
+     Max length: 1000;
+    """
+    product_legacy_callback_flag: bool | None = Field(
+        default=None, alias='productLegacyCallbackFlag'
     )
-    sales_order_id: int | None = Field(default=None, alias='salesOrderId')
-    name: str | None = None
-    include_all_notes_flag: bool | None = Field(
-        default=None, alias='includeAllNotesFlag'
+    opportunity_api_flag: bool | None = Field(default=None, alias='opportunityApiFlag')
+    opportunity_callback_url: str | None = Field(
+        default=None, alias='opportunityCallbackUrl'
     )
-    include_all_documents_flag: bool | None = Field(
-        default=None, alias='includeAllDocumentsFlag'
+    """
+     Max length: 1000;
+    """
+    opportunity_legacy_callback_flag: bool | None = Field(
+        default=None, alias='opportunityLegacyCallbackFlag'
     )
-    include_all_products_flag: bool | None = Field(
-        default=None, alias='includeAllProductsFlag'
+    opportunity_conversion_api_flag: bool | None = Field(
+        default=None, alias='opportunityConversionApiFlag'
     )
-    include_note_ids: list[int] | None = Field(default=None, alias='includeNoteIds')
-    include_document_ids: list[int] | None = Field(
-        default=None, alias='includeDocumentIds'
+    """
+    True if the member has access to the Opportunity Conversion Api.
+    """
+    member_api_flag: bool | None = Field(default=None, alias='memberApiFlag')
+    marketing_api_flag: bool | None = Field(default=None, alias='marketingApiFlag')
+    purchasing_api_flag: bool | None = Field(default=None, alias='purchasingApiFlag')
+    purchasing_callback_url: str | None = Field(
+        default=None, alias='purchasingCallbackUrl'
     )
-    include_product_ids: list[int] | None = Field(
-        default=None, alias='includeProductIds'
+    """
+     Max length: 1000;
+    """
+    purchasing_legacy_callback_flag: bool | None = Field(
+        default=None, alias='purchasingLegacyCallbackFlag'
     )
-
-
-class OpportunityToServiceTicketConversion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    reporting_api_flag: bool | None = Field(default=None, alias='reportingApiFlag')
+    system_api_flag: bool | None = Field(default=None, alias='systemApiFlag')
+    project_api_flag: bool | None = Field(default=None, alias='projectApiFlag')
+    project_callback_url: str | None = Field(default=None, alias='projectCallbackUrl')
+    """
+     Max length: 1000;
+    """
+    project_legacy_callback_flag: bool | None = Field(
+        default=None, alias='projectLegacyCallbackFlag'
     )
-    ticket_id: int | None = Field(default=None, alias='ticketId')
-    summary: str | None = None
-    include_all_notes_flag: bool | None = Field(
-        default=None, alias='includeAllNotesFlag'
+    configuration_api_flag: bool | None = Field(
+        default=None, alias='configurationApiFlag'
     )
-    include_all_documents_flag: bool | None = Field(
-        default=None, alias='includeAllDocumentsFlag'
+    configuration_auto_child_flag: bool | None = Field(
+        default=None, alias='configurationAutoChildFlag'
     )
-    include_all_products_flag: bool | None = Field(
-        default=None, alias='includeAllProductsFlag'
+    configuration_childling_flag: bool | None = Field(
+        default=None, alias='configurationChildlingFlag'
     )
-    include_note_ids: list[int] | None = Field(default=None, alias='includeNoteIds')
-    include_document_ids: list[int] | None = Field(
-        default=None, alias='includeDocumentIds'
+    """
+    True if integrator is allowed to child configurations.
+    """
+    configuration_callback_url: str | None = Field(
+        default=None, alias='configurationCallbackUrl'
     )
-    include_product_ids: list[int] | None = Field(
-        default=None, alias='includeProductIds'
+    """
+     Max length: 1000;
+    """
+    configuration_legacy_callback_flag: bool | None = Field(
+        default=None, alias='configurationLegacyCallbackFlag'
     )
-
-
-class OpportunityType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    schedule_api_flag: bool | None = Field(default=None, alias='scheduleApiFlag')
+    schedule_callback_url: str | None = Field(default=None, alias='scheduleCallbackUrl')
+    """
+     Max length: 1000;
+    """
+    schedule_legacy_callback_flag: bool | None = Field(
+        default=None, alias='scheduleLegacyCallbackFlag'
+    )
+    agreement_api_flag: bool | None = Field(default=None, alias='agreementApiFlag')
+    agreement_callback_url: str | None = Field(
+        default=None, alias='agreementCallbackUrl'
     )
-    id: int | None = None
-    description: str
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OpportunityTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    agreement_callback_legacy_flag: bool | None = Field(
+        default=None, alias='agreementCallbackLegacyFlag'
     )
-    id: int | None = None
-    description: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    document_api_flag: bool | None = Field(default=None, alias='documentApiFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class OpportunityTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class InventoryOnHand(CatalogInventory):
+    pass
 
 
-class Order(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Invoice(ConnectWiseModel):
     id: int | None = None
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    phone: str | None = None
-    phone_ext: str | None = Field(default=None, alias='phoneExt')
-    email: str | None = None
-    site: SiteReference | None = None
-    status: OrderStatusReference | None = None
-    opportunity: OpportunityReference | None = None
-    order_date: datetime | None = Field(default=None, alias='orderDate')
-    due_date: datetime | None = Field(default=None, alias='dueDate')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
-    )
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    po_number: str | None = Field(default=None, alias='poNumber')
+    invoice_number: str | None = Field(default=None, alias='invoiceNumber')
     """
-     Max length: 50;
+     Max length: 15; Required On Updates;
     """
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    sales_rep: MemberReference | None = Field(default=None, alias='salesRep')
-    notes: str | None = None
-    bill_closed_flag: bool | None = Field(default=None, alias='billClosedFlag')
-    bill_shipped_flag: bool | None = Field(default=None, alias='billShippedFlag')
-    restrict_downpayment_flag: bool | None = Field(
-        default=None, alias='restrictDownpaymentFlag'
+    type: Literal[
+        'Agreement',
+        'CreditMemo',
+        'DownPayment',
+        'Miscellaneous',
+        'Progress',
+        'Standard',
+    ]
+    status: BillingStatusReference | None = None
+    company: CompanyReference | None = None
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    description: str | None = None
-    top_comment_flag: bool | None = Field(default=None, alias='topCommentFlag')
-    bottom_comment_flag: bool | None = Field(default=None, alias='bottomCommentFlag')
     ship_to_company: CompanyReference | None = Field(
         default=None, alias='shipToCompany'
     )
-    ship_to_contact: ContactReference | None = Field(
-        default=None, alias='shipToContact'
-    )
-    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    apply_to_type: Literal[
+        'All', 'Agreement', 'Project', 'ProjectPhase', 'SalesOrder', 'Ticket'
+    ] | None = Field(default=None, alias='applyToType')
+    apply_to_id: int | None = Field(default=None, alias='applyToId')
+    attention: str | None = None
+    """
+     Max length: 60;
+    """
+    ship_to_attention: str | None = Field(default=None, alias='shipToAttention')
+    """
+     Max length: 60;
+    """
+    billing_site: SiteReference | None = Field(default=None, alias='billingSite')
+    billing_site_address_line1: str | None = Field(
+        default=None, alias='billingSiteAddressLine1'
     )
-    bill_to_contact: ContactReference | None = Field(
-        default=None, alias='billToContact'
+    billing_site_address_line2: str | None = Field(
+        default=None, alias='billingSiteAddressLine2'
     )
-    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
-    product_ids: list[int] | None = Field(default=None, alias='productIds')
-    document_ids: list[int] | None = Field(default=None, alias='documentIds')
-    invoice_ids: list[int] | None = Field(default=None, alias='invoiceIds')
-    config_ids: list[int] | None = Field(default=None, alias='configIds')
-    total: float | None = None
-    tax_total: float | None = Field(default=None, alias='taxTotal')
-    currency: CurrencyReference | None = None
-    company_location: SystemLocationReference | None = Field(
-        default=None, alias='companyLocation'
+    billing_site_city: str | None = Field(default=None, alias='billingSiteCity')
+    billing_site_state: str | None = Field(default=None, alias='billingSiteState')
+    billing_site_zip: str | None = Field(default=None, alias='billingSiteZip')
+    billing_site_country: str | None = Field(default=None, alias='billingSiteCountry')
+    shipping_site: SiteReference | None = Field(default=None, alias='shippingSite')
+    shipping_site_address_line1: str | None = Field(
+        default=None, alias='shippingSiteAddressLine1'
     )
-    sub_total: float | None = Field(default=None, alias='subTotal')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    shipping_site_address_line2: str | None = Field(
+        default=None, alias='shippingSiteAddressLine2'
     )
-
-
-class OrderStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    shipping_site_city: str | None = Field(default=None, alias='shippingSiteCity')
+    shipping_site_state: str | None = Field(default=None, alias='shippingSiteState')
+    shipping_site_zip: str | None = Field(default=None, alias='shippingSiteZip')
+    shipping_site_country: str | None = Field(default=None, alias='shippingSiteCountry')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    id: int | None = None
-    name: str
+    reference: str | None = None
     """
      Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    email_template: OrderStatusEmailTemplateReference | None = Field(
-        default=None, alias='emailTemplate'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OrderStatusEmailTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    status: OrderStatusReference | None = None
-    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
-    first_name: str | None = Field(default=None, alias='firstName')
+    customer_po: str | None = Field(default=None, alias='customerPO')
     """
-     Max length: 100;
+     Max length: 50;
     """
-    last_name: str | None = Field(default=None, alias='lastName')
+    template_setup_id: int | None = Field(default=None, alias='templateSetupId')
     """
-     Max length: 100;
+    Can be obtained via InvoiceTemplate report.
     """
-    email_address: str | None = Field(default=None, alias='emailAddress')
+    invoice_template: InvoiceTemplateDetailReference | None = Field(
+        default=None, alias='invoiceTemplate'
+    )
+    email_template_id: int | None = Field(default=None, alias='emailTemplateId')
     """
-     Max length: 100;
+    Can be obtained via InvoiceEmailTemplate report.
     """
-    subject: str
+    add_to_batch_email_list: bool | None = Field(
+        default=None, alias='addToBatchEmailList'
+    )
+    date: datetime | None = None
+    restrict_downpayment_flag: bool | None = Field(
+        default=None, alias='restrictDownpaymentFlag'
+    )
+    location_id: int | None = Field(default=None, alias='locationId')
     """
-     Max length: 200;
+     Required On Updates;
     """
-    body: str
-    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OrderStatusEmailTemplateReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    department_id: int | None = Field(default=None, alias='departmentId')
+    """
+    departmentId is only required for special invoices.
+    """
+    territory_id: int | None = Field(default=None, alias='territoryId')
+    top_comment: str | None = Field(default=None, alias='topComment')
+    bottom_comment: str | None = Field(default=None, alias='bottomComment')
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    downpayment_previously_taxed_flag: bool | None = Field(
+        default=None, alias='downpaymentPreviouslyTaxedFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OrderStatusInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_total: float | None = Field(default=None, alias='serviceTotal')
+    override_down_payment_amount_flag: bool | None = Field(
+        default=None, alias='overrideDownPaymentAmountFlag'
+    )
+    currency: CurrencyReference | None = None
+    due_date: datetime | None = Field(default=None, alias='dueDate')
+    expense_total: float | None = Field(default=None, alias='expenseTotal')
+    product_total: float | None = Field(default=None, alias='productTotal')
+    previous_progress_applied: float | None = Field(
+        default=None, alias='previousProgressApplied'
     )
-    id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OrderStatusNotification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_adjustment_amount: float | None = Field(
+        default=None, alias='serviceAdjustmentAmount'
     )
-    id: int | None = None
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
+    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
+    downpayment_applied: float | None = Field(default=None, alias='downpaymentApplied')
+    subtotal: float | None = None
+    total: float | None = None
+    remaining_downpayment: float | None = Field(
+        default=None, alias='remainingDownpayment'
     )
-    status: OrderStatusReference | None = None
-    member: MemberReference | None = None
-    email: str | None = None
-    """
-    Order Status Notification sendEmail must be entered if the notify type is "Email Address". Max length: 50;
-    """
-    workflow_step: int | None = Field(default=None, alias='workflowStep')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OrderStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    sales_tax: float | None = Field(default=None, alias='salesTax')
+    adjustment_reason: str | None = Field(default=None, alias='adjustmentReason')
+    adjusted_by: str | None = Field(default=None, alias='adjustedBy')
+    payments: float | None = None
+    credits: float | None = None
+    balance: float | None = None
+    special_invoice_flag: bool | None = Field(default=None, alias='specialInvoiceFlag')
+    billing_setup_reference: BillingSetupReference | None = Field(
+        default=None, alias='billingSetupReference'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OsGradeWeight(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ticket: TicketReference | None = None
+    project: ProjectReference | None = None
+    phase: ProjectPhaseReference | None = None
+    sales_order: SalesOrderReference | None = Field(default=None, alias='salesOrder')
+    agreement: AgreementReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    id: int | None = None
-    os_grade_weight: float | None = Field(default=None, alias='osGradeWeight')
-    os_name: str | None = Field(default=None, alias='osName')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Other(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InvoiceEmailTemplate(ConnectWiseModel):
     id: int | None = None
-    default_ldap: LdapConfigurationReference | None = Field(
-        default=None, alias='defaultLdap'
-    )
-    default_from_address: str = Field(..., alias='defaultFromAddress')
+    name: str
     """
      Max length: 50;
     """
-    portal_url_override: str = Field(..., alias='portalUrlOverride')
+    service_survey: ServiceSurveyReference | None = Field(
+        default=None, alias='serviceSurvey'
+    )
+    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
+    first_name: str | None = Field(default=None, alias='firstName')
     """
-     Max length: 100;
+    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
     """
-    site_url: str = Field(..., alias='siteUrl')
+    last_name: str | None = Field(default=None, alias='lastName')
     """
-     Max length: 100;
+    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
     """
-    logo_path: str | None = Field(default=None, alias='logoPath')
+    email_address: str | None = Field(default=None, alias='emailAddress')
     """
-     Max length: 200;
+    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
     """
-    contact_sync: ContactSync | None = Field(default=None, alias='contactSync')
-    server_time_zone: TimeZoneSetupReference | None = Field(
-        default=None, alias='serverTimeZone'
-    )
-    default_calendar: CalendarReference | None = Field(
-        default=None, alias='defaultCalendar'
-    )
-    default_address_format: AddressFormatReference | None = Field(
-        default=None, alias='defaultAddressFormat'
-    )
-    use_ssl_flag: bool | None = Field(default=None, alias='useSslFlag')
-    sync_leads_flag: bool | None = Field(default=None, alias='syncLeadsFlag')
-    include_portal_link_flag: bool | None = Field(
-        default=None, alias='includePortalLinkFlag'
-    )
-    use_expanded_format_time_flag: bool | None = Field(
-        default=None, alias='useExpandedFormatTimeFlag'
-    )
-    use_expanded_format_activity_flag: bool | None = Field(
-        default=None, alias='useExpandedFormatActivityFlag'
-    )
-    disable_z_admin_login_flag: bool | None = Field(
-        default=None, alias='disableZAdminLoginFlag'
-    )
-    locale: LocaleReference | None = None
-    update_member_time_zones_flag: bool | None = Field(
-        default=None, alias='updateMemberTimeZonesFlag'
-    )
+    subject: str
     """
-    If true, all Members time zone will also be set to serverTimeZone. Otherwise, only My Company time zone will be updated.
+     Max length: 200;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Other1RevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    body: str | None = None
+    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
+    invoice_status: BillingStatusReference | None = Field(
+        default=None, alias='invoiceStatus'
     )
-    id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    attach_invoice_flag: bool | None = Field(default=None, alias='attachInvoiceFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Other2RevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InvoicePayment(ConnectWiseModel):
     id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OverageRateType(Enum):
-    ADJ_AMOUNT = 'AdjAmount'
-    CUSTOM = 'Custom'
-    MULTIPLIER = 'Multiplier'
-
-
-class OwnerLevelReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    type: str | None = None
+    source: Literal['Default', 'WisePay'] | None = None
+    invoice: InvoiceReference | None = None
+    credit: InvoiceReference | None = None
+    amount: float | None = None
+    payment_date: datetime | None = Field(default=None, alias='paymentDate')
+    applied_by: str | None = Field(default=None, alias='appliedBy')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    wise_pay_payment: WisePayPayment | None = Field(
+        default=None, alias='wisePayPayment'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    payment_sync_status: str | None = Field(default=None, alias='paymentSyncStatus')
+    payment_sync_date: str | None = Field(default=None, alias='paymentSyncDate')
+    payment_account: str | None = Field(default=None, alias='paymentAccount')
+    a_r_payment_account: str | None = Field(default=None, alias='aRPaymentAccount')
 
 
-class OwnershipType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class KnowledgeBaseCategory(ConnectWiseModel):
     id: int | None = None
     name: str
     """
-     Max length: 200;
+     Max length: 50;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OwnershipTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class OwnershipTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PageValues(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    page: int | None = None
-    page_size: int | None = Field(default=None, alias='pageSize')
-    page_id: int | None = Field(default=None, alias='pageId')
-
-
-class ParsingType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    parse_rule: str | None = Field(default=None, alias='parseRule')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    approver: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ParsingVariable(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class KnowledgeBaseSettings(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    code: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PatchOperation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    op: str | None = None
-    path: str | None = None
-    value: dict[str, Any] | None = None
-
-
-class PaymentMethodReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    require_approval: bool = Field(..., alias='requireApproval')
+    default_approver: MemberReference | None = Field(
+        default=None, alias='defaultApprover'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class PaymentType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class KnowledgeBaseSubCategory(ConnectWiseModel):
     id: int | None = None
     name: str
     """
-     Max length: 30;
+     Max length: 50;
     """
-    classification: ClassificationReference | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    company_flag: bool | None = Field(default=None, alias='companyFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    category: KBCategoryReference
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class PaymentTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class KPI(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PercentageCalculation(Enum):
-    ACTUAL_HOURS = 'ActualHours'
-    MANUAL = 'Manual'
-    CLOSED_PHASES = 'ClosedPhases'
-    CLOSED_TICKETS = 'ClosedTickets'
-
-
-class PeriodApplyTo(Enum):
-    BOTH = 'Both'
-    EXPENSE = 'Expense'
-    TIME = 'Time'
-
-
-class PeriodType(Enum):
-    CURRENT = 'Current'
-    FUTURE = 'Future'
-    BOTH = 'Both'
-    UNDEFINED = 'Undefined'
+    category: KPICategoryReference | None = None
+    date_filter: str | None = Field(default=None, alias='dateFilter')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
 
 
-class PersonasInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Location(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-
-
-class PhaseStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    owner_level_id: int | None = Field(default=None, alias='ownerLevelId')
+    structure_level: CorporateStructureLevelReference | None = Field(
+        default=None, alias='structureLevel'
     )
-    id: int | None = None
     name: str
     """
-     Max length: 30;
+     Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    collapsed_flag: bool | None = Field(default=None, alias='collapsedFlag')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    board_association_ids: list[int] | None = Field(
-        default=None, alias='boardAssociationIds'
-    )
-    status_indicator: StatusIndicatorReference | None = Field(
-        default=None, alias='statusIndicator'
-    )
-    custom_status_indicator_name: str | None = Field(
-        default=None, alias='customStatusIndicatorName'
-    )
+    manager: MemberReference | None = None
+    reports_to: SystemLocationReference | None = Field(default=None, alias='reportsTo')
+    sales_rep: str | None = Field(default=None, alias='salesRep')
     """
-    Required when statusIndicator is Custom. Max length: 30;
+     Max length: 50;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PhaseStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Phone(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class PhoneIntegrationType(Enum):
-    TAPI = 'TAPI'
-    SKYPE = 'SKYPE'
-    TEL = 'TEL'
-    CALLTO = 'CALLTO'
-    NONE = 'NONE'
-
-
-class PortalCalendar(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    week_start: WeekStart = Field(..., alias='weekStart')
-    adjust1_start: str | None = Field(default=None, alias='adjust1Start')
-    adjust1_end: str | None = Field(default=None, alias='adjust1End')
-    adjust1_hours: float | None = Field(default=None, alias='adjust1Hours')
-    adjust2_start: str | None = Field(default=None, alias='adjust2Start')
-    adjust2_end: str | None = Field(default=None, alias='adjust2End')
-    adjust2_hours: float | None = Field(default=None, alias='adjust2Hours')
-    adjust3_start: str | None = Field(default=None, alias='adjust3Start')
-    adjust3_end: str | None = Field(default=None, alias='adjust3End')
-    adjust3_hours: float | None = Field(default=None, alias='adjust3Hours')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PortalConfiguration(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_zone_setup: TimeZoneSetupReference | None = Field(
+        default=None, alias='timeZoneSetup'
+    )
+    calendar: CalendarReference | None = None
+    override_address_line1: str | None = Field(
+        default=None, alias='overrideAddressLine1'
     )
-    id: int | None = None
     """
-    Gets or sets and Sets
-                An existing Portal Configuration id is required when copying a Portal Configuration.
+     Max length: 50;
     """
-    name: str
+    override_address_line2: str | None = Field(
+        default=None, alias='overrideAddressLine2'
+    )
     """
-     Max length: 150;
+     Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    company: CompanyReference | None = None
-    login_background_color: str | None = Field(
-        default=None, alias='loginBackgroundColor'
-    )
+    override_city: str | None = Field(default=None, alias='overrideCity')
     """
-     Max length: 7;
+     Max length: 50;
     """
-    portal_background_color: str | None = Field(
-        default=None, alias='portalBackgroundColor'
-    )
+    override_state: str | None = Field(default=None, alias='overrideState')
     """
-     Max length: 7;
+     Max length: 50;
     """
-    menu_color: str | None = Field(default=None, alias='menuColor')
+    override_zip: str | None = Field(default=None, alias='overrideZip')
     """
-     Max length: 7;
+     Max length: 12;
     """
-    button_color: str | None = Field(default=None, alias='buttonColor')
+    override_country: CountryReference | None = Field(
+        default=None, alias='overrideCountry'
+    )
+    override_phone_number: str | None = Field(default=None, alias='overridePhoneNumber')
     """
-     Max length: 7;
+     Max length: 15;
     """
-    header_color: str | None = Field(default=None, alias='headerColor')
+    override_fax_number: str | None = Field(default=None, alias='overrideFaxNumber')
     """
-     Max length: 7;
+     Max length: 15;
     """
-    url: str | None = None
+    owa_url: str | None = Field(default=None, alias='owaUrl')
     """
-     Max length: 1000;
+     Max length: 100;
     """
-    language: Language | None = None
-    welcome_text: str | None = Field(default=None, alias='welcomeText')
+    payroll_xref: str | None = Field(default=None, alias='payrollXref')
     """
-     Max length: 4000;
+     Max length: 10;
     """
-    board_ids: list[int] | None = Field(default=None, alias='boardIds')
-    agreement_type_ids: list[int] | None = Field(default=None, alias='agreementTypeIds')
-    config_type_ids: list[int] | None = Field(default=None, alias='configTypeIds')
-    location_ids: list[int] | None = Field(default=None, alias='locationIds')
-    portal_image_copy_success_flag: bool | None = Field(
-        default=None, alias='portalImageCopySuccessFlag'
-    )
-    display_vendor_flag: bool | None = Field(default=None, alias='displayVendorFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    location_flag: bool | None = Field(default=None, alias='locationFlag')
+    client_flag: bool | None = Field(default=None, alias='clientFlag')
+    work_role_ids: list[int] | None = Field(default=None, alias='workRoleIds')
+    department_ids: list[int] | None = Field(default=None, alias='departmentIds')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class PortalConfigurationInvoiceSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class LocationDepartment(DepartmentLocationInfo):
+    pass
+
+
+class LocationWorkRole(ConnectWiseModel):
     id: int | None = None
-    portal_configuration: PortalConfigurationReference | None = Field(
-        default=None, alias='portalConfiguration'
-    )
-    display_inv_pmt_flag: bool | None = Field(default=None, alias='displayInvPmtFlag')
-    allow_inv_pmt_flag: bool | None = Field(default=None, alias='allowInvPmtFlag')
     location: SystemLocationReference | None = None
-    payment_processor: PortalConfigurationPaymentProcessorReference | None = Field(
-        default=None, alias='paymentProcessor'
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_role_inactive_flag: bool | None = Field(
+        default=None, alias='workRoleInactiveFlag'
     )
-    login: str | None = None
-    password: str | None = None
-    url_override: str | None = Field(default=None, alias='urlOverride')
-    billing_status_ids: list[int] | None = Field(default=None, alias='billingStatusIds')
-    add_all_statuses: bool | None = Field(default=None, alias='addAllStatuses')
-    remove_all_statuses: bool | None = Field(default=None, alias='removeAllStatuses')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class PortalConfigurationOpportunitySetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class M365ContactSyncCompany(ConnectWiseModel):
     id: int | None = None
-    opportunity_status_rec_i_ds: list[int] | None = Field(
-        default=None, alias='opportunityStatusRecIDs'
-    )
-    add_all_opportunity_statuses: bool | None = Field(
-        default=None, alias='addAllOpportunityStatuses'
-    )
-    remove_all_opportunity_statuses: bool | None = Field(
-        default=None, alias='removeAllOpportunityStatuses'
-    )
-    opportunity_type_rec_i_ds: list[int] | None = Field(
-        default=None, alias='opportunityTypeRecIDs'
-    )
-    add_all_opportunity_types: bool | None = Field(
-        default=None, alias='addAllOpportunityTypes'
-    )
-    remove_all_opportunity_types: bool | None = Field(
-        default=None, alias='removeAllOpportunityTypes'
-    )
-    restrict_view_by_opportunity_status_flag: bool | None = Field(
-        default=None, alias='restrictViewByOpportunityStatusFlag'
-    )
-    restrict_view_by_opportunity_type_flag: bool | None = Field(
-        default=None, alias='restrictViewByOpportunityTypeFlag'
-    )
-    acceptance_change_status_flag: bool | None = Field(
-        default=None, alias='acceptanceChangeStatusFlag'
-    )
-    acceptance_create_activity_flag: bool | None = Field(
-        default=None, alias='acceptanceCreateActivityFlag'
-    )
-    acceptance_opportunity_status: OpportunityStatusReference | None = Field(
-        default=None, alias='acceptanceOpportunityStatus'
-    )
-    acceptance_send_email_flag: bool | None = Field(
-        default=None, alias='acceptanceSendEmailFlag'
-    )
-    acceptance_email_from_first_name: str | None = Field(
-        default=None, alias='acceptanceEmailFromFirstName'
-    )
-    acceptance_email_from_last_name: str | None = Field(
-        default=None, alias='acceptanceEmailFromLastName'
+    company_rec_id: int | None = Field(default=None, alias='companyRecId')
+    tenant_id: str | None = Field(default=None, alias='tenantId')
+    parent_tenant_id: str | None = Field(default=None, alias='parentTenantId')
+    m365_tenant: M365Tenant | None = Field(default=None, alias='m365Tenant')
+    display_name: str | None = Field(default=None, alias='displayName')
+    sync_flag: bool | None = Field(default=None, alias='syncFlag')
+    company_id: str | None = Field(default=None, alias='companyId')
+    contacts: list[GraphUserCsv] | None = None
+    inactive_flag_tenant: bool | None = Field(default=None, alias='inactiveFlagTenant')
+    are_all_microsoft365_contact_sync_inactive: bool | None = Field(
+        default=None, alias='areAllMicrosoft365ContactSyncInactive'
     )
-    acceptance_email_subject: str | None = Field(
-        default=None, alias='acceptanceEmailSubject'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ManagedDeviceAccount(ConnectWiseModel):
+    id: int | None = None
+    username: str | None = None
+    password: str | None = None
+    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
+        default=None, alias='managedDevicesIntegration'
     )
-    acceptance_email_body: str | None = Field(default=None, alias='acceptanceEmailBody')
-    acceptance_from_email: str | None = Field(default=None, alias='acceptanceFromEmail')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ManagedDevicesIntegration(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-    Gets or sets
-                required when acceptanceSendEmailFlag is true.
+     Max length: 30;
     """
-    acceptance_email_activity_type: ActivityTypeReference | None = Field(
-        default=None, alias='acceptanceEmailActivityType'
-    )
-    acceptance_email_assigned_by_member: MemberReference | None = Field(
-        default=None, alias='acceptanceEmailAssignedByMember'
-    )
-    rejection_change_status_flag: bool | None = Field(
-        default=None, alias='rejectionChangeStatusFlag'
-    )
-    rejection_create_activity_flag: bool | None = Field(
-        default=None, alias='rejectionCreateActivityFlag'
-    )
-    rejection_opportunity_status: OpportunityStatusReference | None = Field(
-        default=None, alias='rejectionOpportunityStatus'
-    )
-    rejection_send_email_flag: bool | None = Field(
-        default=None, alias='rejectionSendEmailFlag'
-    )
-    rejection_email_from_first_name: str | None = Field(
-        default=None, alias='rejectionEmailFromFirstName'
-    )
-    rejection_email_from_last_name: str | None = Field(
-        default=None, alias='rejectionEmailFromLastName'
-    )
-    rejection_from_email: str | None = Field(default=None, alias='rejectionFromEmail')
+    solution: str
+    """
+     Max length: 30;
+    """
+    portal_url: str | None = Field(default=None, alias='portalUrl')
+    """
+     Max length: 200;
+    """
+    login_by: Literal['Global', 'Member'] = Field(..., alias='loginBy')
+    global_login_username: str | None = Field(default=None, alias='globalLoginUsername')
     """
     Gets or sets
-                required when rejectionSendEmailFlag is true.
+                this is only required when globalLoginFlag = true. Max length: 50;
     """
-    rejection_email_subject: str | None = Field(
-        default=None, alias='rejectionEmailSubject'
-    )
-    rejection_email_body: str | None = Field(default=None, alias='rejectionEmailBody')
-    rejection_email_activity_type: ActivityTypeReference | None = Field(
-        default=None, alias='rejectionEmailActivityType'
-    )
-    rejection_email_assigned_by_member: MemberReference | None = Field(
-        default=None, alias='rejectionEmailAssignedByMember'
-    )
-    confirmation_send_email_flag: bool | None = Field(
-        default=None, alias='confirmationSendEmailFlag'
-    )
-    confirmation_email_use_default_company_email_address_flag: bool | None = Field(
-        default=None, alias='confirmationEmailUseDefaultCompanyEmailAddressFlag'
-    )
-    confirmation_email_from_first_name: str | None = Field(
-        default=None, alias='confirmationEmailFromFirstName'
-    )
-    confirmation_email_from_last_name: str | None = Field(
-        default=None, alias='confirmationEmailFromLastName'
-    )
-    confirmation_from_email: str | None = Field(
-        default=None, alias='confirmationFromEmail'
-    )
+    global_login_password: str | None = Field(default=None, alias='globalLoginPassword')
     """
     Gets or sets
-                required when confirmationSendEmailFlag is true.
+                this is only required when globalLoginFlag = true. Max length: 50;
     """
-    confirmation_email_subject: str | None = Field(
-        default=None, alias='confirmationEmailSubject'
-    )
-    confirmation_email_body: str | None = Field(
-        default=None, alias='confirmationEmailBody'
+    default_billing_level: Literal['Detail', 'Summary'] = Field(
+        ..., alias='defaultBillingLevel'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PortalConfigurationPasswordEmailSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    valid_password_email_use_custom_email_flag: bool | None = Field(
-        default=None, alias='validPasswordEmailUseCustomEmailFlag'
-    )
-    valid_password_email_from_first_name: str | None = Field(
-        default=None, alias='validPasswordEmailFromFirstName'
-    )
-    valid_password_email_from_last_name: str | None = Field(
-        default=None, alias='validPasswordEmailFromLastName'
+    management_it_setup_type: str | None = Field(
+        default=None, alias='managementItSetupType'
     )
-    valid_password_email_from_email: str | None = Field(
-        default=None, alias='validPasswordEmailFromEmail'
+    default_location: SystemLocationReference | None = Field(
+        default=None, alias='defaultLocation'
     )
-    """
-    Gets or sets
-                required when validPasswordEmailUseCustomEmailFlag is true.
-    """
-    valid_password_email_subject: str | None = Field(
-        default=None, alias='validPasswordEmailSubject'
+    default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='defaultDepartment'
     )
-    valid_password_email_body: str | None = Field(
-        default=None, alias='validPasswordEmailBody'
+    integrator_login: IntegratorLoginReference | None = Field(
+        default=None, alias='integratorLogin'
     )
-    invalid_password_email_use_custom_email_flag: bool | None = Field(
-        default=None, alias='invalidPasswordEmailUseCustomEmailFlag'
+    match_on_serial_number_flag: bool | None = Field(
+        default=None, alias='matchOnSerialNumberFlag'
     )
-    invalid_password_email_from_first_name: str | None = Field(
-        default=None, alias='invalidPasswordEmailFromFirstName'
+    disable_new_cross_references_flag: bool | None = Field(
+        default=None, alias='disableNewCrossReferencesFlag'
     )
-    invalid_password_email_from_last_name: str | None = Field(
-        default=None, alias='invalidPasswordEmailFromLastName'
+    config_bill_customer_flag: bool | None = Field(
+        default=None, alias='configBillCustomerFlag'
     )
-    invalid_password_email_from_email: str | None = Field(
-        default=None, alias='invalidPasswordEmailFromEmail'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ManagedDevicesIntegrationCrossReference(ConnectWiseModel):
+    id: int | None = None
+    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
+        default=None, alias='managedDevicesIntegration'
     )
+    vendor_type: str | None = Field(default=None, alias='vendorType')
     """
-    Gets or sets
-                required when invalidPasswordEmailUseCustomEmailFlag is true.
+     Max length: 255;
     """
-    invalid_password_email_subject: str | None = Field(
-        default=None, alias='invalidPasswordEmailSubject'
+    vendor_level: str | None = Field(default=None, alias='vendorLevel')
+    """
+     Max length: 255;
+    """
+    agreement_type: AgreementTypeReference | None = Field(
+        default=None, alias='agreementType'
     )
-    invalid_password_email_body: str | None = Field(
-        default=None, alias='invalidPasswordEmailBody'
+    product: IvItemReference | None = None
+    configuration_type: ConfigurationTypeReference | None = Field(
+        default=None, alias='configurationType'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class PortalConfigurationPaymentProcessor(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ManagedDevicesIntegrationLogin(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    test_url: str | None = Field(default=None, alias='testURL')
-
-
-class PortalConfigurationPaymentProcessorReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
+        default=None, alias='managedDevicesIntegration'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    username: str
+    """
+     Max length: 50;
+    """
+    password: str | None = None
+    """
+     Max length: 50;
+    """
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class PortalConfigurationProjectSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ManagedDevicesIntegrationNotification(ConnectWiseModel):
     id: int | None = None
-    portal_config: PortalConfigurationReference | None = Field(
-        default=None, alias='portalConfig'
-    )
-    project_name_flag: bool | None = Field(default=None, alias='projectNameFlag')
-    project_type_flag: bool | None = Field(default=None, alias='projectTypeFlag')
-    status_flag: bool | None = Field(default=None, alias='statusFlag')
-    project_manager_flag: bool | None = Field(default=None, alias='projectManagerFlag')
-    billing_method_flag: bool | None = Field(default=None, alias='billingMethodFlag')
-    contact_flag: bool | None = Field(default=None, alias='contactFlag')
-    estimated_start_flag: bool | None = Field(default=None, alias='estimatedStartFlag')
-    estimated_end_flag: bool | None = Field(default=None, alias='estimatedEndFlag')
-    description_flag: bool | None = Field(default=None, alias='descriptionFlag')
-    last_updated_flag: bool | None = Field(default=None, alias='lastUpdatedFlag')
-    only_display: OnlyDisplay = Field(..., alias='onlyDisplay')
-    time_material_budget_hrs_flag: bool | None = Field(
-        default=None, alias='timeMaterialBudgetHrsFlag'
-    )
-    time_material_scheduled_start_flag: bool | None = Field(
-        default=None, alias='timeMaterialScheduledStartFlag'
-    )
-    time_material_scheduled_finish_flag: bool | None = Field(
-        default=None, alias='timeMaterialScheduledFinishFlag'
-    )
-    time_material_scheduled_hrs_flag: bool | None = Field(
-        default=None, alias='timeMaterialScheduledHrsFlag'
-    )
-    time_material_actual_start_flag: bool | None = Field(
-        default=None, alias='timeMaterialActualStartFlag'
-    )
-    time_material_actual_finish_flag: bool | None = Field(
-        default=None, alias='timeMaterialActualFinishFlag'
-    )
-    time_material_actual_hrs_flag: bool | None = Field(
-        default=None, alias='timeMaterialActualHrsFlag'
-    )
-    time_material_bill_flag: bool | None = Field(
-        default=None, alias='timeMaterialBillFlag'
+    managed_devices_integration: ManagedDevicesIntegrationReference | None = Field(
+        default=None, alias='managedDevicesIntegration'
     )
-    time_material_status_flag: bool | None = Field(
-        default=None, alias='timeMaterialStatusFlag'
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
     )
-    time_material_assigned_flag: bool | None = Field(
-        default=None, alias='timeMaterialAssignedFlag'
+    member: MemberReference | None = None
+    log_type: Literal[
+        'All',
+        'Error',
+        'NewManagedSolution',
+        'NewDeviceType',
+        'NewConfiguration',
+        'NewAddition',
+        'Info',
+    ] = Field(..., alias='logType')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ManagementReportNotification(ConnectWiseModel):
+    id: int | None = None
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
     )
-    fixed_fee_budget_hrs_flag: bool | None = Field(
-        default=None, alias='fixedFeeBudgetHrsFlag'
+    member: MemberReference | None = None
+    email: str | None = None
+    """
+     Max length: 50;
+    """
+    global_flag: bool | None = Field(default=None, alias='globalFlag')
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Member(ConnectWiseModel):
+    id: int | None = None
+    identifier: str
+    """
+     Max length: 15;
+    """
+    password: str | None = None
+    """
+    ConditionallyRequired. API Member will get random password generated Max length: 60;
+    """
+    disable_online_flag: bool | None = Field(default=None, alias='disableOnlineFlag')
+    license_class: Literal['A', 'C', 'F', 'X'] = Field(..., alias='licenseClass')
+    """
+    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
+    """
+    notes: str | None = None
+    employee_identifer: str | None = Field(default=None, alias='employeeIdentifer')
+    """
+     Max length: 10;
+    """
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    enable_mobile_gps_flag: bool | None = Field(
+        default=None, alias='enableMobileGpsFlag'
     )
-    fixed_fee_scheduled_start_flag: bool | None = Field(
-        default=None, alias='fixedFeeScheduledStartFlag'
+    inactive_date: datetime | None = Field(default=None, alias='inactiveDate')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    last_login: str | None = Field(default=None, alias='lastLogin')
+    client_id: str | None = Field(default=None, alias='clientId')
+    token: str | None = None
+    first_name: str = Field(..., alias='firstName')
+    """
+     Max length: 30;
+    """
+    middle_initial: str | None = Field(default=None, alias='middleInitial')
+    """
+     Max length: 1;
+    """
+    last_name: str = Field(..., alias='lastName')
+    """
+     Max length: 30;
+    """
+    hire_date: datetime = Field(..., alias='hireDate')
+    country: CountryReference | None = None
+    photo: DocumentReference | None = None
+    office_email: str | None = Field(default=None, alias='officeEmail')
+    """
+     Max length: 250;
+    """
+    mobile_email: str | None = Field(default=None, alias='mobileEmail')
+    """
+     Max length: 250;
+    """
+    home_email: str | None = Field(default=None, alias='homeEmail')
+    """
+     Max length: 250;
+    """
+    default_email: Literal['Office', 'Mobile', 'Home'] = Field(
+        ..., alias='defaultEmail'
     )
-    fixed_fee_scheduled_finish_flag: bool | None = Field(
-        default=None, alias='fixedFeeScheduledFinishFlag'
+    primary_email: str | None = Field(default=None, alias='primaryEmail')
+    """
+     Max length: 250;
+    """
+    office_phone: str | None = Field(default=None, alias='officePhone')
+    """
+     Max length: 15;
+    """
+    office_extension: str | None = Field(default=None, alias='officeExtension')
+    """
+     Max length: 10;
+    """
+    mobile_phone: str | None = Field(default=None, alias='mobilePhone')
+    """
+     Max length: 15;
+    """
+    mobile_extension: str | None = Field(default=None, alias='mobileExtension')
+    """
+     Max length: 10;
+    """
+    home_phone: str | None = Field(default=None, alias='homePhone')
+    """
+     Max length: 15;
+    """
+    home_extension: str | None = Field(default=None, alias='homeExtension')
+    """
+     Max length: 10;
+    """
+    default_phone: Literal['Office', 'Mobile', 'Home'] = Field(
+        ..., alias='defaultPhone'
     )
-    fixed_fee_scheduled_hrs_flag: bool | None = Field(
-        default=None, alias='fixedFeeScheduledHrsFlag'
+    security_role: SecurityRoleReference | None = Field(
+        default=None, alias='securityRole'
     )
-    fixed_fee_actual_start_flag: bool | None = Field(
-        default=None, alias='fixedFeeActualStartFlag'
+    office365: MemberOffice365 | None = None
+    mapi_name: str | None = Field(default=None, alias='mapiName')
+    calendar_sync_integration_flag: bool | None = Field(
+        default=None, alias='calendarSyncIntegrationFlag'
     )
-    fixed_fee_actual_finish_flag: bool | None = Field(
-        default=None, alias='fixedFeeActualFinishFlag'
+    authentication_service_type: Literal[
+        'AuthAnvil', 'GoogleAuthenticator', 'Email'
+    ] | None = Field(default=None, alias='authenticationServiceType')
+    timebased_one_time_password_activated: bool | None = Field(
+        default=None, alias='timebasedOneTimePasswordActivated'
     )
-    fixed_fee_actual_hrs_flag: bool | None = Field(
-        default=None, alias='fixedFeeActualHrsFlag'
+    enable_ldap_authentication_flag: bool | None = Field(
+        default=None, alias='enableLdapAuthenticationFlag'
     )
-    fixed_fee_bill_flag: bool | None = Field(default=None, alias='fixedFeeBillFlag')
-    fixed_fee_status_flag: bool | None = Field(default=None, alias='fixedFeeStatusFlag')
-    fixed_fee_assigned_flag: bool | None = Field(
-        default=None, alias='fixedFeeAssignedFlag'
+    ldap_configuration: LdapConfigurationReference | None = Field(
+        default=None, alias='ldapConfiguration'
     )
-    project_issue_budget_hrs_flag: bool | None = Field(
-        default=None, alias='projectIssueBudgetHrsFlag'
+    ldap_user_name: str | None = Field(default=None, alias='ldapUserName')
+    """
+     Max length: 50;
+    """
+    directional_sync: DirectionalSyncReference | None = Field(
+        default=None, alias='directionalSync'
     )
-    project_issue_scheduled_start_flag: bool | None = Field(
-        default=None, alias='projectIssueScheduledStartFlag'
+    sso_settings: MemberSsoSettingsReference | None = Field(
+        default=None, alias='ssoSettings'
     )
-    project_issue_scheduled_finish_flag: bool | None = Field(
-        default=None, alias='projectIssueScheduledFinishFlag'
+    signature: str | None = None
+    phone_integration_type: Literal[
+        'TAPI', 'SKYPE', 'TEL', 'CALLTO', 'NONE'
+    ] | None = Field(default=None, alias='phoneIntegrationType')
+    use_browser_language_flag: bool | None = Field(
+        default=None, alias='useBrowserLanguageFlag'
     )
-    project_issue_scheduled_hrs_flag: bool | None = Field(
-        default=None, alias='projectIssueScheduledHrsFlag'
+    title: str | None = None
+    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
+    enable_mobile_flag: bool | None = Field(default=None, alias='enableMobileFlag')
+    type: MemberTypeReference | None = None
+    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
+    partner_portal_flag: bool | None = Field(default=None, alias='partnerPortalFlag')
+    sts_user_admin_url: str | None = Field(default=None, alias='stsUserAdminUrl')
+    toast_notification_flag: bool | None = Field(
+        default=None, alias='toastNotificationFlag'
     )
-    project_issue_actual_start_flag: bool | None = Field(
-        default=None, alias='projectIssueActualStartFlag'
+    member_personas: list[int] | None = Field(default=None, alias='memberPersonas')
+    admin_flag: bool | None = Field(default=None, alias='adminFlag')
+    structure_level: StructureReference | None = Field(
+        default=None, alias='structureLevel'
     )
-    project_issue_actual_finish_flag: bool | None = Field(
-        default=None, alias='projectIssueActualFinishFlag'
+    security_location: SystemLocationReference | None = Field(
+        default=None, alias='securityLocation'
     )
-    project_issue_actual_hrs_flag: bool | None = Field(
-        default=None, alias='projectIssueActualHrsFlag'
+    default_location: SystemLocationReference | None = Field(
+        default=None, alias='defaultLocation'
     )
-    project_issue_bill_flag: bool | None = Field(
-        default=None, alias='projectIssueBillFlag'
+    default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='defaultDepartment'
     )
-    project_issue_status_flag: bool | None = Field(
-        default=None, alias='projectIssueStatusFlag'
+    reports_to: MemberReference | None = Field(default=None, alias='reportsTo')
+    restrict_location_flag: bool | None = Field(
+        default=None, alias='restrictLocationFlag'
     )
-    project_issue_assigned_flag: bool | None = Field(
-        default=None, alias='projectIssueAssignedFlag'
+    restrict_department_flag: bool | None = Field(
+        default=None, alias='restrictDepartmentFlag'
     )
-    project_detail_total_hours_flag: bool | None = Field(
-        default=None, alias='projectDetailTotalHoursFlag'
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
+    expense_approver: MemberReference | None = Field(
+        default=None, alias='expenseApprover'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PortalConfigurationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    billable_forecast: float | None = Field(default=None, alias='billableForecast')
+    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
+    hourly_cost: float | None = Field(default=None, alias='hourlyCost')
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    include_in_utilization_reporting_flag: bool | None = Field(
+        default=None, alias='includeInUtilizationReportingFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PortalConfigurationServiceSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    require_expense_entry_flag: bool | None = Field(
+        default=None, alias='requireExpenseEntryFlag'
     )
-    id: int | None = None
-    service_type_flag: bool | None = Field(default=None, alias='serviceTypeFlag')
-    service_sub_type_flag: bool | None = Field(default=None, alias='serviceSubTypeFlag')
-    service_sub_type_item_flag: bool | None = Field(
-        default=None, alias='serviceSubTypeItemFlag'
+    require_time_sheet_entry_flag: bool | None = Field(
+        default=None, alias='requireTimeSheetEntryFlag'
     )
-    status_flag: bool | None = Field(default=None, alias='statusFlag')
-    site_name_flag: bool | None = Field(default=None, alias='siteNameFlag')
-    entered_date_flag: bool | None = Field(default=None, alias='enteredDateFlag')
-    last_update_flag: bool | None = Field(default=None, alias='lastUpdateFlag')
-    required_date_flag: bool | None = Field(default=None, alias='requiredDateFlag')
-    contact_flag: bool | None = Field(default=None, alias='contactFlag')
-    assigned_resources_flag: bool | None = Field(
-        default=None, alias='assignedResourcesFlag'
+    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
+        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
     )
-    sla_info_flag: bool | None = Field(default=None, alias='slaInfoFlag')
-    service_board_flag: bool | None = Field(default=None, alias='serviceBoardFlag')
-    budget_hours_flag: bool | None = Field(default=None, alias='budgetHoursFlag')
-    actual_hours_flag: bool | None = Field(default=None, alias='actualHoursFlag')
-    approval_status_flag: bool | None = Field(default=None, alias='approvalStatusFlag')
-    open_tasks_flag: bool | None = Field(default=None, alias='openTasksFlag')
-    closed_tasks_flag: bool | None = Field(default=None, alias='closedTasksFlag')
-    enable_chat_assist_flag: bool | None = Field(
-        default=None, alias='enableChatAssistFlag'
+    allow_in_cell_entry_on_time_sheet: bool | None = Field(
+        default=None, alias='allowInCellEntryOnTimeSheet'
     )
-    display_closed_tickets_option: DisplayClosedTicketsOption = Field(
-        ..., alias='displayClosedTicketsOption'
+    enter_time_against_company_flag: bool | None = Field(
+        default=None, alias='enterTimeAgainstCompanyFlag'
     )
-    time_materials_ticket_template: ServiceSignoffReference | None = Field(
-        default=None, alias='timeMaterialsTicketTemplate'
+    allow_expenses_entered_against_companies_flag: bool | None = Field(
+        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
     )
-    fixed_fee_ticket_template: ServiceSignoffReference | None = Field(
-        default=None, alias='fixedFeeTicketTemplate'
+    time_reminder_email_flag: bool | None = Field(
+        default=None, alias='timeReminderEmailFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PortalReport(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    days_tolerance: int | None = Field(default=None, alias='daysTolerance')
+    minimum_hours: float | None = Field(default=None, alias='minimumHours')
+    time_sheet_start_date: str | None = Field(default=None, alias='timeSheetStartDate')
+    service_default_location: SystemLocationReference | None = Field(
+        default=None, alias='serviceDefaultLocation'
     )
-    id: int | None = None
-    portal_configuration: PortalConfigurationReference | None = Field(
-        default=None, alias='portalConfiguration'
+    service_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='serviceDefaultDepartment'
     )
-    name: str
-    """
-     Max length: 255;
-    """
-    url: str
-    """
-     Max length: 255;
-    """
-    open_same_window_flag: bool | None = Field(default=None, alias='openSameWindowFlag')
-    custom_flag: bool | None = Field(default=None, alias='customFlag')
-    display_flag: bool | None = Field(default=None, alias='displayFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PortalSecurity(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_default_board: BoardReference | None = Field(
+        default=None, alias='serviceDefaultBoard'
     )
-    identifier: str | None = None
-    enabled: bool | None = None
-
-
-class PortalSecurityLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_service_default_location_flag: bool | None = Field(
+        default=None, alias='restrictServiceDefaultLocationFlag'
     )
-    id: int | None = None
-    caption_identifier: str | None = Field(default=None, alias='captionIdentifier')
-    is_default_flag: bool | None = Field(default=None, alias='isDefaultFlag')
-    caption: str | None = None
-    """
-     Max length: 50;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PortalSecuritySetting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_service_default_department_flag: bool | None = Field(
+        default=None, alias='restrictServiceDefaultDepartmentFlag'
     )
-    id: int | None = None
-    function_identifier: str | None = Field(default=None, alias='functionIdentifier')
-    function_description: str | None = Field(default=None, alias='functionDescription')
-    level_one: bool | None = Field(default=None, alias='levelOne')
-    level_two: bool | None = Field(default=None, alias='levelTwo')
-    level_three: bool | None = Field(default=None, alias='levelThree')
-    level_four: bool | None = Field(default=None, alias='levelFour')
-    level_five: bool | None = Field(default=None, alias='levelFive')
-    level_six: bool | None = Field(default=None, alias='levelSix')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PredecessorType(Enum):
-    TICKET = 'Ticket'
-    PHASE = 'Phase'
-
-
-class PrefixSuffixFlag(Enum):
-    PREFIX = 'Prefix'
-    SUFFIX = 'Suffix'
-
-
-class PrefixSuffixOption(Enum):
-    PREFIX = 'Prefix'
-    SUFFIX = 'Suffix'
-
-
-class PrefixSuffixType(Enum):
-    PREFIX = 'Prefix'
-    SUFFIX = 'Suffix'
-
-
-class Presence(Enum):
-    NO_AGENT = 'NoAgent'
-    ONLINE = 'Online'
-    DO_NOT_DISTURB = 'DoNotDisturb'
-    AWAY = 'Away'
-    OFFLINE = 'Offline'
-
-
-class PriceAttribute(Enum):
-    FIXED_FEE = 'FixedFee'
-    NOT_TO_EXCEED = 'NotToExceed'
-    OVERRIDE_RATE = 'OverrideRate'
-    TIME_AND_MATERIALS = 'TimeAndMaterials'
-
-
-class PriceMethod(Enum):
-    FLAT_RATE_FOR_RANGE = 'FlatRateForRange'
-    PERCENT_MARKUP_FROM_COST = 'PercentMarkupFromCost'
-    PERCENT_MARKDOWN_FROM_PRICE = 'PercentMarkdownFromPrice'
-    PRICE_PER_UNIT = 'PricePerUnit'
-
-
-class PricingBreak(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    excluded_service_board_ids: list[int] | None = Field(
+        default=None, alias='excludedServiceBoardIds'
     )
-    id: int | None = None
-    detail_id: int | None = Field(default=None, alias='detailId')
-    amount: float | None = None
-    quantity_start: float = Field(..., alias='quantityStart')
-    quantity_end: float | None = Field(default=None, alias='quantityEnd')
-    unlimited: bool | None = None
-    price_method: PriceMethod = Field(..., alias='priceMethod')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PricingDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    teams: list[int] | None = None
+    service_board_team_ids: list[int] | None = Field(
+        default=None, alias='serviceBoardTeamIds'
     )
-    id: int | None = None
-    product: CatalogItemReference | None = None
-    category: ProductCategoryReference | None = None
-    sub_category: ProductSubCategoryReference | None = Field(
-        default=None, alias='subCategory'
+    project_default_location: SystemLocationReference | None = Field(
+        default=None, alias='projectDefaultLocation'
     )
-    start_date: datetime = Field(..., alias='startDate')
-    end_date: datetime | None = Field(default=None, alias='endDate')
-    no_end_date: bool | None = Field(default=None, alias='noEndDate')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PricingSchedule(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='projectDefaultDepartment'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 30;
-    """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    currency: CurrencyReference | None = None
-    companies: list[int] | None = None
-    set_all_companies_flag: bool | None = Field(
-        default=None, alias='setAllCompaniesFlag'
+    project_default_board: ProjectBoardReference | None = Field(
+        default=None, alias='projectDefaultBoard'
     )
-    remove_all_companies_flag: bool | None = Field(
-        default=None, alias='removeAllCompaniesFlag'
+    restrict_project_default_location_flag: bool | None = Field(
+        default=None, alias='restrictProjectDefaultLocationFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PricingScheduleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_project_default_department_flag: bool | None = Field(
+        default=None, alias='restrictProjectDefaultDepartmentFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PrimaryAddress(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class PrimaryContact(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class Priority(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    excluded_project_board_ids: list[int] | None = Field(
+        default=None, alias='excludedProjectBoardIds'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    color: Color
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    image_link: str | None = Field(default=None, alias='imageLink')
-    urgency_sort_order: str | None = Field(default=None, alias='urgencySortOrder')
-    level: Level | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PriorityInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    schedule_default_location: SystemLocationReference | None = Field(
+        default=None, alias='scheduleDefaultLocation'
     )
-    id: int | None = None
-    name: str | None = None
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PriorityReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    schedule_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='scheduleDefaultDepartment'
     )
-    id: int | None = None
-    name: str | None = None
-    sort: int | None = None
-    level: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProblemSort(Enum):
-    ASCENDING = 'Ascending'
-    DESCENDING = 'Descending'
-
-
-class ProcurementAdjustment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
+    service_location: ServiceLocationReference | None = Field(
+        default=None, alias='serviceLocation'
     )
-    id: int | None = None
-    identifier: str
-    """
-     Max length: 50;
-    """
-    type: AdjustmentTypeReference | None = None
-    reason: str | None = None
-    """
-     Max length: 100;
-    """
-    notes: str | None = None
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    closed_by: str | None = Field(default=None, alias='closedBy')
-    closed_date: datetime | None = Field(default=None, alias='closedDate')
-    adjustment_details: list[AdjustmentDetail] | None = Field(
-        default=None, alias='adjustmentDetails'
+    restrict_schedule_flag: bool | None = Field(
+        default=None, alias='restrictScheduleFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProcurementSetting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    hide_member_in_dispatch_portal_flag: bool | None = Field(
+        default=None, alias='hideMemberInDispatchPortalFlag'
     )
-    id: int | None = None
-    starting_purchase_order_num: int = Field(..., alias='startingPurchaseOrderNum')
-    purchase_order_prefix: str | None = Field(default=None, alias='purchaseOrderPrefix')
-    """
-     Max length: 5;
-    """
-    purchase_order_suffix: str | None = Field(default=None, alias='purchaseOrderSuffix')
-    """
-     Max length: 5;
-    """
-    prefix_suffix_type: PrefixSuffixType | None = Field(
-        default=None, alias='prefixSuffixType'
+    calendar: CalendarReference | None = None
+    sales_default_location: SystemLocationReference | None = Field(
+        default=None, alias='salesDefaultLocation'
     )
-    disable_cost_updates_flag: bool | None = Field(
-        default=None, alias='disableCostUpdatesFlag'
+    restrict_default_sales_territory_flag: bool | None = Field(
+        default=None, alias='restrictDefaultSalesTerritoryFlag'
     )
-    disable_negative_inventory_flag: bool | None = Field(
-        default=None, alias='disableNegativeInventoryFlag'
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
     )
-    costing_method: CostingMethod = Field(..., alias='costingMethod')
-    auto_close_purchase_order_flag: bool | None = Field(
-        default=None, alias='autoClosePurchaseOrderFlag'
+    restrict_default_warehouse_flag: bool | None = Field(
+        default=None, alias='restrictDefaultWarehouseFlag'
     )
-    auto_close_purchase_order_item_flag: bool | None = Field(
-        default=None, alias='autoClosePurchaseOrderItemFlag'
+    restrict_default_warehouse_bin_flag: bool | None = Field(
+        default=None, alias='restrictDefaultWarehouseBinFlag'
     )
-    auto_approve_purchase_order_flag: bool | None = Field(
-        default=None, alias='autoApprovePurchaseOrderFlag'
+    company_activity_tab_format: Literal['SummaryList', 'DetailList'] | None = Field(
+        default=None, alias='companyActivityTabFormat'
     )
-    tax_purchase_order_flag: bool | None = Field(
-        default=None, alias='taxPurchaseOrderFlag'
+    invoice_time_tab_format: Literal['SummaryList', 'DetailList'] | None = Field(
+        default=None, alias='invoiceTimeTabFormat'
     )
-    tax_freight_flag: bool | None = Field(default=None, alias='taxFreightFlag')
-    use_vendor_tax_code_flag: bool | None = Field(
-        default=None, alias='useVendorTaxCodeFlag'
+    invoice_screen_default_tab_format: Literal[
+        'ShowInvoicingTab', 'ShowAgreementInvoicingTab'
+    ] | None = Field(default=None, alias='invoiceScreenDefaultTabFormat')
+    invoicing_display_options: Literal[
+        'RemainOnInvoicingScreen', 'ShowRecentInvoices'
+    ] | None = Field(default=None, alias='invoicingDisplayOptions')
+    agreement_invoicing_display_options: Literal[
+        'RemainOnInvoicingScreen', 'ShowRecentInvoices'
+    ] | None = Field(default=None, alias='agreementInvoicingDisplayOptions')
+    auto_start_stopwatch: bool | None = Field(default=None, alias='autoStartStopwatch')
+    auto_popup_quick_notes_with_stopwatch: bool | None = Field(
+        default=None, alias='autoPopupQuickNotesWithStopwatch'
     )
-    num_decimal_places: int | None = Field(default=None, alias='numDecimalPlaces')
-    disable_auto_pick_flag: bool | None = Field(
-        default=None, alias='disableAutoPickFlag'
+    global_search_default_ticket_filter: Literal[
+        'OpenRecords', 'ClosedRecords', 'AllRecords'
+    ] | None = Field(default=None, alias='globalSearchDefaultTicketFilter')
+    global_search_default_sort: Literal[
+        'None', 'LastUpdatedDesc', 'LastUpdatedAsc', 'CreatedDesc', 'CreatedAsc'
+    ] | None = Field(default=None, alias='globalSearchDefaultSort')
+    phone_source: str | None = Field(default=None, alias='phoneSource')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    copy_pod_layouts: bool | None = Field(default=None, alias='copyPodLayouts')
+    copy_shared_default_views: bool | None = Field(
+        default=None, alias='copySharedDefaultViews'
     )
-    default_product_taxable_flag: bool | None = Field(
-        default=None, alias='defaultProductTaxableFlag'
+    copy_column_layouts_and_filters: bool | None = Field(
+        default=None, alias='copyColumnLayoutsAndFilters'
+    )
+    from_member_rec_id: int | None = Field(default=None, alias='fromMemberRecId')
+    from_member_template_rec_id: int | None = Field(
+        default=None, alias='fromMemberTemplateRecId'
+    )
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    eori_number: str | None = Field(default=None, alias='eoriNumber')
-    """
-     Max length: 50;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProcurementType(Enum):
-    PURCHASE = 'Purchase'
-    ADJUSTMENT = 'Adjustment'
-    TRANSFER = 'Transfer'
 
 
-class ProductCategoryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberAccrual(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    accrual_type: Literal['Holiday', 'PTO', 'Sick', 'Vacation'] = Field(
+        ..., alias='accrualType'
+    )
+    year: int
+    hours: float
+    reason: str
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ProductClass(Enum):
+class MemberCertification(ConnectWiseModel):
+    id: int | None = None
+    certification: CertificationReference
+    percent_complete: int | None = Field(default=None, alias='percentComplete')
+    date_received: datetime | None = Field(default=None, alias='dateReceived')
+    date_expires: datetime | None = Field(default=None, alias='dateExpires')
+    certification_number: str | None = Field(default=None, alias='certificationNumber')
     """
-    Defaults to Non-Inventory.
+     Max length: 50;
     """
-
-    AGREEMENT = 'Agreement'
-    BUNDLE = 'Bundle'
-    INVENTORY = 'Inventory'
-    NON_INVENTORY = 'NonInventory'
-    SERVICE = 'Service'
-
-
-class ProductClass1(Enum):
-    AGREEMENT = 'Agreement'
-    BUNDLE = 'Bundle'
-    INVENTORY = 'Inventory'
-    NON_INVENTORY = 'NonInventory'
-    SERVICE = 'Service'
+    notes: str | None = None
+    member: MemberReference | None = None
+    company: CompanyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ProductComponent(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberDeactivationCompanyTeam(ConnectWiseModel):
+    count: int | None = None
     id: int | None = None
-    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
-    """
-     Required On Updates;
-    """
-    quantity: float
-    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
-    hide_price_flag: bool | None = Field(default=None, alias='hidePriceFlag')
-    hide_item_identifier_flag: bool | None = Field(
-        default=None, alias='hideItemIdentifierFlag'
-    )
-    hide_description_flag: bool | None = Field(
-        default=None, alias='hideDescriptionFlag'
-    )
-    hide_quantity_flag: bool | None = Field(default=None, alias='hideQuantityFlag')
-    hide_extended_price_flag: bool | None = Field(
-        default=None, alias='hideExtendedPriceFlag'
+    name: str | None = None
+    re_assign_to_member: MemberReference | None = Field(
+        default=None, alias='reAssignToMember'
     )
-    vendor: CompanyReference | None = None
-    parent_product_item: ProductItemReference | None = Field(
-        default=None, alias='parentProductItem'
+    re_assign_to_contact: ContactReference | None = Field(
+        default=None, alias='reAssignToContact'
     )
-    product_item: ProductItemReference | None = Field(default=None, alias='productItem')
-    price: float | None = None
-    cost: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ProductDemand(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class MemberDeactivationDepartmentMananager(ConnectWiseModel):
+    count: int | None = None
+    re_assign_to_member: MemberReference | None = Field(
+        default=None, alias='reAssignToMember'
     )
-    product_rec_id: int | None = Field(default=None, alias='productRecId')
-    quantity: int | None = None
-    cost: float | None = None
 
 
-class ProductDetach(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    remove_from_ticket: bool | None = Field(default=None, alias='removeFromTicket')
-    remove_from_invoice: bool | None = Field(default=None, alias='removeFromInvoice')
-    remove_from_opportunity: bool | None = Field(
-        default=None, alias='removeFromOpportunity'
-    )
-    remove_from_sales_order: bool | None = Field(
-        default=None, alias='removeFromSalesOrder'
-    )
-    remove_from_project: bool | None = Field(default=None, alias='removeFromProject')
+class MemberDeactivationDispatchMember(MemberDeactivationDepartmentMananager):
+    pass
 
 
-class ProductItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
-    description: str | None = None
-    """
-     Max length: 2000;
-    """
-    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
-    quantity: float | None = None
-    price: float | None = None
-    cost: float | None = None
-    discount: float | None = None
-    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
-    price_method: PriceMethod | None = Field(default=None, alias='priceMethod')
-    billable_option: BillableOption4 = Field(..., alias='billableOption')
-    agreement: AgreementReference | None = None
-    location_id: int | None = Field(default=None, alias='locationId')
-    """
-     Required On Updates;
-    """
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    """
-     Required On Updates;
-    """
-    vendor: CompanyReference | None = None
-    vendor_sku: str | None = Field(default=None, alias='vendorSku')
-    """
-     Max length: 50;
-    """
-    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
-    dropship_flag: bool | None = Field(default=None, alias='dropshipFlag')
-    special_order_flag: bool | None = Field(default=None, alias='specialOrderFlag')
-    phase_product_flag: bool | None = Field(default=None, alias='phaseProductFlag')
-    cancelled_flag: bool | None = Field(default=None, alias='cancelledFlag')
-    quantity_cancelled: float | None = Field(default=None, alias='quantityCancelled')
-    cancelled_reason: str | None = Field(default=None, alias='cancelledReason')
-    """
-     Max length: 100;
-    """
-    customer_description: str | None = Field(default=None, alias='customerDescription')
-    """
-     Max length: 6000; Required On Updates;
-    """
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    """
-     Max length: 1000;
-    """
-    product_supplied_flag: bool | None = Field(
-        default=None, alias='productSuppliedFlag'
-    )
-    sub_contractor_ship_to_id: int | None = Field(
-        default=None, alias='subContractorShipToId'
-    )
-    sub_contractor_amount_limit: float | None = Field(
-        default=None, alias='subContractorAmountLimit'
-    )
-    recurring: ProductRecurring | None = None
-    sla: SLAReference | None = None
-    entity_type: EntityTypeReference | None = Field(default=None, alias='entityType')
-    ticket: TicketReference | None = None
-    project: ProjectReference | None = None
-    phase: ProjectPhaseReference | None = None
-    sales_order: SalesOrderReference | None = Field(default=None, alias='salesOrder')
-    opportunity: OpportunityReference | None = None
-    invoice: InvoiceReference | None = None
-    warehouse_id: int | None = Field(default=None, alias='warehouseId')
-    warehouse_bin_id: int | None = Field(default=None, alias='warehouseBinId')
-    calculated_price_flag: bool | None = Field(
-        default=None, alias='calculatedPriceFlag'
-    )
-    calculated_cost_flag: bool | None = Field(default=None, alias='calculatedCostFlag')
-    forecast_detail_id: int | None = Field(default=None, alias='forecastDetailId')
-    cancelled_by: int | None = Field(default=None, alias='cancelledBy')
-    cancelled_date: datetime | None = Field(default=None, alias='cancelledDate')
-    warehouse: str | None = None
-    warehouse_bin: str | None = Field(default=None, alias='warehouseBin')
-    purchase_date: datetime | None = Field(default=None, alias='purchaseDate')
-    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
-    list_price: float | None = Field(default=None, alias='listPrice')
-    serial_number_ids: list[int] | None = Field(default=None, alias='serialNumberIds')
-    serial_numbers: list[str] | None = Field(default=None, alias='serialNumbers')
-    company: CompanyReference | None = None
-    forecast_status: OpportunityStatusReference | None = Field(
-        default=None, alias='forecastStatus'
-    )
-    product_class: ProductClass1 | None = Field(default=None, alias='productClass')
-    need_to_purchase_flag: bool | None = Field(default=None, alias='needToPurchaseFlag')
-    need_to_order_quantity: int | None = Field(
-        default=None, alias='needToOrderQuantity'
-    )
-    minimum_stock_flag: bool | None = Field(default=None, alias='minimumStockFlag')
-    ship_set: str | None = Field(default=None, alias='shipSet')
-    """
-     Max length: 10;
-    """
-    calculated_price: float | None = Field(default=None, alias='calculatedPrice')
-    calculated_cost: float | None = Field(default=None, alias='calculatedCost')
-    invoice_grouping: InvoiceGroupingReference | None = Field(
-        default=None, alias='invoiceGrouping'
-    )
-    po_approved_flag: bool | None = Field(default=None, alias='poApprovedFlag')
-    add_components_flag: bool | None = Field(default=None, alias='addComponentsFlag')
-    ignore_pricing_schedules_flag: bool | None = Field(
-        default=None, alias='ignorePricingSchedulesFlag'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    bypass_forecast_update: bool | None = Field(
-        default=None, alias='bypassForecastUpdate'
-    )
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
+class MemberDeactivationDutyManager(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationKnowledgebaseArticle(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationMyCompanyControllerRole(MemberDeactivationDepartmentMananager):
+    pass
+
 
+class MemberDeactivationMyCompanyCOORole(MemberDeactivationDepartmentMananager):
+    pass
 
-class ProductItemReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
+class MemberDeactivationMyCompanyDispatchRole(MemberDeactivationDepartmentMananager):
+    pass
 
-class ProductPickingShippingDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    picked_quantity: int | None = Field(default=None, alias='pickedQuantity')
-    shipped_quantity: int | None = Field(default=None, alias='shippedQuantity')
-    warehouse: WarehouseReference | None = None
-    warehouse_bin: WarehouseBinReference | None = Field(
-        default=None, alias='warehouseBin'
-    )
-    shipment_method: ShipmentMethodReference | None = Field(
-        default=None, alias='shipmentMethod'
-    )
-    serial_number: str | None = Field(default=None, alias='serialNumber')
-    serial_number_ids: list[int] | None = Field(default=None, alias='serialNumberIds')
-    tracking_number: str | None = Field(default=None, alias='trackingNumber')
-    product_item: ProductItemReference | None = Field(default=None, alias='productItem')
-    line_number: int | None = Field(default=None, alias='lineNumber')
-    quantity: int | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
+class MemberDeactivationMyCompanyDutyManagerRole(MemberDeactivationDepartmentMananager):
+    pass
 
-class ProductRecurring(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    recurring_revenue: float | None = Field(default=None, alias='recurringRevenue')
-    recurring_cost: float | None = Field(default=None, alias='recurringCost')
-    start_date: str | None = Field(default=None, alias='startDate')
-    end_date: str | None = Field(default=None, alias='endDate')
-    """
-    The Recurring End Date is calculated based on the
-                start date, number of cycles, and cycle type.
-    """
-    bill_cycle_id: int | None = Field(default=None, alias='billCycleId')
-    cycles: int | None = None
-    cycle_type: CycleType | None = Field(default=None, alias='cycleType')
 
+class MemberDeactivationMyCompanyPresidentRole(MemberDeactivationDepartmentMananager):
+    pass
 
-class ProductReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    description: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
+class MemberDeactivationMyCompanyServiceManagerRole(
+    MemberDeactivationDepartmentMananager
+):
+    pass
 
-class ProductRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+
+class MemberDeactivationOpportunity(MemberDeactivationDepartmentMananager):
+    pass
 
 
-class ProductSubCategoryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberDeactivationProjectManager(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationSalesActivity(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationSalesTeam(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationSendFromEmailNotify(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationServiceManger(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationServiceTeam(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationServiceTemplate(MemberDeactivationDepartmentMananager):
+    pass
+
+
+class MemberDeactivationStatusWorkflow(ConnectWiseModel):
+    count: int | None = None
     id: int | None = None
     name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    re_assign_to_member: MemberReference | None = Field(
+        default=None, alias='reAssignToMember'
+    )
 
 
-class ProductType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    type_xref: TypeXref | None = Field(default=None, alias='typeXref')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class MemberDeactivationWorkflow(MemberDeactivationDepartmentMananager):
+    pass
 
 
-class ProductTypeExemption(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberDelegation(ConnectWiseModel):
     id: int | None = None
-    product_type: ProductTypeReference = Field(..., alias='productType')
-    taxable_levels: list[int] | None = Field(default=None, alias='taxableLevels')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    delegation_type: Literal['Approval', 'Project'] = Field(..., alias='delegationType')
+    delegated_to: MemberReference | None = Field(default=None, alias='delegatedTo')
+    date_start: datetime = Field(..., alias='dateStart')
+    date_end: datetime = Field(..., alias='dateEnd')
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ProductTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberPersona(ConnectWiseModel):
     id: int | None = None
+    job_role_percentage: int | None = Field(default=None, alias='jobRolePercentage')
     name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    persona_id: int = Field(..., alias='personaId')
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ProductTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberSkill(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    skill: SkillReference
+    skill_level: Literal['Beginner', 'Intermediate', 'Advanced', 'Expert'] = Field(
+        ..., alias='skillLevel'
+    )
+    certified_flag: bool | None = Field(default=None, alias='certifiedFlag')
+    years_experience: int | None = Field(default=None, alias='yearsExperience')
+    notes: str | None = None
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Project(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MemberTemplate(ConnectWiseModel):
     id: int | None = None
-    actual_end: datetime | None = Field(default=None, alias='actualEnd')
-    actual_hours: float | None = Field(default=None, alias='actualHours')
-    actual_start: datetime | None = Field(default=None, alias='actualStart')
-    agreement: AgreementReference | None = None
-    bill_expenses: BillExpenses3 | None = Field(default=None, alias='billExpenses')
-    """
-     Required On Updates;
-    """
-    billing_amount: float | None = Field(default=None, alias='billingAmount')
-    billing_attention: str | None = Field(default=None, alias='billingAttention')
+    identifier: str
     """
      Max length: 50;
     """
-    billing_method: BillingMethod1 = Field(..., alias='billingMethod')
-    billing_rate_type: BillingRateType | None = Field(
-        default=None, alias='billingRateType'
-    )
-    """
-     Required On Updates;
-    """
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
-    )
-    bill_products: BillProducts2 | None = Field(default=None, alias='billProducts')
+    template_description: str | None = Field(default=None, alias='templateDescription')
     """
-     Required On Updates;
+     Max length: 1024;
     """
-    bill_project_after_closed_flag: bool | None = Field(
-        default=None, alias='billProjectAfterClosedFlag'
+    title: str | None = None
+    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
+    enable_mobile_flag: bool | None = Field(default=None, alias='enableMobileFlag')
+    type: MemberTypeReference | None = None
+    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
+    partner_portal_flag: bool | None = Field(default=None, alias='partnerPortalFlag')
+    sts_user_admin_url: str | None = Field(default=None, alias='stsUserAdminUrl')
+    toast_notification_flag: bool | None = Field(
+        default=None, alias='toastNotificationFlag'
     )
-    bill_time: BillTime6 | None = Field(default=None, alias='billTime')
-    """
-     Required On Updates;
-    """
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
+    member_personas: list[int] | None = Field(default=None, alias='memberPersonas')
+    admin_flag: bool | None = Field(default=None, alias='adminFlag')
+    structure_level: StructureReference | None = Field(
+        default=None, alias='structureLevel'
     )
-    bill_to_contact: ContactReference | None = Field(
-        default=None, alias='billToContact'
+    security_location: SystemLocationReference | None = Field(
+        default=None, alias='securityLocation'
     )
-    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
-    bill_unapproved_time_and_expense: bool | None = Field(
-        default=None, alias='billUnapprovedTimeAndExpense'
+    default_location: SystemLocationReference | None = Field(
+        default=None, alias='defaultLocation'
     )
-    board: ProjectBoardReference | None = None
-    budget_analysis: BudgetAnalysis | None = Field(default=None, alias='budgetAnalysis')
-    """
-     Required On Updates;
-    """
-    budget_flag: bool | None = Field(default=None, alias='budgetFlag')
-    budget_hours: float | None = Field(default=None, alias='budgetHours')
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    customer_po: str | None = Field(default=None, alias='customerPO')
-    """
-     Max length: 50;
-    """
-    description: str | None = None
-    currency: CurrencyReference | None = None
-    downpayment: float | None = None
-    estimated_end: datetime = Field(..., alias='estimatedEnd')
-    percent_complete: float | None = Field(default=None, alias='percentComplete')
-    estimated_expense_revenue: float | None = Field(
-        default=None, alias='estimatedExpenseRevenue'
+    default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='defaultDepartment'
     )
-    estimated_hours: float | None = Field(default=None, alias='estimatedHours')
-    estimated_product_revenue: float | None = Field(
-        default=None, alias='estimatedProductRevenue'
+    reports_to: MemberReference | None = Field(default=None, alias='reportsTo')
+    restrict_location_flag: bool | None = Field(
+        default=None, alias='restrictLocationFlag'
     )
-    estimated_start: datetime = Field(..., alias='estimatedStart')
-    estimated_time_revenue: float | None = Field(
-        default=None, alias='estimatedTimeRevenue'
+    restrict_department_flag: bool | None = Field(
+        default=None, alias='restrictDepartmentFlag'
     )
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
     expense_approver: MemberReference | None = Field(
         default=None, alias='expenseApprover'
     )
-    include_dependencies_flag: bool | None = Field(
-        default=None, alias='includeDependenciesFlag'
+    billable_forecast: float | None = Field(default=None, alias='billableForecast')
+    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
+    hourly_cost: float | None = Field(default=None, alias='hourlyCost')
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    include_in_utilization_reporting_flag: bool | None = Field(
+        default=None, alias='includeInUtilizationReportingFlag'
     )
-    include_estimates_flag: bool | None = Field(
-        default=None, alias='includeEstimatesFlag'
+    require_expense_entry_flag: bool | None = Field(
+        default=None, alias='requireExpenseEntryFlag'
     )
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    manager: MemberReference | None = None
-    name: str
-    """
-     Max length: 100;
-    """
-    opportunity: OpportunityReference | None = None
-    project_template_id: int | None = Field(default=None, alias='projectTemplateId')
-    restrict_down_payment_flag: bool | None = Field(
-        default=None, alias='restrictDownPaymentFlag'
+    require_time_sheet_entry_flag: bool | None = Field(
+        default=None, alias='requireTimeSheetEntryFlag'
     )
-    scheduled_end: datetime | None = Field(default=None, alias='scheduledEnd')
-    scheduled_hours: float | None = Field(default=None, alias='scheduledHours')
-    scheduled_start: datetime | None = Field(default=None, alias='scheduledStart')
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
+    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
+        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
     )
-    ship_to_contact: ContactReference | None = Field(
-        default=None, alias='shipToContact'
+    allow_in_cell_entry_on_time_sheet: bool | None = Field(
+        default=None, alias='allowInCellEntryOnTimeSheet'
     )
-    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
-    site: SiteReference | None = None
-    status: ProjectStatusReference | None = None
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
-    type: ProjectTypeReference | None = None
-    do_not_display_in_portal_flag: bool | None = Field(
-        default=None, alias='doNotDisplayInPortalFlag'
+    enter_time_against_company_flag: bool | None = Field(
+        default=None, alias='enterTimeAgainstCompanyFlag'
     )
-    billing_start_date: datetime | None = Field(default=None, alias='billingStartDate')
-    estimated_time_cost: float | None = Field(default=None, alias='estimatedTimeCost')
-    estimated_expense_cost: float | None = Field(
-        default=None, alias='estimatedExpenseCost'
+    allow_expenses_entered_against_companies_flag: bool | None = Field(
+        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
+    )
+    time_reminder_email_flag: bool | None = Field(
+        default=None, alias='timeReminderEmailFlag'
+    )
+    days_tolerance: int | None = Field(default=None, alias='daysTolerance')
+    minimum_hours: float | None = Field(default=None, alias='minimumHours')
+    time_sheet_start_date: str | None = Field(default=None, alias='timeSheetStartDate')
+    service_default_location: SystemLocationReference | None = Field(
+        default=None, alias='serviceDefaultLocation'
+    )
+    service_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='serviceDefaultDepartment'
+    )
+    service_default_board: BoardReference | None = Field(
+        default=None, alias='serviceDefaultBoard'
+    )
+    restrict_service_default_location_flag: bool | None = Field(
+        default=None, alias='restrictServiceDefaultLocationFlag'
     )
-    estimated_product_cost: float | None = Field(
-        default=None, alias='estimatedProductCost'
+    restrict_service_default_department_flag: bool | None = Field(
+        default=None, alias='restrictServiceDefaultDepartmentFlag'
     )
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    company_location: SystemLocationReference | None = Field(
-        default=None, alias='companyLocation'
+    excluded_service_board_ids: list[int] | None = Field(
+        default=None, alias='excludedServiceBoardIds'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    teams: list[int] | None = None
+    service_board_team_ids: list[int] | None = Field(
+        default=None, alias='serviceBoardTeamIds'
     )
-
-
-class ProjectBillingRate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_default_location: SystemLocationReference | None = Field(
+        default=None, alias='projectDefaultLocation'
     )
-    id: int | None = None
-    project_rec_id: int | None = Field(default=None, alias='projectRecId')
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    activity_class_rec_id: int | None = Field(default=None, alias='activityClassRecId')
-    member: MemberReference | None = None
-    member_rec_id: int | None = Field(default=None, alias='memberRecId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectBoardReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='projectDefaultDepartment'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectBoardTeam(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_default_board: ProjectBoardReference | None = Field(
+        default=None, alias='projectDefaultBoard'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectBoardTeamInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_project_default_location_flag: bool | None = Field(
+        default=None, alias='restrictProjectDefaultLocationFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectBoardTeamMember(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_project_default_department_flag: bool | None = Field(
+        default=None, alias='restrictProjectDefaultDepartmentFlag'
     )
-    id: int | None = None
-    member: MemberReference | None = None
-    project_role: ProjectRoleReference | None = Field(default=None, alias='projectRole')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectContact(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    excluded_project_board_ids: list[int] | None = Field(
+        default=None, alias='excludedProjectBoardIds'
     )
-    id: int | None = None
-    project_id: int | None = Field(default=None, alias='projectId')
-    contact: ContactReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    schedule_default_location: SystemLocationReference | None = Field(
+        default=None, alias='scheduleDefaultLocation'
     )
-    id: int | None = None
-    project_id: int | None = Field(default=None, alias='projectId')
-    text: str
-    type: NoteTypeReference | None = None
-    flagged: bool | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectPhase(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    schedule_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='scheduleDefaultDepartment'
     )
-    id: int | None = None
-    project_id: int | None = Field(default=None, alias='projectId')
-    description: str
-    """
-     Max length: 100;
-    """
-    board: ProjectBoardReference | None = None
-    status: PhaseStatusReference | None = None
-    agreement: AgreementReference | None = None
-    opportunity: OpportunityReference | None = None
-    parent_phase: ProjectPhaseReference | None = Field(
-        default=None, alias='parentPhase'
+    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
+    service_location: ServiceLocationReference | None = Field(
+        default=None, alias='serviceLocation'
     )
-    wbs_code: str | None = Field(default=None, alias='wbsCode')
-    """
-     Max length: 50;
-    """
-    bill_time: BillTime6 | None = Field(default=None, alias='billTime')
-    """
-     Required On Updates;
-    """
-    bill_expenses: BillExpenses3 | None = Field(default=None, alias='billExpenses')
-    """
-     Required On Updates;
-    """
-    bill_products: BillProducts2 | None = Field(default=None, alias='billProducts')
-    """
-     Required On Updates;
-    """
-    mark_as_milestone_flag: bool | None = Field(
-        default=None, alias='markAsMilestoneFlag'
+    restrict_schedule_flag: bool | None = Field(
+        default=None, alias='restrictScheduleFlag'
     )
-    notes: str | None = None
-    deadline_date: datetime | None = Field(default=None, alias='deadlineDate')
-    bill_separately_flag: bool | None = Field(default=None, alias='billSeparatelyFlag')
-    billing_method: BillingMethod2 | None = Field(default=None, alias='billingMethod')
-    """
-    billingMethod is required if the phase billSeparatelyFlag is true.
-    """
-    scheduled_hours: float | None = Field(default=None, alias='scheduledHours')
-    scheduled_start: str | None = Field(default=None, alias='scheduledStart')
-    scheduled_end: str | None = Field(default=None, alias='scheduledEnd')
-    actual_hours: float | None = Field(default=None, alias='actualHours')
-    actual_start: str | None = Field(default=None, alias='actualStart')
-    actual_end: str | None = Field(default=None, alias='actualEnd')
-    budget_hours: float | None = Field(default=None, alias='budgetHours')
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    billing_start_date: datetime | None = Field(default=None, alias='billingStartDate')
-    bill_phase_closed_flag: bool | None = Field(
-        default=None, alias='billPhaseClosedFlag'
+    hide_member_in_dispatch_portal_flag: bool | None = Field(
+        default=None, alias='hideMemberInDispatchPortalFlag'
     )
-    """
-    This phase can only be billed after it has been closed.
-    """
-    bill_project_closed_flag: bool | None = Field(
-        default=None, alias='billProjectClosedFlag'
+    calendar: CalendarReference | None = None
+    sales_default_location: SystemLocationReference | None = Field(
+        default=None, alias='salesDefaultLocation'
     )
-    """
-    This phase can only be billed after the project has been closed.
-    """
-    downpayment: float | None = None
-    po_number: str | None = Field(default=None, alias='poNumber')
-    """
-     Max length: 25;
-    """
-    po_amount: float | None = Field(default=None, alias='poAmount')
-    estimated_time_cost: float | None = Field(default=None, alias='estimatedTimeCost')
-    estimated_expense_cost: float | None = Field(
-        default=None, alias='estimatedExpenseCost'
+    restrict_default_sales_territory_flag: bool | None = Field(
+        default=None, alias='restrictDefaultSalesTerritoryFlag'
     )
-    estimated_product_cost: float | None = Field(
-        default=None, alias='estimatedProductCost'
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
     )
-    estimated_time_revenue: float | None = Field(
-        default=None, alias='estimatedTimeRevenue'
+    restrict_default_warehouse_flag: bool | None = Field(
+        default=None, alias='restrictDefaultWarehouseFlag'
     )
-    estimated_expense_revenue: float | None = Field(
-        default=None, alias='estimatedExpenseRevenue'
+    restrict_default_warehouse_bin_flag: bool | None = Field(
+        default=None, alias='restrictDefaultWarehouseBinFlag'
     )
-    estimated_product_revenue: float | None = Field(
-        default=None, alias='estimatedProductRevenue'
+    company_activity_tab_format: Literal['SummaryList', 'DetailList'] | None = Field(
+        default=None, alias='companyActivityTabFormat'
     )
-    currency: CurrencyReference | None = None
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
+    invoice_time_tab_format: Literal['SummaryList', 'DetailList'] | None = Field(
+        default=None, alias='invoiceTimeTabFormat'
     )
-    bill_to_contact: ContactReference | None = Field(
-        default=None, alias='billToContact'
+    invoice_screen_default_tab_format: Literal[
+        'ShowInvoicingTab', 'ShowAgreementInvoicingTab'
+    ] | None = Field(default=None, alias='invoiceScreenDefaultTabFormat')
+    invoicing_display_options: Literal[
+        'RemainOnInvoicingScreen', 'ShowRecentInvoices'
+    ] | None = Field(default=None, alias='invoicingDisplayOptions')
+    agreement_invoicing_display_options: Literal[
+        'RemainOnInvoicingScreen', 'ShowRecentInvoices'
+    ] | None = Field(default=None, alias='agreementInvoicingDisplayOptions')
+    auto_start_stopwatch: bool | None = Field(default=None, alias='autoStartStopwatch')
+    auto_popup_quick_notes_with_stopwatch: bool | None = Field(
+        default=None, alias='autoPopupQuickNotesWithStopwatch'
     )
-    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
+    global_search_default_ticket_filter: Literal[
+        'OpenRecords', 'ClosedRecords', 'AllRecords'
+    ] | None = Field(default=None, alias='globalSearchDefaultTicketFilter')
+    global_search_default_sort: Literal[
+        'None', 'LastUpdatedDesc', 'LastUpdatedAsc', 'CreatedDesc', 'CreatedAsc'
+    ] | None = Field(default=None, alias='globalSearchDefaultSort')
+    phone_source: str | None = Field(default=None, alias='phoneSource')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    copy_pod_layouts: bool | None = Field(default=None, alias='copyPodLayouts')
+    copy_shared_default_views: bool | None = Field(
+        default=None, alias='copySharedDefaultViews'
     )
-    ship_to_contact: ContactReference | None = Field(
-        default=None, alias='shipToContact'
+    copy_column_layouts_and_filters: bool | None = Field(
+        default=None, alias='copyColumnLayoutsAndFilters'
+    )
+    from_member_rec_id: int | None = Field(default=None, alias='fromMemberRecId')
+    from_member_template_rec_id: int | None = Field(
+        default=None, alias='fromMemberTemplateRecId'
     )
-    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
     custom_fields: list[CustomFieldValue] | None = Field(
         default=None, alias='customFields'
     )
 
 
-class ProjectPhaseReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectRoleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MenuEntry(ConnectWiseModel):
     id: int | None = None
-    identifier: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectSecurityRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    menu_location: MenuLocationReference | None = Field(
+        default=None, alias='menuLocation'
     )
-    id: int | None = None
-    name: str
+    caption: str
     """
-     Max length: 30;
+     Max length: 50;
     """
-    manager_role_flag: bool | None = Field(default=None, alias='managerRoleFlag')
-    default_contact_flag: bool | None = Field(default=None, alias='defaultContactFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectSecurityRoleSetting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    add_level: AddLevel | None = Field(default=None, alias='addLevel')
-    edit_level: EditLevel | None = Field(default=None, alias='editLevel')
-    delete_level: DeleteLevel | None = Field(default=None, alias='deleteLevel')
-    inquire_level: InquireLevel | None = Field(default=None, alias='inquireLevel')
-    module_identifier: str | None = Field(default=None, alias='moduleIdentifier')
+    link: str
     """
-     Max length: 50;
+     Max length: 2000;
     """
-    my_flag: bool | None = Field(default=None, alias='myFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
+    new_window_flag: bool = Field(..., alias='newWindowFlag')
+    location_ids: list[int] | None = Field(default=None, alias='locationIds')
+    origin: str | None = None
     """
-     Max length: 30;
+     Max length: 2000;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    no_time_flag: bool | None = Field(default=None, alias='noTimeFlag')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    status_indicator: StatusIndicatorReference | None = Field(
-        default=None, alias='statusIndicator'
-    )
-    custom_status_indicator_name: str | None = Field(
-        default=None, alias='customStatusIndicatorName'
-    )
+    client_id: str | None = Field(default=None, alias='clientId')
     """
-    Required when statusIndicator is Custom. Max length: 30;
+    Only required if not already set Max length: 36;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectStatusInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    add_all_locations: bool | None = Field(default=None, alias='addAllLocations')
+    remove_all_locations: bool | None = Field(default=None, alias='removeAllLocations')
+    small_menu_icon_id: int | None = Field(default=None, alias='smallMenuIconId')
+    large_menu_icon_id: int | None = Field(default=None, alias='largeMenuIconId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ProjectStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MenuEntryLocation(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    location: SystemLocationReference | None = None
+    menu_entry: SystemMenuEntryReference | None = Field(default=None, alias='menuEntry')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ProjectTeamMember(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MinimumStockByWarehouse(ConnectWiseModel):
     id: int | None = None
-    project_id: int | None = Field(default=None, alias='projectId')
-    hours: float | None = None
-    member: MemberReference | None = None
-    project_role: ProjectRoleReference | None = Field(default=None, alias='projectRole')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    start_date: datetime | None = Field(default=None, alias='startDate')
-    end_date: datetime | None = Field(default=None, alias='endDate')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    warehouse: WarehouseReference
+    minimum_stock: int = Field(..., alias='minimumStock')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ProjectTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MyAccount(ConnectWiseModel):
     id: int | None = None
-    name: str
+    identifier: str
     """
-     Max length: 200;
+     Max length: 15;
     """
-    description: str | None = None
-    type: ProjectTypeReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectTemplateTask(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    ticket_id: int | None = Field(default=None, alias='ticketId')
-    sequence: int | None = None
-    description: str | None = None
-    summary: str | None = None
-    code: ServiceCodeReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectTemplateTicket(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    project_template_id: int | None = Field(default=None, alias='projectTemplateId')
-    project_template_phase_id: int | None = Field(
-        default=None, alias='projectTemplatePhaseId'
-    )
-    line_number: float | None = Field(default=None, alias='lineNumber')
-    description: str
+    password: str | None = None
     """
-     Max length: 100;
+    ConditionallyRequired. API Member will get random password generated Max length: 60;
     """
-    notes: str | None = None
-    internal_analysis: str | None = Field(default=None, alias='internalAnalysis')
-    resolution: str | None = None
-    budget_hours: float | None = Field(default=None, alias='budgetHours')
-    duration: int | None = None
-    wbs_code: str | None = Field(default=None, alias='wbsCode')
+    first_name: str = Field(..., alias='firstName')
     """
-     Max length: 50;
+     Max length: 30;
     """
-    bill_separately_flag: bool | None = Field(default=None, alias='billSeparatelyFlag')
-    mark_as_milestone_flag: bool | None = Field(
-        default=None, alias='markAsMilestoneFlag'
-    )
-    record_type: str | None = Field(default=None, alias='recordType')
+    middle_initial: str | None = Field(default=None, alias='middleInitial')
     """
      Max length: 1;
     """
-    pm_tmp_project_rec_id: int | None = Field(default=None, alias='pmTmpProjectRecID')
-    priority: PriorityReference | None = None
-    source: ServiceSourceReference | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectTemplateWorkPlan(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    tree_id: str | None = Field(default=None, alias='treeID')
-    i_d: int | None = Field(default=None, alias='iD')
-    rec_id: int | None = Field(default=None, alias='recID')
-    display_id: str | None = Field(default=None, alias='displayID')
-    s_r_service_rec_id: int | None = Field(default=None, alias='sR_Service_RecID')
-    description: str | None = None
-    project_name: str | None = Field(default=None, alias='projectName')
-    budget_amount: float | None = Field(default=None, alias='budgetAmount')
-    is_project: bool | None = Field(default=None, alias='isProject')
-    is_phase: bool | None = Field(default=None, alias='isPhase')
-    is_ticket: bool | None = Field(default=None, alias='isTicket')
-    is_new_item: bool | None = Field(default=None, alias='isNewItem')
-    wbs_code: str | None = Field(default=None, alias='wbsCode')
-    parent_phase_rec_id: int | None = Field(default=None, alias='parentPhaseRecID')
-
-
-class ProjectTicket(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    summary: str
+    last_name: str = Field(..., alias='lastName')
     """
-     Max length: 100;
+     Max length: 30;
     """
-    is_issue_flag: bool | None = Field(default=None, alias='isIssueFlag')
-    board: BoardReference | None = None
-    status: ServiceStatusReference | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    project: ProjectReference | None = None
-    phase: ProjectPhaseReference | None = None
-    wbs_code: str | None = Field(default=None, alias='wbsCode')
+    title: str | None = None
     """
      Max length: 50;
     """
-    company: CompanyReference | None = None
-    site: SiteReference | None = None
-    site_name: str | None = Field(default=None, alias='siteName')
+    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
+    license_class: Literal['A', 'C', 'F', 'X'] = Field(..., alias='licenseClass')
     """
-     Max length: 50;
+    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
     """
-    address_line1: str | None = Field(default=None, alias='addressLine1')
+    disable_online_flag: bool | None = Field(default=None, alias='disableOnlineFlag')
+    enable_mobile_flag: bool | None = Field(default=None, alias='enableMobileFlag')
+    type: MemberTypeReference | None = None
+    employee_identifer: str | None = Field(default=None, alias='employeeIdentifer')
     """
-     Max length: 50;
+     Max length: 10;
     """
-    address_line2: str | None = Field(default=None, alias='addressLine2')
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    notes: str | None = None
+    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
+    country: CountryReference | None = None
+    service_board_team_ids: list[int] | None = Field(
+        default=None, alias='serviceBoardTeamIds'
+    )
+    enable_mobile_gps_flag: bool | None = Field(
+        default=None, alias='enableMobileGpsFlag'
+    )
+    inactive_date: datetime | None = Field(default=None, alias='inactiveDate')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    last_login: str | None = Field(default=None, alias='lastLogin')
+    photo: DocumentReference | None = None
+    partner_portal_flag: bool | None = Field(default=None, alias='partnerPortalFlag')
+    client_id: str | None = Field(default=None, alias='clientId')
+    sts_user_admin_url: str | None = Field(default=None, alias='stsUserAdminUrl')
+    token: str | None = None
+    toast_notification_flag: bool | None = Field(
+        default=None, alias='toastNotificationFlag'
+    )
+    member_personas: list[int] | None = Field(default=None, alias='memberPersonas')
+    office365: MemberOffice365 | None = None
+    office_email: str | None = Field(default=None, alias='officeEmail')
     """
-     Max length: 50;
+     Max length: 250;
     """
-    city: str | None = None
+    office_phone: str | None = Field(default=None, alias='officePhone')
     """
-     Max length: 50;
+     Max length: 15;
     """
-    state_identifier: str | None = Field(default=None, alias='stateIdentifier')
+    office_extension: str | None = Field(default=None, alias='officeExtension')
     """
-     Max length: 50;
+     Max length: 10;
     """
-    zip: str | None = None
+    mobile_email: str | None = Field(default=None, alias='mobileEmail')
     """
-     Max length: 12;
+     Max length: 250;
     """
-    country: CountryReference | None = None
-    contact: ContactReference | None = None
-    contact_name: str | None = Field(default=None, alias='contactName')
+    mobile_phone: str | None = Field(default=None, alias='mobilePhone')
     """
-     Max length: 62;
+     Max length: 15;
     """
-    contact_phone_number: str | None = Field(default=None, alias='contactPhoneNumber')
+    mobile_extension: str | None = Field(default=None, alias='mobileExtension')
     """
-     Max length: 20;
+     Max length: 10;
     """
-    contact_phone_extension: str | None = Field(
-        default=None, alias='contactPhoneExtension'
-    )
+    home_email: str | None = Field(default=None, alias='homeEmail')
+    """
+     Max length: 250;
+    """
+    home_phone: str | None = Field(default=None, alias='homePhone')
     """
      Max length: 15;
     """
-    contact_email_address: str | None = Field(default=None, alias='contactEmailAddress')
+    home_extension: str | None = Field(default=None, alias='homeExtension')
+    """
+     Max length: 10;
+    """
+    default_email: Literal['Office', 'Mobile', 'Home'] = Field(
+        ..., alias='defaultEmail'
+    )
+    primary_email: str | None = Field(default=None, alias='primaryEmail')
     """
      Max length: 250;
     """
-    type: ServiceTypeReference | None = None
-    sub_type: ServiceSubTypeReference | None = Field(default=None, alias='subType')
-    item: ServiceItemReference | None = None
-    owner: MemberReference | None = None
-    priority: PriorityReference | None = None
-    service_location: ServiceLocationReference | None = Field(
-        default=None, alias='serviceLocation'
+    default_phone: Literal['Office', 'Mobile', 'Home'] = Field(
+        ..., alias='defaultPhone'
     )
-    source: ServiceSourceReference | None = None
-    required_date: datetime | None = Field(default=None, alias='requiredDate')
-    budget_hours: float | None = Field(default=None, alias='budgetHours')
-    opportunity: OpportunityReference | None = None
-    agreement: AgreementReference | None = None
-    knowledge_base_category_id: int | None = Field(
-        default=None, alias='knowledgeBaseCategoryId'
+    default_location: SystemLocationReference | None = Field(
+        default=None, alias='defaultLocation'
     )
-    knowledge_base_sub_category_id: int | None = Field(
-        default=None, alias='knowledgeBaseSubCategoryId'
+    default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='defaultDepartment'
+    )
+    reports_to: MemberReference | None = Field(default=None, alias='reportsTo')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
+    expense_approver: MemberReference | None = Field(
+        default=None, alias='expenseApprover'
+    )
+    billable_forecast: float | None = Field(default=None, alias='billableForecast')
+    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
+    include_in_utilization_reporting_flag: bool | None = Field(
+        default=None, alias='includeInUtilizationReportingFlag'
+    )
+    require_expense_entry_flag: bool | None = Field(
+        default=None, alias='requireExpenseEntryFlag'
+    )
+    require_time_sheet_entry_flag: bool | None = Field(
+        default=None, alias='requireTimeSheetEntryFlag'
+    )
+    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
+        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
+    )
+    allow_in_cell_entry_on_time_sheet: bool | None = Field(
+        default=None, alias='allowInCellEntryOnTimeSheet'
+    )
+    enter_time_against_company_flag: bool | None = Field(
+        default=None, alias='enterTimeAgainstCompanyFlag'
+    )
+    allow_expenses_entered_against_companies_flag: bool | None = Field(
+        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
+    )
+    time_reminder_email_flag: bool | None = Field(
+        default=None, alias='timeReminderEmailFlag'
+    )
+    days_tolerance: int | None = Field(default=None, alias='daysTolerance')
+    minimum_hours: float | None = Field(default=None, alias='minimumHours')
+    time_sheet_start_date: datetime | None = Field(
+        default=None, alias='timeSheetStartDate'
+    )
+    hire_date: datetime = Field(..., alias='hireDate')
+    service_default_location: SystemLocationReference | None = Field(
+        default=None, alias='serviceDefaultLocation'
+    )
+    service_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='serviceDefaultDepartment'
+    )
+    service_default_board: BoardReference | None = Field(
+        default=None, alias='serviceDefaultBoard'
+    )
+    project_default_location: SystemLocationReference | None = Field(
+        default=None, alias='projectDefaultLocation'
+    )
+    project_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='projectDefaultDepartment'
+    )
+    project_default_board: ProjectBoardReference | None = Field(
+        default=None, alias='projectDefaultBoard'
+    )
+    schedule_default_location: SystemLocationReference | None = Field(
+        default=None, alias='scheduleDefaultLocation'
     )
-    knowledge_base_link_id: int | None = Field(
-        default=None, alias='knowledgeBaseLinkId'
+    schedule_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='scheduleDefaultDepartment'
     )
-    knowledge_base_link_type: KnowledgeBaseLinkType | None = Field(
-        default=None, alias='knowledgeBaseLinkType'
+    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
+    service_location: ServiceLocationReference | None = Field(
+        default=None, alias='serviceLocation'
     )
-    allow_all_clients_portal_view: bool | None = Field(
-        default=None, alias='allowAllClientsPortalView'
+    hide_member_in_dispatch_portal_flag: bool | None = Field(
+        default=None, alias='hideMemberInDispatchPortalFlag'
     )
-    customer_updated_flag: bool | None = Field(
-        default=None, alias='customerUpdatedFlag'
+    calendar: CalendarReference | None = None
+    sales_default_location: SystemLocationReference | None = Field(
+        default=None, alias='salesDefaultLocation'
     )
-    automatic_email_contact_flag: bool | None = Field(
-        default=None, alias='automaticEmailContactFlag'
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
     )
-    automatic_email_resource_flag: bool | None = Field(
-        default=None, alias='automaticEmailResourceFlag'
+    mapi_name: str | None = Field(default=None, alias='mapiName')
+    calendar_sync_integration_flag: bool | None = Field(
+        default=None, alias='calendarSyncIntegrationFlag'
     )
-    automatic_email_cc_flag: bool | None = Field(
-        default=None, alias='automaticEmailCcFlag'
+    company_activity_tab_format: Literal['SummaryList', 'DetailList'] = Field(
+        ..., alias='companyActivityTabFormat'
     )
-    automatic_email_cc: str | None = Field(default=None, alias='automaticEmailCc')
-    """
-     Max length: 1000;
-    """
-    closed_date: str | None = Field(default=None, alias='closedDate')
-    closed_by: str | None = Field(default=None, alias='closedBy')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    actual_hours: float | None = Field(default=None, alias='actualHours')
-    approved: bool | None = None
-    sub_billing_method: SubBillingMethod | None = Field(
-        default=None, alias='subBillingMethod'
+    invoice_time_tab_format: Literal['SummaryList', 'DetailList'] = Field(
+        ..., alias='invoiceTimeTabFormat'
     )
-    sub_billing_amount: float | None = Field(default=None, alias='subBillingAmount')
-    sub_date_accepted: str | None = Field(default=None, alias='subDateAccepted')
-    resources: str | None = None
-    bill_time: BillTime8 | None = Field(default=None, alias='billTime')
-    bill_expenses: BillExpenses5 | None = Field(default=None, alias='billExpenses')
-    bill_products: BillProducts4 | None = Field(default=None, alias='billProducts')
-    predecessor_type: PredecessorType | None = Field(
-        default=None, alias='predecessorType'
+    invoice_screen_default_tab_format: Literal[
+        'ShowInvoicingTab', 'ShowAgreementInvoicingTab'
+    ] = Field(..., alias='invoiceScreenDefaultTabFormat')
+    invoicing_display_options: Literal[
+        'RemainOnInvoicingScreen', 'ShowRecentInvoices'
+    ] = Field(..., alias='invoicingDisplayOptions')
+    agreement_invoicing_display_options: Literal[
+        'RemainOnInvoicingScreen', 'ShowRecentInvoices'
+    ] = Field(..., alias='agreementInvoicingDisplayOptions')
+    authentication_service_type: Literal[
+        'AuthAnvil', 'GoogleAuthenticator', 'Email'
+    ] | None = Field(default=None, alias='authenticationServiceType')
+    timebased_one_time_password_activated: bool | None = Field(
+        default=None, alias='timebasedOneTimePasswordActivated'
     )
-    predecessor_id: int | None = Field(default=None, alias='predecessorId')
-    predecessor_closed_flag: bool | None = Field(
-        default=None, alias='predecessorClosedFlag'
+    directional_sync: DirectionalSyncReference | None = Field(
+        default=None, alias='directionalSync'
     )
-    lag_days: int | None = Field(default=None, alias='lagDays')
-    lag_nonworking_days_flag: bool | None = Field(
-        default=None, alias='lagNonworkingDaysFlag'
+    auto_start_stopwatch: bool | None = Field(default=None, alias='autoStartStopwatch')
+    auto_popup_quick_notes_with_stopwatch: bool | None = Field(
+        default=None, alias='autoPopupQuickNotesWithStopwatch'
     )
-    estimated_start_date: datetime | None = Field(
-        default=None, alias='estimatedStartDate'
+    signature: str | None = None
+    global_search_default_ticket_filter: Literal[
+        'OpenRecords', 'ClosedRecords', 'AllRecords'
+    ] | None = Field(default=None, alias='globalSearchDefaultTicketFilter')
+    global_search_default_sort: Literal[
+        'None', 'LastUpdatedDesc', 'LastUpdatedAsc', 'CreatedDesc', 'CreatedAsc'
+    ] | None = Field(default=None, alias='globalSearchDefaultSort')
+    phone_source: str | None = Field(default=None, alias='phoneSource')
+    phone_integration_type: Literal[
+        'TAPI', 'SKYPE', 'TEL', 'CALLTO', 'NONE'
+    ] | None = Field(default=None, alias='phoneIntegrationType')
+    use_browser_language_flag: bool | None = Field(
+        default=None, alias='useBrowserLanguageFlag'
     )
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    duration: int | None = None
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    currency: CurrencyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    tasks: list[TicketTask] | None = None
-    initial_description: str | None = Field(default=None, alias='initialDescription')
-    """
-    Only available for POST, will not be returned in the response.
-    """
-    initial_internal_analysis: str | None = Field(
-        default=None, alias='initialInternalAnalysis'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    copy_pod_layouts: bool | None = Field(default=None, alias='copyPodLayouts')
+    copy_shared_default_views: bool | None = Field(
+        default=None, alias='copySharedDefaultViews'
     )
-    """
-    Only available for POST, will not be returned in the response.
-    """
-    initial_resolution: str | None = Field(default=None, alias='initialResolution')
-    """
-    Only available for POST, will not be returned in the response.
-    """
-    contact_email_lookup: str | None = Field(default=None, alias='contactEmailLookup')
-    process_notifications: bool | None = Field(
-        default=None, alias='processNotifications'
+    copy_column_layouts_and_filters: bool | None = Field(
+        default=None, alias='copyColumnLayoutsAndFilters'
     )
-    """
-    Can be set to false to skip notification processing when adding or updating a ticket (Defaults to True).
-    """
-    skip_callback: bool | None = Field(default=None, alias='skipCallback')
+    from_member_rec_id: int | None = Field(default=None, alias='fromMemberRecId')
     custom_fields: list[CustomFieldValue] | None = Field(
         default=None, alias='customFields'
     )
 
 
-class ProjectTicketNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    note_type: NoteType | None = Field(default=None, alias='noteType')
-    ticket: TicketReference | None = None
-    text: str | None = None
-    detail_description_flag: bool | None = Field(
-        default=None, alias='detailDescriptionFlag'
-    )
-    internal_analysis_flag: bool | None = Field(
-        default=None, alias='internalAnalysisFlag'
-    )
-    resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
-    time_start: datetime | None = Field(default=None, alias='timeStart')
-    time_end: datetime | None = Field(default=None, alias='timeEnd')
-    bundled_flag: bool | None = Field(default=None, alias='bundledFlag')
-    merged_flag: bool | None = Field(default=None, alias='mergedFlag')
-    issue_flag: bool | None = Field(default=None, alias='issueFlag')
-    original_author: str | None = Field(default=None, alias='originalAuthor')
-    member: MemberReference | None = None
-    contact: ContactReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MyMember(ConnectWiseModel):
     id: int | None = None
-    name: str
+    identifier: str | None = None
+    password: str | None = None
     """
-     Max length: 30;
+    ConditionallyRequired. API Member will get random password generated
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    integration_xref: str | None = Field(default=None, alias='integrationXref')
+    first_name: str | None = Field(default=None, alias='firstName')
+    middle_initial: str | None = Field(default=None, alias='middleInitial')
+    last_name: str | None = Field(default=None, alias='lastName')
+    title: str | None = None
+    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
+    license_class: Literal['A', 'C', 'F', 'X'] | None = Field(
+        default=None, alias='licenseClass'
+    )
     """
-     Max length: 50;
+    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    disable_online_flag: bool | None = Field(default=None, alias='disableOnlineFlag')
+    enable_mobile_flag: bool | None = Field(default=None, alias='enableMobileFlag')
+    type: MemberTypeReference | None = None
+    employee_identifer: str | None = Field(default=None, alias='employeeIdentifer')
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    notes: str | None = None
+    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
+    country: CountryReference | None = None
+    service_board_team_ids: list[int] | None = Field(
+        default=None, alias='serviceBoardTeamIds'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    enable_mobile_gps_flag: bool | None = Field(
+        default=None, alias='enableMobileGpsFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ProjectWorkplan(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    inactive_date: str | None = Field(default=None, alias='inactiveDate')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    last_login: str | None = Field(default=None, alias='lastLogin')
+    photo: DocumentReference | None = None
+    toast_notification_flag: bool | None = Field(
+        default=None, alias='toastNotificationFlag'
     )
-    id: int | None = None
-    project_id: int | None = Field(default=None, alias='projectId')
-    description: str | None = None
-    board: ProjectBoardReference | None = None
-    status: PhaseStatusReference | None = None
-    agreement: AgreementReference | None = None
-    opportunity: OpportunityReference | None = None
-    parent_phase: ProjectPhaseReference | None = Field(
-        default=None, alias='parentPhase'
+    office_email: str | None = Field(default=None, alias='officeEmail')
+    office_phone: str | None = Field(default=None, alias='officePhone')
+    office_extension: str | None = Field(default=None, alias='officeExtension')
+    mobile_email: str | None = Field(default=None, alias='mobileEmail')
+    mobile_phone: str | None = Field(default=None, alias='mobilePhone')
+    mobile_extension: str | None = Field(default=None, alias='mobileExtension')
+    home_email: str | None = Field(default=None, alias='homeEmail')
+    home_phone: str | None = Field(default=None, alias='homePhone')
+    home_extension: str | None = Field(default=None, alias='homeExtension')
+    default_email: Literal['Office', 'Mobile', 'Home'] | None = Field(
+        default=None, alias='defaultEmail'
     )
-    wbs_code: str | None = Field(default=None, alias='wbsCode')
-    bill_time: BillTime8 | None = Field(default=None, alias='billTime')
-    bill_expenses: BillExpenses5 | None = Field(default=None, alias='billExpenses')
-    bill_products: BillProducts4 | None = Field(default=None, alias='billProducts')
-    mark_as_milestone_flag: bool | None = Field(
-        default=None, alias='markAsMilestoneFlag'
+    default_phone: Literal['Office', 'Mobile', 'Home'] | None = Field(
+        default=None, alias='defaultPhone'
     )
-    notes: str | None = None
-    deadline_date: str | None = Field(default=None, alias='deadlineDate')
-    bill_separately_flag: bool | None = Field(default=None, alias='billSeparatelyFlag')
-    billing_method: BillingMethod2 | None = Field(default=None, alias='billingMethod')
-    """
-    billingMethod is required if the phase billSeparatelyFlag is true.
-    """
-    scheduled_hours: float | None = Field(default=None, alias='scheduledHours')
-    scheduled_start: str | None = Field(default=None, alias='scheduledStart')
-    scheduled_end: str | None = Field(default=None, alias='scheduledEnd')
-    actual_hours: float | None = Field(default=None, alias='actualHours')
-    actual_start: str | None = Field(default=None, alias='actualStart')
-    actual_end: str | None = Field(default=None, alias='actualEnd')
-    budget_hours: float | None = Field(default=None, alias='budgetHours')
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    security_role: SecurityRoleReference | None = Field(
+        default=None, alias='securityRole'
+    )
+    admin_flag: bool | None = Field(default=None, alias='adminFlag')
+    structure_level: StructureReference | None = Field(
+        default=None, alias='structureLevel'
+    )
+    security_location: SystemLocationReference | None = Field(
+        default=None, alias='securityLocation'
+    )
+    default_location: SystemLocationReference | None = Field(
+        default=None, alias='defaultLocation'
+    )
+    default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='defaultDepartment'
+    )
+    reports_to: MemberReference | None = Field(default=None, alias='reportsTo')
+    restrict_location_flag: bool | None = Field(
+        default=None, alias='restrictLocationFlag'
+    )
+    restrict_department_flag: bool | None = Field(
+        default=None, alias='restrictDepartmentFlag'
+    )
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
+    expense_approver: MemberReference | None = Field(
+        default=None, alias='expenseApprover'
+    )
+    billable_forecast: float | None = Field(default=None, alias='billableForecast')
+    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
+    hourly_cost: float | None = Field(default=None, alias='hourlyCost')
     hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    billing_start_date: str | None = Field(default=None, alias='billingStartDate')
-    bill_phase_closed_flag: bool | None = Field(
-        default=None, alias='billPhaseClosedFlag'
+    include_in_utilization_reporting_flag: bool | None = Field(
+        default=None, alias='includeInUtilizationReportingFlag'
     )
-    """
-    This phase can only be billed after it has been closed.
-    """
-    bill_project_closed_flag: bool | None = Field(
-        default=None, alias='billProjectClosedFlag'
+    require_expense_entry_flag: bool | None = Field(
+        default=None, alias='requireExpenseEntryFlag'
     )
-    """
-    This phase can only be billed after the project has been closed.
-    """
-    downpayment: float | None = None
-    po_number: str | None = Field(default=None, alias='poNumber')
-    po_amount: float | None = Field(default=None, alias='poAmount')
-    estimated_time_cost: float | None = Field(default=None, alias='estimatedTimeCost')
-    estimated_expense_cost: float | None = Field(
-        default=None, alias='estimatedExpenseCost'
+    require_time_sheet_entry_flag: bool | None = Field(
+        default=None, alias='requireTimeSheetEntryFlag'
     )
-    estimated_product_cost: float | None = Field(
-        default=None, alias='estimatedProductCost'
+    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
+        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
     )
-    estimated_time_revenue: float | None = Field(
-        default=None, alias='estimatedTimeRevenue'
+    allow_in_cell_entry_on_time_sheet: bool | None = Field(
+        default=None, alias='allowInCellEntryOnTimeSheet'
     )
-    estimated_expense_revenue: float | None = Field(
-        default=None, alias='estimatedExpenseRevenue'
+    enter_time_against_company_flag: bool | None = Field(
+        default=None, alias='enterTimeAgainstCompanyFlag'
     )
-    estimated_product_revenue: float | None = Field(
-        default=None, alias='estimatedProductRevenue'
+    allow_expenses_entered_against_companies_flag: bool | None = Field(
+        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
     )
-    currency: CurrencyReference | None = None
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
+    time_reminder_email_flag: bool | None = Field(
+        default=None, alias='timeReminderEmailFlag'
     )
-    bill_to_contact: ContactReference | None = Field(
-        default=None, alias='billToContact'
+    days_tolerance: int | None = Field(default=None, alias='daysTolerance')
+    minimum_hours: float | None = Field(default=None, alias='minimumHours')
+    time_sheet_start_date: str | None = Field(default=None, alias='timeSheetStartDate')
+    hire_date: str | None = Field(default=None, alias='hireDate')
+    service_default_location: SystemLocationReference | None = Field(
+        default=None, alias='serviceDefaultLocation'
     )
-    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
+    service_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='serviceDefaultDepartment'
     )
-    ship_to_contact: ContactReference | None = Field(
-        default=None, alias='shipToContact'
+    service_default_board: BoardReference | None = Field(
+        default=None, alias='serviceDefaultBoard'
     )
-    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    tickets: list[ProjectTicket] | None = None
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    restrict_service_default_location_flag: bool | None = Field(
+        default=None, alias='restrictServiceDefaultLocationFlag'
     )
-
-
-class Projects(Enum):
-    DISCARD = 'Discard'
-    MERGE = 'Merge'
-
-
-class PropertyType(Enum):
-    CITY = 'City'
-    DEPARTMENT_CONTACT_SYNC = 'DepartmentContactSync'
-    EMAIL = 'Email'
-    DISTRIBUTION_GROUP = 'DistributionGroup'
-    JOB_TITLE = 'JobTitle'
-    ASSIGNED_LICENSES = 'AssignedLicenses'
-    DISPLAY_NAME = 'DisplayName'
-    OFFICE_LOCATION = 'OfficeLocation'
-    REPORT_MANAGER = 'ReportManager'
-    STATE = 'State'
-    EMPLOYEE_TYPE = 'EmployeeType'
-    USER_TYPE = 'UserType'
-
-
-class PtoAvailableType(Enum):
-    ANNIVERSARY_YEAR = 'AnniversaryYear'
-    CALENDAR_YEAR = 'CalendarYear'
-
-
-class PurchaseOrder(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_service_default_department_flag: bool | None = Field(
+        default=None, alias='restrictServiceDefaultDepartmentFlag'
     )
-    id: int | None = None
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    cancel_reason: str | None = Field(default=None, alias='cancelReason')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    """
-    The closed flag can only be updated via updating the purchase order status to a closed/open status.
-    """
-    closed_by: str | None = Field(default=None, alias='closedBy')
-    customer_city: str | None = Field(default=None, alias='customerCity')
-    customer_company: CompanyReference | None = Field(
-        default=None, alias='customerCompany'
+    excluded_service_board_ids: list[int] | None = Field(
+        default=None, alias='excludedServiceBoardIds'
     )
-    customer_contact: ContactReference | None = Field(
-        default=None, alias='customerContact'
+    project_default_location: SystemLocationReference | None = Field(
+        default=None, alias='projectDefaultLocation'
     )
-    customer_country: CountryReference | None = Field(
-        default=None, alias='customerCountry'
+    project_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='projectDefaultDepartment'
     )
-    customer_extension: str | None = Field(default=None, alias='customerExtension')
-    customer_name: str | None = Field(default=None, alias='customerName')
-    customer_phone: str | None = Field(default=None, alias='customerPhone')
-    customer_site: SiteReference | None = Field(default=None, alias='customerSite')
-    customer_site_name: str | None = Field(default=None, alias='customerSiteName')
-    customer_state: str | None = Field(default=None, alias='customerState')
-    customer_street_line1: str | None = Field(default=None, alias='customerStreetLine1')
-    customer_street_line2: str | None = Field(default=None, alias='customerStreetLine2')
-    customer_zip: str | None = Field(default=None, alias='customerZip')
-    date_closed: datetime | None = Field(default=None, alias='dateClosed')
-    drop_ship_customer_flag: bool | None = Field(
-        default=None, alias='dropShipCustomerFlag'
+    project_default_board: ProjectBoardReference | None = Field(
+        default=None, alias='projectDefaultBoard'
     )
-    entered_by: str | None = Field(default=None, alias='enteredBy')
-    freight_cost: float | None = Field(default=None, alias='freightCost')
-    freight_packing_slip: str | None = Field(default=None, alias='freightPackingSlip')
-    freight_tax_total: float | None = Field(default=None, alias='freightTaxTotal')
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    location_id: int | None = Field(default=None, alias='locationId')
-    po_date: datetime | None = Field(default=None, alias='poDate')
-    """
-     Required On Updates;
-    """
-    po_number: str | None = Field(default=None, alias='poNumber')
-    """
-     Required On Updates; Max length: 50;
-    """
-    sales_tax: float | None = Field(default=None, alias='salesTax')
-    shipment_date: datetime | None = Field(default=None, alias='shipmentDate')
-    shipment_method: ShipmentMethodReference | None = Field(
-        default=None, alias='shipmentMethod'
+    restrict_project_default_location_flag: bool | None = Field(
+        default=None, alias='restrictProjectDefaultLocationFlag'
     )
-    shipping_instructions: str | None = Field(
-        default=None, alias='shippingInstructions'
+    restrict_project_default_department_flag: bool | None = Field(
+        default=None, alias='restrictProjectDefaultDepartmentFlag'
     )
-    status: PurchaseOrderStatusReference | None = None
-    sub_total: float | None = Field(default=None, alias='subTotal')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    tax_freight_flag: bool | None = Field(default=None, alias='taxFreightFlag')
-    tax_po_flag: bool | None = Field(default=None, alias='taxPoFlag')
-    terms: BillingTermsReference | None = None
-    total: float | None = None
-    tracking_number: str | None = Field(default=None, alias='trackingNumber')
-    """
-     Max length: 50;
-    """
-    update_shipment_info: bool | None = Field(default=None, alias='updateShipmentInfo')
-    """
-    Determines whether or not to update all of the shipment info for each associated line item when new shipment info is passed in.
-    """
-    update_vendor_order_number: bool | None = Field(
-        default=None, alias='updateVendorOrderNumber'
+    excluded_project_board_ids: list[int] | None = Field(
+        default=None, alias='excludedProjectBoardIds'
     )
-    """
-    Determines whether or not to update vendor order number for each associated line item when new vendor order number is passed in.
-    """
-    vendor_company: CompanyReference | None = Field(default=None, alias='vendorCompany')
-    vendor_contact: ContactReference | None = Field(default=None, alias='vendorContact')
-    vendor_invoice_date: datetime | None = Field(
-        default=None, alias='vendorInvoiceDate'
+    schedule_default_location: SystemLocationReference | None = Field(
+        default=None, alias='scheduleDefaultLocation'
     )
-    vendor_invoice_number: str | None = Field(default=None, alias='vendorInvoiceNumber')
-    """
-     Max length: 50;
-    """
-    vendor_order_number: str | None = Field(default=None, alias='vendorOrderNumber')
-    """
-     Max length: 50;
-    """
-    vendor_site: SiteReference | None = Field(default=None, alias='vendorSite')
-    warehouse: WarehouseReference | None = None
-    warehouse_contact: ContactReference | None = Field(
-        default=None, alias='warehouseContact'
+    schedule_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='scheduleDefaultDepartment'
     )
-    currency: CurrencyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
+    service_location: ServiceLocationReference | None = Field(
+        default=None, alias='serviceLocation'
     )
-
-
-class PurchaseOrderLineItem(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_schedule_flag: bool | None = Field(
+        default=None, alias='restrictScheduleFlag'
     )
-    id: int | None = None
-    backordered_flag: bool | None = Field(default=None, alias='backorderedFlag')
-    canceled_by: str | None = Field(default=None, alias='canceledBy')
-    canceled_flag: bool | None = Field(default=None, alias='canceledFlag')
-    canceled_reason: str | None = Field(default=None, alias='canceledReason')
-    """
-     Max length: 100;
-    """
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    date_canceled: datetime | None = Field(default=None, alias='dateCanceled')
-    date_canceled_utc: datetime | None = Field(default=None, alias='dateCanceledUtc')
-    description: str
-    """
-     Max length: 6000;
-    """
-    display_internal_notes_flag: bool | None = Field(
-        default=None, alias='displayInternalNotesFlag'
+    hide_member_in_dispatch_portal_flag: bool | None = Field(
+        default=None, alias='hideMemberInDispatchPortalFlag'
     )
-    expected_ship_date: datetime | None = Field(default=None, alias='expectedShipDate')
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    """
-     Max length: 1000;
-    """
-    line_number: int = Field(..., alias='lineNumber')
-    packing_slip: str | None = Field(default=None, alias='packingSlip')
-    """
-     Max length: 50;
-    """
-    product: IvItemReference | None = None
-    purchase_order_id: int | None = Field(default=None, alias='purchaseOrderId')
-    quantity: float
-    received_quantity: int | None = Field(default=None, alias='receivedQuantity')
-    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
-    ship_date: datetime | None = Field(default=None, alias='shipDate')
-    shipment_method: ShipmentMethodReference | None = Field(
-        default=None, alias='shipmentMethod'
+    calendar: CalendarReference | None = None
+    sales_default_location: SystemLocationReference | None = Field(
+        default=None, alias='salesDefaultLocation'
     )
-    tax: float | None = None
-    tracking_number: str | None = Field(default=None, alias='trackingNumber')
-    """
-     Max length: 50;
-    """
-    unit_cost: float | None = Field(default=None, alias='unitCost')
-    unit_of_measure: UnitOfMeasureReference | None = Field(
-        default=None, alias='unitOfMeasure'
+    restrict_default_sales_territory_flag: bool | None = Field(
+        default=None, alias='restrictDefaultSalesTerritoryFlag'
     )
-    vendor_order_number: str | None = Field(default=None, alias='vendorOrderNumber')
-    """
-     Max length: 50;
-    """
-    vendor_sku: str | None = Field(default=None, alias='vendorSku')
-    """
-     Max length: 50;
-    """
     warehouse: WarehouseReference | None = None
     warehouse_bin: WarehouseBinReference | None = Field(
         default=None, alias='warehouseBin'
     )
-    ship_set: str | None = Field(default=None, alias='shipSet')
-    """
-     Max length: 10;
-    """
-    date_received: datetime | None = Field(default=None, alias='dateReceived')
-    received_status: ReceivedStatus | None = Field(default=None, alias='receivedStatus')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
-
-
-class PurchaseOrderLineItemReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PurchaseOrderReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_default_warehouse_flag: bool | None = Field(
+        default=None, alias='restrictDefaultWarehouseFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PurchaseOrderStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_default_warehouse_bin_flag: bool | None = Field(
+        default=None, alias='restrictDefaultWarehouseBinFlag'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    default_closed_flag: bool | None = Field(default=None, alias='defaultClosedFlag')
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    email_template: PurchaseOrderStatusEmailTemplateReference | None = Field(
-        default=None, alias='emailTemplate'
+    mapi_name: str | None = Field(default=None, alias='mapiName')
+    calendar_sync_integration_flag: bool | None = Field(
+        default=None, alias='calendarSyncIntegrationFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PurchaseOrderStatusEmailTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    enable_ldap_authentication_flag: bool | None = Field(
+        default=None, alias='enableLdapAuthenticationFlag'
     )
-    id: int | None = None
-    status: PurchaseOrderStatusReference | None = None
-    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
-    first_name: str | None = Field(default=None, alias='firstName')
-    """
-     Max length: 100;
-    """
-    last_name: str | None = Field(default=None, alias='lastName')
-    """
-     Max length: 100;
-    """
-    email_address: str | None = Field(default=None, alias='emailAddress')
-    """
-     Max length: 100;
-    """
-    subject: str
-    """
-     Max length: 200;
-    """
-    body: str | None = None
-    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PurchaseOrderStatusEmailTemplateReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ldap_configuration: LdapConfigurationReference | None = Field(
+        default=None, alias='ldapConfiguration'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PurchaseOrderStatusNotification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ldap_user_name: str | None = Field(default=None, alias='ldapUserName')
+    company_activity_tab_format: Literal['SummaryList', 'DetailList'] | None = Field(
+        default=None, alias='companyActivityTabFormat'
     )
-    id: int | None = None
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
+    invoice_time_tab_format: Literal['SummaryList', 'DetailList'] | None = Field(
+        default=None, alias='invoiceTimeTabFormat'
     )
-    status: PurchaseOrderStatusReference | None = None
-    member: MemberReference | None = None
-    email: str | None = None
-    """
-    Purchase Order Status Notification email must be entered if the notify type is "Email Address". Max length: 50;
-    """
-    workflow_step: int | None = Field(default=None, alias='workflowStep')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PurchaseOrderStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    invoice_screen_default_tab_format: Literal[
+        'ShowInvoicingTab', 'ShowAgreementInvoicingTab'
+    ] | None = Field(default=None, alias='invoiceScreenDefaultTabFormat')
+    invoicing_display_options: Literal[
+        'RemainOnInvoicingScreen', 'ShowRecentInvoices'
+    ] | None = Field(default=None, alias='invoicingDisplayOptions')
+    agreement_invoicing_display_options: Literal[
+        'RemainOnInvoicingScreen', 'ShowRecentInvoices'
+    ] | None = Field(default=None, alias='agreementInvoicingDisplayOptions')
+    corelytics_username: str | None = Field(default=None, alias='corelyticsUsername')
+    corelytics_password: str | None = Field(default=None, alias='corelyticsPassword')
+    authentication_service_type: Literal[
+        'AuthAnvil', 'GoogleAuthenticator', 'Email'
+    ] | None = Field(default=None, alias='authenticationServiceType')
+    timebased_one_time_password_activated: bool | None = Field(
+        default=None, alias='timebasedOneTimePasswordActivated'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class PurchasingDemand(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    directional_sync: DirectionalSyncReference | None = Field(
+        default=None, alias='directionalSync'
     )
-    warehouse: WarehouseReference | None = None
-    vendor: CompanyReference | None = None
-    products: list[ProductDemand] | None = None
-    purchase_order: PurchaseOrder | None = Field(default=None, alias='purchaseOrder')
+    sso_session_flag: bool | None = Field(default=None, alias='ssoSessionFlag')
+    sso_client_id: str | None = Field(default=None, alias='ssoClientId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class QuoteLink(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class MyMemberInfo(ConnectWiseModel):
     id: int | None = None
-    location: SystemLocationReference | None = None
-    link: str
+    identifier: str | None = None
+    first_name: str | None = Field(default=None, alias='firstName')
+    middle_initial: str | None = Field(default=None, alias='middleInitial')
+    last_name: str | None = Field(default=None, alias='lastName')
+    full_name: str | None = Field(default=None, alias='fullName')
+    default_email: str | None = Field(default=None, alias='defaultEmail')
+    photo: DocumentReference | None = None
+    license_class: Literal['A', 'C', 'F', 'X'] | None = Field(
+        default=None, alias='licenseClass'
+    )
     """
-     Max length: 2000;
+    F = Full Member, A = API Member, C = StreamlineIT Member, X = Subcontractor Member
     """
-    all_locations_flag: bool | None = Field(default=None, alias='allLocationsFlag')
-    new_window_flag: bool | None = Field(default=None, alias='newWindowFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RateType(Enum):
-    ADJ_AMOUNT = 'AdjAmount'
-    CUSTOM = 'Custom'
-    MULTIPLIER = 'Multiplier'
-
-
-class RateType4(Enum):
-    AMOUNT = 'Amount'
-    PERCENT = 'Percent'
-
-
-class RateType5(Enum):
-    ADJ_AMOUNT = 'AdjAmount'
-    CUSTOM = 'Custom'
-    MULTIPLIER = 'Multiplier'
-
-
-class ReceivedStatus(Enum):
-    WAITING = 'Waiting'
-    FULLY_RECEIVED = 'FullyReceived'
-    PARTIALLY_RECEIVE_CANCEL_REST = 'PartiallyReceiveCancelRest'
-    PARTIALLY_RECEIVE_CLONE_REST = 'PartiallyReceiveCloneRest'
-
-
-class RecordType(Enum):
-    PROJECT_ISSUE = 'ProjectIssue'
-    PROJECT_TICKET = 'ProjectTicket'
-    SERVICE_TICKET = 'ServiceTicket'
-
-
-class RecurringCycleType(Enum):
-    CONTRACT_YEAR = 'ContractYear'
-    CALENDAR_YEAR = 'CalendarYear'
-
-
-class RelationshipReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    time_zone: TimeZoneSetupReference | None = Field(default=None, alias='timeZone')
+    use_browser_language_flag: bool | None = Field(
+        default=None, alias='useBrowserLanguageFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ReminderReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    default_location: SystemLocationReference | None = Field(
+        default=None, alias='defaultLocation'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Report(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='defaultDepartment'
     )
-    name: str | None = None
-
-
-class ReportCard(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    daily_capacity: float | None = Field(default=None, alias='dailyCapacity')
+    require_expense_entry_flag: bool | None = Field(
+        default=None, alias='requireExpenseEntryFlag'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ReportCardDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    require_time_sheet_entry_flag: bool | None = Field(
+        default=None, alias='requireTimeSheetEntryFlag'
     )
-    id: int | None = None
-    kpi: KPIReference | None = None
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ReportCardInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    require_start_and_end_time_on_time_entry_flag: bool | None = Field(
+        default=None, alias='requireStartAndEndTimeOnTimeEntryFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ReportCardReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    enter_time_against_company_flag: bool | None = Field(
+        default=None, alias='enterTimeAgainstCompanyFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ReportColumnDefinition(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    allow_expenses_entered_against_companies_flag: bool | None = Field(
+        default=None, alias='allowExpensesEnteredAgainstCompaniesFlag'
     )
-    type: str | None = None
-    is_nullable: bool | None = Field(default=None, alias='isNullable')
-    identity_column: bool | None = Field(default=None, alias='identityColumn')
-
-
-class ReportDataResponse(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_default_board: BoardReference | None = Field(
+        default=None, alias='serviceDefaultBoard'
     )
-    column_definitions: list[dict[str, ReportColumnDefinition]] | None = None
-    row_values: list[list[dict[str, Any]]] | None = None
-
-
-class ReportingService(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_default_location: SystemLocationReference | None = Field(
+        default=None, alias='serviceDefaultLocation'
     )
-    id: int | None = None
-    reporting_user_name: str | None = Field(default=None, alias='reportingUserName')
-    """
-     Max length: 50;
-    """
-    reporting_password: str | None = Field(default=None, alias='reportingPassword')
-    """
-    To blank out the password, enter an empty string here. Max length: 50;
-    """
-    reporting_domain: str | None = Field(default=None, alias='reportingDomain')
-    """
-     Max length: 50;
-    """
-    reporting_url: str | None = Field(default=None, alias='reportingUrl')
-    """
-     Max length: 100;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RequestPasswordRequest(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='serviceDefaultDepartment'
     )
-    email: str
-
-
-class ResolutionSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
-
-
-class ResolutionSort(Enum):
-    ASCENDING = 'Ascending'
-    DESCENDING = 'Descending'
-
-
-class ResourcesSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
-
-
-class ResultInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_service_default_location_flag: bool | None = Field(
+        default=None, alias='restrictServiceDefaultLocationFlag'
     )
-    success: bool | None = None
-    original_index: int | None = Field(default=None, alias='originalIndex')
-    status_code: int | None = Field(default=None, alias='statusCode')
-    data: IRestIdentifiedItem | None = None
-    error: ErrorResponseMessage | None = None
-
-
-class Revenue(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class RevenueYear(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class RmaAction(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_service_default_department_flag: bool | None = Field(
+        default=None, alias='restrictServiceDefaultDepartmentFlag'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaActionInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    excluded_service_board_ids: list[int] | None = Field(
+        default=None, alias='excludedServiceBoardIds'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaActionReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_default_location: SystemLocationReference | None = Field(
+        default=None, alias='projectDefaultLocation'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaDisposition(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='projectDefaultDepartment'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaDispositionInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_default_board: ProjectBoardReference | None = Field(
+        default=None, alias='projectDefaultBoard'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaDispositionReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_project_default_location_flag: bool | None = Field(
+        default=None, alias='restrictProjectDefaultLocationFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_project_default_department_flag: bool | None = Field(
+        default=None, alias='restrictProjectDefaultDepartmentFlag'
+    )
+    excluded_project_board_ids: list[int] | None = Field(
+        default=None, alias='excludedProjectBoardIds'
+    )
+    schedule_default_location: SystemLocationReference | None = Field(
+        default=None, alias='scheduleDefaultLocation'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    email_template: RmaStatusEmailTemplateReference | None = Field(
-        default=None, alias='emailTemplate'
+    schedule_default_department: SystemDepartmentReference | None = Field(
+        default=None, alias='scheduleDefaultDepartment'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaStatusEmailTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    schedule_capacity: float | None = Field(default=None, alias='scheduleCapacity')
+    service_location: ServiceLocationReference | None = Field(
+        default=None, alias='serviceLocation'
     )
-    id: int | None = None
-    status: RmaStatusReference | None = None
-    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
-    first_name: str | None = Field(default=None, alias='firstName')
-    """
-     Max length: 100;
-    """
-    last_name: str | None = Field(default=None, alias='lastName')
-    """
-     Max length: 100;
-    """
-    email_address: str | None = Field(default=None, alias='emailAddress')
-    """
-     Max length: 100;
-    """
-    subject: str
-    """
-     Max length: 200;
-    """
-    body: str
-    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaStatusEmailTemplateReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    sales_default_location: SystemLocationReference | None = Field(
+        default=None, alias='salesDefaultLocation'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaStatusInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
     )
-    id: int | None = None
-    name: str | None = None
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class RmaStatusNotification(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    restrict_default_warehouse_flag: bool | None = Field(
+        default=None, alias='restrictDefaultWarehouseFlag'
     )
-    id: int | None = None
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
+    restrict_default_warehouse_bin_flag: bool | None = Field(
+        default=None, alias='restrictDefaultWarehouseBinFlag'
     )
-    status: RmaStatusReference | None = None
-    member: MemberReference | None = None
-    email: str | None = None
-    """
-    RMA Status Notification sendEmail must be entered if the notify type is "Email Address". Max length: 50;
-    """
-    workflow_step: int | None = Field(default=None, alias='workflowStep')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    sso_session_flag: bool | None = Field(default=None, alias='ssoSessionFlag')
+    sso_client_id: str | None = Field(default=None, alias='ssoClientId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class RmaStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class OnHandSerialNumber(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    serial: str | None = None
+    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class RmaTag(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Opportunity(ConnectWiseModel):
     id: int | None = None
-    service_ticket: TicketReference | None = Field(default=None, alias='serviceTicket')
-    sales_order: SalesOrderReference | None = Field(default=None, alias='salesOrder')
-    invoice: InvoiceReference | None = None
-    project: ProjectReference | None = None
-    summary: str | None = None
-    """
-     Max length: 150;
-    """
-    product: IvItemReference | None = None
-    iv_description: str | None = Field(default=None, alias='ivDescription')
-    product_description: str = Field(..., alias='productDescription')
-    """
-     Max length: 200;
-    """
-    serial_number: str | None = Field(default=None, alias='serialNumber')
-    mfg_item_id: str | None = Field(default=None, alias='mfgItemID')
+    name: str
     """
      Max length: 100;
     """
-    status: RmaStatusReference | None = None
-    list_price: float | None = Field(default=None, alias='listPrice')
-    unit_price: float | None = Field(default=None, alias='unitPrice')
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    problem_description: str | None = Field(default=None, alias='problemDescription')
-    """
-     Max length: 1000;
-    """
-    returned_company: CompanyReference | None = Field(
-        default=None, alias='returnedCompany'
-    )
-    returned_contact: ContactReference | None = Field(
-        default=None, alias='returnedContact'
-    )
-    returned_contact_type: str | None = Field(default=None, alias='returnedContactType')
-    returned_contact_phone: str | None = Field(
-        default=None, alias='returnedContactPhone'
-    )
-    returned_contact_extension: str | None = Field(
-        default=None, alias='returnedContactExtension'
-    )
-    returned_contact_email: str | None = Field(
-        default=None, alias='returnedContactEmail'
-    )
-    returned_contact_address_line1: str | None = Field(
-        default=None, alias='returnedContactAddressLine1'
+    expected_close_date: datetime | None = Field(
+        default=None, alias='expectedCloseDate'
     )
     """
-     Max length: 50;
+     Required On Updates;
     """
-    returned_contact_address_line2: str | None = Field(
-        default=None, alias='returnedContactAddressLine2'
-    )
+    type: OpportunityTypeReference | None = None
+    stage: OpportunityStageReference | None = None
+    status: OpportunityStatusReference | None = None
+    priority: OpportunityPriorityReference | None = None
+    notes: str | None = None
+    probability: OpportunityProbabilityReference | None = None
+    source: str | None = None
     """
      Max length: 50;
     """
-    returned_contact_city: str | None = Field(default=None, alias='returnedContactCity')
+    rating: OpportunityRatingReference | None = None
+    campaign: CampaignReference | None = None
+    primary_sales_rep: MemberReference | None = Field(
+        default=None, alias='primarySalesRep'
+    )
+    secondary_sales_rep: MemberReference | None = Field(
+        default=None, alias='secondarySalesRep'
+    )
+    location_id: int | None = Field(default=None, alias='locationId')
     """
-     Max length: 50;
+     Required On Updates;
     """
-    returned_contact_state: str | None = Field(
-        default=None, alias='returnedContactState'
-    )
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
     """
-     Max length: 50;
+     Required On Updates;
     """
-    returned_contact_zip: str | None = Field(default=None, alias='returnedContactZip')
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    site: SiteReference | None = None
+    customer_po: str | None = Field(default=None, alias='customerPO')
     """
-     Max length: 12;
+     Max length: 25;
     """
-    returned_contact_country: CountryReference | None = Field(
-        default=None, alias='returnedContactCountry'
-    )
-    rma_disposition: RmaDispositionReference | None = Field(
-        default=None, alias='rmaDisposition'
-    )
-    returned_site: SiteReference | None = Field(default=None, alias='returnedSite')
-    purchased_company: CompanyReference | None = Field(
-        default=None, alias='purchasedCompany'
-    )
-    purchased_contact: ContactReference | None = Field(
-        default=None, alias='purchasedContact'
-    )
-    purchased_contact_type: str | None = Field(
-        default=None, alias='purchasedContactType'
+    pipeline_change_date: datetime | None = Field(
+        default=None, alias='pipelineChangeDate'
     )
-    purchased_contact_phone: str | None = Field(
-        default=None, alias='purchasedContactPhone'
+    date_became_lead: datetime | None = Field(default=None, alias='dateBecameLead')
+    closed_date: datetime | None = Field(default=None, alias='closedDate')
+    closed_by: MemberReference | None = Field(default=None, alias='closedBy')
+    total_sales_tax: float | None = Field(default=None, alias='totalSalesTax')
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
     )
-    purchased_contact_extension: str | None = Field(
-        default=None, alias='purchasedContactExtension'
+    ship_to_contact: ContactReference | None = Field(
+        default=None, alias='shipToContact'
     )
-    purchased_contact_email: str | None = Field(
-        default=None, alias='purchasedContactEmail'
+    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    purchased_contact_address_line1: str | None = Field(
-        default=None, alias='purchasedContactAddressLine1'
+    bill_to_contact: ContactReference | None = Field(
+        default=None, alias='billToContact'
     )
-    """
-     Max length: 50;
-    """
-    purchased_contact_address_line2: str | None = Field(
-        default=None, alias='purchasedContactAddressLine2'
+    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    """
-     Max length: 50;
-    """
-    purchased_contact_city: str | None = Field(
-        default=None, alias='purchasedContactCity'
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    currency: CurrencyReference | None = None
+    company_location_id: int | None = Field(default=None, alias='companyLocationId')
+    technical_contact: ContactReference | None = Field(
+        default=None, alias='technicalContact'
     )
-    """
-     Max length: 50;
-    """
-    purchased_contact_state: str | None = Field(
-        default=None, alias='purchasedContactState'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    """
-     Max length: 50;
-    """
-    purchased_contact_zip: str | None = Field(default=None, alias='purchasedContactZip')
-    """
-     Max length: 12;
-    """
-    purchased_contact_country: CountryReference | None = Field(
-        default=None, alias='purchasedContactCountry'
+
+
+class OpportunityContact(ConnectWiseModel):
+    id: int | None = None
+    contact: ContactReference | None = None
+    company: CompanyReference | None = None
+    role: OpportunitySalesRoleReference | None = None
+    notes: str | None = None
+    referral_flag: bool | None = Field(default=None, alias='referralFlag')
+    opportunity_id: int | None = Field(default=None, alias='opportunityId')
+    phone_number: str | None = Field(default=None, alias='phoneNumber')
+    email_address: str | None = Field(default=None, alias='emailAddress')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class OpportunityToProjectConversion(ConnectWiseModel):
+    project_id: int | None = Field(default=None, alias='projectId')
+    name: str | None = None
+    status: ProjectStatusReference | None = None
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    board: ProjectBoardReference | None = None
+    manager: MemberReference | None = None
+    estimated_start: str | None = Field(default=None, alias='estimatedStart')
+    estimated_end: str | None = Field(default=None, alias='estimatedEnd')
+    include_all_notes_flag: bool | None = Field(
+        default=None, alias='includeAllNotesFlag'
     )
-    purchased_invoice_number: str | None = Field(
-        default=None, alias='purchasedInvoiceNumber'
+    include_all_documents_flag: bool | None = Field(
+        default=None, alias='includeAllDocumentsFlag'
     )
-    """
-     Max length: 50;
-    """
-    purchased_invoice_date: date | None = Field(
-        default=None, alias='purchasedInvoiceDate'
+    include_all_products_flag: bool | None = Field(
+        default=None, alias='includeAllProductsFlag'
     )
-    purchased_order_number: str | None = Field(
-        default=None, alias='purchasedOrderNumber'
+    include_note_ids: list[int] | None = Field(default=None, alias='includeNoteIds')
+    include_document_ids: list[int] | None = Field(
+        default=None, alias='includeDocumentIds'
     )
-    """
-     Max length: 50;
-    """
-    purchased_vendor_action: RmaActionReference | None = Field(
-        default=None, alias='purchasedVendorAction'
+    include_product_ids: list[int] | None = Field(
+        default=None, alias='includeProductIds'
     )
-    purchased_vendor_rma_number: str | None = Field(
-        default=None, alias='purchasedVendorRmaNumber'
+
+
+class Order(ConnectWiseModel):
+    id: int | None = None
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    phone: str | None = None
+    phone_ext: str | None = Field(default=None, alias='phoneExt')
+    email: str | None = None
+    site: SiteReference | None = None
+    status: OrderStatusReference | None = None
+    opportunity: OpportunityReference | None = None
+    order_date: datetime | None = Field(default=None, alias='orderDate')
+    due_date: datetime | None = Field(default=None, alias='dueDate')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    po_number: str | None = Field(default=None, alias='poNumber')
     """
      Max length: 50;
     """
-    purchased_site: SiteReference | None = Field(default=None, alias='purchasedSite')
-    purchased_notes: str | None = Field(default=None, alias='purchasedNotes')
-    """
-     Max length: 1000;
-    """
-    warranty_company: CompanyReference | None = Field(
-        default=None, alias='warrantyCompany'
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    sales_rep: MemberReference | None = Field(default=None, alias='salesRep')
+    notes: str | None = None
+    bill_closed_flag: bool | None = Field(default=None, alias='billClosedFlag')
+    bill_shipped_flag: bool | None = Field(default=None, alias='billShippedFlag')
+    restrict_downpayment_flag: bool | None = Field(
+        default=None, alias='restrictDownpaymentFlag'
     )
-    warranty_contact: ContactReference | None = Field(
-        default=None, alias='warrantyContact'
+    description: str | None = None
+    top_comment_flag: bool | None = Field(default=None, alias='topCommentFlag')
+    bottom_comment_flag: bool | None = Field(default=None, alias='bottomCommentFlag')
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
     )
-    warranty_contact_type: str | None = Field(default=None, alias='warrantyContactType')
-    warranty_contact_phone: str | None = Field(
-        default=None, alias='warrantyContactPhone'
+    ship_to_contact: ContactReference | None = Field(
+        default=None, alias='shipToContact'
     )
-    warranty_contact_email: str | None = Field(
-        default=None, alias='warrantyContactEmail'
+    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    warranty_contact_extension: str | None = Field(
-        default=None, alias='warrantyContactExtension'
+    bill_to_contact: ContactReference | None = Field(
+        default=None, alias='billToContact'
     )
-    warranty_contact_address_line1: str | None = Field(
-        default=None, alias='warrantyContactAddressLine1'
+    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
+    product_ids: list[int] | None = Field(default=None, alias='productIds')
+    document_ids: list[int] | None = Field(default=None, alias='documentIds')
+    invoice_ids: list[int] | None = Field(default=None, alias='invoiceIds')
+    config_ids: list[int] | None = Field(default=None, alias='configIds')
+    total: float | None = None
+    tax_total: float | None = Field(default=None, alias='taxTotal')
+    currency: CurrencyReference | None = None
+    company_location: SystemLocationReference | None = Field(
+        default=None, alias='companyLocation'
     )
-    """
-     Max length: 50;
-    """
-    warranty_contact_address_line2: str | None = Field(
-        default=None, alias='warrantyContactAddressLine2'
+    sub_total: float | None = Field(default=None, alias='subTotal')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
+
+
+class OrderStatus(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
      Max length: 50;
     """
-    warranty_contact_city: str | None = Field(default=None, alias='warrantyContactCity')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    email_template: OrderStatusEmailTemplateReference | None = Field(
+        default=None, alias='emailTemplate'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class OrderStatusEmailTemplate(ConnectWiseModel):
+    id: int | None = None
+    status: OrderStatusReference | None = None
+    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
+    first_name: str | None = Field(default=None, alias='firstName')
     """
-     Max length: 50;
+     Max length: 100;
     """
-    warranty_contact_state: str | None = Field(
-        default=None, alias='warrantyContactState'
-    )
+    last_name: str | None = Field(default=None, alias='lastName')
     """
-     Max length: 50;
+     Max length: 100;
     """
-    warranty_contact_zip: str | None = Field(default=None, alias='warrantyContactZip')
+    email_address: str | None = Field(default=None, alias='emailAddress')
     """
-     Max length: 12;
+     Max length: 100;
     """
-    warranty_contact_country: CountryReference | None = Field(
-        default=None, alias='warrantyContactCountry'
-    )
-    warranty_site: SiteReference | None = Field(default=None, alias='warrantySite')
-    warranty_notes: str | None = Field(default=None, alias='warrantyNotes')
+    subject: str
     """
-     Max length: 1000;
+     Max length: 200;
     """
-    repair_company: CompanyReference | None = Field(default=None, alias='repairCompany')
-    repair_contact: ContactReference | None = Field(default=None, alias='repairContact')
-    repair_contact_type: str | None = Field(default=None, alias='repairContactType')
-    repair_contact_phone: str | None = Field(default=None, alias='repairContactPhone')
-    repair_contact_extension: str | None = Field(
-        default=None, alias='repairContactExtension'
-    )
-    repair_contact_email: str | None = Field(default=None, alias='repairContactEmail')
-    repair_contact_address_line1: str | None = Field(
-        default=None, alias='repairContactAddressLine1'
+    body: str
+    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class OrderStatusNotification(ConnectWiseModel):
+    id: int | None = None
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
     )
+    status: OrderStatusReference | None = None
+    member: MemberReference | None = None
+    email: str | None = None
     """
-     Max length: 50;
+    Order Status Notification sendEmail must be entered if the notify type is "Email Address". Max length: 50;
     """
-    repair_contact_address_line2: str | None = Field(
-        default=None, alias='repairContactAddressLine2'
+    workflow_step: int | None = Field(default=None, alias='workflowStep')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class Other(ConnectWiseModel):
+    id: int | None = None
+    default_ldap: LdapConfigurationReference | None = Field(
+        default=None, alias='defaultLdap'
     )
+    default_from_address: str = Field(..., alias='defaultFromAddress')
     """
      Max length: 50;
     """
-    repair_contact_city: str | None = Field(default=None, alias='repairContactCity')
+    portal_url_override: str = Field(..., alias='portalUrlOverride')
     """
-     Max length: 50;
+     Max length: 100;
     """
-    repair_contact_state: str | None = Field(default=None, alias='repairContactState')
+    site_url: str = Field(..., alias='siteUrl')
     """
-     Max length: 50;
+     Max length: 100;
     """
-    repair_contact_zip: str | None = Field(default=None, alias='repairContactZip')
+    logo_path: str | None = Field(default=None, alias='logoPath')
     """
-     Max length: 12;
+     Max length: 200;
     """
-    repair_contact_country: CountryReference | None = Field(
-        default=None, alias='repairContactCountry'
+    contact_sync: Literal['FL', 'LF', 'CFL', 'CLF'] | None = Field(
+        default=None, alias='contactSync'
     )
-    repair_order_number: str | None = Field(default=None, alias='repairOrderNumber')
-    """
-     Max length: 50;
-    """
-    repair_site: SiteReference | None = Field(default=None, alias='repairSite')
-    repair_notes: str | None = Field(default=None, alias='repairNotes')
-    """
-     Max length: 1000;
-    """
-    drop_ship_flag: bool | None = Field(default=None, alias='dropShipFlag')
-    ship_method: ShipmentMethodReference | None = Field(
-        default=None, alias='shipMethod'
+    server_time_zone: TimeZoneSetupReference | None = Field(
+        default=None, alias='serverTimeZone'
     )
-    shipping_date: date | None = Field(default=None, alias='shippingDate')
-    shipping_tracking_number: str | None = Field(
-        default=None, alias='shippingTrackingNumber'
+    default_calendar: CalendarReference | None = Field(
+        default=None, alias='defaultCalendar'
+    )
+    default_address_format: AddressFormatReference | None = Field(
+        default=None, alias='defaultAddressFormat'
+    )
+    use_ssl_flag: bool | None = Field(default=None, alias='useSslFlag')
+    sync_leads_flag: bool | None = Field(default=None, alias='syncLeadsFlag')
+    include_portal_link_flag: bool | None = Field(
+        default=None, alias='includePortalLinkFlag'
+    )
+    use_expanded_format_time_flag: bool | None = Field(
+        default=None, alias='useExpandedFormatTimeFlag'
+    )
+    use_expanded_format_activity_flag: bool | None = Field(
+        default=None, alias='useExpandedFormatActivityFlag'
+    )
+    disable_z_admin_login_flag: bool | None = Field(
+        default=None, alias='disableZAdminLoginFlag'
+    )
+    locale: LocaleReference | None = None
+    update_member_time_zones_flag: bool | None = Field(
+        default=None, alias='updateMemberTimeZonesFlag'
     )
     """
-     Max length: 50;
-    """
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    """
-     Max length: 1000;
+    If true, all Members time zone will also be set to serverTimeZone. Otherwise, only My Company time zone will be updated.
     """
-    closing_notes: str | None = Field(default=None, alias='closingNotes')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class PhaseStatus(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-     Max length: 1000;
+     Max length: 30;
     """
-    date_closed: str | None = Field(default=None, alias='dateClosed')
-    account_manager: MemberReference | None = Field(
-        default=None, alias='accountManager'
-    )
-    technical_contact: MemberReference | None = Field(
-        default=None, alias='technicalContact'
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    collapsed_flag: bool | None = Field(default=None, alias='collapsedFlag')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    board_association_ids: list[int] | None = Field(
+        default=None, alias='boardAssociationIds'
     )
-    currency: CurrencyReference | None = None
-    closed_by: MemberReference | None = Field(default=None, alias='closedBy')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    status_indicator: StatusIndicatorReference | None = Field(
+        default=None, alias='statusIndicator'
     )
-
-
-class Role(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    custom_status_indicator_name: str | None = Field(
+        default=None, alias='customStatusIndicatorName'
     )
-    id: int | None = None
-    name: str
     """
-     Max length: 50;
+    Required when statusIndicator is Custom. Max length: 30;
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class RoutingRule(Enum):
-    ACCOUNT = 'Account'
-    TERRITORY = 'Territory'
-    CREATOR = 'Creator'
-    DEPARTMENT = 'Department'
-    LOCATION = 'Location'
-    MEMBER = 'Member'
-    PROJECT = 'Project'
-    SALES = 'Sales'
+class PortalConfigurationInvoiceSetup(ConnectWiseModel):
+    id: int | None = None
+    portal_configuration: PortalConfigurationReference | None = Field(
+        default=None, alias='portalConfiguration'
+    )
+    display_inv_pmt_flag: bool | None = Field(default=None, alias='displayInvPmtFlag')
+    allow_inv_pmt_flag: bool | None = Field(default=None, alias='allowInvPmtFlag')
+    location: SystemLocationReference | None = None
+    payment_processor: PortalConfigurationPaymentProcessorReference | None = Field(
+        default=None, alias='paymentProcessor'
+    )
+    login: str | None = None
+    password: str | None = None
+    url_override: str | None = Field(default=None, alias='urlOverride')
+    billing_status_ids: list[int] | None = Field(default=None, alias='billingStatusIds')
+    add_all_statuses: bool | None = Field(default=None, alias='addAllStatuses')
+    remove_all_statuses: bool | None = Field(default=None, alias='removeAllStatuses')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SLA(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PortalConfigurationProjectSetup(ConnectWiseModel):
     id: int | None = None
-    name: str
-    """
-     Max length: 25;
-    """
-    based_on: BasedOn = Field(..., alias='basedOn')
-    custom_calendar: CalendarReference | None = Field(
-        default=None, alias='customCalendar'
-    )
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    application_order: int | None = Field(default=None, alias='applicationOrder')
-    hi_impact_hi_urgency: PriorityReference | None = Field(
-        default=None, alias='hiImpactHiUrgency'
+    portal_config: PortalConfigurationReference | None = Field(
+        default=None, alias='portalConfig'
     )
-    hi_impact_med_urgency: PriorityReference | None = Field(
-        default=None, alias='hiImpactMedUrgency'
+    project_name_flag: bool | None = Field(default=None, alias='projectNameFlag')
+    project_type_flag: bool | None = Field(default=None, alias='projectTypeFlag')
+    status_flag: bool | None = Field(default=None, alias='statusFlag')
+    project_manager_flag: bool | None = Field(default=None, alias='projectManagerFlag')
+    billing_method_flag: bool | None = Field(default=None, alias='billingMethodFlag')
+    contact_flag: bool | None = Field(default=None, alias='contactFlag')
+    estimated_start_flag: bool | None = Field(default=None, alias='estimatedStartFlag')
+    estimated_end_flag: bool | None = Field(default=None, alias='estimatedEndFlag')
+    description_flag: bool | None = Field(default=None, alias='descriptionFlag')
+    last_updated_flag: bool | None = Field(default=None, alias='lastUpdatedFlag')
+    only_display: Literal[
+        'DoNotDisplay',
+        'Closed30Days',
+        'Closed60Days',
+        'Closed90Days',
+        'Closed120Days',
+        'AllClosed',
+    ] = Field(..., alias='onlyDisplay')
+    time_material_budget_hrs_flag: bool | None = Field(
+        default=None, alias='timeMaterialBudgetHrsFlag'
     )
-    hi_impact_low_urgency: PriorityReference | None = Field(
-        default=None, alias='hiImpactLowUrgency'
+    time_material_scheduled_start_flag: bool | None = Field(
+        default=None, alias='timeMaterialScheduledStartFlag'
     )
-    med_impact_hi_urgency: PriorityReference | None = Field(
-        default=None, alias='medImpactHiUrgency'
+    time_material_scheduled_finish_flag: bool | None = Field(
+        default=None, alias='timeMaterialScheduledFinishFlag'
     )
-    med_impact_med_urgency: PriorityReference | None = Field(
-        default=None, alias='medImpactMedUrgency'
+    time_material_scheduled_hrs_flag: bool | None = Field(
+        default=None, alias='timeMaterialScheduledHrsFlag'
     )
-    med_impact_low_urgency: PriorityReference | None = Field(
-        default=None, alias='medImpactLowUrgency'
+    time_material_actual_start_flag: bool | None = Field(
+        default=None, alias='timeMaterialActualStartFlag'
     )
-    low_impact_hi_urgency: PriorityReference | None = Field(
-        default=None, alias='lowImpactHiUrgency'
+    time_material_actual_finish_flag: bool | None = Field(
+        default=None, alias='timeMaterialActualFinishFlag'
     )
-    low_impact_med_urgency: PriorityReference | None = Field(
-        default=None, alias='lowImpactMedUrgency'
+    time_material_actual_hrs_flag: bool | None = Field(
+        default=None, alias='timeMaterialActualHrsFlag'
     )
-    low_impact_low_urgency: PriorityReference | None = Field(
-        default=None, alias='lowImpactLowUrgency'
+    time_material_bill_flag: bool | None = Field(
+        default=None, alias='timeMaterialBillFlag'
     )
-    respond_hours: float | None = Field(default=None, alias='respondHours')
-    respond_percent: int | None = Field(default=None, alias='respondPercent')
-    plan_within: float | None = Field(default=None, alias='planWithin')
-    plan_within_percent: int | None = Field(default=None, alias='planWithinPercent')
-    resolution_hours: float | None = Field(default=None, alias='resolutionHours')
-    resolution_percent: int | None = Field(default=None, alias='resolutionPercent')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SLAInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_material_status_flag: bool | None = Field(
+        default=None, alias='timeMaterialStatusFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SLAPriority(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    time_material_assigned_flag: bool | None = Field(
+        default=None, alias='timeMaterialAssignedFlag'
     )
-    id: int | None = None
-    priority: PriorityReference | None = None
-    respond_hours: float | None = Field(default=None, alias='respondHours')
-    respond_percent: int | None = Field(default=None, alias='respondPercent')
-    plan_within: float | None = Field(default=None, alias='planWithin')
-    plan_within_percent: int | None = Field(default=None, alias='planWithinPercent')
-    resolution_hours: float | None = Field(default=None, alias='resolutionHours')
-    resolution_percent: int | None = Field(default=None, alias='resolutionPercent')
-    sla: SLAReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SLAReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    fixed_fee_budget_hrs_flag: bool | None = Field(
+        default=None, alias='fixedFeeBudgetHrsFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SalesOrderReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    fixed_fee_scheduled_start_flag: bool | None = Field(
+        default=None, alias='fixedFeeScheduledStartFlag'
     )
-    id: int | None = None
-    identifier: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SalesProbability(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    fixed_fee_scheduled_finish_flag: bool | None = Field(
+        default=None, alias='fixedFeeScheduledFinishFlag'
     )
-    id: int | None = None
-    probability: int
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SalesProbabilityInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    fixed_fee_scheduled_hrs_flag: bool | None = Field(
+        default=None, alias='fixedFeeScheduledHrsFlag'
     )
-    id: int | None = None
-    probability: int | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SalesQuota(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    fixed_fee_actual_start_flag: bool | None = Field(
+        default=None, alias='fixedFeeActualStartFlag'
     )
-    id: int | None = None
-    member: MemberReference | None = None
-    forecast_year: int | None = Field(default=None, alias='forecastYear')
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    category: ProductCategoryReference | None = None
-    sub_category: ProductSubCategoryReference | None = Field(
-        default=None, alias='subCategory'
+    fixed_fee_actual_finish_flag: bool | None = Field(
+        default=None, alias='fixedFeeActualFinishFlag'
     )
-    january_revenue: float | None = Field(default=None, alias='januaryRevenue')
-    january_margin: float | None = Field(default=None, alias='januaryMargin')
-    february_revenue: float | None = Field(default=None, alias='februaryRevenue')
-    february_margin: float | None = Field(default=None, alias='februaryMargin')
-    march_revenue: float | None = Field(default=None, alias='marchRevenue')
-    march_margin: float | None = Field(default=None, alias='marchMargin')
-    april_revenue: float | None = Field(default=None, alias='aprilRevenue')
-    april_margin: float | None = Field(default=None, alias='aprilMargin')
-    may_revenue: float | None = Field(default=None, alias='mayRevenue')
-    may_margin: float | None = Field(default=None, alias='mayMargin')
-    june_revenue: float | None = Field(default=None, alias='juneRevenue')
-    june_margin: float | None = Field(default=None, alias='juneMargin')
-    july_revenue: float | None = Field(default=None, alias='julyRevenue')
-    july_margin: float | None = Field(default=None, alias='julyMargin')
-    august_revenue: float | None = Field(default=None, alias='augustRevenue')
-    august_margin: float | None = Field(default=None, alias='augustMargin')
-    september_revenue: float | None = Field(default=None, alias='septemberRevenue')
-    september_margin: float | None = Field(default=None, alias='septemberMargin')
-    october_revenue: float | None = Field(default=None, alias='octoberRevenue')
-    october_margin: float | None = Field(default=None, alias='octoberMargin')
-    november_revenue: float | None = Field(default=None, alias='novemberRevenue')
-    november_margin: float | None = Field(default=None, alias='novemberMargin')
-    december_revenue: float | None = Field(default=None, alias='decemberRevenue')
-    december_margin: float | None = Field(default=None, alias='decemberMargin')
-    currency: CurrencyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SalesTeam(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    fixed_fee_actual_hrs_flag: bool | None = Field(
+        default=None, alias='fixedFeeActualHrsFlag'
     )
-    id: int | None = None
-    sales_team_identifier: str = Field(..., alias='salesTeamIdentifier')
-    """
-     Max length: 20;
-    """
-    sales_team_description: str = Field(..., alias='salesTeamDescription')
-    """
-     Max length: 50;
-    """
-    sales_team_location: SystemLocationReference | None = Field(
-        default=None, alias='salesTeamLocation'
+    fixed_fee_bill_flag: bool | None = Field(default=None, alias='fixedFeeBillFlag')
+    fixed_fee_status_flag: bool | None = Field(default=None, alias='fixedFeeStatusFlag')
+    fixed_fee_assigned_flag: bool | None = Field(
+        default=None, alias='fixedFeeAssignedFlag'
     )
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SalesTeamMember(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_issue_budget_hrs_flag: bool | None = Field(
+        default=None, alias='projectIssueBudgetHrsFlag'
     )
-    id: int | None = None
-    member: MemberReference | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    allow_access_flag: bool | None = Field(default=None, alias='allowAccessFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SalesTeamReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_issue_scheduled_start_flag: bool | None = Field(
+        default=None, alias='projectIssueScheduledStartFlag'
     )
-    id: int | None = None
-    identifier: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ScheduleColor(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_issue_scheduled_finish_flag: bool | None = Field(
+        default=None, alias='projectIssueScheduledFinishFlag'
     )
-    id: int | None = None
-    start_percent: int | None = Field(default=None, alias='startPercent')
-    """
-    A startPercent (0 or higher) is required if endPercent has value.
-    """
-    end_percent: int | None = Field(default=None, alias='endPercent')
-    """
-    A endPercent is required if startPercent has value.
-    """
-    color: str
-    """
-    Must be a valid Hexadecimal Color Code.
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ScheduleDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_issue_scheduled_hrs_flag: bool | None = Field(
+        default=None, alias='projectIssueScheduledHrsFlag'
     )
-    id: int | None = None
-    schedule_entry: ScheduleEntryReference | None = Field(
-        default=None, alias='scheduleEntry'
+    project_issue_actual_start_flag: bool | None = Field(
+        default=None, alias='projectIssueActualStartFlag'
     )
-    date_start: str | None = Field(default=None, alias='dateStart')
-    date_end: str | None = Field(default=None, alias='dateEnd')
-    member: MemberReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ScheduleEntry(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    project_issue_actual_finish_flag: bool | None = Field(
+        default=None, alias='projectIssueActualFinishFlag'
     )
-    id: int | None = None
-    object_id: int | None = Field(default=None, alias='objectId')
-    name: str | None = None
-    """
-     Max length: 250;
-    """
-    member: MemberReference | None = None
-    where: ServiceLocationReference | None = None
-    date_start: datetime | None = Field(default=None, alias='dateStart')
-    date_end: datetime | None = Field(default=None, alias='dateEnd')
-    reminder: ReminderReference | None = None
-    status: ScheduleStatusReference | None = None
-    type: ScheduleTypeReference | None = None
-    span: ScheduleSpanReference | None = None
-    done_flag: bool | None = Field(default=None, alias='doneFlag')
-    acknowledged_flag: bool | None = Field(default=None, alias='acknowledgedFlag')
-    owner_flag: bool | None = Field(default=None, alias='ownerFlag')
-    meeting_flag: bool | None = Field(default=None, alias='meetingFlag')
-    allow_schedule_conflicts_flag: bool | None = Field(
-        default=None, alias='allowScheduleConflictsFlag'
+    project_issue_actual_hrs_flag: bool | None = Field(
+        default=None, alias='projectIssueActualHrsFlag'
     )
-    add_member_to_project_flag: bool | None = Field(
-        default=None, alias='addMemberToProjectFlag'
+    project_issue_bill_flag: bool | None = Field(
+        default=None, alias='projectIssueBillFlag'
     )
-    project_role_id: int | None = Field(default=None, alias='projectRoleId')
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    acknowledged_date: datetime | None = Field(default=None, alias='acknowledgedDate')
-    close_date: datetime | None = Field(default=None, alias='closeDate')
-    hours: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    project_issue_status_flag: bool | None = Field(
+        default=None, alias='projectIssueStatusFlag'
+    )
+    project_issue_assigned_flag: bool | None = Field(
+        default=None, alias='projectIssueAssignedFlag'
+    )
+    project_detail_total_hours_flag: bool | None = Field(
+        default=None, alias='projectDetailTotalHoursFlag'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ScheduleEntryDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PortalConfigurationServiceSetup(ConnectWiseModel):
     id: int | None = None
-    schedule_entry: ScheduleEntryReference | None = Field(
-        default=None, alias='scheduleEntry'
+    service_type_flag: bool | None = Field(default=None, alias='serviceTypeFlag')
+    service_sub_type_flag: bool | None = Field(default=None, alias='serviceSubTypeFlag')
+    service_sub_type_item_flag: bool | None = Field(
+        default=None, alias='serviceSubTypeItemFlag'
     )
-    date_start: str | None = Field(default=None, alias='dateStart')
-    date_end: str | None = Field(default=None, alias='dateEnd')
-    hours_scheduled: float | None = Field(default=None, alias='hoursScheduled')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    status_flag: bool | None = Field(default=None, alias='statusFlag')
+    site_name_flag: bool | None = Field(default=None, alias='siteNameFlag')
+    entered_date_flag: bool | None = Field(default=None, alias='enteredDateFlag')
+    last_update_flag: bool | None = Field(default=None, alias='lastUpdateFlag')
+    required_date_flag: bool | None = Field(default=None, alias='requiredDateFlag')
+    contact_flag: bool | None = Field(default=None, alias='contactFlag')
+    assigned_resources_flag: bool | None = Field(
+        default=None, alias='assignedResourcesFlag'
+    )
+    sla_info_flag: bool | None = Field(default=None, alias='slaInfoFlag')
+    service_board_flag: bool | None = Field(default=None, alias='serviceBoardFlag')
+    budget_hours_flag: bool | None = Field(default=None, alias='budgetHoursFlag')
+    actual_hours_flag: bool | None = Field(default=None, alias='actualHoursFlag')
+    approval_status_flag: bool | None = Field(default=None, alias='approvalStatusFlag')
+    open_tasks_flag: bool | None = Field(default=None, alias='openTasksFlag')
+    closed_tasks_flag: bool | None = Field(default=None, alias='closedTasksFlag')
+    enable_chat_assist_flag: bool | None = Field(
+        default=None, alias='enableChatAssistFlag'
+    )
+    display_closed_tickets_option: Literal[
+        'DoNotDisplay',
+        'Closed30Days',
+        'Closed60Days',
+        'Closed90Days',
+        'Closed120Days',
+        'AllClosed',
+    ] = Field(..., alias='displayClosedTicketsOption')
+    time_materials_ticket_template: ServiceSignoffReference | None = Field(
+        default=None, alias='timeMaterialsTicketTemplate'
+    )
+    fixed_fee_ticket_template: ServiceSignoffReference | None = Field(
+        default=None, alias='fixedFeeTicketTemplate'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ScheduleEntryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PricingDetail(ConnectWiseModel):
     id: int | None = None
-    description: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    product: CatalogItemReference | None = None
+    category: ProductCategoryReference | None = None
+    sub_category: ProductSubCategoryReference | None = Field(
+        default=None, alias='subCategory'
+    )
+    start_date: datetime = Field(..., alias='startDate')
+    end_date: datetime | None = Field(default=None, alias='endDate')
+    no_end_date: bool | None = Field(default=None, alias='noEndDate')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ScheduleReminderTime(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProcurementAdjustment(ConnectWiseModel):
     id: int | None = None
-    time: int | None = None
+    identifier: str
     """
-    Time is calculated in minutes.
+     Max length: 50;
     """
-    name: str | None = None
+    type: AdjustmentTypeReference | None = None
+    reason: str | None = None
     """
-     Max length: 10;
+     Max length: 100;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ScheduleSpan(Enum):
-    STANDARD = 'Standard'
-    OFFICE_HOURS = 'OfficeHours'
-    OVERNIGHT = 'Overnight'
-
-
-class ScheduleSpanReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    notes: str | None = None
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    closed_by: str | None = Field(default=None, alias='closedBy')
+    closed_date: datetime | None = Field(default=None, alias='closedDate')
+    adjustment_details: list[AdjustmentDetail] | None = Field(
+        default=None, alias='adjustmentDetails'
     )
-    id: int | None = None
-    identifier: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ScheduleStatus(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProductComponent(ConnectWiseModel):
     id: int | None = None
-    name: str
+    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
     """
-     Max length: 30;
+     Required On Updates;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    show_as_tentative_flag: bool | None = Field(
-        default=None, alias='showAsTentativeFlag'
+    quantity: float
+    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
+    hide_price_flag: bool | None = Field(default=None, alias='hidePriceFlag')
+    hide_item_identifier_flag: bool | None = Field(
+        default=None, alias='hideItemIdentifierFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ScheduleStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    hide_description_flag: bool | None = Field(
+        default=None, alias='hideDescriptionFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    hide_quantity_flag: bool | None = Field(default=None, alias='hideQuantityFlag')
+    hide_extended_price_flag: bool | None = Field(
+        default=None, alias='hideExtendedPriceFlag'
+    )
+    vendor: CompanyReference | None = None
+    parent_product_item: ProductItemReference | None = Field(
+        default=None, alias='parentProductItem'
+    )
+    product_item: ProductItemReference | None = Field(default=None, alias='productItem')
+    price: float | None = None
+    cost: float | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ScheduleStopwatch(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class ProductItem(ConnectWiseModel):
+    id: int | None = None
+    catalog_item: CatalogItemReference | None = Field(default=None, alias='catalogItem')
+    description: str | None = None
+    """
+     Max length: 2000;
+    """
+    sequence_number: float | None = Field(default=None, alias='sequenceNumber')
+    quantity: float | None = None
+    price: float | None = None
+    cost: float | None = None
+    discount: float | None = None
+    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
+    price_method: Literal[
+        'FlatRateForRange',
+        'PercentMarkupFromCost',
+        'PercentMarkdownFromPrice',
+        'PricePerUnit',
+    ] | None = Field(default=None, alias='priceMethod')
+    billable_option: Literal['Billable', 'DoNotBill', 'NoCharge'] = Field(
+        ..., alias='billableOption'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
     agreement: AgreementReference | None = None
-    billable_option: BillableOption5 | None = Field(
-        default=None, alias='billableOption'
-    )
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    date_entered: datetime | None = Field(default=None, alias='dateEntered')
-    end_time: datetime | None = Field(default=None, alias='endTime')
-    id: int | None = None
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
     location_id: int | None = Field(default=None, alias='locationId')
-    member: MemberReference | None = None
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    notes: str | None = None
     """
-     Max length: 4000;
+     Required On Updates;
     """
-    schedule_id: int = Field(..., alias='scheduleId')
-    schedule_mobile_guid: UUID | None = Field(default=None, alias='scheduleMobileGuid')
-    start_time: datetime | None = Field(default=None, alias='startTime')
-    status: Status4
-    total_pause_time: int | None = Field(default=None, alias='totalPauseTime')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-
-
-class ScheduleType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    """
+     Required On Updates;
+    """
+    vendor: CompanyReference | None = None
+    vendor_sku: str | None = Field(default=None, alias='vendorSku')
     """
      Max length: 50;
     """
-    identifier: str
+    taxable_flag: bool | None = Field(default=None, alias='taxableFlag')
+    dropship_flag: bool | None = Field(default=None, alias='dropshipFlag')
+    special_order_flag: bool | None = Field(default=None, alias='specialOrderFlag')
+    phase_product_flag: bool | None = Field(default=None, alias='phaseProductFlag')
+    cancelled_flag: bool | None = Field(default=None, alias='cancelledFlag')
+    quantity_cancelled: float | None = Field(default=None, alias='quantityCancelled')
+    cancelled_reason: str | None = Field(default=None, alias='cancelledReason')
     """
-     Max length: 1;
+     Max length: 100;
     """
-    charge_code: ChargeCodeReference | None = Field(default=None, alias='chargeCode')
-    where: ServiceLocationReference | None = None
-    system_flag: bool | None = Field(default=None, alias='systemFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ScheduleTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    customer_description: str | None = Field(default=None, alias='customerDescription')
+    """
+     Max length: 6000; Required On Updates;
+    """
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    """
+     Max length: 1000;
+    """
+    product_supplied_flag: bool | None = Field(
+        default=None, alias='productSuppliedFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    identifier: str | None = None
-    charge_code: ChargeCodeReference | None = Field(default=None, alias='chargeCode')
-    where: ServiceLocationReference | None = None
-    system_flag: bool | None = Field(default=None, alias='systemFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ScheduleTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    sub_contractor_ship_to_id: int | None = Field(
+        default=None, alias='subContractorShipToId'
     )
-    id: int | None = None
-    identifier: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SchedulingMemberInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    sub_contractor_amount_limit: float | None = Field(
+        default=None, alias='subContractorAmountLimit'
     )
-    id: int | None = None
-    identifier: str | None = None
-    first_name: str | None = Field(default=None, alias='firstName')
-    middle_initial: str | None = Field(default=None, alias='middleInitial')
-    last_name: str | None = Field(default=None, alias='lastName')
-    full_name: str | None = Field(default=None, alias='fullName')
-    default_email: str | None = Field(default=None, alias='defaultEmail')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ScreenLink(Enum):
-    COMPANY = 'Company'
-    CONTACT = 'Contact'
-    SERVICE = 'Service'
-    INVOICE = 'Invoice'
-    PURCHASE_ORDER = 'PurchaseOrder'
-    SALES_ORDER = 'SalesOrder'
-
-
-class SecurityRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    recurring: ProductRecurring | None = None
+    sla: SLAReference | None = None
+    entity_type: EntityTypeReference | None = Field(default=None, alias='entityType')
+    ticket: TicketReference | None = None
+    project: ProjectReference | None = None
+    phase: ProjectPhaseReference | None = None
+    sales_order: SalesOrderReference | None = Field(default=None, alias='salesOrder')
+    opportunity: OpportunityReference | None = None
+    invoice: InvoiceReference | None = None
+    warehouse_id: int | None = Field(default=None, alias='warehouseId')
+    warehouse_bin_id: int | None = Field(default=None, alias='warehouseBinId')
+    calculated_price_flag: bool | None = Field(
+        default=None, alias='calculatedPriceFlag'
+    )
+    calculated_cost_flag: bool | None = Field(default=None, alias='calculatedCostFlag')
+    forecast_detail_id: int | None = Field(default=None, alias='forecastDetailId')
+    cancelled_by: int | None = Field(default=None, alias='cancelledBy')
+    cancelled_date: datetime | None = Field(default=None, alias='cancelledDate')
+    warehouse: str | None = None
+    warehouse_bin: str | None = Field(default=None, alias='warehouseBin')
+    purchase_date: datetime | None = Field(default=None, alias='purchaseDate')
+    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
+    list_price: float | None = Field(default=None, alias='listPrice')
+    serial_number_ids: list[int] | None = Field(default=None, alias='serialNumberIds')
+    serial_numbers: list[str] | None = Field(default=None, alias='serialNumbers')
+    company: CompanyReference | None = None
+    forecast_status: OpportunityStatusReference | None = Field(
+        default=None, alias='forecastStatus'
+    )
+    product_class: Literal[
+        'Agreement', 'Bundle', 'Inventory', 'NonInventory', 'Service'
+    ] | None = Field(default=None, alias='productClass')
+    need_to_purchase_flag: bool | None = Field(default=None, alias='needToPurchaseFlag')
+    need_to_order_quantity: int | None = Field(
+        default=None, alias='needToOrderQuantity'
+    )
+    minimum_stock_flag: bool | None = Field(default=None, alias='minimumStockFlag')
+    ship_set: str | None = Field(default=None, alias='shipSet')
+    """
+     Max length: 10;
+    """
+    calculated_price: float | None = Field(default=None, alias='calculatedPrice')
+    calculated_cost: float | None = Field(default=None, alias='calculatedCost')
+    invoice_grouping: InvoiceGroupingReference | None = Field(
+        default=None, alias='invoiceGrouping'
+    )
+    po_approved_flag: bool | None = Field(default=None, alias='poApprovedFlag')
+    add_components_flag: bool | None = Field(default=None, alias='addComponentsFlag')
+    ignore_pricing_schedules_flag: bool | None = Field(
+        default=None, alias='ignorePricingSchedulesFlag'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 30;
-    """
-    role_type: str | None = Field(default=None, alias='roleType')
-    """
-     Max length: 30;
-    """
-    admin_flag: bool | None = Field(default=None, alias='adminFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SecurityRoleInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    bypass_forecast_update: bool | None = Field(
+        default=None, alias='bypassForecastUpdate'
     )
-    id: int | None = None
-    name: str | None = None
-    role_type: str | None = Field(default=None, alias='roleType')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SecurityRoleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SecurityRoleSetting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProductPickingShippingDetail(ConnectWiseModel):
     id: int | None = None
-    add_level: AddLevel | None = Field(default=None, alias='addLevel')
-    edit_level: EditLevel | None = Field(default=None, alias='editLevel')
-    delete_level: DeleteLevel | None = Field(default=None, alias='deleteLevel')
-    inquire_level: InquireLevel | None = Field(default=None, alias='inquireLevel')
-    module_function_name: str | None = Field(default=None, alias='moduleFunctionName')
-    module_function_description: str | None = Field(
-        default=None, alias='moduleFunctionDescription'
+    picked_quantity: int | None = Field(default=None, alias='pickedQuantity')
+    shipped_quantity: int | None = Field(default=None, alias='shippedQuantity')
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
     )
-    my_all_flag: bool | None = Field(default=None, alias='myAllFlag')
-    module_function_identifier: str | None = Field(
-        default=None, alias='moduleFunctionIdentifier'
+    shipment_method: ShipmentMethodReference | None = Field(
+        default=None, alias='shipmentMethod'
     )
-    report_flag: bool | None = Field(default=None, alias='reportFlag')
-    restrict_flag: bool | None = Field(default=None, alias='restrictFlag')
-    custom_flag: bool | None = Field(default=None, alias='customFlag')
-    module_description: str | None = Field(default=None, alias='moduleDescription')
-    module_identifier: str | None = Field(default=None, alias='moduleIdentifier')
-    module_name: str | None = Field(default=None, alias='moduleName')
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Segment10type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment1type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment2type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment3type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment4type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment5type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment6type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment7type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment8type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
-
-
-class Segment9type(Enum):
-    ACCOUNT = 'Account'
-    CLASS_ = 'Class'
+    serial_number: str | None = Field(default=None, alias='serialNumber')
+    serial_number_ids: list[int] | None = Field(default=None, alias='serialNumberIds')
+    tracking_number: str | None = Field(default=None, alias='trackingNumber')
+    product_item: ProductItemReference | None = Field(default=None, alias='productItem')
+    line_number: int | None = Field(default=None, alias='lineNumber')
+    quantity: int | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SendNotesAsEmailSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
+class ProductTypeExemption(ConnectWiseModel):
+    id: int | None = None
+    product_type: ProductTypeReference = Field(..., alias='productType')
+    taxable_levels: list[int] | None = Field(default=None, alias='taxableLevels')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Service(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Project(ConnectWiseModel):
     id: int | None = None
-    sr_notify: SrNotify = Field(..., alias='srNotify')
-    schedule_span: ScheduleSpan = Field(..., alias='scheduleSpan')
-    hide_delimiter_flag: bool | None = Field(default=None, alias='hideDelimiterFlag')
-    allow_cc_flag: bool | None = Field(default=None, alias='allowCCFlag')
-    allow_to_flag: bool | None = Field(default=None, alias='allowTOFlag')
-    header_color: str | None = Field(default=None, alias='headerColor')
+    actual_end: datetime | None = Field(default=None, alias='actualEnd')
+    actual_hours: float | None = Field(default=None, alias='actualHours')
+    actual_start: datetime | None = Field(default=None, alias='actualStart')
+    agreement: AgreementReference | None = None
+    bill_expenses: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billExpenses')
     """
-     Max length: 50;
+     Required On Updates;
     """
-    member_color: str | None = Field(default=None, alias='memberColor')
+    billing_amount: float | None = Field(default=None, alias='billingAmount')
+    billing_attention: str | None = Field(default=None, alias='billingAttention')
     """
      Max length: 50;
     """
-    contact_color: str | None = Field(default=None, alias='contactColor')
+    billing_method: Literal[
+        'ActualRates', 'FixedFee', 'NotToExceed', 'OverrideRate'
+    ] = Field(..., alias='billingMethod')
+    billing_rate_type: Literal['StaffMember', 'WorkRole'] | None = Field(
+        default=None, alias='billingRateType'
+    )
     """
-     Max length: 50;
+     Required On Updates;
     """
-    unknown_color: str | None = Field(default=None, alias='unknownColor')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
+    )
+    bill_products: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billProducts')
     """
-     Max length: 50;
+     Required On Updates;
     """
-    calendar_setup: CalendarSetupReference | None = Field(
-        default=None, alias='calendarSetup'
-    )
-    header_color_disable_flag: bool | None = Field(
-        default=None, alias='headerColorDisableFlag'
-    )
-    member_color_disable_flag: bool | None = Field(
-        default=None, alias='memberColorDisableFlag'
+    bill_project_after_closed_flag: bool | None = Field(
+        default=None, alias='billProjectAfterClosedFlag'
     )
-    contact_color_disable_flag: bool | None = Field(
-        default=None, alias='contactColorDisableFlag'
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] | None = Field(
+        default=None, alias='billTime'
     )
-    unknown_color_disable_flag: bool | None = Field(
-        default=None, alias='unknownColorDisableFlag'
+    """
+     Required On Updates;
+    """
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceCodeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_to_contact: ContactReference | None = Field(
+        default=None, alias='billToContact'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceEmailTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
+    bill_unapproved_time_and_expense: bool | None = Field(
+        default=None, alias='billUnapprovedTimeAndExpense'
     )
-    id: int | None = None
-    type: Type7
-    service_survey: ServiceSurveyReference | None = Field(
-        default=None, alias='serviceSurvey'
+    board: ProjectBoardReference | None = None
+    budget_analysis: Literal['ActualHours', 'BillableHours'] | None = Field(
+        default=None, alias='budgetAnalysis'
     )
-    service_board: BoardReference | None = Field(default=None, alias='serviceBoard')
-    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
-    first_name: str | None = Field(default=None, alias='firstName')
-    """
-    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
-    """
-    last_name: str | None = Field(default=None, alias='lastName')
-    """
-    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
-    """
-    email_address: str | None = Field(default=None, alias='emailAddress')
     """
-    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
+     Required On Updates;
     """
-    subject: str | None = None
+    budget_flag: bool | None = Field(default=None, alias='budgetFlag')
+    budget_hours: float | None = Field(default=None, alias='budgetHours')
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    customer_po: str | None = Field(default=None, alias='customerPO')
     """
-     Max length: 200;
+     Max length: 50;
     """
-    body: str | None = None
-    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
-    tasks_flag: bool | None = Field(default=None, alias='tasksFlag')
-    resource_records_flag: bool | None = Field(
-        default=None, alias='resourceRecordsFlag'
-    )
-    external_contact_notifications: bool | None = Field(
-        default=None, alias='externalContactNotifications'
-    )
-    internal_contact_notifications: bool | None = Field(
-        default=None, alias='internalContactNotifications'
+    description: str | None = None
+    currency: CurrencyReference | None = None
+    downpayment: float | None = None
+    estimated_end: datetime = Field(..., alias='estimatedEnd')
+    percent_complete: float | None = Field(default=None, alias='percentComplete')
+    estimated_expense_revenue: float | None = Field(
+        default=None, alias='estimatedExpenseRevenue'
     )
-    service_status: ServiceStatusReference | None = Field(
-        default=None, alias='serviceStatus'
+    estimated_hours: float | None = Field(default=None, alias='estimatedHours')
+    estimated_product_revenue: float | None = Field(
+        default=None, alias='estimatedProductRevenue'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceEmailTemplateReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_start: datetime = Field(..., alias='estimatedStart')
+    estimated_time_revenue: float | None = Field(
+        default=None, alias='estimatedTimeRevenue'
     )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    type: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    expense_approver: MemberReference | None = Field(
+        default=None, alias='expenseApprover'
     )
-    id: int | None = None
-    header_color: str | None = Field(default=None, alias='headerColor')
-    member_color: str | None = Field(default=None, alias='memberColor')
-    contact_color: str | None = Field(default=None, alias='contactColor')
-    unknown_color: str | None = Field(default=None, alias='unknownColor')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceItemReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    include_dependencies_flag: bool | None = Field(
+        default=None, alias='includeDependenciesFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceLocation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    include_estimates_flag: bool | None = Field(
+        default=None, alias='includeEstimatesFlag'
     )
-    id: int | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    manager: MemberReference | None = None
     name: str
     """
-     Max length: 30;
+     Max length: 100;
     """
-    where: Where
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceLocationInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    opportunity: OpportunityReference | None = None
+    project_template_id: int | None = Field(default=None, alias='projectTemplateId')
+    restrict_down_payment_flag: bool | None = Field(
+        default=None, alias='restrictDownPaymentFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceLocationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    scheduled_end: datetime | None = Field(default=None, alias='scheduledEnd')
+    scheduled_hours: float | None = Field(default=None, alias='scheduledHours')
+    scheduled_start: datetime | None = Field(default=None, alias='scheduledStart')
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ship_to_contact: ContactReference | None = Field(
+        default=None, alias='shipToContact'
     )
-    id: int | None = None
-    ticket_id: int | None = Field(default=None, alias='ticketId')
-    text: str | None = None
-    detail_description_flag: bool | None = Field(
-        default=None, alias='detailDescriptionFlag'
+    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
+    site: SiteReference | None = None
+    status: ProjectStatusReference | None = None
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    time_approver: MemberReference | None = Field(default=None, alias='timeApprover')
+    type: ProjectTypeReference | None = None
+    do_not_display_in_portal_flag: bool | None = Field(
+        default=None, alias='doNotDisplayInPortalFlag'
     )
-    internal_analysis_flag: bool | None = Field(
-        default=None, alias='internalAnalysisFlag'
+    billing_start_date: datetime | None = Field(default=None, alias='billingStartDate')
+    estimated_time_cost: float | None = Field(default=None, alias='estimatedTimeCost')
+    estimated_expense_cost: float | None = Field(
+        default=None, alias='estimatedExpenseCost'
+    )
+    estimated_product_cost: float | None = Field(
+        default=None, alias='estimatedProductCost'
     )
-    resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
-    issue_flag: bool | None = Field(default=None, alias='issueFlag')
-    member: MemberReference | None = None
-    contact: ContactReference | None = None
-    customer_updated_flag: bool | None = Field(
-        default=None, alias='customerUpdatedFlag'
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    company_location: SystemLocationReference | None = Field(
+        default=None, alias='companyLocation'
     )
-    process_notifications: bool | None = Field(
-        default=None, alias='processNotifications'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    date_created: str | None = Field(default=None, alias='dateCreated')
-    created_by: str | None = Field(default=None, alias='createdBy')
-    internal_flag: bool | None = Field(default=None, alias='internalFlag')
-    external_flag: bool | None = Field(default=None, alias='externalFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectBillingRate(ConnectWiseModel):
     id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    project_rec_id: int | None = Field(default=None, alias='projectRecId')
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    activity_class_rec_id: int | None = Field(default=None, alias='activityClassRecId')
+    member: MemberReference | None = None
+    member_rec_id: int | None = Field(default=None, alias='memberRecId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceSignoff(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectBoardTeam(ConnectWiseModel):
     id: int | None = None
     name: str
     """
      Max length: 50;
     """
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
     default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    visible_logo_flag: bool | None = Field(default=None, alias='visibleLogoFlag')
-    company_info_flag: bool | None = Field(default=None, alias='companyInfoFlag')
-    billing_terms_flag: bool | None = Field(default=None, alias='billingTermsFlag')
-    summary_flag: bool | None = Field(default=None, alias='summaryFlag')
-    discussion_flag: bool | None = Field(default=None, alias='discussionFlag')
-    task_flag: bool | None = Field(default=None, alias='taskFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ProjectBoardTeamMember(ConnectWiseModel):
+    id: int | None = None
+    member: MemberReference | None = None
+    project_role: ProjectRoleReference | None = Field(default=None, alias='projectRole')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ProjectPhase(ConnectWiseModel):
+    id: int | None = None
+    project_id: int | None = Field(default=None, alias='projectId')
+    description: str
     """
-    On add/post, if this is set to true but no value is set for task, task is defaulted to ServiceTasks.All.
+     Max length: 100;
     """
-    task: Task | None = None
+    board: ProjectBoardReference | None = None
+    status: PhaseStatusReference | None = None
+    agreement: AgreementReference | None = None
+    opportunity: OpportunityReference | None = None
+    parent_phase: ProjectPhaseReference | None = Field(
+        default=None, alias='parentPhase'
+    )
+    wbs_code: str | None = Field(default=None, alias='wbsCode')
     """
-    On add/post, if this is set but no value is set for taskFlag, taskFlag is set to true.
+     Max length: 50;
     """
-    configurations_flag: bool | None = Field(default=None, alias='configurationsFlag')
-    internal_notes_flag: bool | None = Field(default=None, alias='internalNotesFlag')
-    resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
-    time_flag: bool | None = Field(default=None, alias='timeFlag')
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] | None = Field(
+        default=None, alias='billTime'
+    )
     """
-    On add/post, if any time related flag is set to true, this is also set to true.
+     Required On Updates;
     """
-    time_member_flag: bool | None = Field(default=None, alias='timeMemberFlag')
-    time_date_flag: bool | None = Field(default=None, alias='timeDateFlag')
-    time_start_end_flag: bool | None = Field(default=None, alias='timeStartEndFlag')
-    time_bill_flag: bool | None = Field(default=None, alias='timeBillFlag')
-    time_hours_flag: bool | None = Field(default=None, alias='timeHoursFlag')
-    time_rate_flag: bool | None = Field(default=None, alias='timeRateFlag')
-    time_extended_amount_flag: bool | None = Field(
-        default=None, alias='timeExtendedAmountFlag'
-    )
-    time_work_type_flag: bool | None = Field(default=None, alias='timeWorkTypeFlag')
-    time_agreement_flag: bool | None = Field(default=None, alias='timeAgreementFlag')
-    time_notes_flag: bool | None = Field(default=None, alias='timeNotesFlag')
-    time_manual_flag: bool | None = Field(default=None, alias='timeManualFlag')
-    time_manual_entry: int | None = Field(default=None, alias='timeManualEntry')
-    time_tax_flag: bool | None = Field(default=None, alias='timeTaxFlag')
-    expense_flag: bool | None = Field(default=None, alias='expenseFlag')
+    bill_expenses: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billExpenses')
     """
-    On add/post, if any expense related flag is set to true, this is also set to true.
+     Required On Updates;
     """
-    expense_date_flag: bool | None = Field(default=None, alias='expenseDateFlag')
-    expense_member_flag: bool | None = Field(default=None, alias='expenseMemberFlag')
-    expense_type_flag: bool | None = Field(default=None, alias='expenseTypeFlag')
-    expense_bill_flag: bool | None = Field(default=None, alias='expenseBillFlag')
-    expense_amount_flag: bool | None = Field(default=None, alias='expenseAmountFlag')
-    expense_agreement_flag: bool | None = Field(
-        default=None, alias='expenseAgreementFlag'
-    )
-    expense_notes_flag: bool | None = Field(default=None, alias='expenseNotesFlag')
-    expense_tax_flag: bool | None = Field(default=None, alias='expenseTaxFlag')
-    expense_manual_flag: bool | None = Field(default=None, alias='expenseManualFlag')
-    expense_manual_entry: int | None = Field(default=None, alias='expenseManualEntry')
-    product_flag: bool | None = Field(default=None, alias='productFlag')
+    bill_products: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billProducts')
     """
-    On add/post, if any product related flag is set to true, this is also set to true.
+     Required On Updates;
     """
-    product_description_flag: bool | None = Field(
-        default=None, alias='productDescriptionFlag'
-    )
-    product_bill_flag: bool | None = Field(default=None, alias='productBillFlag')
-    product_quantity_flag: bool | None = Field(
-        default=None, alias='productQuantityFlag'
-    )
-    product_price_flag: bool | None = Field(default=None, alias='productPriceFlag')
-    product_extended_amount_flag: bool | None = Field(
-        default=None, alias='productExtendedAmountFlag'
-    )
-    product_agreement_flag: bool | None = Field(
-        default=None, alias='productAgreementFlag'
-    )
-    product_manual_flag: bool | None = Field(default=None, alias='productManualFlag')
-    product_manual_entry: int | None = Field(default=None, alias='productManualEntry')
-    product_tax_flag: bool | None = Field(default=None, alias='productTaxFlag')
-    technician_signoff_flag: bool | None = Field(
-        default=None, alias='technicianSignoffFlag'
-    )
-    customer_signoff_text_flag: bool | None = Field(
-        default=None, alias='customerSignoffTextFlag'
+    mark_as_milestone_flag: bool | None = Field(
+        default=None, alias='markAsMilestoneFlag'
     )
+    notes: str | None = None
+    deadline_date: datetime | None = Field(default=None, alias='deadlineDate')
+    bill_separately_flag: bool | None = Field(default=None, alias='billSeparatelyFlag')
+    billing_method: Literal[
+        'ActualRates', 'FixedFee', 'NotToExceed', 'OverrideRate'
+    ] | None = Field(default=None, alias='billingMethod')
     """
-    On add/post, if customerSignoffText.Length > 0, this is set to true.
+    billingMethod is required if the phase billSeparatelyFlag is true.
     """
-    customer_signoff_text: str | None = Field(default=None, alias='customerSignoffText')
+    scheduled_hours: float | None = Field(default=None, alias='scheduledHours')
+    scheduled_start: str | None = Field(default=None, alias='scheduledStart')
+    scheduled_end: str | None = Field(default=None, alias='scheduledEnd')
+    actual_hours: float | None = Field(default=None, alias='actualHours')
+    actual_start: str | None = Field(default=None, alias='actualStart')
+    actual_end: str | None = Field(default=None, alias='actualEnd')
+    budget_hours: float | None = Field(default=None, alias='budgetHours')
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    billing_start_date: datetime | None = Field(default=None, alias='billingStartDate')
+    bill_phase_closed_flag: bool | None = Field(
+        default=None, alias='billPhaseClosedFlag'
+    )
     """
-     Max length: 4000;
+    This phase can only be billed after it has been closed.
     """
-    customer_signoff_fields_flag: bool | None = Field(
-        default=None, alias='customerSignoffFieldsFlag'
-    )
-    billing_methods_text_flag: bool | None = Field(
-        default=None, alias='billingMethodsTextFlag'
+    bill_project_closed_flag: bool | None = Field(
+        default=None, alias='billProjectClosedFlag'
     )
     """
-    On add/post, if billingMethodsText.Length > 0, this is set to true.
+    This phase can only be billed after the project has been closed.
     """
-    billing_methods_text: str | None = Field(default=None, alias='billingMethodsText')
+    downpayment: float | None = None
+    po_number: str | None = Field(default=None, alias='poNumber')
     """
-     Max length: 2000;
+     Max length: 25;
     """
-    credit_card_fields_flag: bool | None = Field(
-        default=None, alias='creditCardFieldsFlag'
+    po_amount: float | None = Field(default=None, alias='poAmount')
+    estimated_time_cost: float | None = Field(default=None, alias='estimatedTimeCost')
+    estimated_expense_cost: float | None = Field(
+        default=None, alias='estimatedExpenseCost'
     )
-    default_ff_flag: bool | None = Field(default=None, alias='defaultFFFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceSignoffCustomField(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_product_cost: float | None = Field(
+        default=None, alias='estimatedProductCost'
     )
-    id: int | None = None
-    sequence_number: float = Field(..., alias='sequenceNumber')
-    display_section: DisplaySection = Field(..., alias='displaySection')
-    user_defined_field: UserDefinedFieldReference | None = Field(
-        default=None, alias='userDefinedField'
+    estimated_time_revenue: float | None = Field(
+        default=None, alias='estimatedTimeRevenue'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceSignoffInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_expense_revenue: float | None = Field(
+        default=None, alias='estimatedExpenseRevenue'
     )
-    id: int | None = None
-    name: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceSignoffReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_product_revenue: float | None = Field(
+        default=None, alias='estimatedProductRevenue'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceSourceReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    currency: CurrencyReference | None = None
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceStatusReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_to_contact: ContactReference | None = Field(
+        default=None, alias='billToContact'
     )
-    id: int | None = None
-    name: str | None = None
-    sort: int | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceSubTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
+    )
+    ship_to_contact: ContactReference | None = Field(
+        default=None, alias='shipToContact'
+    )
+    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceSurvey(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectStatus(ConnectWiseModel):
     id: int | None = None
     name: str
     """
-     Max length: 50;
+     Max length: 30;
     """
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
     inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    header_include_logo_flag: bool | None = Field(
-        default=None, alias='headerIncludeLogoFlag'
-    )
-    header_text: str | None = Field(default=None, alias='headerText')
-    """
-     Max length: 4000;
-    """
-    header_text_visible_flag: bool | None = Field(
-        default=None, alias='headerTextVisibleFlag'
-    )
-    footer_text: str | None = Field(default=None, alias='footerText')
-    """
-     Max length: 500;
-    """
-    footer_text_visible_flag: bool | None = Field(
-        default=None, alias='footerTextVisibleFlag'
-    )
-    thank_you_text: str | None = Field(default=None, alias='thankYouText')
-    """
-     Max length: 4000;
-    """
-    notify_who: GenericIdIdentifierReference | None = Field(
-        default=None, alias='notifyWho'
-    )
-    notify_who_visible_flag: bool | None = Field(
-        default=None, alias='notifyWhoVisibleFlag'
-    )
-    notify_member: MemberReference | None = Field(default=None, alias='notifyMember')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceSurveyQuestion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    no_time_flag: bool | None = Field(default=None, alias='noTimeFlag')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    status_indicator: StatusIndicatorReference | None = Field(
+        default=None, alias='statusIndicator'
+    )
+    custom_status_indicator_name: str | None = Field(
+        default=None, alias='customStatusIndicatorName'
     )
-    id: int | None = None
-    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
-    type: Type8
-    question: str
     """
-     Max length: 1000;
+    Required when statusIndicator is Custom. Max length: 30;
     """
-    options: list[ServiceSurveyQuestionOption] | None = None
-    include_flag: bool | None = Field(default=None, alias='includeFlag')
-    required_flag: bool | None = Field(default=None, alias='requiredFlag')
-    no_answer_points: int | None = Field(default=None, alias='noAnswerPoints')
-    survey_id: int | None = Field(default=None, alias='surveyId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceSurveyQuestionOption(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    include_flag: bool | None = Field(default=None, alias='includeFlag')
-    caption: str | None = None
-    points: int | None = None
+class ProjectTeamMember(ConnectWiseModel):
+    id: int | None = None
+    project_id: int | None = Field(default=None, alias='projectId')
+    hours: float | None = None
+    member: MemberReference | None = None
+    project_role: ProjectRoleReference | None = Field(default=None, alias='projectRole')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    start_date: datetime | None = Field(default=None, alias='startDate')
+    end_date: datetime | None = Field(default=None, alias='endDate')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceSurveyReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectTemplate(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str
+    """
+     Max length: 200;
+    """
+    description: str | None = None
+    type: ProjectTypeReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceTeam(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectTemplateTask(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    leader: MemberReference | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    delete_notify_flag: bool | None = Field(default=None, alias='deleteNotifyFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    ticket_id: int | None = Field(default=None, alias='ticketId')
+    sequence: int | None = None
+    description: str | None = None
+    summary: str | None = None
+    code: ServiceCodeReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceTeamReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectTemplateTicket(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    project_template_id: int | None = Field(default=None, alias='projectTemplateId')
+    project_template_phase_id: int | None = Field(
+        default=None, alias='projectTemplatePhaseId'
+    )
+    line_number: float | None = Field(default=None, alias='lineNumber')
+    description: str
+    """
+     Max length: 100;
+    """
+    notes: str | None = None
+    internal_analysis: str | None = Field(default=None, alias='internalAnalysis')
+    resolution: str | None = None
+    budget_hours: float | None = Field(default=None, alias='budgetHours')
+    duration: int | None = None
+    wbs_code: str | None = Field(default=None, alias='wbsCode')
+    """
+     Max length: 50;
+    """
+    bill_separately_flag: bool | None = Field(default=None, alias='billSeparatelyFlag')
+    mark_as_milestone_flag: bool | None = Field(
+        default=None, alias='markAsMilestoneFlag'
+    )
+    record_type: str | None = Field(default=None, alias='recordType')
+    """
+     Max length: 1;
+    """
+    pm_tmp_project_rec_id: int | None = Field(default=None, alias='pmTmpProjectRecID')
+    priority: PriorityReference | None = None
+    source: ServiceSourceReference | None = None
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceTemplate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectTicket(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
+    summary: str
+    """
+     Max length: 100;
+    """
+    is_issue_flag: bool | None = Field(default=None, alias='isIssueFlag')
     board: BoardReference | None = None
+    status: ServiceStatusReference | None = None
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    project: ProjectReference | None = None
+    phase: ProjectPhaseReference | None = None
+    wbs_code: str | None = Field(default=None, alias='wbsCode')
+    """
+     Max length: 50;
+    """
+    company: CompanyReference | None = None
+    site: SiteReference | None = None
+    site_name: str | None = Field(default=None, alias='siteName')
+    """
+     Max length: 50;
+    """
+    address_line1: str | None = Field(default=None, alias='addressLine1')
+    """
+     Max length: 50;
+    """
+    address_line2: str | None = Field(default=None, alias='addressLine2')
+    """
+     Max length: 50;
+    """
+    city: str | None = None
+    """
+     Max length: 50;
+    """
+    state_identifier: str | None = Field(default=None, alias='stateIdentifier')
+    """
+     Max length: 50;
+    """
+    zip: str | None = None
+    """
+     Max length: 12;
+    """
+    country: CountryReference | None = None
+    contact: ContactReference | None = None
+    contact_name: str | None = Field(default=None, alias='contactName')
+    """
+     Max length: 62;
+    """
+    contact_phone_number: str | None = Field(default=None, alias='contactPhoneNumber')
+    """
+     Max length: 20;
+    """
+    contact_phone_extension: str | None = Field(
+        default=None, alias='contactPhoneExtension'
+    )
+    """
+     Max length: 15;
+    """
+    contact_email_address: str | None = Field(default=None, alias='contactEmailAddress')
+    """
+     Max length: 250;
+    """
     type: ServiceTypeReference | None = None
+    sub_type: ServiceSubTypeReference | None = Field(default=None, alias='subType')
     item: ServiceItemReference | None = None
-    subtype: ServiceSubTypeReference | None = None
+    owner: MemberReference | None = None
+    priority: PriorityReference | None = None
     service_location: ServiceLocationReference | None = Field(
         default=None, alias='serviceLocation'
     )
-    status: ServiceStatusReference | None = None
     source: ServiceSourceReference | None = None
-    priority: PriorityReference | None = None
-    team: ServiceTeamReference | None = None
-    company: CompanyReference | None = None
-    contact: ContactReference | None = None
-    site: SiteReference | None = None
-    assigned_notify_flag: bool | None = Field(default=None, alias='assignedNotifyFlag')
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    summary: str | None = None
-    problem: str | None = None
-    hours_budget: float | None = Field(default=None, alias='hoursBudget')
-    internal_analysis: str | None = Field(default=None, alias='internalAnalysis')
-    time_billable_flag: bool | None = Field(default=None, alias='timeBillableFlag')
-    expense_billable_flag: bool | None = Field(
-        default=None, alias='expenseBillableFlag'
+    required_date: datetime | None = Field(default=None, alias='requiredDate')
+    budget_hours: float | None = Field(default=None, alias='budgetHours')
+    opportunity: OpportunityReference | None = None
+    agreement: AgreementReference | None = None
+    knowledge_base_category_id: int | None = Field(
+        default=None, alias='knowledgeBaseCategoryId'
     )
-    purchase_order_number: str | None = Field(default=None, alias='purchaseOrderNumber')
-    reference: str | None = None
-    bill_complete_flag: bool | None = Field(default=None, alias='billComplete_Flag')
-    bill_service_separately_flag: bool | None = Field(
-        default=None, alias='billServiceSeparatelyFlag'
+    knowledge_base_sub_category_id: int | None = Field(
+        default=None, alias='knowledgeBaseSubCategoryId'
     )
-    billing_amount: float | None = Field(default=None, alias='billingAmount')
-    bill_unapproved_time_and_expenses_flag: bool | None = Field(
-        default=None, alias='billUnapprovedTimeAndExpensesFlag'
+    knowledge_base_link_id: int | None = Field(
+        default=None, alias='knowledgeBaseLinkId'
     )
-    override_flag: bool | None = Field(default=None, alias='overrideFlag')
-    time_invoice_flag: bool | None = Field(default=None, alias='timeInvoiceFlag')
-    expense_invoice_flag: bool | None = Field(default=None, alias='expenseInvoiceFlag')
-    product_invoice_flag: bool | None = Field(default=None, alias='productInvoiceFlag')
-    agreement: AgreementReference | None = None
-    billing_method: BillingMethod4 | None = Field(default=None, alias='billingMethod')
-    severity: Severity | None = None
-    impact: Impact1 | None = None
-    assigned_by: MemberReference | None = Field(default=None, alias='assignedBy')
-    schedule_days_before: int | None = Field(default=None, alias='scheduleDaysBefore')
-    service_days_before: int | None = Field(default=None, alias='serviceDaysBefore')
-    attach_schedule_to_new_service_flag: bool | None = Field(
-        default=None, alias='attachScheduleToNewServiceFlag'
+    knowledge_base_link_type: Literal[
+        'Activity',
+        'ProjectIssue',
+        'KnowledgeBaseArticle',
+        'ProjectTicket',
+        'ServiceTicket',
+        'Time',
+    ] | None = Field(default=None, alias='knowledgeBaseLinkType')
+    allow_all_clients_portal_view: bool | None = Field(
+        default=None, alias='allowAllClientsPortalView'
     )
-    template_flag: bool | None = Field(default=None, alias='templateFlag')
-    email_contact_flag: bool | None = Field(default=None, alias='emailContactFlag')
-    email_resource_flag: bool | None = Field(default=None, alias='emailResourceFlag')
-    email_cc_flag: bool | None = Field(default=None, alias='emailCCFlag')
-    email_cc: str | None = Field(default=None, alias='emailCC')
-    restrict_downpayment_flag: bool | None = Field(
-        default=None, alias='restrictDownpaymentFlag'
+    customer_updated_flag: bool | None = Field(
+        default=None, alias='customerUpdatedFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceTemplateInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    automatic_email_contact_flag: bool | None = Field(
+        default=None, alias='automaticEmailContactFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    template_flag: bool | None = Field(default=None, alias='templateFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceTemplateReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    automatic_email_resource_flag: bool | None = Field(
+        default=None, alias='automaticEmailResourceFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    summary: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceTicketLink(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    automatic_email_cc_flag: bool | None = Field(
+        default=None, alias='automaticEmailCcFlag'
+    )
+    automatic_email_cc: str | None = Field(default=None, alias='automaticEmailCc')
+    """
+     Max length: 1000;
+    """
+    closed_date: str | None = Field(default=None, alias='closedDate')
+    closed_by: str | None = Field(default=None, alias='closedBy')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    actual_hours: float | None = Field(default=None, alias='actualHours')
+    approved: bool | None = None
+    sub_billing_method: Literal[
+        'ActualRates', 'FixedFee', 'NotToExceed', 'OverrideRate'
+    ] | None = Field(default=None, alias='subBillingMethod')
+    sub_billing_amount: float | None = Field(default=None, alias='subBillingAmount')
+    sub_date_accepted: str | None = Field(default=None, alias='subDateAccepted')
+    resources: str | None = None
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] | None = Field(
+        default=None, alias='billTime'
+    )
+    bill_expenses: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billExpenses')
+    bill_products: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billProducts')
+    predecessor_type: Literal['Ticket', 'Phase'] | None = Field(
+        default=None, alias='predecessorType'
+    )
+    predecessor_id: int | None = Field(default=None, alias='predecessorId')
+    predecessor_closed_flag: bool | None = Field(
+        default=None, alias='predecessorClosedFlag'
+    )
+    lag_days: int | None = Field(default=None, alias='lagDays')
+    lag_nonworking_days_flag: bool | None = Field(
+        default=None, alias='lagNonworkingDaysFlag'
+    )
+    estimated_start_date: datetime | None = Field(
+        default=None, alias='estimatedStartDate'
+    )
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    duration: int | None = None
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    currency: CurrencyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    tasks: list[TicketTask] | None = None
+    initial_description: str | None = Field(default=None, alias='initialDescription')
+    """
+    Only available for POST, will not be returned in the response.
+    """
+    initial_internal_analysis: str | None = Field(
+        default=None, alias='initialInternalAnalysis'
     )
-    id: int | None = None
-    name: str
     """
-     Max length: 50;
+    Only available for POST, will not be returned in the response.
     """
-    enabled_flag: bool | None = Field(default=None, alias='enabledFlag')
-    link_text: str = Field(..., alias='linkText')
+    initial_resolution: str | None = Field(default=None, alias='initialResolution')
     """
-     Max length: 50;
+    Only available for POST, will not be returned in the response.
     """
-    url: str
+    contact_email_lookup: str | None = Field(default=None, alias='contactEmailLookup')
+    process_notifications: bool | None = Field(
+        default=None, alias='processNotifications'
+    )
     """
-     Max length: 1000;
+    Can be set to false to skip notification processing when adding or updating a ticket (Defaults to True).
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceTicketLinkInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    skip_callback: bool | None = Field(default=None, alias='skipCallback')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    id: int | None = None
-    name: str | None = None
-    link_text: str | None = Field(default=None, alias='linkText')
-    url: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class ServiceTicketNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectTicketNote(ConnectWiseModel):
     id: int | None = None
-    note_type: NoteType | None = Field(default=None, alias='noteType')
+    note_type: Literal['TicketNote', 'TimeEntryNote', 'MeetingNote'] | None = Field(
+        default=None, alias='noteType'
+    )
     ticket: TicketReference | None = None
     text: str | None = None
-    is_markdown_flag: bool | None = Field(default=None, alias='isMarkdownFlag')
     detail_description_flag: bool | None = Field(
         default=None, alias='detailDescriptionFlag'
     )
@@ -17331,1642 +14624,1066 @@ class ServiceTicketNote(BaseModel):
         default=None, alias='internalAnalysisFlag'
     )
     resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
-    time_start: str | None = Field(default=None, alias='timeStart')
-    time_end: str | None = Field(default=None, alias='timeEnd')
+    time_start: datetime | None = Field(default=None, alias='timeStart')
+    time_end: datetime | None = Field(default=None, alias='timeEnd')
     bundled_flag: bool | None = Field(default=None, alias='bundledFlag')
     merged_flag: bool | None = Field(default=None, alias='mergedFlag')
     issue_flag: bool | None = Field(default=None, alias='issueFlag')
     original_author: str | None = Field(default=None, alias='originalAuthor')
     member: MemberReference | None = None
     contact: ContactReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ServiceTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Services(Enum):
-    DISCARD = 'Discard'
-    MERGE = 'Merge'
-
-
-class SetupScreen(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ProjectWorkplan(ConnectWiseModel):
     id: int | None = None
-    category: str | None = None
-    name: str | None = None
+    project_id: int | None = Field(default=None, alias='projectId')
     description: str | None = None
-    module_description: str | None = Field(default=None, alias='moduleDescription')
-    module_identifier: str | None = Field(default=None, alias='moduleIdentifier')
-    module_name: str | None = Field(default=None, alias='moduleName')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Severity(Enum):
-    LOW = 'Low'
-    MEDIUM = 'Medium'
-    HIGH = 'High'
-
-
-class Severity1(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    board: ProjectBoardReference | None = None
+    status: PhaseStatusReference | None = None
+    agreement: AgreementReference | None = None
+    opportunity: OpportunityReference | None = None
+    parent_phase: ProjectPhaseReference | None = Field(
+        default=None, alias='parentPhase'
     )
-    id: int | None = None
-    name: str | None = None
-    description: str
-    """
-     Max length: 200;
-    """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Severity2(Enum):
+    wbs_code: str | None = Field(default=None, alias='wbsCode')
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] | None = Field(
+        default=None, alias='billTime'
+    )
+    bill_expenses: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billExpenses')
+    bill_products: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billProducts')
+    mark_as_milestone_flag: bool | None = Field(
+        default=None, alias='markAsMilestoneFlag'
+    )
+    notes: str | None = None
+    deadline_date: str | None = Field(default=None, alias='deadlineDate')
+    bill_separately_flag: bool | None = Field(default=None, alias='billSeparatelyFlag')
+    billing_method: Literal[
+        'ActualRates', 'FixedFee', 'NotToExceed', 'OverrideRate'
+    ] | None = Field(default=None, alias='billingMethod')
     """
-    Required On Updates;
+    billingMethod is required if the phase billSeparatelyFlag is true.
     """
-
-    LOW = 'Low'
-    MEDIUM = 'Medium'
-    HIGH = 'High'
-
-
-class ShipmentMethod(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    scheduled_hours: float | None = Field(default=None, alias='scheduledHours')
+    scheduled_start: str | None = Field(default=None, alias='scheduledStart')
+    scheduled_end: str | None = Field(default=None, alias='scheduledEnd')
+    actual_hours: float | None = Field(default=None, alias='actualHours')
+    actual_start: str | None = Field(default=None, alias='actualStart')
+    actual_end: str | None = Field(default=None, alias='actualEnd')
+    budget_hours: float | None = Field(default=None, alias='budgetHours')
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    billing_start_date: str | None = Field(default=None, alias='billingStartDate')
+    bill_phase_closed_flag: bool | None = Field(
+        default=None, alias='billPhaseClosedFlag'
     )
-    id: int | None = None
-    name: str
     """
-     Max length: 50;
+    This phase can only be billed after it has been closed.
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    tracking_url: str | None = Field(default=None, alias='trackingUrl')
+    bill_project_closed_flag: bool | None = Field(
+        default=None, alias='billProjectClosedFlag'
+    )
     """
-     Max length: 200;
+    This phase can only be billed after the project has been closed.
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ShipmentMethodInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    downpayment: float | None = None
+    po_number: str | None = Field(default=None, alias='poNumber')
+    po_amount: float | None = Field(default=None, alias='poAmount')
+    estimated_time_cost: float | None = Field(default=None, alias='estimatedTimeCost')
+    estimated_expense_cost: float | None = Field(
+        default=None, alias='estimatedExpenseCost'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class ShipmentMethodReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_product_cost: float | None = Field(
+        default=None, alias='estimatedProductCost'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SicCode(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class SicCodeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_time_revenue: float | None = Field(
+        default=None, alias='estimatedTimeRevenue'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SickAvailableType(Enum):
-    ANNIVERSARY_YEAR = 'AnniversaryYear'
-    CALENDAR_YEAR = 'CalendarYear'
-
-
-class SiteReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_expense_revenue: float | None = Field(
+        default=None, alias='estimatedExpenseRevenue'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Sites(Enum):
-    DISCARD = 'Discard'
-    MERGE = 'Merge'
-
-
-class Skill(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_product_revenue: float | None = Field(
+        default=None, alias='estimatedProductRevenue'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    category: SkillCategoryReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SkillCategory(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    currency: CurrencyReference | None = None
+    bill_to_company: CompanyReference | None = Field(
+        default=None, alias='billToCompany'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 30;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SkillCategoryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_to_contact: ContactReference | None = Field(
+        default=None, alias='billToContact'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SkillInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SkillLevel(Enum):
-    BEGINNER = 'Beginner'
-    INTERMEDIATE = 'Intermediate'
-    ADVANCED = 'Advanced'
-    EXPERT = 'Expert'
-
-
-class SkillReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ship_to_contact: ContactReference | None = Field(
+        default=None, alias='shipToContact'
+    )
+    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    tickets: list[ProjectTicket] | None = None
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Source(Enum):
-    NONE = 'None'
-    MEMBER = 'Member'
-    API = 'API'
-    WORKFLOW = 'Workflow'
-    PORTAL = 'Portal'
-    MOBILE = 'Mobile'
-    NETWORK = 'Network'
-    EMAIL_CONNECTOR = 'EmailConnector'
-    MASS_MAINTENANCE = 'MassMaintenance'
-    APPLICATION = 'Application'
-    SYSTEM_API = 'SystemAPI'
-    CONVERSION = 'Conversion'
-
-
-class Source2(Enum):
-    DEFAULT = 'Default'
-    WISE_PAY = 'WisePay'
 
 
-class Source3(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PurchaseOrder(ConnectWiseModel):
     id: int | None = None
-    name: str
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    cancel_reason: str | None = Field(default=None, alias='cancelReason')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
     """
-     Max length: 50;
+    The closed flag can only be updated via updating the purchase order status to a closed/open status.
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    entered_by: str | None = Field(default=None, alias='enteredBy')
-    date_entered: datetime | None = Field(default=None, alias='dateEntered')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Source4(Enum):
-    NONE = 'None'
-    MEMBER = 'Member'
-    API = 'API'
-    WORKFLOW = 'Workflow'
-    PORTAL = 'Portal'
-    MOBILE = 'Mobile'
-    NETWORK = 'Network'
-    EMAIL_CONNECTOR = 'EmailConnector'
-    MASS_MAINTENANCE = 'MassMaintenance'
-    APPLICATION = 'Application'
-    SYSTEM_API = 'SystemAPI'
-    CONVERSION = 'Conversion'
-
-
-class SourceInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    closed_by: str | None = Field(default=None, alias='closedBy')
+    customer_city: str | None = Field(default=None, alias='customerCity')
+    customer_company: CompanyReference | None = Field(
+        default=None, alias='customerCompany'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SourceList(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class SrNotify(Enum):
-    ALL = 'All'
-    NEW_AND_CLOSED_REQUESTS = 'NewAndClosedRequests'
-    CLOSED_REQUESTS_ONLY = 'ClosedRequestsOnly'
-    NEW_REQUESTS_ONLY = 'NewRequestsOnly'
-    NONE = 'None'
-
-
-class SsoConfiguration(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    customer_contact: ContactReference | None = Field(
+        default=None, alias='customerContact'
     )
-    id: int | None = None
-    """
-    Unique identifier of the SSO Configuration
-    """
-    name: str
-    """
-    Descriptor of the SSO Configuration Max length: 100;
-    """
-    sso_type: SsoType = Field(..., alias='ssoType')
-    """
-    Type of SSO Configuration
-    """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    """
-    Whether the SSO configuration is not active
-    """
-    saml_entity_id: str | None = Field(default=None, alias='samlEntityId')
-    """
-    SAML Identity Provider Id Max length: 1000;
-    """
-    saml_sign_in_url: str | None = Field(default=None, alias='samlSignInUrl')
-    """
-    Sign in url for the SAML Identity Provider Max length: 1000;
-    """
-    saml_idp_certificate: str | None = Field(default=None, alias='samlIdpCertificate')
-    """
-    Public certificate for Identity Provider signatures
-    """
-    saml_certificate_name: str | None = Field(default=None, alias='samlCertificateName')
-    """
-    Name of the SAML certificate. Metadata on SAML_Idp_Certificate
-    """
-    saml_certificate_issued_to: str | None = Field(
-        default=None, alias='samlCertificateIssuedTo'
+    customer_country: CountryReference | None = Field(
+        default=None, alias='customerCountry'
+    )
+    customer_extension: str | None = Field(default=None, alias='customerExtension')
+    customer_name: str | None = Field(default=None, alias='customerName')
+    customer_phone: str | None = Field(default=None, alias='customerPhone')
+    customer_site: SiteReference | None = Field(default=None, alias='customerSite')
+    customer_site_name: str | None = Field(default=None, alias='customerSiteName')
+    customer_state: str | None = Field(default=None, alias='customerState')
+    customer_street_line1: str | None = Field(default=None, alias='customerStreetLine1')
+    customer_street_line2: str | None = Field(default=None, alias='customerStreetLine2')
+    customer_zip: str | None = Field(default=None, alias='customerZip')
+    date_closed: datetime | None = Field(default=None, alias='dateClosed')
+    drop_ship_customer_flag: bool | None = Field(
+        default=None, alias='dropShipCustomerFlag'
     )
+    entered_by: str | None = Field(default=None, alias='enteredBy')
+    freight_cost: float | None = Field(default=None, alias='freightCost')
+    freight_packing_slip: str | None = Field(default=None, alias='freightPackingSlip')
+    freight_tax_total: float | None = Field(default=None, alias='freightTaxTotal')
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    location_id: int | None = Field(default=None, alias='locationId')
+    po_date: datetime | None = Field(default=None, alias='poDate')
     """
-    Who the SAML certificate was issued to. Metadata on SAML_Idp_Certificate
+     Required On Updates;
     """
-    saml_certificate_thumbprint: str | None = Field(
-        default=None, alias='samlCertificateThumbprint'
-    )
+    po_number: str | None = Field(default=None, alias='poNumber')
     """
-    Thumbprint of the SAML certificate. Metadata on SAML_Idp_Certificate
+     Required On Updates; Max length: 50;
     """
-    saml_certificate_valid_from: datetime | None = Field(
-        default=None, alias='samlCertificateValidFrom'
+    sales_tax: float | None = Field(default=None, alias='salesTax')
+    shipment_date: datetime | None = Field(default=None, alias='shipmentDate')
+    shipment_method: ShipmentMethodReference | None = Field(
+        default=None, alias='shipmentMethod'
     )
-    """
-    Date when the SAML certificate becomes valid. Metadata on SAML_Idp_Certificate
-    """
-    saml_certificate_valid_to: datetime | None = Field(
-        default=None, alias='samlCertificateValidTo'
+    shipping_instructions: str | None = Field(
+        default=None, alias='shippingInstructions'
     )
+    status: PurchaseOrderStatusReference | None = None
+    sub_total: float | None = Field(default=None, alias='subTotal')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    tax_freight_flag: bool | None = Field(default=None, alias='taxFreightFlag')
+    tax_po_flag: bool | None = Field(default=None, alias='taxPoFlag')
+    terms: BillingTermsReference | None = None
+    total: float | None = None
+    tracking_number: str | None = Field(default=None, alias='trackingNumber')
     """
-    Date when the SAML certificate is no longer valid. Metadata on SAML_Idp_Certificate
-    """
-    location_ids: list[int] = Field(..., alias='locationIds')
-    """
-    The locations where the SAML Idp Configuration is used
-    """
-    client_id: str | None = Field(default=None, alias='clientId')
-    """
-    Client identity for this configuration of ConnectWise SSO Max length: 1000;
+     Max length: 50;
     """
-    sts_base_url: str | None = Field(default=None, alias='stsBaseUrl')
+    update_shipment_info: bool | None = Field(default=None, alias='updateShipmentInfo')
     """
-    Sign in URL for ConnectWise SSO
+    Determines whether or not to update all of the shipment info for each associated line item when new shipment info is passed in.
     """
-    sts_user_admin_url: str | None = Field(default=None, alias='stsUserAdminUrl')
+    update_vendor_order_number: bool | None = Field(
+        default=None, alias='updateVendorOrderNumber'
+    )
     """
-    User Admin Url for ConnectWise SSO
+    Determines whether or not to update vendor order number for each associated line item when new vendor order number is passed in.
     """
-    token: str | None = None
-    submitted_member_count: int | None = Field(
-        default=None, alias='submittedMemberCount'
-    )
-    all_members_submitted: bool | None = Field(
-        default=None, alias='allMembersSubmitted'
+    vendor_company: CompanyReference | None = Field(default=None, alias='vendorCompany')
+    vendor_contact: ContactReference | None = Field(default=None, alias='vendorContact')
+    vendor_invoice_date: datetime | None = Field(
+        default=None, alias='vendorInvoiceDate'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    is_sso_on_by_default: bool | None = Field(default=None, alias='isSsoOnByDefault')
-
-
-class SsoType(Enum):
+    vendor_invoice_number: str | None = Field(default=None, alias='vendorInvoiceNumber')
     """
-    Type of SSO Configuration
+     Max length: 50;
     """
-
-    CWSSO = 'CWSSO'
-    SAML = 'SAML'
-
-
-class SsoUser(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    sso_user_id: str | None = Field(default=None, alias='ssoUserId')
-    user_name: str | None = Field(default=None, alias='userName')
-    first_name: str | None = Field(default=None, alias='firstName')
-    last_name: str | None = Field(default=None, alias='lastName')
-    email: str | None = None
-    email_confirmed: bool | None = Field(default=None, alias='emailConfirmed')
-    disabled_flag: bool | None = Field(default=None, alias='disabledFlag')
-    linked_flag: bool | None = Field(default=None, alias='linkedFlag')
-    date_entered: str | None = Field(default=None, alias='dateEntered')
-    last_updated: str | None = Field(default=None, alias='lastUpdated')
-    linked_member: MemberReference | None = Field(default=None, alias='linkedMember')
-
-
-class StandardNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
+    vendor_order_number: str | None = Field(default=None, alias='vendorOrderNumber')
     """
      Max length: 50;
     """
-    contents: str
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    board: BoardReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class StandardNoteInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    vendor_site: SiteReference | None = Field(default=None, alias='vendorSite')
+    warehouse: WarehouseReference | None = None
+    warehouse_contact: ContactReference | None = Field(
+        default=None, alias='warehouseContact'
+    )
+    currency: CurrencyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    id: int | None = None
-    name: str | None = None
-    contents: str | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    board: BoardReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class State(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PurchaseOrderLineItem(ConnectWiseModel):
     id: int | None = None
-    identifier: str
+    backordered_flag: bool | None = Field(default=None, alias='backorderedFlag')
+    canceled_by: str | None = Field(default=None, alias='canceledBy')
+    canceled_flag: bool | None = Field(default=None, alias='canceledFlag')
+    canceled_reason: str | None = Field(default=None, alias='canceledReason')
     """
-     Max length: 50;
+     Max length: 100;
     """
-    name: str
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    date_canceled: datetime | None = Field(default=None, alias='dateCanceled')
+    date_canceled_utc: datetime | None = Field(default=None, alias='dateCanceledUtc')
+    description: str
     """
-     Max length: 50;
+     Max length: 6000;
     """
-    country: CountryReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class StateInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    identifier: str | None = None
-    country: CountryReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class StateReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Status(Enum):
-    RESET = 'Reset'
-    RUNNING = 'Running'
-    PAUSED = 'Paused'
-    STOPPED = 'Stopped'
-
-
-class Status1(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class Status2(Enum):
-    OPEN = 'Open'
-    REJECTED = 'Rejected'
-    PENDING_APPROVAL = 'PendingApproval'
-    ERRORS_CORRECTED = 'ErrorsCorrected'
-    PENDING_PROJECT_APPROVAL = 'PendingProjectApproval'
-    APPROVED_BY_TIER_ONE = 'ApprovedByTierOne'
-    REJECT_BY_SECOND_TIER = 'RejectBySecondTier'
-    APPROVED_BY_TIER_TWO = 'ApprovedByTierTwo'
-    READY_TO_BILL = 'ReadyToBill'
-    BILLED = 'Billed'
-    WRITTEN_OFF = 'WrittenOff'
-    BILLED_AGREEMENT = 'BilledAgreement'
-
-
-class Status4(Enum):
-    RESET = 'Reset'
-    RUNNING = 'Running'
-    PAUSED = 'Paused'
-    STOPPED = 'Stopped'
-
-
-class Status6(Enum):
-    OPEN = 'Open'
-    REJECTED = 'Rejected'
-    PENDING_APPROVAL = 'PendingApproval'
-    ERRORS_CORRECTED = 'ErrorsCorrected'
-    PENDING_PROJECT_APPROVAL = 'PendingProjectApproval'
-    APPROVED_BY_TIER_ONE = 'ApprovedByTierOne'
-    REJECT_BY_SECOND_TIER = 'RejectBySecondTier'
-    APPROVED_BY_TIER_TWO = 'ApprovedByTierTwo'
-    READY_TO_BILL = 'ReadyToBill'
-    BILLED = 'Billed'
-    WRITTEN_OFF = 'WrittenOff'
-    BILLED_AGREEMENT = 'BilledAgreement'
-
-
-class StatusIndicator(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    color: str | None = None
-    icon: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class StatusIndicatorReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class StructureReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SubBillingMethod(Enum):
-    ACTUAL_RATES = 'ActualRates'
-    FIXED_FEE = 'FixedFee'
-    NOT_TO_EXCEED = 'NotToExceed'
-    OVERRIDE_RATE = 'OverrideRate'
-
-
-class SubCategory(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    display_internal_notes_flag: bool | None = Field(
+        default=None, alias='displayInternalNotesFlag'
     )
-    id: int | None = None
-    name: str
+    expected_ship_date: datetime | None = Field(default=None, alias='expectedShipDate')
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    integration_xref: str | None = Field(default=None, alias='integrationXref')
+    line_number: int = Field(..., alias='lineNumber')
+    packing_slip: str | None = Field(default=None, alias='packingSlip')
     """
      Max length: 50;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    category: ProductCategoryReference
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SubCategoryInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    category: ProductCategoryReference | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SuccessResponse(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    success: bool | None = None
-    message: str | None = None
-
-
-class SummarizeInvoices(Enum):
-    DEFAULT = 'Default'
-    CONDENSED = 'Condensed'
-    DETAILED = 'Detailed'
-
-
-class SummarySetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
-
-
-class Survey(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    product: IvItemReference | None = None
+    purchase_order_id: int | None = Field(default=None, alias='purchaseOrderId')
+    quantity: float
+    received_quantity: int | None = Field(default=None, alias='receivedQuantity')
+    serial_numbers: str | None = Field(default=None, alias='serialNumbers')
+    ship_date: datetime | None = Field(default=None, alias='shipDate')
+    shipment_method: ShipmentMethodReference | None = Field(
+        default=None, alias='shipmentMethod'
     )
-    id: int | None = None
-    name: str
+    tax: float | None = None
+    tracking_number: str | None = Field(default=None, alias='trackingNumber')
     """
      Max length: 50;
     """
-    instructions: str | None = None
+    unit_cost: float | None = Field(default=None, alias='unitCost')
+    unit_of_measure: UnitOfMeasureReference | None = Field(
+        default=None, alias='unitOfMeasure'
+    )
+    vendor_order_number: str | None = Field(default=None, alias='vendorOrderNumber')
     """
-     Max length: 1000;
+     Max length: 50;
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SurveyInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SurveyOption(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    caption: str
+    vendor_sku: str | None = Field(default=None, alias='vendorSku')
     """
-     Max length: 100;
+     Max length: 50;
     """
-    points: int
-    visibleflag: bool | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SurveyQuestion(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    survey: SurveyReference | None = None
-    field_type: FieldType3 = Field(..., alias='fieldType')
-    entry_type: EntryType = Field(..., alias='entryType')
-    sequence_number: float = Field(..., alias='sequenceNumber')
-    question: str
+    warehouse: WarehouseReference | None = None
+    warehouse_bin: WarehouseBinReference | None = Field(
+        default=None, alias='warehouseBin'
+    )
+    ship_set: str | None = Field(default=None, alias='shipSet')
     """
-     Max length: 1000;
+     Max length: 10;
     """
-    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
-    required_flag: bool | None = Field(default=None, alias='requiredFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SurveyQuestionReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    date_received: datetime | None = Field(default=None, alias='dateReceived')
+    received_status: Literal[
+        'Waiting',
+        'FullyReceived',
+        'PartiallyReceiveCancelRest',
+        'PartiallyReceiveCloneRest',
+    ] | None = Field(default=None, alias='receivedStatus')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    id: int | None = None
-    question: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SurveyQuestionValue(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PurchaseOrderStatus(ConnectWiseModel):
     id: int | None = None
-    survey: SurveyReference | None = None
-    question: SurveyQuestionReference | None = None
-    value: str
+    name: str
     """
-     Max length: 1000;
+     Max length: 50;
     """
     default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    point_value: int | None = Field(default=None, alias='pointValue')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
     inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class SurveyReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    default_closed_flag: bool | None = Field(default=None, alias='defaultClosedFlag')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    email_template: PurchaseOrderStatusEmailTemplateReference | None = Field(
+        default=None, alias='emailTemplate'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SurveyResult(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class PurchaseOrderStatusEmailTemplate(ConnectWiseModel):
     id: int | None = None
-    ticket_id: int = Field(..., alias='ticketId')
+    status: PurchaseOrderStatusReference | None = None
+    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
+    first_name: str | None = Field(default=None, alias='firstName')
+    """
+     Max length: 100;
+    """
+    last_name: str | None = Field(default=None, alias='lastName')
+    """
+     Max length: 100;
+    """
     email_address: str | None = Field(default=None, alias='emailAddress')
-    footer_response: str | None = Field(default=None, alias='footerResponse')
-    contact_me_flag: bool | None = Field(default=None, alias='contactMeFlag')
-    contact: ContactReference | None = None
-    results: list[SurveyResultDetail] | None = None
-    total_points: int | None = Field(default=None, alias='totalPoints')
-    company: CompanyReference | None = None
-    survey_id: int | None = Field(default=None, alias='surveyId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    """
+     Max length: 100;
+    """
+    subject: str
+    """
+     Max length: 200;
+    """
+    body: str | None = None
+    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SurveyResultDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class PurchaseOrderStatusNotification(ConnectWiseModel):
+    id: int | None = None
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
     )
-    question_id: int | None = Field(default=None, alias='questionId')
-    answer: dict[str, Any] | None = None
+    status: PurchaseOrderStatusReference | None = None
+    member: MemberReference | None = None
+    email: str | None = None
     """
-    If question type is Selection, this should be the option array index.
+    Purchase Order Status Notification email must be entered if the notify type is "Email Address". Max length: 50;
     """
+    workflow_step: int | None = Field(default=None, alias='workflowStep')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SystemDepartmentReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class PurchasingDemand(ConnectWiseModel):
+    warehouse: WarehouseReference | None = None
+    vendor: CompanyReference | None = None
+    products: list[ProductDemand] | None = None
+    purchase_order: PurchaseOrder | None = Field(default=None, alias='purchaseOrder')
 
 
-class SystemLocationReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class QuoteLink(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    location: SystemLocationReference | None = None
+    link: str
+    """
+     Max length: 2000;
+    """
+    all_locations_flag: bool | None = Field(default=None, alias='allLocationsFlag')
+    new_window_flag: bool | None = Field(default=None, alias='newWindowFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SystemMenuEntryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ReportCardDetail(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    kpi: KPIReference | None = None
+    sort_order: int | None = Field(default=None, alias='sortOrder')
+    report_card: ReportCardReference | None = Field(default=None, alias='reportCard')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class SystemSetting(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    description: str | None = None
-    value: str
-    value_type: str | None = Field(default=None, alias='valueType')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class ResultInfo(ConnectWiseModel):
+    success: bool | None = None
+    original_index: int | None = Field(default=None, alias='originalIndex')
+    status_code: int | None = Field(default=None, alias='statusCode')
+    data: IRestIdentifiedItem | None = None
+    error: ErrorResponseMessage | None = None
 
 
-class Task(Enum):
+class RmaStatus(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
-    On add/post, if this is set but no value is set for taskFlag, taskFlag is set to true.
+     Max length: 50;
     """
-
-    ALL = 'All'
-    CLOSED = 'Closed'
-    OPEN = 'Open'
-
-
-class Task1(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    ticket_id: int | None = Field(default=None, alias='ticketId')
-    notes: str | None = None
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    sort_order: int | None = Field(default=None, alias='sortOrder')
     closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    priority: int | None = None
-    schedule: ScheduleEntryReference | None = None
-    code: ServiceCodeReference | None = None
-    resolution: str | None = None
-    child_schedule_action: ChildScheduleAction | None = Field(
-        default=None, alias='childScheduleAction'
+    email_template: RmaStatusEmailTemplateReference | None = Field(
+        default=None, alias='emailTemplate'
     )
-    child_ticket_id: int | None = Field(default=None, alias='childTicketId')
-    summary: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TasksSetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TaxCode(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class TaxCode1(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class RmaStatusEmailTemplate(ConnectWiseModel):
     id: int | None = None
-    identifier: str
+    status: RmaStatusReference | None = None
+    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
+    first_name: str | None = Field(default=None, alias='firstName')
     """
-     Max length: 8;
+     Max length: 100;
     """
-    description: str
+    last_name: str | None = Field(default=None, alias='lastName')
     """
-     Max length: 50;
+     Max length: 100;
     """
-    invoice_caption: str = Field(..., alias='invoiceCaption')
+    email_address: str | None = Field(default=None, alias='emailAddress')
     """
-     Max length: 25;
+     Max length: 100;
     """
-    country: CountryReference | None = None
-    effective_date: datetime = Field(..., alias='effectiveDate')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    display_on_invoice_flag: bool | None = Field(
-        default=None, alias='displayOnInvoiceFlag'
-    )
-    canada_calculate_gst_flag: bool | None = Field(
-        default=None, alias='canadaCalculateGSTFlag'
-    )
-    cancel_date: datetime | None = Field(default=None, alias='cancelDate')
-    level_one_rate: float | None = Field(default=None, alias='levelOneRate')
-    level_one_rate_type: LevelOneRateType | None = Field(
-        default=None, alias='levelOneRateType'
-    )
-    level_one_taxable_max: float | None = Field(
-        default=None, alias='levelOneTaxableMax'
-    )
-    level_one_caption: str | None = Field(default=None, alias='levelOneCaption')
+    subject: str
     """
-     Max length: 25;
+     Max length: 200;
     """
-    level_one_tax_code_xref: str | None = Field(
-        default=None, alias='levelOneTaxCodeXref'
+    body: str
+    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class RmaStatusNotification(ConnectWiseModel):
+    id: int | None = None
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
     )
+    status: RmaStatusReference | None = None
+    member: MemberReference | None = None
+    email: str | None = None
     """
-     Max length: 50;
+    RMA Status Notification sendEmail must be entered if the notify type is "Email Address". Max length: 50;
     """
-    level_one_agency_xref: str | None = Field(default=None, alias='levelOneAgencyXref')
+    workflow_step: int | None = Field(default=None, alias='workflowStep')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class RmaTag(ConnectWiseModel):
+    id: int | None = None
+    service_ticket: TicketReference | None = Field(default=None, alias='serviceTicket')
+    sales_order: SalesOrderReference | None = Field(default=None, alias='salesOrder')
+    invoice: InvoiceReference | None = None
+    project: ProjectReference | None = None
+    summary: str | None = None
     """
-     Max length: 100;
+     Max length: 150;
     """
-    level_one_services_flag: bool | None = Field(
-        default=None, alias='levelOneServicesFlag'
-    )
-    level_one_expenses_flag: bool | None = Field(
-        default=None, alias='levelOneExpensesFlag'
-    )
-    level_one_products_flag: bool | None = Field(
-        default=None, alias='levelOneProductsFlag'
-    )
-    level_one_apply_single_unit_flag: bool | None = Field(
-        default=None, alias='levelOneApplySingleUnitFlag'
-    )
-    level_one_apply_single_unit_min: float | None = Field(
-        default=None, alias='levelOneApplySingleUnitMin'
-    )
-    level_one_apply_single_unit_max: float | None = Field(
-        default=None, alias='levelOneApplySingleUnitMax'
-    )
-    level_two_rate: float | None = Field(default=None, alias='levelTwoRate')
-    level_two_rate_type: LevelTwoRateType | None = Field(
-        default=None, alias='levelTwoRateType'
-    )
-    level_two_taxable_max: float | None = Field(
-        default=None, alias='levelTwoTaxableMax'
-    )
-    level_two_caption: str | None = Field(default=None, alias='levelTwoCaption')
+    product: IvItemReference | None = None
+    iv_description: str | None = Field(default=None, alias='ivDescription')
+    product_description: str = Field(..., alias='productDescription')
     """
-     Max length: 25;
+     Max length: 200;
     """
-    level_two_tax_code_xref: str | None = Field(
-        default=None, alias='levelTwoTaxCodeXref'
-    )
+    serial_number: str | None = Field(default=None, alias='serialNumber')
+    mfg_item_id: str | None = Field(default=None, alias='mfgItemID')
     """
-     Max length: 50;
+     Max length: 100;
     """
-    level_two_agency_xref: str | None = Field(default=None, alias='levelTwoAgencyXref')
+    status: RmaStatusReference | None = None
+    list_price: float | None = Field(default=None, alias='listPrice')
+    unit_price: float | None = Field(default=None, alias='unitPrice')
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    problem_description: str | None = Field(default=None, alias='problemDescription')
     """
-     Max length: 100;
+     Max length: 1000;
     """
-    level_two_services_flag: bool | None = Field(
-        default=None, alias='levelTwoServicesFlag'
-    )
-    level_two_expenses_flag: bool | None = Field(
-        default=None, alias='levelTwoExpensesFlag'
-    )
-    level_two_products_flag: bool | None = Field(
-        default=None, alias='levelTwoProductsFlag'
+    returned_company: CompanyReference | None = Field(
+        default=None, alias='returnedCompany'
     )
-    level_two_apply_single_unit_flag: bool | None = Field(
-        default=None, alias='levelTwoApplySingleUnitFlag'
+    returned_contact: ContactReference | None = Field(
+        default=None, alias='returnedContact'
     )
-    level_two_apply_single_unit_min: float | None = Field(
-        default=None, alias='levelTwoApplySingleUnitMin'
+    returned_contact_type: str | None = Field(default=None, alias='returnedContactType')
+    returned_contact_phone: str | None = Field(
+        default=None, alias='returnedContactPhone'
     )
-    level_two_apply_single_unit_max: float | None = Field(
-        default=None, alias='levelTwoApplySingleUnitMax'
+    returned_contact_extension: str | None = Field(
+        default=None, alias='returnedContactExtension'
     )
-    level_three_rate: float | None = Field(default=None, alias='levelThreeRate')
-    level_three_rate_type: LevelThreeRateType | None = Field(
-        default=None, alias='levelThreeRateType'
+    returned_contact_email: str | None = Field(
+        default=None, alias='returnedContactEmail'
     )
-    level_three_taxable_max: float | None = Field(
-        default=None, alias='levelThreeTaxableMax'
+    returned_contact_address_line1: str | None = Field(
+        default=None, alias='returnedContactAddressLine1'
     )
-    level_three_caption: str | None = Field(default=None, alias='levelThreeCaption')
     """
-     Max length: 25;
+     Max length: 50;
     """
-    level_three_tax_code_xref: str | None = Field(
-        default=None, alias='levelThreeTaxCodeXref'
+    returned_contact_address_line2: str | None = Field(
+        default=None, alias='returnedContactAddressLine2'
     )
     """
      Max length: 50;
     """
-    level_three_agency_xref: str | None = Field(
-        default=None, alias='levelThreeAgencyXref'
+    returned_contact_city: str | None = Field(default=None, alias='returnedContactCity')
+    """
+     Max length: 50;
+    """
+    returned_contact_state: str | None = Field(
+        default=None, alias='returnedContactState'
     )
     """
-     Max length: 100;
+     Max length: 50;
     """
-    level_three_services_flag: bool | None = Field(
-        default=None, alias='levelThreeServicesFlag'
+    returned_contact_zip: str | None = Field(default=None, alias='returnedContactZip')
+    """
+     Max length: 12;
+    """
+    returned_contact_country: CountryReference | None = Field(
+        default=None, alias='returnedContactCountry'
     )
-    level_three_expenses_flag: bool | None = Field(
-        default=None, alias='levelThreeExpensesFlag'
+    rma_disposition: RmaDispositionReference | None = Field(
+        default=None, alias='rmaDisposition'
     )
-    level_three_products_flag: bool | None = Field(
-        default=None, alias='levelThreeProductsFlag'
+    returned_site: SiteReference | None = Field(default=None, alias='returnedSite')
+    purchased_company: CompanyReference | None = Field(
+        default=None, alias='purchasedCompany'
     )
-    level_three_apply_single_unit_flag: bool | None = Field(
-        default=None, alias='levelThreeApplySingleUnitFlag'
+    purchased_contact: ContactReference | None = Field(
+        default=None, alias='purchasedContact'
     )
-    level_three_apply_single_unit_min: float | None = Field(
-        default=None, alias='levelThreeApplySingleUnitMin'
+    purchased_contact_type: str | None = Field(
+        default=None, alias='purchasedContactType'
     )
-    level_three_apply_single_unit_max: float | None = Field(
-        default=None, alias='levelThreeApplySingleUnitMax'
+    purchased_contact_phone: str | None = Field(
+        default=None, alias='purchasedContactPhone'
     )
-    level_four_rate: float | None = Field(default=None, alias='levelFourRate')
-    level_four_rate_type: LevelFourRateType | None = Field(
-        default=None, alias='levelFourRateType'
+    purchased_contact_extension: str | None = Field(
+        default=None, alias='purchasedContactExtension'
     )
-    level_four_taxable_max: float | None = Field(
-        default=None, alias='levelFourTaxableMax'
+    purchased_contact_email: str | None = Field(
+        default=None, alias='purchasedContactEmail'
     )
-    level_four_caption: str | None = Field(default=None, alias='levelFourCaption')
-    """
-     Max length: 25;
-    """
-    level_four_tax_code_xref: str | None = Field(
-        default=None, alias='levelFourTaxCodeXref'
+    purchased_contact_address_line1: str | None = Field(
+        default=None, alias='purchasedContactAddressLine1'
     )
     """
      Max length: 50;
     """
-    level_four_agency_xref: str | None = Field(
-        default=None, alias='levelFourAgencyXref'
+    purchased_contact_address_line2: str | None = Field(
+        default=None, alias='purchasedContactAddressLine2'
     )
     """
-     Max length: 100;
+     Max length: 50;
     """
-    level_four_services_flag: bool | None = Field(
-        default=None, alias='levelFourServicesFlag'
-    )
-    level_four_expenses_flag: bool | None = Field(
-        default=None, alias='levelFourExpensesFlag'
-    )
-    level_four_products_flag: bool | None = Field(
-        default=None, alias='levelFourProductsFlag'
-    )
-    level_four_apply_single_unit_flag: bool | None = Field(
-        default=None, alias='levelFourApplySingleUnitFlag'
-    )
-    level_four_apply_single_unit_min: float | None = Field(
-        default=None, alias='levelFourApplySingleUnitMin'
-    )
-    level_four_apply_single_unit_max: float | None = Field(
-        default=None, alias='levelFourApplySingleUnitMax'
-    )
-    level_five_rate: float | None = Field(default=None, alias='levelFiveRate')
-    level_five_rate_type: LevelFiveRateType | None = Field(
-        default=None, alias='levelFiveRateType'
-    )
-    level_five_taxable_max: float | None = Field(
-        default=None, alias='levelFiveTaxableMax'
+    purchased_contact_city: str | None = Field(
+        default=None, alias='purchasedContactCity'
     )
-    level_five_caption: str | None = Field(default=None, alias='levelFiveCaption')
     """
-     Max length: 25;
+     Max length: 50;
     """
-    level_five_tax_code_xref: str | None = Field(
-        default=None, alias='levelFiveTaxCodeXref'
+    purchased_contact_state: str | None = Field(
+        default=None, alias='purchasedContactState'
     )
     """
      Max length: 50;
     """
-    level_five_agency_xref: str | None = Field(
-        default=None, alias='levelFiveAgencyXref'
-    )
+    purchased_contact_zip: str | None = Field(default=None, alias='purchasedContactZip')
     """
-     Max length: 100;
+     Max length: 12;
     """
-    level_five_services_flag: bool | None = Field(
-        default=None, alias='levelFiveServicesFlag'
-    )
-    level_five_expenses_flag: bool | None = Field(
-        default=None, alias='levelFiveExpensesFlag'
-    )
-    level_five_products_flag: bool | None = Field(
-        default=None, alias='levelFiveProductsFlag'
-    )
-    level_five_apply_single_unit_flag: bool | None = Field(
-        default=None, alias='levelFiveApplySingleUnitFlag'
-    )
-    level_five_apply_single_unit_min: float | None = Field(
-        default=None, alias='levelFiveApplySingleUnitMin'
+    purchased_contact_country: CountryReference | None = Field(
+        default=None, alias='purchasedContactCountry'
     )
-    level_five_apply_single_unit_max: float | None = Field(
-        default=None, alias='levelFiveApplySingleUnitMax'
+    purchased_invoice_number: str | None = Field(
+        default=None, alias='purchasedInvoiceNumber'
     )
-    level_six_rate: float | None = Field(default=None, alias='levelSixRate')
-    level_six_rate_type: LevelSixRateType | None = Field(
-        default=None, alias='levelSixRateType'
+    """
+     Max length: 50;
+    """
+    purchased_invoice_date: date | None = Field(
+        default=None, alias='purchasedInvoiceDate'
     )
-    level_six_taxable_max: float | None = Field(
-        default=None, alias='levelSixTaxableMax'
+    purchased_order_number: str | None = Field(
+        default=None, alias='purchasedOrderNumber'
     )
-    level_six_caption: str | None = Field(default=None, alias='levelSixCaption')
     """
-     Max length: 25;
+     Max length: 50;
     """
-    level_six_tax_code_xref: str | None = Field(
-        default=None, alias='levelSixTaxCodeXref'
+    purchased_vendor_action: RmaActionReference | None = Field(
+        default=None, alias='purchasedVendorAction'
+    )
+    purchased_vendor_rma_number: str | None = Field(
+        default=None, alias='purchasedVendorRmaNumber'
     )
     """
      Max length: 50;
     """
-    level_six_agency_xref: str | None = Field(default=None, alias='levelSixAgencyXref')
+    purchased_site: SiteReference | None = Field(default=None, alias='purchasedSite')
+    purchased_notes: str | None = Field(default=None, alias='purchasedNotes')
     """
-     Max length: 100;
+     Max length: 1000;
     """
-    level_six_services_flag: bool | None = Field(
-        default=None, alias='levelSixServicesFlag'
-    )
-    level_six_expenses_flag: bool | None = Field(
-        default=None, alias='levelSixExpensesFlag'
+    warranty_company: CompanyReference | None = Field(
+        default=None, alias='warrantyCompany'
     )
-    level_six_products_flag: bool | None = Field(
-        default=None, alias='levelSixProductsFlag'
+    warranty_contact: ContactReference | None = Field(
+        default=None, alias='warrantyContact'
     )
-    level_six_apply_single_unit_flag: bool | None = Field(
-        default=None, alias='levelSixApplySingleUnitFlag'
+    warranty_contact_type: str | None = Field(default=None, alias='warrantyContactType')
+    warranty_contact_phone: str | None = Field(
+        default=None, alias='warrantyContactPhone'
     )
-    level_six_apply_single_unit_min: float | None = Field(
-        default=None, alias='levelSixApplySingleUnitMin'
+    warranty_contact_email: str | None = Field(
+        default=None, alias='warrantyContactEmail'
     )
-    level_six_apply_single_unit_max: float | None = Field(
-        default=None, alias='levelSixApplySingleUnitMax'
+    warranty_contact_extension: str | None = Field(
+        default=None, alias='warrantyContactExtension'
     )
-    work_role_ids: list[int] | None = Field(default=None, alias='workRoleIds')
-    """
-    Array of work role exemptions for the tax code.
-    """
-    add_all_work_roles: bool | None = Field(default=None, alias='addAllWorkRoles')
-    remove_all_work_roles: bool | None = Field(default=None, alias='removeAllWorkRoles')
-    expense_type_ids: list[int] | None = Field(default=None, alias='expenseTypeIds')
-    """
-    Array of expense type exemptions for the tax code.
-    """
-    add_all_expense_types: bool | None = Field(default=None, alias='addAllExpenseTypes')
-    remove_all_expense_types: bool | None = Field(
-        default=None, alias='removeAllExpenseTypes'
+    warranty_contact_address_line1: str | None = Field(
+        default=None, alias='warrantyContactAddressLine1'
     )
-    product_type_ids: list[int] | None = Field(default=None, alias='productTypeIds')
     """
-    Array of product type exemptions for the tax code.
+     Max length: 50;
     """
-    add_all_product_types: bool | None = Field(default=None, alias='addAllProductTypes')
-    remove_all_product_types: bool | None = Field(
-        default=None, alias='removeAllProductTypes'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxCodeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    description: str | None = None
-    effective_date: str | None = Field(default=None, alias='effectiveDate')
-    cancel_date: str | None = Field(default=None, alias='cancelDate')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxCodeLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    warranty_contact_address_line2: str | None = Field(
+        default=None, alias='warrantyContactAddressLine2'
     )
-    id: int | None = None
-    tax_level: int | None = Field(default=None, alias='taxLevel')
-    tax_rate: float = Field(..., alias='taxRate')
-    rate_type: RateType4 = Field(..., alias='rateType')
-    taxable_max: float | None = Field(default=None, alias='taxableMax')
-    caption: str | None = None
     """
-     Max length: 25;
+     Max length: 50;
     """
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
+    warranty_contact_city: str | None = Field(default=None, alias='warrantyContactCity')
     """
      Max length: 50;
     """
-    agency_xref: str | None = Field(default=None, alias='agencyXref')
+    warranty_contact_state: str | None = Field(
+        default=None, alias='warrantyContactState'
+    )
     """
-     Max length: 100;
+     Max length: 50;
     """
-    tax_services_flag: bool | None = Field(default=None, alias='taxServicesFlag')
-    tax_expenses_flag: bool | None = Field(default=None, alias='taxExpensesFlag')
-    tax_products_flag: bool | None = Field(default=None, alias='taxProductsFlag')
-    single_unit_flag: bool | None = Field(default=None, alias='singleUnitFlag')
-    single_unit_minimum: float | None = Field(default=None, alias='singleUnitMinimum')
-    single_unit_maximum: float | None = Field(default=None, alias='singleUnitMaximum')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxCodeLevelReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxCodeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxCodeXRef(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    warranty_contact_zip: str | None = Field(default=None, alias='warrantyContactZip')
+    """
+     Max length: 12;
+    """
+    warranty_contact_country: CountryReference | None = Field(
+        default=None, alias='warrantyContactCountry'
     )
-    id: int | None = None
-    description: str
+    warranty_site: SiteReference | None = Field(default=None, alias='warrantySite')
+    warranty_notes: str | None = Field(default=None, alias='warrantyNotes')
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    level_one: LevelOne | None = Field(default=None, alias='levelOne')
-    level_two: LevelTwo | None = Field(default=None, alias='levelTwo')
-    level_three: LevelThree | None = Field(default=None, alias='levelThree')
-    level_four: LevelFour | None = Field(default=None, alias='levelFour')
-    level_five: LevelFive | None = Field(default=None, alias='levelFive')
-    level_six: LevelSix | None = Field(default=None, alias='levelSix')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    taxable_levels: list[int] | None = Field(default=None, alias='taxableLevels')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxIntegration(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    repair_company: CompanyReference | None = Field(default=None, alias='repairCompany')
+    repair_contact: ContactReference | None = Field(default=None, alias='repairContact')
+    repair_contact_type: str | None = Field(default=None, alias='repairContactType')
+    repair_contact_phone: str | None = Field(default=None, alias='repairContactPhone')
+    repair_contact_extension: str | None = Field(
+        default=None, alias='repairContactExtension'
     )
-    tax_integration_type: TaxIntegrationType | None = Field(
-        default=None, alias='taxIntegrationType'
+    repair_contact_email: str | None = Field(default=None, alias='repairContactEmail')
+    repair_contact_address_line1: str | None = Field(
+        default=None, alias='repairContactAddressLine1'
     )
-    id: int | None = None
-    account_number: str | None = Field(default=None, alias='accountNumber')
     """
      Max length: 50;
     """
-    license_key: str | None = Field(default=None, alias='licenseKey')
+    repair_contact_address_line2: str | None = Field(
+        default=None, alias='repairContactAddressLine2'
+    )
     """
      Max length: 50;
     """
-    service_url: str | None = Field(default=None, alias='serviceUrl')
+    repair_contact_city: str | None = Field(default=None, alias='repairContactCity')
     """
-     Max length: 250;
+     Max length: 50;
     """
-    company_code: str | None = Field(default=None, alias='companyCode')
+    repair_contact_state: str | None = Field(default=None, alias='repairContactState')
     """
      Max length: 50;
     """
-    time_tax_code: str | None = Field(default=None, alias='timeTaxCode')
+    repair_contact_zip: str | None = Field(default=None, alias='repairContactZip')
     """
-     Max length: 50;
+     Max length: 12;
     """
-    expense_tax_code: str | None = Field(default=None, alias='expenseTaxCode')
+    repair_contact_country: CountryReference | None = Field(
+        default=None, alias='repairContactCountry'
+    )
+    repair_order_number: str | None = Field(default=None, alias='repairOrderNumber')
     """
      Max length: 50;
     """
-    product_tax_code: str | None = Field(default=None, alias='productTaxCode')
+    repair_site: SiteReference | None = Field(default=None, alias='repairSite')
+    repair_notes: str | None = Field(default=None, alias='repairNotes')
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    invoice_amount_tax_code: str | None = Field(
-        default=None, alias='invoiceAmountTaxCode'
+    drop_ship_flag: bool | None = Field(default=None, alias='dropShipFlag')
+    ship_method: ShipmentMethodReference | None = Field(
+        default=None, alias='shipMethod'
+    )
+    shipping_date: date | None = Field(default=None, alias='shippingDate')
+    shipping_tracking_number: str | None = Field(
+        default=None, alias='shippingTrackingNumber'
     )
     """
      Max length: 50;
     """
-    enabled_flag: bool | None = Field(default=None, alias='enabledFlag')
-    commit_transactions_flag: bool | None = Field(
-        default=None, alias='commitTransactionsFlag'
-    )
-    sales_invoice_flag: bool | None = Field(default=None, alias='salesInvoiceFlag')
-    freight_tax_code: str | None = Field(default=None, alias='freightTaxCode')
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
     """
-     Max length: 50;
+     Max length: 1000;
     """
-    accounting_integration_flag: bool | None = Field(
-        default=None, alias='accountingIntegrationFlag'
-    )
-    tax_line_flag: bool | None = Field(default=None, alias='taxLineFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxIntegrationInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    enabled_flag: bool | None = Field(default=None, alias='enabledFlag')
-    tax_integration_type: TaxIntegrationType | None = Field(
-        default=None, alias='taxIntegrationType'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxIntegrationType(Enum):
-    AVALARA = 'Avalara'
-
-
-class TaxableExpenseTypeLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    tax_code_level: TaxCodeLevelReference | None = Field(
-        default=None, alias='taxCodeLevel'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxableProductTypeLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    tax_code_level: TaxCodeLevelReference | None = Field(
-        default=None, alias='taxCodeLevel'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxableWorkRoleLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    tax_code_level: TaxCodeLevelReference | None = Field(
-        default=None, alias='taxCodeLevel'
+    closing_notes: str | None = Field(default=None, alias='closingNotes')
+    """
+     Max length: 1000;
+    """
+    date_closed: str | None = Field(default=None, alias='dateClosed')
+    account_manager: MemberReference | None = Field(
+        default=None, alias='accountManager'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TaxableXRefLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    technical_contact: MemberReference | None = Field(
+        default=None, alias='technicalContact'
     )
-    id: int | None = None
-    tax_code_level: TaxCodeLevelReference | None = Field(
-        default=None, alias='taxCodeLevel'
+    currency: CurrencyReference | None = None
+    closed_by: MemberReference | None = Field(default=None, alias='closedBy')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Team(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SalesQuota(ConnectWiseModel):
     id: int | None = None
-    type: Type9
     member: MemberReference | None = None
-    sales_team: SalesTeamReference | None = Field(default=None, alias='salesTeam')
-    commission_percent: int | None = Field(default=None, alias='commissionPercent')
-    referral_flag: bool | None = Field(default=None, alias='referralFlag')
-    opportunity_id: int | None = Field(default=None, alias='opportunityId')
-    responsible_flag: bool | None = Field(default=None, alias='responsibleFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TeamMember(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    forecast_year: int | None = Field(default=None, alias='forecastYear')
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    category: ProductCategoryReference | None = None
+    sub_category: ProductSubCategoryReference | None = Field(
+        default=None, alias='subCategory'
     )
-    id: int | None = None
-    board: BoardReference | None = None
-    team: ServiceTeamReference | None = None
-    member: MemberReference | None = None
-    team_leader_flag: bool | None = Field(default=None, alias='teamLeaderFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    january_revenue: float | None = Field(default=None, alias='januaryRevenue')
+    january_margin: float | None = Field(default=None, alias='januaryMargin')
+    february_revenue: float | None = Field(default=None, alias='februaryRevenue')
+    february_margin: float | None = Field(default=None, alias='februaryMargin')
+    march_revenue: float | None = Field(default=None, alias='marchRevenue')
+    march_margin: float | None = Field(default=None, alias='marchMargin')
+    april_revenue: float | None = Field(default=None, alias='aprilRevenue')
+    april_margin: float | None = Field(default=None, alias='aprilMargin')
+    may_revenue: float | None = Field(default=None, alias='mayRevenue')
+    may_margin: float | None = Field(default=None, alias='mayMargin')
+    june_revenue: float | None = Field(default=None, alias='juneRevenue')
+    june_margin: float | None = Field(default=None, alias='juneMargin')
+    july_revenue: float | None = Field(default=None, alias='julyRevenue')
+    july_margin: float | None = Field(default=None, alias='julyMargin')
+    august_revenue: float | None = Field(default=None, alias='augustRevenue')
+    august_margin: float | None = Field(default=None, alias='augustMargin')
+    september_revenue: float | None = Field(default=None, alias='septemberRevenue')
+    september_margin: float | None = Field(default=None, alias='septemberMargin')
+    october_revenue: float | None = Field(default=None, alias='octoberRevenue')
+    october_margin: float | None = Field(default=None, alias='octoberMargin')
+    november_revenue: float | None = Field(default=None, alias='novemberRevenue')
+    november_margin: float | None = Field(default=None, alias='novemberMargin')
+    december_revenue: float | None = Field(default=None, alias='decemberRevenue')
+    december_margin: float | None = Field(default=None, alias='decemberMargin')
+    currency: CurrencyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TeamRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SalesTeam(ConnectWiseModel):
     id: int | None = None
-    name: str
+    sales_team_identifier: str = Field(..., alias='salesTeamIdentifier')
     """
      Max length: 20;
     """
-    account_manager_flag: bool | None = Field(default=None, alias='accountManagerFlag')
-    tech_flag: bool | None = Field(default=None, alias='techFlag')
-    sales_flag: bool | None = Field(default=None, alias='salesFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TeamRoleInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    sales_team_description: str = Field(..., alias='salesTeamDescription')
+    """
+     Max length: 50;
+    """
+    sales_team_location: SystemLocationReference | None = Field(
+        default=None, alias='salesTeamLocation'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TeamRoleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SalesTeamMember(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    member: MemberReference | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    allow_access_flag: bool | None = Field(default=None, alias='allowAccessFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TemplateGeneratedCountsModel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class ScheduleDetail(ConnectWiseModel):
+    id: int | None = None
+    schedule_entry: ScheduleEntryReference | None = Field(
+        default=None, alias='scheduleEntry'
     )
-    service_count: int | None = Field(default=None, alias='serviceCount')
-    schedule_count: int | None = Field(default=None, alias='scheduleCount')
-
-
-class TemplatePrioritySetting(Enum):
-    APPEND = 'Append'
-    OVERWRITE = 'Overwrite'
-    IGNORE = 'Ignore'
-
-
-class Territory(Enum):
-    FROM_ = 'From'
-    TO = 'To'
+    date_start: str | None = Field(default=None, alias='dateStart')
+    date_end: str | None = Field(default=None, alias='dateEnd')
+    member: MemberReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Ticket(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ScheduleEntry(ConnectWiseModel):
     id: int | None = None
-    summary: str
-    """
-     Max length: 100;
-    """
-    record_type: RecordType | None = Field(default=None, alias='recordType')
-    board: BoardReference | None = None
-    status: ServiceStatusReference | None = None
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    company: CompanyReference | None = None
-    site: SiteReference | None = None
-    site_name: str | None = Field(default=None, alias='siteName')
-    """
-     Max length: 50;
-    """
-    address_line1: str | None = Field(default=None, alias='addressLine1')
-    """
-     Max length: 50;
-    """
-    address_line2: str | None = Field(default=None, alias='addressLine2')
-    """
-     Max length: 50;
-    """
-    city: str | None = None
-    """
-     Max length: 50;
-    """
-    state_identifier: str | None = Field(default=None, alias='stateIdentifier')
-    """
-     Max length: 50;
-    """
-    zip: str | None = None
-    """
-     Max length: 12;
-    """
-    country: CountryReference | None = None
-    contact: ContactReference | None = None
-    contact_name: str | None = Field(default=None, alias='contactName')
-    """
-     Max length: 62;
-    """
-    contact_phone_number: str | None = Field(default=None, alias='contactPhoneNumber')
+    object_id: int | None = Field(default=None, alias='objectId')
+    name: str | None = None
     """
-     Max length: 20;
+     Max length: 250;
     """
-    contact_phone_extension: str | None = Field(
-        default=None, alias='contactPhoneExtension'
+    member: MemberReference | None = None
+    where: ServiceLocationReference | None = None
+    date_start: datetime | None = Field(default=None, alias='dateStart')
+    date_end: datetime | None = Field(default=None, alias='dateEnd')
+    reminder: ReminderReference | None = None
+    status: ScheduleStatusReference | None = None
+    type: ScheduleTypeReference | None = None
+    span: ScheduleSpanReference | None = None
+    done_flag: bool | None = Field(default=None, alias='doneFlag')
+    acknowledged_flag: bool | None = Field(default=None, alias='acknowledgedFlag')
+    owner_flag: bool | None = Field(default=None, alias='ownerFlag')
+    meeting_flag: bool | None = Field(default=None, alias='meetingFlag')
+    allow_schedule_conflicts_flag: bool | None = Field(
+        default=None, alias='allowScheduleConflictsFlag'
     )
-    """
-     Max length: 15;
-    """
-    contact_email_address: str | None = Field(default=None, alias='contactEmailAddress')
-    """
-     Max length: 250;
-    """
-    type: ServiceTypeReference | None = None
-    sub_type: ServiceSubTypeReference | None = Field(default=None, alias='subType')
-    item: ServiceItemReference | None = None
-    team: ServiceTeamReference | None = None
-    owner: MemberReference | None = None
-    priority: PriorityReference | None = None
-    service_location: ServiceLocationReference | None = Field(
-        default=None, alias='serviceLocation'
+    add_member_to_project_flag: bool | None = Field(
+        default=None, alias='addMemberToProjectFlag'
     )
-    source: ServiceSourceReference | None = None
-    required_date: datetime | None = Field(default=None, alias='requiredDate')
-    budget_hours: float | None = Field(default=None, alias='budgetHours')
-    opportunity: OpportunityReference | None = None
+    project_role_id: int | None = Field(default=None, alias='projectRoleId')
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    acknowledged_date: datetime | None = Field(default=None, alias='acknowledgedDate')
+    close_date: datetime | None = Field(default=None, alias='closeDate')
+    hours: float | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ScheduleEntryDetail(ConnectWiseModel):
+    id: int | None = None
+    schedule_entry: ScheduleEntryReference | None = Field(
+        default=None, alias='scheduleEntry'
+    )
+    date_start: str | None = Field(default=None, alias='dateStart')
+    date_end: str | None = Field(default=None, alias='dateEnd')
+    hours_scheduled: float | None = Field(default=None, alias='hoursScheduled')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ScheduleStopwatch(ConnectWiseModel):
+    info: dict[str, str] | None = Field(default=None, alias='_info')
     agreement: AgreementReference | None = None
-    severity: Severity2 | None = None
-    """
-     Required On Updates;
-    """
-    impact: Impact2 | None = None
-    """
-     Required On Updates;
-    """
-    external_x_ref: str | None = Field(default=None, alias='externalXRef')
+    billable_option: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billableOption')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    date_entered: datetime | None = Field(default=None, alias='dateEntered')
+    end_time: datetime | None = Field(default=None, alias='endTime')
+    id: int | None = None
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    location_id: int | None = Field(default=None, alias='locationId')
+    member: MemberReference | None = None
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    notes: str | None = None
     """
-     Max length: 100;
+     Max length: 4000;
     """
-    po_number: str | None = Field(default=None, alias='poNumber')
+    schedule_id: int = Field(..., alias='scheduleId')
+    schedule_mobile_guid: UUID | None = Field(default=None, alias='scheduleMobileGuid')
+    start_time: datetime | None = Field(default=None, alias='startTime')
+    status: Literal['Reset', 'Running', 'Paused', 'Stopped']
+    total_pause_time: int | None = Field(default=None, alias='totalPauseTime')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+
+
+class ScheduleType(ConnectWiseModel):
+    id: int | None = None
+    name: str
     """
      Max length: 50;
     """
-    knowledge_base_category_id: int | None = Field(
-        default=None, alias='knowledgeBaseCategoryId'
-    )
-    knowledge_base_sub_category_id: int | None = Field(
-        default=None, alias='knowledgeBaseSubCategoryId'
-    )
-    allow_all_clients_portal_view: bool | None = Field(
-        default=None, alias='allowAllClientsPortalView'
-    )
-    customer_updated_flag: bool | None = Field(
-        default=None, alias='customerUpdatedFlag'
-    )
-    automatic_email_contact_flag: bool | None = Field(
-        default=None, alias='automaticEmailContactFlag'
-    )
-    automatic_email_resource_flag: bool | None = Field(
-        default=None, alias='automaticEmailResourceFlag'
-    )
-    automatic_email_cc_flag: bool | None = Field(
-        default=None, alias='automaticEmailCcFlag'
-    )
-    automatic_email_cc: str | None = Field(default=None, alias='automaticEmailCc')
+    identifier: str
     """
-     Max length: 1000;
+     Max length: 1;
     """
-    initial_description: str | None = Field(default=None, alias='initialDescription')
+    charge_code: ChargeCodeReference | None = Field(default=None, alias='chargeCode')
+    where: ServiceLocationReference | None = None
+    system_flag: bool | None = Field(default=None, alias='systemFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ScheduleTypeInfo(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    identifier: str | None = None
+    charge_code: ChargeCodeReference | None = Field(default=None, alias='chargeCode')
+    where: ServiceLocationReference | None = None
+    system_flag: bool | None = Field(default=None, alias='systemFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceEmailTemplate(ConnectWiseModel):
+    id: int | None = None
+    type: Literal[
+        'Any',
+        'Closed',
+        'Invoice',
+        'New',
+        'SalesOrder',
+        'PurchaseOrder',
+        'RMA',
+        'Specific',
+    ]
+    service_survey: ServiceSurveyReference | None = Field(
+        default=None, alias='serviceSurvey'
+    )
+    service_board: BoardReference | None = Field(default=None, alias='serviceBoard')
+    use_sender_flag: bool | None = Field(default=None, alias='useSenderFlag')
+    first_name: str | None = Field(default=None, alias='firstName')
     """
-    Only available for POST, will not be returned in the response.
+    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
     """
-    initial_internal_analysis: str | None = Field(
-        default=None, alias='initialInternalAnalysis'
-    )
+    last_name: str | None = Field(default=None, alias='lastName')
     """
-    Only available for POST, will not be returned in the response.
+    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
     """
-    initial_resolution: str | None = Field(default=None, alias='initialResolution')
+    email_address: str | None = Field(default=None, alias='emailAddress')
     """
-    Only available for POST, will not be returned in the response.
+    From fields (first name, last name, email address) are required if useSenderFlag is false. Max length: 100;
     """
-    initial_description_from: str | None = Field(
-        default=None, alias='initialDescriptionFrom'
-    )
-    contact_email_lookup: str | None = Field(default=None, alias='contactEmailLookup')
-    process_notifications: bool | None = Field(
-        default=None, alias='processNotifications'
-    )
+    subject: str | None = None
     """
-    Can be set to false to skip notification processing when adding or updating a ticket (Defaults to True).
+     Max length: 200;
     """
-    skip_callback: bool | None = Field(default=None, alias='skipCallback')
-    closed_date: str | None = Field(default=None, alias='closedDate')
-    closed_by: str | None = Field(default=None, alias='closedBy')
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    actual_hours: float | None = Field(default=None, alias='actualHours')
-    approved: bool | None = None
-    estimated_expense_cost: float | None = Field(
-        default=None, alias='estimatedExpenseCost'
-    )
-    estimated_expense_revenue: float | None = Field(
-        default=None, alias='estimatedExpenseRevenue'
-    )
-    estimated_product_cost: float | None = Field(
-        default=None, alias='estimatedProductCost'
-    )
-    estimated_product_revenue: float | None = Field(
-        default=None, alias='estimatedProductRevenue'
-    )
-    estimated_time_cost: float | None = Field(default=None, alias='estimatedTimeCost')
-    estimated_time_revenue: float | None = Field(
-        default=None, alias='estimatedTimeRevenue'
-    )
-    billing_method: BillingMethod4 | None = Field(default=None, alias='billingMethod')
-    billing_amount: float | None = Field(default=None, alias='billingAmount')
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    sub_billing_method: SubBillingMethod | None = Field(
-        default=None, alias='subBillingMethod'
-    )
-    sub_billing_amount: float | None = Field(default=None, alias='subBillingAmount')
-    sub_date_accepted: str | None = Field(default=None, alias='subDateAccepted')
-    date_resolved: str | None = Field(default=None, alias='dateResolved')
-    date_resplan: str | None = Field(default=None, alias='dateResplan')
-    date_responded: str | None = Field(default=None, alias='dateResponded')
-    resolve_minutes: int | None = Field(default=None, alias='resolveMinutes')
-    res_plan_minutes: int | None = Field(default=None, alias='resPlanMinutes')
-    respond_minutes: int | None = Field(default=None, alias='respondMinutes')
-    is_in_sla: bool | None = Field(default=None, alias='isInSla')
-    knowledge_base_link_id: int | None = Field(
-        default=None, alias='knowledgeBaseLinkId'
-    )
-    resources: str | None = None
-    parent_ticket_id: int | None = Field(default=None, alias='parentTicketId')
-    has_child_ticket: bool | None = Field(default=None, alias='hasChildTicket')
-    has_merged_child_ticket_flag: bool | None = Field(
-        default=None, alias='hasMergedChildTicketFlag'
-    )
-    knowledge_base_link_type: KnowledgeBaseLinkType | None = Field(
-        default=None, alias='knowledgeBaseLinkType'
-    )
-    bill_time: BillTime8 | None = Field(default=None, alias='billTime')
-    bill_expenses: BillExpenses5 | None = Field(default=None, alias='billExpenses')
-    bill_products: BillProducts4 | None = Field(default=None, alias='billProducts')
-    predecessor_type: PredecessorType | None = Field(
-        default=None, alias='predecessorType'
-    )
-    predecessor_id: int | None = Field(default=None, alias='predecessorId')
-    predecessor_closed_flag: bool | None = Field(
-        default=None, alias='predecessorClosedFlag'
-    )
-    lag_days: int | None = Field(default=None, alias='lagDays')
-    lag_nonworking_days_flag: bool | None = Field(
-        default=None, alias='lagNonworkingDaysFlag'
-    )
-    estimated_start_date: datetime | None = Field(
-        default=None, alias='estimatedStartDate'
-    )
-    duration: int | None = None
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    sla: SLAReference | None = None
-    sla_status: str | None = Field(default=None, alias='slaStatus')
-    request_for_change_flag: bool | None = Field(
-        default=None, alias='requestForChangeFlag'
-    )
-    currency: CurrencyReference | None = None
-    merged_parent_ticket: TicketReference | None = Field(
-        default=None, alias='mergedParentTicket'
-    )
-    integrator_tags: list[str] | None = Field(default=None, alias='integratorTags')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    escalation_start_date_utc: str | None = Field(
-        default=None, alias='escalationStartDateUTC'
-    )
-    escalation_level: int | None = Field(default=None, alias='escalationLevel')
-    minutes_before_waiting: int | None = Field(
-        default=None, alias='minutesBeforeWaiting'
+    body: str | None = None
+    copy_sender_flag: bool | None = Field(default=None, alias='copySenderFlag')
+    tasks_flag: bool | None = Field(default=None, alias='tasksFlag')
+    resource_records_flag: bool | None = Field(
+        default=None, alias='resourceRecordsFlag'
     )
-    responded_skipped_minutes: int | None = Field(
-        default=None, alias='respondedSkippedMinutes'
+    external_contact_notifications: bool | None = Field(
+        default=None, alias='externalContactNotifications'
     )
-    resplan_skipped_minutes: int | None = Field(
-        default=None, alias='resplanSkippedMinutes'
+    internal_contact_notifications: bool | None = Field(
+        default=None, alias='internalContactNotifications'
     )
-    responded_hours: float | None = Field(default=None, alias='respondedHours')
-    responded_by: str | None = Field(default=None, alias='respondedBy')
-    resplan_hours: float | None = Field(default=None, alias='resplanHours')
-    resplan_by: str | None = Field(default=None, alias='resplanBy')
-    resolution_hours: float | None = Field(default=None, alias='resolutionHours')
-    resolved_by: str | None = Field(default=None, alias='resolvedBy')
-    minutes_waiting: int | None = Field(default=None, alias='minutesWaiting')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
+    service_status: ServiceStatusReference | None = Field(
+        default=None, alias='serviceStatus'
     )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TicketBundle(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class ServiceSignoffCustomField(ConnectWiseModel):
+    id: int | None = None
+    sequence_number: float = Field(..., alias='sequenceNumber')
+    display_section: Literal[
+        'CustomerInformation',
+        'Detail',
+        'Expenses',
+        'Configurations',
+        'AdditionalSignOffFields',
+        'InternalNotes',
+        'Time',
+        'Products',
+        'Resolution',
+        'Summary',
+        'Tasks',
+    ] = Field(..., alias='displaySection')
+    user_defined_field: UserDefinedFieldReference | None = Field(
+        default=None, alias='userDefinedField'
     )
-    child_ticket_ids: list[int] | None = Field(default=None, alias='childTicketIds')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class ServiceSurveyQuestion(ConnectWiseModel):
+    id: int | None = None
+    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
+    type: Literal['OpenEnded', 'Selection']
+    question: str
+    """
+     Max length: 1000;
+    """
+    options: list[ServiceSurveyQuestionOption] | None = None
+    include_flag: bool | None = Field(default=None, alias='includeFlag')
+    required_flag: bool | None = Field(default=None, alias='requiredFlag')
+    no_answer_points: int | None = Field(default=None, alias='noAnswerPoints')
+    survey_id: int | None = Field(default=None, alias='surveyId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TicketInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ServiceTeam(ConnectWiseModel):
     id: int | None = None
-    summary: str | None = None
-    company: CompanyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str | None = None
+    leader: MemberReference | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    delete_notify_flag: bool | None = Field(default=None, alias='deleteNotifyFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TicketMerge(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class ServiceTemplate(ConnectWiseModel):
+    id: int | None = None
+    name: str | None = None
+    board: BoardReference | None = None
+    type: ServiceTypeReference | None = None
+    item: ServiceItemReference | None = None
+    subtype: ServiceSubTypeReference | None = None
+    service_location: ServiceLocationReference | None = Field(
+        default=None, alias='serviceLocation'
     )
-    merge_ticket_ids: list[int] = Field(..., alias='mergeTicketIds')
     status: ServiceStatusReference | None = None
+    source: ServiceSourceReference | None = None
+    priority: PriorityReference | None = None
+    team: ServiceTeamReference | None = None
+    company: CompanyReference | None = None
+    contact: ContactReference | None = None
+    site: SiteReference | None = None
+    assigned_notify_flag: bool | None = Field(default=None, alias='assignedNotifyFlag')
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    summary: str | None = None
+    problem: str | None = None
+    hours_budget: float | None = Field(default=None, alias='hoursBudget')
+    internal_analysis: str | None = Field(default=None, alias='internalAnalysis')
+    time_billable_flag: bool | None = Field(default=None, alias='timeBillableFlag')
+    expense_billable_flag: bool | None = Field(
+        default=None, alias='expenseBillableFlag'
+    )
+    purchase_order_number: str | None = Field(default=None, alias='purchaseOrderNumber')
+    reference: str | None = None
+    bill_complete_flag: bool | None = Field(default=None, alias='billComplete_Flag')
+    bill_service_separately_flag: bool | None = Field(
+        default=None, alias='billServiceSeparatelyFlag'
+    )
+    billing_amount: float | None = Field(default=None, alias='billingAmount')
+    bill_unapproved_time_and_expenses_flag: bool | None = Field(
+        default=None, alias='billUnapprovedTimeAndExpensesFlag'
+    )
+    override_flag: bool | None = Field(default=None, alias='overrideFlag')
+    time_invoice_flag: bool | None = Field(default=None, alias='timeInvoiceFlag')
+    expense_invoice_flag: bool | None = Field(default=None, alias='expenseInvoiceFlag')
+    product_invoice_flag: bool | None = Field(default=None, alias='productInvoiceFlag')
+    agreement: AgreementReference | None = None
+    billing_method: Literal[
+        'ActualRates', 'FixedFee', 'NotToExceed', 'OverrideRate'
+    ] | None = Field(default=None, alias='billingMethod')
+    severity: Literal['Low', 'Medium', 'High'] | None = None
+    impact: Literal['Low', 'Medium', 'High'] | None = None
+    assigned_by: MemberReference | None = Field(default=None, alias='assignedBy')
+    schedule_days_before: int | None = Field(default=None, alias='scheduleDaysBefore')
+    service_days_before: int | None = Field(default=None, alias='serviceDaysBefore')
+    attach_schedule_to_new_service_flag: bool | None = Field(
+        default=None, alias='attachScheduleToNewServiceFlag'
+    )
+    template_flag: bool | None = Field(default=None, alias='templateFlag')
+    email_contact_flag: bool | None = Field(default=None, alias='emailContactFlag')
+    email_resource_flag: bool | None = Field(default=None, alias='emailResourceFlag')
+    email_cc_flag: bool | None = Field(default=None, alias='emailCCFlag')
+    email_cc: str | None = Field(default=None, alias='emailCC')
+    restrict_downpayment_flag: bool | None = Field(
+        default=None, alias='restrictDownpaymentFlag'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TicketNote(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class ServiceTicketNote(ConnectWiseModel):
     id: int | None = None
-    ticket_id: int | None = Field(default=None, alias='ticketId')
+    note_type: Literal['TicketNote', 'TimeEntryNote', 'MeetingNote'] | None = Field(
+        default=None, alias='noteType'
+    )
+    ticket: TicketReference | None = None
     text: str | None = None
+    is_markdown_flag: bool | None = Field(default=None, alias='isMarkdownFlag')
     detail_description_flag: bool | None = Field(
         default=None, alias='detailDescriptionFlag'
     )
@@ -18974,1397 +15691,620 @@ class TicketNote(BaseModel):
         default=None, alias='internalAnalysisFlag'
     )
     resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
+    time_start: str | None = Field(default=None, alias='timeStart')
+    time_end: str | None = Field(default=None, alias='timeEnd')
+    bundled_flag: bool | None = Field(default=None, alias='bundledFlag')
+    merged_flag: bool | None = Field(default=None, alias='mergedFlag')
     issue_flag: bool | None = Field(default=None, alias='issueFlag')
+    original_author: str | None = Field(default=None, alias='originalAuthor')
     member: MemberReference | None = None
     contact: ContactReference | None = None
-    customer_updated_flag: bool | None = Field(
-        default=None, alias='customerUpdatedFlag'
-    )
-    process_notifications: bool | None = Field(
-        default=None, alias='processNotifications'
-    )
-    internal_flag: bool | None = Field(default=None, alias='internalFlag')
-    external_flag: bool | None = Field(default=None, alias='externalFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TicketReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Skill(ConnectWiseModel):
     id: int | None = None
-    summary: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str
+    """
+     Max length: 50;
+    """
+    category: SkillCategoryReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TicketStopwatch(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    agreement: AgreementReference | None = None
-    billable_option: BillableOption5 | None = Field(
-        default=None, alias='billableOption'
-    )
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    date_entered: datetime | None = Field(default=None, alias='dateEntered')
-    end_time: datetime | None = Field(default=None, alias='endTime')
+class SLAPriority(ConnectWiseModel):
     id: int | None = None
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    location_id: int | None = Field(default=None, alias='locationId')
-    member: MemberReference | None = None
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    notes: str | None = None
-    """
-     Max length: 4000;
-    """
-    service_status: ServiceStatusReference | None = Field(
-        default=None, alias='serviceStatus'
-    )
-    start_time: datetime | None = Field(default=None, alias='startTime')
-    status: Status4
-    ticket: TicketReference | None = None
-    ticket_mobile_guid: UUID | None = Field(default=None, alias='ticketMobileGuid')
-    total_pause_time: int | None = Field(default=None, alias='totalPauseTime')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    show_notes_in_discussion_flag: bool | None = Field(
-        default=None, alias='showNotesInDiscussionFlag'
-    )
-    show_notes_in_internal_flag: bool | None = Field(
-        default=None, alias='showNotesInInternalFlag'
-    )
-    show_notes_in_resolution_flag: bool | None = Field(
-        default=None, alias='showNotesInResolutionFlag'
-    )
-    email_notes_to_contact_flag: bool | None = Field(
-        default=None, alias='emailNotesToContactFlag'
-    )
-    email_notes_to_resources_flag: bool | None = Field(
-        default=None, alias='emailNotesToResourcesFlag'
-    )
+    priority: PriorityReference | None = None
+    respond_hours: float | None = Field(default=None, alias='respondHours')
+    respond_percent: int | None = Field(default=None, alias='respondPercent')
+    plan_within: float | None = Field(default=None, alias='planWithin')
+    plan_within_percent: int | None = Field(default=None, alias='planWithinPercent')
+    resolution_hours: float | None = Field(default=None, alias='resolutionHours')
+    resolution_percent: int | None = Field(default=None, alias='resolutionPercent')
+    sla: SLAReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TicketSync(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class StandardNote(ConnectWiseModel):
     id: int | None = None
     name: str
     """
-     Max length: 80;
+     Max length: 50;
     """
-    vendor_type: VendorType = Field(..., alias='vendorType')
-    integrator_login: IntegratorLoginReference | None = Field(
-        default=None, alias='integratorLogin'
-    )
-    company: CompanyReference | None = None
-    url: str
-    user_name: str | None = Field(default=None, alias='userName')
-    password: str | None = None
-    psg: str | None = None
-    problem_description_flag: bool | None = Field(
-        default=None, alias='problemDescriptionFlag'
-    )
-    internal_analysis_flag: bool | None = Field(
-        default=None, alias='internalAnalysisFlag'
-    )
-    resolution_flag: bool | None = Field(default=None, alias='resolutionFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    contents: str
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    board: BoardReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TicketTask(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class StandardNoteInfo(ConnectWiseModel):
     id: int | None = None
-    ticket_id: int | None = Field(default=None, alias='ticketId')
-    notes: str | None = None
-    closed_flag: bool | None = Field(default=None, alias='closedFlag')
-    priority: int | None = None
-    schedule: ScheduleEntryReference | None = None
-    code: ServiceCodeReference | None = None
-    resolution: str | None = None
-    summary: str | None = None
-    child_schedule_action: ChildScheduleAction | None = Field(
-        default=None, alias='childScheduleAction'
-    )
-    child_ticket_id: int | None = Field(default=None, alias='childTicketId')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str | None = None
+    contents: str | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    board: BoardReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TimeAccrual(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SurveyQuestion(ConnectWiseModel):
     id: int | None = None
-    location: SystemLocationReference | None = None
-    vacation_flag: bool | None = Field(default=None, alias='vacationFlag')
-    """
-    if vacationFlag is set to false, system will clear out or ingore the values of vacationAvailableType, vacationCarryoverAllowedFlag, vacationCarryoverLimit
-    """
-    vacation_available_type: VacationAvailableType | None = Field(
-        default=None, alias='vacationAvailableType'
-    )
-    vacation_carryover_allowed_flag: bool | None = Field(
-        default=None, alias='vacationCarryoverAllowedFlag'
-    )
-    vacation_carryover_limit: float | None = Field(
-        default=None, alias='vacationCarryoverLimit'
-    )
-    sick_flag: bool | None = Field(default=None, alias='sickFlag')
-    """
-    if sickFlag is set to false, system will clear out or ignore the values of sickAvailableType, sickCarryoverAllowedFlag, sickCarryoverLimit
-    """
-    sick_available_type: SickAvailableType | None = Field(
-        default=None, alias='sickAvailableType'
-    )
-    sick_carryover_allowed_flag: bool | None = Field(
-        default=None, alias='sickCarryoverAllowedFlag'
-    )
-    sick_carryover_limit: float | None = Field(default=None, alias='sickCarryoverLimit')
-    pto_flag: bool | None = Field(default=None, alias='ptoFlag')
-    """
-    if ptoFlag is set to false, system will clear out or ignore the values of ptoAvailableType, ptoCarryoverAllowedFlag, ptoCarryoverLimit
-    """
-    pto_available_type: PtoAvailableType | None = Field(
-        default=None, alias='ptoAvailableType'
-    )
-    pto_carryover_allowed_flag: bool | None = Field(
-        default=None, alias='ptoCarryoverAllowedFlag'
+    survey: SurveyReference | None = None
+    field_type: Literal[
+        'TextArea',
+        'Button',
+        'Currency',
+        'Date',
+        'Hyperlink',
+        'IPAddress',
+        'Checkbox',
+        'Number',
+        'Percent',
+        'Text',
+        'Password',
+    ] = Field(..., alias='fieldType')
+    entry_type: Literal['Date', 'EntryField', 'List', 'Option'] = Field(
+        ..., alias='entryType'
     )
-    pto_carryover_limit: float | None = Field(default=None, alias='ptoCarryoverLimit')
-    holiday_flag: bool | None = Field(default=None, alias='holidayFlag')
+    sequence_number: float = Field(..., alias='sequenceNumber')
+    question: str
     """
-    if holidayFlag is set to false, system will clear out or ignore the values of holidayAvailableType, holidayCarryoverAllowedFlag, holidayCarryoverLimit
+     Max length: 1000;
     """
-    holiday_available_type: HolidayAvailableType | None = Field(
-        default=None, alias='holidayAvailableType'
-    )
-    holiday_carryover_allowed_flag: bool | None = Field(
-        default=None, alias='holidayCarryoverAllowedFlag'
-    )
-    holiday_carryover_limit: float | None = Field(
-        default=None, alias='holidayCarryoverLimit'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    number_of_decimals: int | None = Field(default=None, alias='numberOfDecimals')
+    required_flag: bool | None = Field(default=None, alias='requiredFlag')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TimeAccrualDetail(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class SurveyQuestionValue(ConnectWiseModel):
     id: int | None = None
-    accrual_type: AccrualType1 = Field(..., alias='accrualType')
+    survey: SurveyReference | None = None
+    question: SurveyQuestionReference | None = None
+    value: str
     """
-    Available types are: Holiday, PTO, Sick and Vacation.
+     Max length: 1000;
     """
-    start_year: int = Field(..., alias='startYear')
-    end_year: int = Field(..., alias='endYear')
-    hours: float
-    time_accrual: TimeAccrualReference | None = Field(default=None, alias='timeAccrual')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    point_value: int | None = Field(default=None, alias='pointValue')
+    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class SurveyResult(ConnectWiseModel):
+    id: int | None = None
+    ticket_id: int = Field(..., alias='ticketId')
+    email_address: str | None = Field(default=None, alias='emailAddress')
+    footer_response: str | None = Field(default=None, alias='footerResponse')
+    contact_me_flag: bool | None = Field(default=None, alias='contactMeFlag')
+    contact: ContactReference | None = None
+    results: list[SurveyResultDetail] | None = None
+    total_points: int | None = Field(default=None, alias='totalPoints')
+    company: CompanyReference | None = None
+    survey_id: int | None = Field(default=None, alias='surveyId')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class TaxableExpenseTypeLevel(ConnectWiseModel):
+    id: int | None = None
+    tax_code_level: TaxCodeLevelReference | None = Field(
+        default=None, alias='taxCodeLevel'
+    )
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class TimeAccrualReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+class TaxableProductTypeLevel(TaxableExpenseTypeLevel):
+    pass
 
 
-class TimeEntry(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TaxableWorkRoleLevel(TaxableExpenseTypeLevel):
+    pass
+
+
+class TaxableXRefLevel(TaxableExpenseTypeLevel):
+    pass
+
+
+class Ticket(ConnectWiseModel):
     id: int | None = None
+    summary: str
+    """
+     Max length: 100;
+    """
+    record_type: Literal[
+        'ProjectIssue', 'ProjectTicket', 'ServiceTicket'
+    ] | None = Field(default=None, alias='recordType')
+    board: BoardReference | None = None
+    status: ServiceStatusReference | None = None
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
     company: CompanyReference | None = None
-    charge_to_id: int | None = Field(default=None, alias='chargeToId')
+    site: SiteReference | None = None
+    site_name: str | None = Field(default=None, alias='siteName')
     """
-    If chargeToId is not specified, we asume you enter time against the company specified
+     Max length: 50;
     """
-    charge_to_type: ChargeToType1 | None = Field(default=None, alias='chargeToType')
+    address_line1: str | None = Field(default=None, alias='addressLine1')
     """
-    If chargeToId is not specified, we asume you enter time against the company specified
+     Max length: 50;
     """
-    member: MemberReference | None = None
-    location_id: int | None = Field(default=None, alias='locationId')
-    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
-    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    agreement: AgreementReference | None = None
-    time_start: datetime = Field(..., alias='timeStart')
-    time_end: datetime | None = Field(default=None, alias='timeEnd')
-    hours_deduct: float | None = Field(default=None, alias='hoursDeduct')
-    actual_hours: float | None = Field(default=None, alias='actualHours')
-    billable_option: BillableOption7 | None = Field(
-        default=None, alias='billableOption'
-    )
+    address_line2: str | None = Field(default=None, alias='addressLine2')
     """
-     Required On Updates;
+     Max length: 50;
     """
-    notes: str | None = None
-    internal_notes: str | None = Field(default=None, alias='internalNotes')
-    add_to_detail_description_flag: bool | None = Field(
-        default=None, alias='addToDetailDescriptionFlag'
-    )
-    add_to_internal_analysis_flag: bool | None = Field(
-        default=None, alias='addToInternalAnalysisFlag'
-    )
-    add_to_resolution_flag: bool | None = Field(
-        default=None, alias='addToResolutionFlag'
-    )
-    email_resource_flag: bool | None = Field(default=None, alias='emailResourceFlag')
+    city: str | None = None
     """
-    This is an action flag. To update this value use the /service/tickets endpoint automaticEmailResourceFlag field
+     Max length: 50;
     """
-    email_contact_flag: bool | None = Field(default=None, alias='emailContactFlag')
+    state_identifier: str | None = Field(default=None, alias='stateIdentifier')
     """
-    This is an action flag. To update this value use the /service/tickets endpoint automaticEmailContactFlag field
+     Max length: 50;
     """
-    email_cc_flag: bool | None = Field(default=None, alias='emailCcFlag')
+    zip: str | None = None
     """
-    This is an action flag. To update this value use the /service/tickets endpoint automaticEmailCcFlag field
+     Max length: 12;
     """
-    email_cc: str | None = Field(default=None, alias='emailCc')
+    country: CountryReference | None = None
+    contact: ContactReference | None = None
+    contact_name: str | None = Field(default=None, alias='contactName')
     """
-    To update this value use the /service/tickets endpoint automaticEmailCc field
+     Max length: 62;
     """
-    hours_billed: float | None = Field(default=None, alias='hoursBilled')
-    invoice_hours: float | None = Field(default=None, alias='invoiceHours')
-    entered_by: str | None = Field(default=None, alias='enteredBy')
-    date_entered: datetime | None = Field(default=None, alias='dateEntered')
-    invoice: InvoiceReference | None = None
-    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    contact_phone_number: str | None = Field(default=None, alias='contactPhoneNumber')
     """
-    This field may only be Updated, it is defaulted on Create
+     Max length: 20;
     """
-    overage_rate: float | None = Field(default=None, alias='overageRate')
-    agreement_hours: float | None = Field(default=None, alias='agreementHours')
-    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
-    time_sheet: TimeSheetReference | None = Field(default=None, alias='timeSheet')
-    status: Status6 | None = None
-    ticket: TicketReference | None = None
-    project: ProjectReference | None = None
-    phase: ProjectPhaseReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-    custom_fields: list[CustomFieldValue] | None = Field(
-        default=None, alias='customFields'
-    )
-
-
-class TimeEntryAudit(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    member: MemberReference | None = None
-    source: Source4 | None = None
-    type: Type10 | None = None
-    message: str | None = None
-    old_value: str | None = Field(default=None, alias='oldValue')
-    new_value: str | None = Field(default=None, alias='newValue')
-    value: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeEntryReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeExpense(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    tier1_approval_flag: bool | None = Field(default=None, alias='tier1ApprovalFlag')
-    tier2_approval_flag: bool | None = Field(default=None, alias='tier2ApprovalFlag')
-    disable_time_entry_flag: bool | None = Field(
-        default=None, alias='disableTimeEntryFlag'
-    )
-    require_time_note_flag: bool | None = Field(
-        default=None, alias='requireTimeNoteFlag'
-    )
-    require_expense_note_flag: bool | None = Field(
-        default=None, alias='requireExpenseNoteFlag'
-    )
-    rounding_factor: float | None = Field(default=None, alias='roundingFactor')
-    invoice_start: int | None = Field(default=None, alias='invoiceStart')
-    default_special_invoice_type: DefaultSpecialInvoiceType | None = Field(
-        default=None, alias='defaultSpecialInvoiceType'
-    )
-    internal_company: CompanyReference | None = Field(
-        default=None, alias='internalCompany'
-    )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimePeriod(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    time_period_setup: TimePeriodSetupReference | None = Field(
-        default=None, alias='timePeriodSetup'
-    )
-    period: int | None = None
-    start_date: str | None = Field(default=None, alias='startDate')
-    end_date: str | None = Field(default=None, alias='endDate')
-    deadline_date: str | None = Field(default=None, alias='deadlineDate')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimePeriodSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    contact_phone_extension: str | None = Field(
+        default=None, alias='contactPhoneExtension'
     )
-    id: int | None = None
-    period_apply_to: PeriodApplyTo = Field(..., alias='periodApplyTo')
-    year: int
-    number_future_periods: int = Field(..., alias='numberFuturePeriods')
-    type: Type11
-    description: str | None = None
     """
-     Max length: 100;
+     Max length: 15;
     """
-    first_period_end_date: date = Field(..., alias='firstPeriodEndDate')
-    monthly_period_ends: int | None = Field(default=None, alias='monthlyPeriodEnds')
+    contact_email_address: str | None = Field(default=None, alias='contactEmailAddress')
     """
-    Only needed when type is monthly
+     Max length: 250;
     """
-    semi_monthly_first_period: int | None = Field(
-        default=None, alias='semiMonthlyFirstPeriod'
+    type: ServiceTypeReference | None = None
+    sub_type: ServiceSubTypeReference | None = Field(default=None, alias='subType')
+    item: ServiceItemReference | None = None
+    team: ServiceTeamReference | None = None
+    owner: MemberReference | None = None
+    priority: PriorityReference | None = None
+    service_location: ServiceLocationReference | None = Field(
+        default=None, alias='serviceLocation'
     )
+    source: ServiceSourceReference | None = None
+    required_date: datetime | None = Field(default=None, alias='requiredDate')
+    budget_hours: float | None = Field(default=None, alias='budgetHours')
+    opportunity: OpportunityReference | None = None
+    agreement: AgreementReference | None = None
+    severity: Literal['Low', 'Medium', 'High'] | None = None
     """
-    Only needed when type is semi-monthly
+     Required On Updates;
     """
-    semi_monthly_second_period: int | None = Field(
-        default=None, alias='semiMonthlySecondPeriod'
-    )
+    impact: Literal['Low', 'Medium', 'High'] | None = None
     """
-    Only needed when type is semi-monthly
+     Required On Updates;
     """
-    semi_monthly_last_day_flag: bool | None = Field(
-        default=None, alias='semiMonthlyLastDayFlag'
-    )
-    last_day_flag: bool | None = Field(default=None, alias='lastDayFlag')
+    external_x_ref: str | None = Field(default=None, alias='externalXRef')
     """
-    Only needed when type is monthly
+     Max length: 100;
     """
-    days_past_end_date: int = Field(..., alias='daysPastEndDate')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimePeriodSetupDefaults(BaseModel):
-    pass
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-
-
-class TimePeriodSetupReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    po_number: str | None = Field(default=None, alias='poNumber')
+    """
+     Max length: 50;
+    """
+    knowledge_base_category_id: int | None = Field(
+        default=None, alias='knowledgeBaseCategoryId'
     )
-    id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeSheet(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    knowledge_base_sub_category_id: int | None = Field(
+        default=None, alias='knowledgeBaseSubCategoryId'
     )
-    id: int | None = None
-    member: MemberReference | None = None
-    year: int | None = None
-    period: int | None = None
-    date_start: str | None = Field(default=None, alias='dateStart')
-    date_end: str | None = Field(default=None, alias='dateEnd')
-    status: Status6 | None = None
-    hours: float | None = None
-    deadline: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeSheetAudit(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    allow_all_clients_portal_view: bool | None = Field(
+        default=None, alias='allowAllClientsPortalView'
     )
-    id: int | None = None
-    member: MemberReference | None = None
-    source: Source4 | None = None
-    type: Type12 | None = None
-    message: str | None = None
-    old_value: str | None = Field(default=None, alias='oldValue')
-    new_value: str | None = Field(default=None, alias='newValue')
-    value: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeSheetReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    customer_updated_flag: bool | None = Field(
+        default=None, alias='customerUpdatedFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeSheetTierUpdate(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    automatic_email_contact_flag: bool | None = Field(
+        default=None, alias='automaticEmailContactFlag'
     )
-    id: int | None = None
-    approval_type: ApprovalType | None = Field(default=None, alias='approvalType')
-
-
-class TimeZone(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class TimeZoneReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    automatic_email_resource_flag: bool | None = Field(
+        default=None, alias='automaticEmailResourceFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeZoneSetup(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    automatic_email_cc_flag: bool | None = Field(
+        default=None, alias='automaticEmailCcFlag'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    time_zone: TimeZoneReference | None = Field(default=None, alias='timeZone')
-    offset: float | None = None
+    automatic_email_cc: str | None = Field(default=None, alias='automaticEmailCc')
     """
-    The hours offset from UTC (+/-)
+     Max length: 1000;
     """
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
+    initial_description: str | None = Field(default=None, alias='initialDescription')
     """
-    Identifies the default system time zone setup
+    Only available for POST, will not be returned in the response.
     """
-    daylight_savings_flag: bool | None = Field(
-        default=None, alias='daylightSavingsFlag'
+    initial_internal_analysis: str | None = Field(
+        default=None, alias='initialInternalAnalysis'
     )
     """
-    Determined based on system library value for specified timeZone.
-                Not able to be used in query params at this time
+    Only available for POST, will not be returned in the response.
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeZoneSetupInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    offset: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TimeZoneSetupReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TodayPageCategory(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
+    initial_resolution: str | None = Field(default=None, alias='initialResolution')
     """
-     Max length: 30;
+    Only available for POST, will not be returned in the response.
     """
-    sort_order: int = Field(..., alias='sortOrder')
-    location: SystemLocationReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Token(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    initial_description_from: str | None = Field(
+        default=None, alias='initialDescriptionFrom'
     )
-    public_key: str | None = Field(default=None, alias='publicKey')
-    private_key: str | None = Field(default=None, alias='privateKey')
-    expiration: str | None = None
-
-
-class Track(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    contact_email_lookup: str | None = Field(default=None, alias='contactEmailLookup')
+    process_notifications: bool | None = Field(
+        default=None, alias='processNotifications'
     )
-    id: int | None = None
-    name: str
     """
-     Max length: 100;
+    Can be set to false to skip notification processing when adding or updating a ticket (Defaults to True).
     """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    notify_action_ids: list[int] | None = Field(default=None, alias='notifyActionIds')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TrackAction(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    skip_callback: bool | None = Field(default=None, alias='skipCallback')
+    closed_date: str | None = Field(default=None, alias='closedDate')
+    closed_by: str | None = Field(default=None, alias='closedBy')
+    closed_flag: bool | None = Field(default=None, alias='closedFlag')
+    actual_hours: float | None = Field(default=None, alias='actualHours')
+    approved: bool | None = None
+    estimated_expense_cost: float | None = Field(
+        default=None, alias='estimatedExpenseCost'
     )
-    id: int | None = None
-    notify_type: NotifyType = Field(..., alias='notifyType')
-    service_template: ServiceTemplateReference | None = Field(
-        default=None, alias='serviceTemplate'
+    estimated_expense_revenue: float | None = Field(
+        default=None, alias='estimatedExpenseRevenue'
     )
-    specific_member_to: MemberReference | None = Field(
-        default=None, alias='specificMemberTo'
+    estimated_product_cost: float | None = Field(
+        default=None, alias='estimatedProductCost'
     )
-    email_recipient: str | None = Field(default=None, alias='emailRecipient')
-    """
-     Max length: 250;
-    """
-    specific_member_from: MemberReference | None = Field(
-        default=None, alias='specificMemberFrom'
+    estimated_product_revenue: float | None = Field(
+        default=None, alias='estimatedProductRevenue'
     )
-    email_from: str | None = Field(default=None, alias='emailFrom')
-    """
-     Max length: 250;
-    """
-    subject: str | None = None
-    """
-     Max length: 100;
-    """
-    notes: str | None = None
-    activity_type: ActivityTypeReference | None = Field(
-        default=None, alias='activityType'
+    estimated_time_cost: float | None = Field(default=None, alias='estimatedTimeCost')
+    estimated_time_revenue: float | None = Field(
+        default=None, alias='estimatedTimeRevenue'
     )
-    activity_status: ActivityStatusReference | None = Field(
-        default=None, alias='activityStatus'
+    billing_method: Literal[
+        'ActualRates', 'FixedFee', 'NotToExceed', 'OverrideRate'
+    ] | None = Field(default=None, alias='billingMethod')
+    billing_amount: float | None = Field(default=None, alias='billingAmount')
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    sub_billing_method: Literal[
+        'ActualRates', 'FixedFee', 'NotToExceed', 'OverrideRate'
+    ] | None = Field(default=None, alias='subBillingMethod')
+    sub_billing_amount: float | None = Field(default=None, alias='subBillingAmount')
+    sub_date_accepted: str | None = Field(default=None, alias='subDateAccepted')
+    date_resolved: str | None = Field(default=None, alias='dateResolved')
+    date_resplan: str | None = Field(default=None, alias='dateResplan')
+    date_responded: str | None = Field(default=None, alias='dateResponded')
+    resolve_minutes: int | None = Field(default=None, alias='resolveMinutes')
+    res_plan_minutes: int | None = Field(default=None, alias='resPlanMinutes')
+    respond_minutes: int | None = Field(default=None, alias='respondMinutes')
+    is_in_sla: bool | None = Field(default=None, alias='isInSla')
+    knowledge_base_link_id: int | None = Field(
+        default=None, alias='knowledgeBaseLinkId'
     )
-    company_status: CompanyStatusReference | None = Field(
-        default=None, alias='companyStatus'
+    resources: str | None = None
+    parent_ticket_id: int | None = Field(default=None, alias='parentTicketId')
+    has_child_ticket: bool | None = Field(default=None, alias='hasChildTicket')
+    has_merged_child_ticket_flag: bool | None = Field(
+        default=None, alias='hasMergedChildTicketFlag'
     )
-    track: TrackReference | None = None
-    attached_track: TrackReference | None = Field(default=None, alias='attachedTrack')
-    group: GroupReference | None = None
-    cc_contact: ContactReference | None = Field(default=None, alias='ccContact')
-    bcc_contact: ContactReference | None = Field(default=None, alias='bccContact')
-    days_to_execute: int | None = Field(default=None, alias='daysToExecute')
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
+    knowledge_base_link_type: Literal[
+        'Activity',
+        'ProjectIssue',
+        'KnowledgeBaseArticle',
+        'ProjectTicket',
+        'ServiceTicket',
+        'Time',
+    ] | None = Field(default=None, alias='knowledgeBaseLinkType')
+    bill_time: Literal['Billable', 'DoNotBill', 'NoCharge', 'NoDefault'] | None = Field(
+        default=None, alias='billTime'
+    )
+    bill_expenses: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billExpenses')
+    bill_products: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billProducts')
+    predecessor_type: Literal['Ticket', 'Phase'] | None = Field(
+        default=None, alias='predecessorType'
     )
-    notify_from: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyFrom'
+    predecessor_id: int | None = Field(default=None, alias='predecessorId')
+    predecessor_closed_flag: bool | None = Field(
+        default=None, alias='predecessorClosedFlag'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class TrackReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    lag_days: int | None = Field(default=None, alias='lagDays')
+    lag_nonworking_days_flag: bool | None = Field(
+        default=None, alias='lagNonworkingDaysFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Type(Enum):
-    COMPANY = 'Company'
-    VENDOR = 'Vendor'
-
-
-class Type1(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class Type10(Enum):
-    ACTIVITY = 'Activity'
-    CLOSE_DATE = 'CloseDate'
-    COMPANY = 'Company'
-    CONTACT = 'Contact'
-    CONVERSION = 'Conversion'
-    DOCUMENT = 'Document'
-    FORECAST = 'Forecast'
-    NOTE = 'Note'
-    NOTES = 'Notes'
-    OPPORTUNITY = 'Opportunity'
-    PRODUCTS = 'Products'
-    STAGE = 'Stage'
-    STATUS = 'Status'
-    SURVEYS = 'Surveys'
-    TEAM = 'Team'
-    TRACKS = 'Tracks'
-    CONFIGURATION = 'Configuration'
-    CONFIGURATION_QUESTIONS = 'ConfigurationQuestions'
-    DEVICE_BACKUP_DETAILS = 'DeviceBackupDetails'
-    TICKETS = 'Tickets'
-    SUBJECT = 'Subject'
-    ACTIVITY_OVERVIEW = 'ActivityOverview'
-    SCHEDULE = 'Schedule'
-    RESOURCES = 'Resources'
-    EXPENSE_ENTRY = 'ExpenseEntry'
-    MEMBER = 'Member'
-    DATE = 'Date'
-    CLASSIFICATION = 'Classification'
-    AMOUNT = 'Amount'
-    EXPENSE_TYPE = 'ExpenseType'
-    WORK_TYPE = 'WorkType'
-    WORK_ROLE = 'WorkRole'
-    MILEAGE = 'Mileage'
-    BILLING = 'Billing'
-    EXPENSE_HEADER = 'ExpenseHeader'
-    PROJECT = 'Project'
-    TIME_ENTRY = 'TimeEntry'
-    TICKET_STATUS = 'TicketStatus'
-    DATE_TIME = 'DateTime'
-    DEDUCT_HOURS = 'DeductHours'
-    ACTUAL_HOURS = 'ActualHours'
-    INVOICE = 'Invoice'
-    COMPANY_FINANCE = 'CompanyFinance'
-    BILLABLE = 'Billable'
-    SALES_ORDER = 'SalesOrder'
-    SHIPPING = 'Shipping'
-    PROFILE = 'Profile'
-    GROUP = 'Group'
-    GROUP_CONTACT = 'GroupContact'
-    GROUP_COMPANY = 'GroupCompany'
-    OPTIONS = 'Options'
-    SITE = 'Site'
-    AGREEMENT = 'Agreement'
-    ADDITION = 'Addition'
-    ADJUSTMENT = 'Adjustment'
-    MICROSOFT365 = 'Microsoft365'
-    API = 'API'
-    PROJECT_FINANCE = 'ProjectFinance'
-    COMPANY_PROFILE = 'CompanyProfile'
-    COMPANY_TEAM = 'CompanyTeam'
-    COMPANY_MGMT = 'CompanyMgmt'
-    INVOICE_TOTAL = 'InvoiceTotal'
-    BILLING_INFORMATION = 'BillingInformation'
-    SHIPPING_INFORMATION = 'ShippingInformation'
-    BILLING_STATUS = 'BillingStatus'
-    LOCATION = 'Location'
-    DEPARTMENT = 'Department'
-    TERRITORY = 'Territory'
-    PAYMENT = 'Payment'
-    CREDIT = 'Credit'
-    SUBCONTRACTOR_INFORMATION = 'SubcontractorInformation'
-    INVOICING_PARAMETERS = 'InvoicingParameters'
-    APPLICATION_PARAMETERS = 'ApplicationParameters'
-    FINANCE = 'Finance'
-    INVOICING = 'Invoicing'
-    EMAIL = 'Email'
-    BATCHING = 'Batching'
-    KNOWLEDGE_BASE = 'KnowledgeBase'
-    KB_ARTICLE = 'KbArticle'
-    KNOWLEDGE_BASE_APPROVAL = 'KnowledgeBaseApproval'
-    KNOWLEDGE_BASE_TICKET = 'KnowledgeBaseTicket'
-    MANAGE_NETWORK = 'ManageNetwork'
-    TASKS = 'Tasks'
-    CUSTOM_FIELD = 'CustomField'
-    SCREEN_CONNECT = 'ScreenConnect'
-    SLA = 'SLA'
-    TICKET = 'Ticket'
-    WORKFLOW = 'Workflow'
-    RECORD = 'Record'
-    COMBINED_TICKETS = 'CombinedTickets'
-    TEMPLATE = 'Template'
-    PURCHASE_ORDER = 'PurchaseOrder'
-    MEETING = 'Meeting'
-    RMA_OVERVIEW = 'RmaOverview'
-    RETURNED_BY = 'ReturnedBy'
-    PURCHASED_FROM_VENDOR = 'PurchasedFromVendor'
-    WARRANTY_VENDOR = 'WarrantyVendor'
-    REPAIR_VENDOR = 'RepairVendor'
-    ADDITIONAL_DETAILS = 'AdditionalDetails'
-    TICKET_TEMPLATE = 'TicketTemplate'
-    AUTO_GENERATION = 'AutoGeneration'
-    TIME_INTERNAL_NOTE = 'TimeInternalNote'
-    TIME_DISCUSSION = 'TimeDiscussion'
-    TIME_INTERNAL = 'TimeInternal'
-    TIME_RESOLUTION = 'TimeResolution'
-    MEMBER_TEMPLATE = 'MemberTemplate'
-    DELEGATION = 'Delegation'
-    SKILL = 'Skill'
-    CERTIFICATION = 'Certification'
-    ACCRUAL = 'Accrual'
-    API_KEY = 'ApiKey'
-    LOGIN = 'Login'
-    NOTIFICATIONS = 'Notifications'
-    SYSTEM = 'System'
-    SERVICE_BOARD = 'ServiceBoard'
-    PROJECT_BOARD = 'ProjectBoard'
-    SCHEDULING = 'Scheduling'
-    TIME_BILLING_EXPENSE = 'TimeBillingExpense'
-    CRM = 'CRM'
-    PROCUREMENT = 'Procurement'
-    JOB_ROLE = 'JobRole'
-    DETAILS = 'Details'
-    AUTHENTICATION = 'Authentication'
-
-
-class Type11(Enum):
-    WEEKLY = 'Weekly'
-    BI_WEEKLY = 'BiWeekly'
-    SEMI_MONTHLY = 'SemiMonthly'
-    MONTHLY = 'Monthly'
-
-
-class Type12(Enum):
-    ACTIVITY = 'Activity'
-    CLOSE_DATE = 'CloseDate'
-    COMPANY = 'Company'
-    CONTACT = 'Contact'
-    CONVERSION = 'Conversion'
-    DOCUMENT = 'Document'
-    FORECAST = 'Forecast'
-    NOTE = 'Note'
-    NOTES = 'Notes'
-    OPPORTUNITY = 'Opportunity'
-    PRODUCTS = 'Products'
-    STAGE = 'Stage'
-    STATUS = 'Status'
-    SURVEYS = 'Surveys'
-    TEAM = 'Team'
-    TRACKS = 'Tracks'
-    CONFIGURATION = 'Configuration'
-    CONFIGURATION_QUESTIONS = 'ConfigurationQuestions'
-    DEVICE_BACKUP_DETAILS = 'DeviceBackupDetails'
-    TICKETS = 'Tickets'
-    SUBJECT = 'Subject'
-    ACTIVITY_OVERVIEW = 'ActivityOverview'
-    SCHEDULE = 'Schedule'
-    RESOURCES = 'Resources'
-    EXPENSE_ENTRY = 'ExpenseEntry'
-    MEMBER = 'Member'
-    DATE = 'Date'
-    CLASSIFICATION = 'Classification'
-    AMOUNT = 'Amount'
-    EXPENSE_TYPE = 'ExpenseType'
-    WORK_TYPE = 'WorkType'
-    WORK_ROLE = 'WorkRole'
-    MILEAGE = 'Mileage'
-    BILLING = 'Billing'
-    EXPENSE_HEADER = 'ExpenseHeader'
-    PROJECT = 'Project'
-    TIME_ENTRY = 'TimeEntry'
-    TICKET_STATUS = 'TicketStatus'
-    DATE_TIME = 'DateTime'
-    DEDUCT_HOURS = 'DeductHours'
-    ACTUAL_HOURS = 'ActualHours'
-    INVOICE = 'Invoice'
-    COMPANY_FINANCE = 'CompanyFinance'
-    BILLABLE = 'Billable'
-    SALES_ORDER = 'SalesOrder'
-    SHIPPING = 'Shipping'
-    PROFILE = 'Profile'
-    GROUP = 'Group'
-    GROUP_CONTACT = 'GroupContact'
-    GROUP_COMPANY = 'GroupCompany'
-    OPTIONS = 'Options'
-    SITE = 'Site'
-    AGREEMENT = 'Agreement'
-    ADDITION = 'Addition'
-    ADJUSTMENT = 'Adjustment'
-    MICROSOFT365 = 'Microsoft365'
-    API = 'API'
-    PROJECT_FINANCE = 'ProjectFinance'
-    COMPANY_PROFILE = 'CompanyProfile'
-    COMPANY_TEAM = 'CompanyTeam'
-    COMPANY_MGMT = 'CompanyMgmt'
-    INVOICE_TOTAL = 'InvoiceTotal'
-    BILLING_INFORMATION = 'BillingInformation'
-    SHIPPING_INFORMATION = 'ShippingInformation'
-    BILLING_STATUS = 'BillingStatus'
-    LOCATION = 'Location'
-    DEPARTMENT = 'Department'
-    TERRITORY = 'Territory'
-    PAYMENT = 'Payment'
-    CREDIT = 'Credit'
-    SUBCONTRACTOR_INFORMATION = 'SubcontractorInformation'
-    INVOICING_PARAMETERS = 'InvoicingParameters'
-    APPLICATION_PARAMETERS = 'ApplicationParameters'
-    FINANCE = 'Finance'
-    INVOICING = 'Invoicing'
-    EMAIL = 'Email'
-    BATCHING = 'Batching'
-    KNOWLEDGE_BASE = 'KnowledgeBase'
-    KB_ARTICLE = 'KbArticle'
-    KNOWLEDGE_BASE_APPROVAL = 'KnowledgeBaseApproval'
-    KNOWLEDGE_BASE_TICKET = 'KnowledgeBaseTicket'
-    MANAGE_NETWORK = 'ManageNetwork'
-    TASKS = 'Tasks'
-    CUSTOM_FIELD = 'CustomField'
-    SCREEN_CONNECT = 'ScreenConnect'
-    SLA = 'SLA'
-    TICKET = 'Ticket'
-    WORKFLOW = 'Workflow'
-    RECORD = 'Record'
-    COMBINED_TICKETS = 'CombinedTickets'
-    TEMPLATE = 'Template'
-    PURCHASE_ORDER = 'PurchaseOrder'
-    MEETING = 'Meeting'
-    RMA_OVERVIEW = 'RmaOverview'
-    RETURNED_BY = 'ReturnedBy'
-    PURCHASED_FROM_VENDOR = 'PurchasedFromVendor'
-    WARRANTY_VENDOR = 'WarrantyVendor'
-    REPAIR_VENDOR = 'RepairVendor'
-    ADDITIONAL_DETAILS = 'AdditionalDetails'
-    TICKET_TEMPLATE = 'TicketTemplate'
-    AUTO_GENERATION = 'AutoGeneration'
-    TIME_INTERNAL_NOTE = 'TimeInternalNote'
-    TIME_DISCUSSION = 'TimeDiscussion'
-    TIME_INTERNAL = 'TimeInternal'
-    TIME_RESOLUTION = 'TimeResolution'
-    MEMBER_TEMPLATE = 'MemberTemplate'
-    DELEGATION = 'Delegation'
-    SKILL = 'Skill'
-    CERTIFICATION = 'Certification'
-    ACCRUAL = 'Accrual'
-    API_KEY = 'ApiKey'
-    LOGIN = 'Login'
-    NOTIFICATIONS = 'Notifications'
-    SYSTEM = 'System'
-    SERVICE_BOARD = 'ServiceBoard'
-    PROJECT_BOARD = 'ProjectBoard'
-    SCHEDULING = 'Scheduling'
-    TIME_BILLING_EXPENSE = 'TimeBillingExpense'
-    CRM = 'CRM'
-    PROCUREMENT = 'Procurement'
-    JOB_ROLE = 'JobRole'
-    DETAILS = 'Details'
-    AUTHENTICATION = 'Authentication'
-
-
-class Type2(Enum):
-    TAB = 'Tab'
-    POD = 'Pod'
-    TOOLBAR_BUTTON = 'ToolbarButton'
-
-
-class Type3(Enum):
-    TEXT_AREA = 'TextArea'
-    BUTTON = 'Button'
-    CURRENCY = 'Currency'
-    DATE = 'Date'
-    HYPERLINK = 'Hyperlink'
-    IP_ADDRESS = 'IPAddress'
-    CHECKBOX = 'Checkbox'
-    NUMBER = 'Number'
-    PERCENT = 'Percent'
-    TEXT = 'Text'
-    PASSWORD = 'Password'
-
-
-class Type4(Enum):
-    ACTIVITY = 'Activity'
-    CLOSE_DATE = 'CloseDate'
-    COMPANY = 'Company'
-    CONTACT = 'Contact'
-    CONVERSION = 'Conversion'
-    DOCUMENT = 'Document'
-    FORECAST = 'Forecast'
-    NOTE = 'Note'
-    NOTES = 'Notes'
-    OPPORTUNITY = 'Opportunity'
-    PRODUCTS = 'Products'
-    STAGE = 'Stage'
-    STATUS = 'Status'
-    SURVEYS = 'Surveys'
-    TEAM = 'Team'
-    TRACKS = 'Tracks'
-    CONFIGURATION = 'Configuration'
-    CONFIGURATION_QUESTIONS = 'ConfigurationQuestions'
-    DEVICE_BACKUP_DETAILS = 'DeviceBackupDetails'
-    TICKETS = 'Tickets'
-    SUBJECT = 'Subject'
-    ACTIVITY_OVERVIEW = 'ActivityOverview'
-    SCHEDULE = 'Schedule'
-    RESOURCES = 'Resources'
-    EXPENSE_ENTRY = 'ExpenseEntry'
-    MEMBER = 'Member'
-    DATE = 'Date'
-    CLASSIFICATION = 'Classification'
-    AMOUNT = 'Amount'
-    EXPENSE_TYPE = 'ExpenseType'
-    WORK_TYPE = 'WorkType'
-    WORK_ROLE = 'WorkRole'
-    MILEAGE = 'Mileage'
-    BILLING = 'Billing'
-    EXPENSE_HEADER = 'ExpenseHeader'
-    PROJECT = 'Project'
-    TIME_ENTRY = 'TimeEntry'
-    TICKET_STATUS = 'TicketStatus'
-    DATE_TIME = 'DateTime'
-    DEDUCT_HOURS = 'DeductHours'
-    ACTUAL_HOURS = 'ActualHours'
-    INVOICE = 'Invoice'
-    COMPANY_FINANCE = 'CompanyFinance'
-    BILLABLE = 'Billable'
-    SALES_ORDER = 'SalesOrder'
-    SHIPPING = 'Shipping'
-    PROFILE = 'Profile'
-    GROUP = 'Group'
-    GROUP_CONTACT = 'GroupContact'
-    GROUP_COMPANY = 'GroupCompany'
-    OPTIONS = 'Options'
-    SITE = 'Site'
-    AGREEMENT = 'Agreement'
-    ADDITION = 'Addition'
-    ADJUSTMENT = 'Adjustment'
-    MICROSOFT365 = 'Microsoft365'
-    API = 'API'
-    PROJECT_FINANCE = 'ProjectFinance'
-    COMPANY_PROFILE = 'CompanyProfile'
-    COMPANY_TEAM = 'CompanyTeam'
-    COMPANY_MGMT = 'CompanyMgmt'
-    INVOICE_TOTAL = 'InvoiceTotal'
-    BILLING_INFORMATION = 'BillingInformation'
-    SHIPPING_INFORMATION = 'ShippingInformation'
-    BILLING_STATUS = 'BillingStatus'
-    LOCATION = 'Location'
-    DEPARTMENT = 'Department'
-    TERRITORY = 'Territory'
-    PAYMENT = 'Payment'
-    CREDIT = 'Credit'
-    SUBCONTRACTOR_INFORMATION = 'SubcontractorInformation'
-    INVOICING_PARAMETERS = 'InvoicingParameters'
-    APPLICATION_PARAMETERS = 'ApplicationParameters'
-    FINANCE = 'Finance'
-    INVOICING = 'Invoicing'
-    EMAIL = 'Email'
-    BATCHING = 'Batching'
-    KNOWLEDGE_BASE = 'KnowledgeBase'
-    KB_ARTICLE = 'KbArticle'
-    KNOWLEDGE_BASE_APPROVAL = 'KnowledgeBaseApproval'
-    KNOWLEDGE_BASE_TICKET = 'KnowledgeBaseTicket'
-    MANAGE_NETWORK = 'ManageNetwork'
-    TASKS = 'Tasks'
-    CUSTOM_FIELD = 'CustomField'
-    SCREEN_CONNECT = 'ScreenConnect'
-    SLA = 'SLA'
-    TICKET = 'Ticket'
-    WORKFLOW = 'Workflow'
-    RECORD = 'Record'
-    COMBINED_TICKETS = 'CombinedTickets'
-    TEMPLATE = 'Template'
-    PURCHASE_ORDER = 'PurchaseOrder'
-    MEETING = 'Meeting'
-    RMA_OVERVIEW = 'RmaOverview'
-    RETURNED_BY = 'ReturnedBy'
-    PURCHASED_FROM_VENDOR = 'PurchasedFromVendor'
-    WARRANTY_VENDOR = 'WarrantyVendor'
-    REPAIR_VENDOR = 'RepairVendor'
-    ADDITIONAL_DETAILS = 'AdditionalDetails'
-    TICKET_TEMPLATE = 'TicketTemplate'
-    AUTO_GENERATION = 'AutoGeneration'
-    TIME_INTERNAL_NOTE = 'TimeInternalNote'
-    TIME_DISCUSSION = 'TimeDiscussion'
-    TIME_INTERNAL = 'TimeInternal'
-    TIME_RESOLUTION = 'TimeResolution'
-    MEMBER_TEMPLATE = 'MemberTemplate'
-    DELEGATION = 'Delegation'
-    SKILL = 'Skill'
-    CERTIFICATION = 'Certification'
-    ACCRUAL = 'Accrual'
-    API_KEY = 'ApiKey'
-    LOGIN = 'Login'
-    NOTIFICATIONS = 'Notifications'
-    SYSTEM = 'System'
-    SERVICE_BOARD = 'ServiceBoard'
-    PROJECT_BOARD = 'ProjectBoard'
-    SCHEDULING = 'Scheduling'
-    TIME_BILLING_EXPENSE = 'TimeBillingExpense'
-    CRM = 'CRM'
-    PROCUREMENT = 'Procurement'
-    JOB_ROLE = 'JobRole'
-    DETAILS = 'Details'
-    AUTHENTICATION = 'Authentication'
-
-
-class Type6(Enum):
-    AGREEMENT = 'Agreement'
-    CREDIT_MEMO = 'CreditMemo'
-    DOWN_PAYMENT = 'DownPayment'
-    MISCELLANEOUS = 'Miscellaneous'
-    PROGRESS = 'Progress'
-    STANDARD = 'Standard'
-
-
-class Type7(Enum):
-    ANY = 'Any'
-    CLOSED = 'Closed'
-    INVOICE = 'Invoice'
-    NEW = 'New'
-    SALES_ORDER = 'SalesOrder'
-    PURCHASE_ORDER = 'PurchaseOrder'
-    RMA = 'RMA'
-    SPECIFIC = 'Specific'
-
-
-class Type8(Enum):
-    OPEN_ENDED = 'OpenEnded'
-    SELECTION = 'Selection'
-
-
-class Type9(Enum):
-    INDIVIDUAL = 'Individual'
-    TEAM = 'Team'
-
-
-class TypeXref(Enum):
-    INVENTORY_PART = 'InventoryPart'
-    NON_INVENTORY_PART = 'NonInventoryPart'
-    OTHER_CHARGE = 'OtherCharge'
-    SERVICE = 'Service'
-
-
-class UnitOfMeasure(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    estimated_start_date: datetime | None = Field(
+        default=None, alias='estimatedStartDate'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    uom_schedule_xref: str | None = Field(default=None, alias='uomScheduleXref')
-    """
-     Max length: 31;
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class UnitOfMeasureReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    duration: int | None = None
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    sla: SLAReference | None = None
+    sla_status: str | None = Field(default=None, alias='slaStatus')
+    request_for_change_flag: bool | None = Field(
+        default=None, alias='requestForChangeFlag'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class UnpostedExpense(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    currency: CurrencyReference | None = None
+    merged_parent_ticket: TicketReference | None = Field(
+        default=None, alias='mergedParentTicket'
     )
-    id: int | None = None
-    location_id: int | None = Field(default=None, alias='locationId')
-    department_id: int | None = Field(default=None, alias='departmentId')
-    company: CompanyReference | None = None
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    credit_account: str | None = Field(default=None, alias='creditAccount')
-    expense_detail_id: int | None = Field(default=None, alias='expenseDetailId')
-    expense_type: ExpenseTypeReference | None = Field(default=None, alias='expenseType')
-    classification: Classification1 | None = None
-    gl_type: GlType | None = Field(default=None, alias='glType')
-    member: MemberReference | None = None
-    date_expense: str | None = Field(default=None, alias='dateExpense')
-    charge_code: ChargeCodeReference | None = Field(default=None, alias='chargeCode')
-    charge_description: str | None = Field(default=None, alias='chargeDescription')
-    in_policy: bool | None = Field(default=None, alias='inPolicy')
-    payment_method: PaymentMethodReference | None = Field(
-        default=None, alias='paymentMethod'
+    integrator_tags: list[str] | None = Field(default=None, alias='integratorTags')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    escalation_start_date_utc: str | None = Field(
+        default=None, alias='escalationStartDateUTC'
     )
-    currency: CurrencyReference | None = None
-    total: float | None = None
-    billable_amount: float | None = Field(default=None, alias='billableAmount')
-    non_billable_amount: float | None = Field(default=None, alias='nonBillableAmount')
-    agreement: AgreementReference | None = None
-    agreement_amount_covered: float | None = Field(
-        default=None, alias='agreementAmountCovered'
+    escalation_level: int | None = Field(default=None, alias='escalationLevel')
+    minutes_before_waiting: int | None = Field(
+        default=None, alias='minutesBeforeWaiting'
     )
-    ticket: TicketReference | None = None
-    project: ProjectReference | None = None
-    project_phase: ProjectPhaseReference | None = Field(
-        default=None, alias='projectPhase'
+    responded_skipped_minutes: int | None = Field(
+        default=None, alias='respondedSkippedMinutes'
     )
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    avalara_tax_flag: bool | None = Field(default=None, alias='avalaraTaxFlag')
-    """
-    Used to determine if Avalara tax is enabled.
-    """
-    item_taxable_flag: bool | None = Field(default=None, alias='itemTaxableFlag')
-    sales_tax_amount: float | None = Field(default=None, alias='salesTaxAmount')
-    state_tax_flag: bool | None = Field(default=None, alias='stateTaxFlag')
-    """
-    Set to true if transaction is taxable at the state level.
-    """
-    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
-    state_tax_amount: float | None = Field(default=None, alias='stateTaxAmount')
-    county_tax_flag: bool | None = Field(default=None, alias='countyTaxFlag')
-    """
-    Set to true if transaction is taxable at the county level.
-    """
-    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
-    county_tax_amount: float | None = Field(default=None, alias='countyTaxAmount')
-    city_tax_flag: bool | None = Field(default=None, alias='cityTaxFlag')
-    """
-    Set to true if transaction is taxable at the city level.
-    """
-    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
-    city_tax_amount: float | None = Field(default=None, alias='cityTaxAmount')
-    country_tax_flag: bool | None = Field(default=None, alias='countryTaxFlag')
-    """
-    Set to true if transaction is taxable at the country level.
-    """
-    country_tax_xref: str | None = Field(default=None, alias='countryTaxXref')
-    country_tax_amount: float | None = Field(default=None, alias='countryTaxAmount')
-    composite_tax_flag: bool | None = Field(default=None, alias='compositeTaxFlag')
-    """
-    Set to true if transaction is taxable at the composite level.
-    """
-    composite_tax_xref: str | None = Field(default=None, alias='compositeTaxXref')
-    composite_tax_amount: float | None = Field(default=None, alias='compositeTaxAmount')
-    level_six_tax_flag: bool | None = Field(default=None, alias='levelSixTaxFlag')
+    resplan_skipped_minutes: int | None = Field(
+        default=None, alias='resplanSkippedMinutes'
+    )
+    responded_hours: float | None = Field(default=None, alias='respondedHours')
+    responded_by: str | None = Field(default=None, alias='respondedBy')
+    resplan_hours: float | None = Field(default=None, alias='resplanHours')
+    resplan_by: str | None = Field(default=None, alias='resplanBy')
+    resolution_hours: float | None = Field(default=None, alias='resolutionHours')
+    resolved_by: str | None = Field(default=None, alias='resolvedBy')
+    minutes_waiting: int | None = Field(default=None, alias='minutesWaiting')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
+    )
+
+
+class TicketStopwatch(ConnectWiseModel):
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    agreement: AgreementReference | None = None
+    billable_option: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billableOption')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    date_entered: datetime | None = Field(default=None, alias='dateEntered')
+    end_time: datetime | None = Field(default=None, alias='endTime')
+    id: int | None = None
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    location_id: int | None = Field(default=None, alias='locationId')
+    member: MemberReference | None = None
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    notes: str | None = None
     """
-    Set to true if transaction is taxable at level six.
+     Max length: 4000;
     """
-    level_six_tax_xref: str | None = Field(default=None, alias='levelSixTaxXref')
-    level_six_tax_amount: float | None = Field(default=None, alias='levelSixTaxAmount')
-    date_closed: str | None = Field(default=None, alias='dateClosed')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    service_status: ServiceStatusReference | None = Field(
+        default=None, alias='serviceStatus'
+    )
+    start_time: datetime | None = Field(default=None, alias='startTime')
+    status: Literal['Reset', 'Running', 'Paused', 'Stopped']
+    ticket: TicketReference | None = None
+    ticket_mobile_guid: UUID | None = Field(default=None, alias='ticketMobileGuid')
+    total_pause_time: int | None = Field(default=None, alias='totalPauseTime')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    show_notes_in_discussion_flag: bool | None = Field(
+        default=None, alias='showNotesInDiscussionFlag'
+    )
+    show_notes_in_internal_flag: bool | None = Field(
+        default=None, alias='showNotesInInternalFlag'
+    )
+    show_notes_in_resolution_flag: bool | None = Field(
+        default=None, alias='showNotesInResolutionFlag'
+    )
+    email_notes_to_contact_flag: bool | None = Field(
+        default=None, alias='emailNotesToContactFlag'
+    )
+    email_notes_to_resources_flag: bool | None = Field(
+        default=None, alias='emailNotesToResourcesFlag'
+    )
 
 
-class UnpostedExpenseTaxableLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TimeAccrualDetail(ConnectWiseModel):
     id: int | None = None
-    tax_level: int | None = Field(default=None, alias='taxLevel')
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
-    tax_amount: float | None = Field(default=None, alias='taxAmount')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    accrual_type: Literal['Holiday', 'PTO', 'Sick', 'Vacation'] = Field(
+        ..., alias='accrualType'
+    )
+    """
+    Available types are: Holiday, PTO, Sick and Vacation.
+    """
+    start_year: int = Field(..., alias='startYear')
+    end_year: int = Field(..., alias='endYear')
+    hours: float
+    time_accrual: TimeAccrualReference | None = Field(default=None, alias='timeAccrual')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class UnpostedInvoice(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TimeEntry(ConnectWiseModel):
     id: int | None = None
-    billing_log_id: int | None = Field(default=None, alias='billingLogId')
-    location_id: int | None = Field(default=None, alias='locationId')
-    department_id: int | None = Field(default=None, alias='departmentId')
     company: CompanyReference | None = None
-    account_number: str | None = Field(default=None, alias='accountNumber')
-    bill_to_company: CompanyReference | None = Field(
-        default=None, alias='billToCompany'
-    )
-    bill_to_site: SiteReference | None = Field(default=None, alias='billToSite')
-    ship_to_company: CompanyReference | None = Field(
-        default=None, alias='shipToCompany'
-    )
-    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
-    invoice_number: str | None = Field(default=None, alias='invoiceNumber')
-    invoice_date: str | None = Field(default=None, alias='invoiceDate')
-    invoice_type: InvoiceType | None = Field(default=None, alias='invoiceType')
-    description: str | None = None
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
-    )
-    due_days: str | None = Field(default=None, alias='dueDays')
-    due_date: str | None = Field(default=None, alias='dueDate')
-    currency: CurrencyReference | None = None
-    sub_total: float | None = Field(default=None, alias='subTotal')
-    total: float | None = None
-    invoice_taxable_flag: bool | None = Field(default=None, alias='invoiceTaxableFlag')
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    avalara_tax_flag: bool | None = Field(default=None, alias='avalaraTaxFlag')
+    charge_to_id: int | None = Field(default=None, alias='chargeToId')
     """
-    Used to determine if Avalara tax is enabled.
+    If chargeToId is not specified, we asume you enter time against the company specified
     """
-    item_taxable_flag: bool | None = Field(default=None, alias='itemTaxableFlag')
-    sales_tax_amount: float | None = Field(default=None, alias='salesTaxAmount')
-    state_tax_flag: bool | None = Field(default=None, alias='stateTaxFlag')
+    charge_to_type: Literal[
+        'ServiceTicket', 'ProjectTicket', 'ChargeCode', 'Activity'
+    ] | None = Field(default=None, alias='chargeToType')
     """
-    Set to true if transaction is taxable at the state level.
+    If chargeToId is not specified, we asume you enter time against the company specified
     """
-    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
-    state_tax_amount: float | None = Field(default=None, alias='stateTaxAmount')
-    county_tax_flag: bool | None = Field(default=None, alias='countyTaxFlag')
+    member: MemberReference | None = None
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    work_type: WorkTypeReference | None = Field(default=None, alias='workType')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    agreement: AgreementReference | None = None
+    time_start: datetime = Field(..., alias='timeStart')
+    time_end: datetime | None = Field(default=None, alias='timeEnd')
+    hours_deduct: float | None = Field(default=None, alias='hoursDeduct')
+    actual_hours: float | None = Field(default=None, alias='actualHours')
+    billable_option: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billableOption')
     """
-    Set to true if transaction is taxable at the county level.
+     Required On Updates;
     """
-    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
-    county_tax_amount: float | None = Field(default=None, alias='countyTaxAmount')
-    city_tax_flag: bool | None = Field(default=None, alias='cityTaxFlag')
+    notes: str | None = None
+    internal_notes: str | None = Field(default=None, alias='internalNotes')
+    add_to_detail_description_flag: bool | None = Field(
+        default=None, alias='addToDetailDescriptionFlag'
+    )
+    add_to_internal_analysis_flag: bool | None = Field(
+        default=None, alias='addToInternalAnalysisFlag'
+    )
+    add_to_resolution_flag: bool | None = Field(
+        default=None, alias='addToResolutionFlag'
+    )
+    email_resource_flag: bool | None = Field(default=None, alias='emailResourceFlag')
     """
-    Set to true if transaction is taxable at the city level.
+    This is an action flag. To update this value use the /service/tickets endpoint automaticEmailResourceFlag field
     """
-    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
-    city_tax_amount: float | None = Field(default=None, alias='cityTaxAmount')
-    country_tax_flag: bool | None = Field(default=None, alias='countryTaxFlag')
+    email_contact_flag: bool | None = Field(default=None, alias='emailContactFlag')
     """
-    Set to true if transaction is taxable at the country level.
+    This is an action flag. To update this value use the /service/tickets endpoint automaticEmailContactFlag field
     """
-    country_tax_xref: str | None = Field(default=None, alias='countryTaxXref')
-    country_tax_amount: float | None = Field(default=None, alias='countryTaxAmount')
-    composite_tax_flag: bool | None = Field(default=None, alias='compositeTaxFlag')
+    email_cc_flag: bool | None = Field(default=None, alias='emailCcFlag')
     """
-    Set to true if transaction is taxable at the composite level.
+    This is an action flag. To update this value use the /service/tickets endpoint automaticEmailCcFlag field
     """
-    composite_tax_xref: str | None = Field(default=None, alias='compositeTaxXref')
-    composite_tax_amount: float | None = Field(default=None, alias='compositeTaxAmount')
-    level_six_tax_flag: bool | None = Field(default=None, alias='levelSixTaxFlag')
+    email_cc: str | None = Field(default=None, alias='emailCc')
     """
-    Set to true if transaction is taxable at level six.
+    To update this value use the /service/tickets endpoint automaticEmailCc field
     """
-    level_six_tax_xref: str | None = Field(default=None, alias='levelSixTaxXref')
-    level_six_tax_amount: float | None = Field(default=None, alias='levelSixTaxAmount')
-    created_by: str | None = Field(default=None, alias='createdBy')
-    date_closed: str | None = Field(default=None, alias='dateClosed')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    hours_billed: float | None = Field(default=None, alias='hoursBilled')
+    invoice_hours: float | None = Field(default=None, alias='invoiceHours')
+    entered_by: str | None = Field(default=None, alias='enteredBy')
+    date_entered: datetime | None = Field(default=None, alias='dateEntered')
+    invoice: InvoiceReference | None = None
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    """
+    This field may only be Updated, it is defaulted on Create
+    """
+    overage_rate: float | None = Field(default=None, alias='overageRate')
+    agreement_hours: float | None = Field(default=None, alias='agreementHours')
+    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
+    time_sheet: TimeSheetReference | None = Field(default=None, alias='timeSheet')
+    status: Literal[
+        'Open',
+        'Rejected',
+        'PendingApproval',
+        'ErrorsCorrected',
+        'PendingProjectApproval',
+        'ApprovedByTierOne',
+        'RejectBySecondTier',
+        'ApprovedByTierTwo',
+        'ReadyToBill',
+        'Billed',
+        'WrittenOff',
+        'BilledAgreement',
+    ] | None = None
+    ticket: TicketReference | None = None
+    project: ProjectReference | None = None
+    phase: ProjectPhaseReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
+    )
 
 
-class UnpostedInvoiceTaxableLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TimePeriod(ConnectWiseModel):
     id: int | None = None
-    tax_level: int | None = Field(default=None, alias='taxLevel')
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
-    tax_amount: float | None = Field(default=None, alias='taxAmount')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    time_period_setup: TimePeriodSetupReference | None = Field(
+        default=None, alias='timePeriodSetup'
+    )
+    period: int | None = None
+    start_date: str | None = Field(default=None, alias='startDate')
+    end_date: str | None = Field(default=None, alias='endDate')
+    deadline_date: str | None = Field(default=None, alias='deadlineDate')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class UnpostedProcurement(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class TrackAction(ConnectWiseModel):
     id: int | None = None
-    description: str | None = None
-    unposted_product_id: str | None = Field(default=None, alias='unpostedProductId')
-    location_id: int | None = Field(default=None, alias='locationId')
-    department_id: int | None = Field(default=None, alias='departmentId')
-    procurement_type: ProcurementType | None = Field(
-        default=None, alias='procurementType'
-    )
-    purchase_order: PurchaseOrderReference | None = Field(
-        default=None, alias='purchaseOrder'
+    notify_type: Literal[
+        'CreateActivity',
+        'SendEmail',
+        'AddToGroup',
+        'AttachTrack',
+        'ChangeCompanyStatus',
+        'CreateServiceTicket',
+    ] = Field(..., alias='notifyType')
+    service_template: ServiceTemplateReference | None = Field(
+        default=None, alias='serviceTemplate'
     )
-    purchase_date: str | None = Field(default=None, alias='purchaseDate')
-    tracking_number: str | None = Field(default=None, alias='trackingNumber')
-    billing_terms: BillingTermsReference | None = Field(
-        default=None, alias='billingTerms'
+    specific_member_to: MemberReference | None = Field(
+        default=None, alias='specificMemberTo'
     )
-    currency: CurrencyReference | None = None
-    total: float | None = None
-    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
-    avalara_tax_flag: bool | None = Field(default=None, alias='avalaraTaxFlag')
+    email_recipient: str | None = Field(default=None, alias='emailRecipient')
     """
-    Used to determine if Avalara tax is enabled.
+     Max length: 250;
     """
-    item_taxable_flag: bool | None = Field(default=None, alias='itemTaxableFlag')
-    purchase_order_taxable_flag: bool | None = Field(
-        default=None, alias='purchaseOrderTaxableFlag'
+    specific_member_from: MemberReference | None = Field(
+        default=None, alias='specificMemberFrom'
     )
-    state_tax_flag: bool | None = Field(default=None, alias='stateTaxFlag')
-    """
-    Set to true if transaction is taxable at the state level.
-    """
-    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
-    state_tax_amount: float | None = Field(default=None, alias='stateTaxAmount')
-    county_tax_flag: bool | None = Field(default=None, alias='countyTaxFlag')
-    """
-    Set to true if transaction is taxable at the county level.
-    """
-    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
-    county_tax_amount: float | None = Field(default=None, alias='countyTaxAmount')
-    city_tax_flag: bool | None = Field(default=None, alias='cityTaxFlag')
-    """
-    Set to true if transaction is taxable at the city level.
-    """
-    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
-    city_tax_amount: float | None = Field(default=None, alias='cityTaxAmount')
-    country_tax_flag: bool | None = Field(default=None, alias='countryTaxFlag')
-    """
-    Set to true if transaction is taxable at the country level.
-    """
-    country_tax_xref: str | None = Field(default=None, alias='countryTaxXref')
-    country_tax_amount: float | None = Field(default=None, alias='countryTaxAmount')
-    composite_tax_flag: bool | None = Field(default=None, alias='compositeTaxFlag')
+    email_from: str | None = Field(default=None, alias='emailFrom')
     """
-    Set to true if transaction is taxable at the composite level.
+     Max length: 250;
     """
-    composite_tax_xref: str | None = Field(default=None, alias='compositeTaxXref')
-    composite_tax_amount: float | None = Field(default=None, alias='compositeTaxAmount')
-    level_six_tax_flag: bool | None = Field(default=None, alias='levelSixTaxFlag')
+    subject: str | None = None
     """
-    Set to true if transaction is taxable at level six.
+     Max length: 100;
     """
-    level_six_tax_xref: str | None = Field(default=None, alias='levelSixTaxXref')
-    level_six_tax_amount: float | None = Field(default=None, alias='levelSixTaxAmount')
-    tax_total: float | None = Field(default=None, alias='taxTotal')
-    customer: CompanyReference | None = None
-    vendor: CompanyReference | None = None
-    vendor_account_number: str | None = Field(default=None, alias='vendorAccountNumber')
-    vendor_invoice_number: str | None = Field(default=None, alias='vendorInvoiceNumber')
-    vendor_invoice_date: str | None = Field(default=None, alias='vendorInvoiceDate')
-    tax_freight_flag: bool | None = Field(default=None, alias='taxFreightFlag')
-    freight_tax_total: float | None = Field(default=None, alias='freightTaxTotal')
-    freight_cost: float | None = Field(default=None, alias='freightCost')
-    date_closed: str | None = Field(default=None, alias='dateClosed')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class UnpostedProcurementTaxableLevel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    notes: str | None = None
+    activity_type: ActivityTypeReference | None = Field(
+        default=None, alias='activityType'
+    )
+    activity_status: ActivityStatusReference | None = Field(
+        default=None, alias='activityStatus'
+    )
+    company_status: CompanyStatusReference | None = Field(
+        default=None, alias='companyStatus'
+    )
+    track: TrackReference | None = None
+    attached_track: TrackReference | None = Field(default=None, alias='attachedTrack')
+    group: GroupReference | None = None
+    cc_contact: ContactReference | None = Field(default=None, alias='ccContact')
+    bcc_contact: ContactReference | None = Field(default=None, alias='bccContact')
+    days_to_execute: int | None = Field(default=None, alias='daysToExecute')
+    notify_who: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyWho'
     )
-    id: int | None = None
-    tax_level: int | None = Field(default=None, alias='taxLevel')
-    tax_code_xref: str | None = Field(default=None, alias='taxCodeXref')
-    tax_amount: float | None = Field(default=None, alias='taxAmount')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Usage(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    notify_from: NotificationRecipientReference | None = Field(
+        default=None, alias='notifyFrom'
     )
-    type: str | None = None
-    count: int | None = None
-    id: int | None = None
-    description: str | None = None
-    hyperlink: str | None = None
-    type_key: str | None = Field(default=None, alias='typeKey')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class UserDefinedField(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class UserDefinedField(ConnectWiseModel):
     id: int | None = None
     """
     ID of the custom user defined field
@@ -20389,14 +16329,26 @@ class UserDefinedField(BaseModel):
     """
     Help text to accompany the custom field Max length: 1000;
     """
-    field_type_identifier: FieldTypeIdentifier = Field(..., alias='fieldTypeIdentifier')
+    field_type_identifier: Literal[
+        'TextArea',
+        'Button',
+        'Currency',
+        'Date',
+        'Hyperlink',
+        'IPAddress',
+        'Checkbox',
+        'Number',
+        'Percent',
+        'Text',
+        'Password',
+    ] = Field(..., alias='fieldTypeIdentifier')
     number_decimals: int | None = Field(default=None, alias='numberDecimals')
     """
     Only valid for Number or percent
     """
-    entry_type_identifier: EntryTypeIdentifier | None = Field(
-        default=None, alias='entryTypeIdentifier'
-    )
+    entry_type_identifier: Literal[
+        'Date', 'EntryField', 'List', 'Option'
+    ] | None = Field(default=None, alias='entryTypeIdentifier')
     required_flag: bool | None = Field(default=None, alias='requiredFlag')
     display_on_screen_flag: bool | None = Field(
         default=None, alias='displayOnScreenFlag'
@@ -20425,63 +16377,10 @@ class UserDefinedField(BaseModel):
     """
     Date in UTC the custom field was created
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class UserDefinedField1(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedField10(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedField2(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedField3(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedField4(Enum):
-    FROM_ = 'From'
-    TO = 'To'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class UserDefinedField5(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedField6(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedField7(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedField8(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedField9(Enum):
-    FROM_ = 'From'
-    TO = 'To'
-
-
-class UserDefinedFieldInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class UserDefinedFieldInfo(ConnectWiseModel):
     id: int | None = None
     """
     ID of the custom user defined field
@@ -20502,16 +16401,26 @@ class UserDefinedFieldInfo(BaseModel):
     """
     Help text to accompany the custom field
     """
-    field_type_identifier: FieldTypeIdentifier | None = Field(
-        default=None, alias='fieldTypeIdentifier'
-    )
+    field_type_identifier: Literal[
+        'TextArea',
+        'Button',
+        'Currency',
+        'Date',
+        'Hyperlink',
+        'IPAddress',
+        'Checkbox',
+        'Number',
+        'Percent',
+        'Text',
+        'Password',
+    ] | None = Field(default=None, alias='fieldTypeIdentifier')
     number_decimals: int | None = Field(default=None, alias='numberDecimals')
     """
     Only valid for Number or percent
     """
-    entry_type_identifier: EntryTypeIdentifier | None = Field(
-        default=None, alias='entryTypeIdentifier'
-    )
+    entry_type_identifier: Literal[
+        'Date', 'EntryField', 'List', 'Option'
+    ] | None = Field(default=None, alias='entryTypeIdentifier')
     required_flag: bool | None = Field(default=None, alias='requiredFlag')
     display_on_screen_flag: bool | None = Field(
         default=None, alias='displayOnScreenFlag'
@@ -20538,113 +16447,10 @@ class UserDefinedFieldInfo(BaseModel):
     """
     Date in UTC the custom field was created
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class UserDefinedFieldOption(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    option_value: str | None = Field(default=None, alias='optionValue')
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    sort_order: int | None = Field(default=None, alias='sortOrder')
-
-
-class UserDefinedFieldReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class UserDefinedFieldValueModel(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    user_defined_field_rec_id: int | None = Field(
-        default=None, alias='userDefinedFieldRecId'
-    )
-    value: str | None = None
-    row_num: int | None = Field(default=None, alias='rowNum')
-    skip_location_and_billing_unit: bool | None = Field(
-        default=None, alias='skipLocationAndBillingUnit'
-    )
-    filtered: bool | None = None
-
-
-class VacationAvailableType(Enum):
-    ANNIVERSARY_YEAR = 'AnniversaryYear'
-    CALENDAR_YEAR = 'CalendarYear'
-
-
-class ValidatePortalRequest(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    email: str
-    password: str
-
-
-class ValidatePortalResponse(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    success: bool | None = None
-    contact_id: int | None = Field(default=None, alias='contactId')
-
-
-class ValidationError(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    code: str | None = None
-    message: str | None = None
-    resource: str | None = None
-    field: str | None = None
-    details: str | None = None
-
-
-class VendorType(Enum):
-    ZENITH = 'Zenith'
-
-
-class Warehouse(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    company: CompanyReference | None = None
-    location: SystemLocationReference | None = None
-    contact: ContactReference | None = None
-    department: SystemDepartmentReference | None = None
-    manager: MemberReference | None = None
-    site: SiteReference | None = None
-    location_xref: str | None = Field(default=None, alias='locationXref')
-    """
-     Max length: 10;
-    """
-    location_default_flag: bool | None = Field(
-        default=None, alias='locationDefaultFlag'
-    )
-    overall_default_flag: bool | None = Field(default=None, alias='overallDefaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    locked_flag: bool | None = Field(default=None, alias='lockedFlag')
-    currency: CurrencyReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WarehouseBin(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class WarehouseBin(ConnectWiseModel):
     id: int | None = None
     name: str
     """
@@ -20670,527 +16476,505 @@ class WarehouseBin(BaseModel):
     transfer_bin: WarehouseBinReference | None = Field(
         default=None, alias='transferBin'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WarehouseBinInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class WarehouseBinInfo(ConnectWiseModel):
     id: int | None = None
     name: str | None = None
     warehouse: WarehouseReference | None = None
     inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
     default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WarehouseBinReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Workflow(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    name: str
+    """
+     Max length: 100;
+    """
+    table_type: WorkflowTableTypeReference | None = Field(
+        default=None, alias='tableType'
+    )
+    location: SystemLocationReference | None = None
+    department: SystemDepartmentReference | None = None
+    activate_flag: bool | None = Field(default=None, alias='activateFlag')
+    """
+    Batches can not be turned on until after the workflow is created and it has atleast one event associated with it
+    """
+    batch_interval: int | None = Field(default=None, alias='batchInterval')
+    batch_frequency_unit: Literal['Minutes', 'Hours', 'Days'] | None = Field(
+        default=None, alias='batchFrequencyUnit'
+    )
+    """
+    If not specified, defaults to Minutes. Months is not supported as month length varies
+    """
+    batch_last_ran: datetime | None = Field(default=None, alias='batchLastRan')
+    batch_schedule: Literal[
+        'AnyTime', 'MyCompanyOfficeHours', 'SlaHours'
+    ] | None = Field(default=None, alias='batchSchedule')
+    """
+    If activateFlag is true, batchSchedule is required
+    """
+    board: BoardReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WarehouseInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class WorkRoleExemption(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    work_role: WorkRoleReference = Field(..., alias='workRole')
+    taxable_levels: list[int] | None = Field(default=None, alias='taxableLevels')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WarehouseReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class WorkRoleLocation(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    locked_flag: bool | None = Field(default=None, alias='lockedFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    location: SystemLocationReference | None = None
+    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
+    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class Website(Enum):
-    FROM_ = 'From'
-    TO = 'To'
+class BulkResult(ConnectWiseModel):
+    payload: list[ResultInfo] | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WeekStart(Enum):
-    SUNDAY = 'Sunday'
-    MONDAY = 'Monday'
-    TUESDAY = 'Tuesday'
-    WEDNESDAY = 'Wednesday'
-    THURSDAY = 'Thursday'
-    FRIDAY = 'Friday'
-    SATURDAY = 'Saturday'
+class BundleResult(ConnectWiseModel):
+    sequence_number: int | None = Field(default=None, alias='sequenceNumber')
+    resource_type: str | None = Field(default=None, alias='resourceType')
+    entities: list[IRestIdentifiedItem] | None = None
+    count: int | None = None
+    version: str | None = None
+    success: bool | None = None
+    status_code: int | None = Field(default=None, alias='statusCode')
+    error: ErrorResponseMessage | None = None
 
 
-class Where(Enum):
-    ON_SITE = 'OnSite'
-    REMOTE = 'Remote'
-    IN_HOUSE = 'InHouse'
+class BundleResultsCollection(ConnectWiseModel):
+    results: list[BundleResult] | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WisePayBatchPayment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class ExpenseEntry(ConnectWiseModel):
+    id: int | None = None
+    expense_report: ExpenseReportReference | None = Field(
+        default=None, alias='expenseReport'
+    )
+    company: CompanyReference | None = None
+    charge_to_id: int | None = Field(default=None, alias='chargeToId')
+    charge_to_type: Literal[
+        'ServiceTicket', 'ProjectTicket', 'ChargeCode', 'Activity'
+    ] | None = Field(default=None, alias='chargeToType')
+    """
+    Gets or sets
+                company or chargeToType is required.
+    """
+    type: ExpenseTypeReference | None = None
+    member: MemberReference | None = None
+    payment_method: PaymentMethodReference | None = Field(
+        default=None, alias='paymentMethod'
+    )
+    classification: ClassificationReference | None = None
+    amount: float
+    billable_option: Literal[
+        'Billable', 'DoNotBill', 'NoCharge', 'NoDefault'
+    ] | None = Field(default=None, alias='billableOption')
+    date: datetime
+    location_id: int | None = Field(default=None, alias='locationId')
+    business_unit_id: int | None = Field(default=None, alias='businessUnitId')
+    notes: str | None = None
+    agreement: AgreementReference | None = None
+    invoice_amount: float | None = Field(default=None, alias='invoiceAmount')
+    mobile_guid: UUID | None = Field(default=None, alias='mobileGuid')
+    taxes: list[ExpenseTax] | None = None
+    invoice: InvoiceReference | None = None
+    currency: CurrencyReference | None = None
+    status: Literal[
+        'Open',
+        'Rejected',
+        'PendingApproval',
+        'ErrorsCorrected',
+        'PendingProjectApproval',
+        'ApprovedByTierOne',
+        'RejectBySecondTier',
+        'ApprovedByTierTwo',
+        'ReadyToBill',
+        'Billed',
+        'WrittenOff',
+        'BilledAgreement',
+    ] | None = None
+    bill_amount: float | None = Field(default=None, alias='billAmount')
+    agreement_amount: float | None = Field(default=None, alias='agreementAmount')
+    odometer_start: float | None = Field(default=None, alias='odometerStart')
+    odometer_end: float | None = Field(default=None, alias='odometerEnd')
+    ticket: TicketReference | None = None
+    project: ProjectReference | None = None
+    phase: ProjectPhaseReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+    custom_fields: list[CustomFieldValue] | None = Field(
+        default=None, alias='customFields'
     )
-    amount: float | None = None
-    wise_pay_href: str | None = Field(default=None, alias='wisePayHref')
 
 
-class WisePayFeeInvoice(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class Forecast(ConnectWiseModel):
     id: int | None = None
-    invoice_number: str | None = Field(default=None, alias='invoiceNumber')
-    amount: float | None = None
-    invoice_href: str | None = Field(default=None, alias='invoiceHref')
+    forecast_items: list[ForecastItem] | None = Field(
+        default=None, alias='forecastItems'
+    )
+    product_revenue: ProductRevenueReference | None = Field(
+        default=None, alias='productRevenue'
+    )
+    service_revenue: ServiceRevenueReference | None = Field(
+        default=None, alias='serviceRevenue'
+    )
+    agreement_revenue: AgreementRevenueReference | None = Field(
+        default=None, alias='agreementRevenue'
+    )
+    time_revenue: TimeRevenueReference | None = Field(default=None, alias='timeRevenue')
+    expense_revenue: ExpenseRevenueReference | None = Field(
+        default=None, alias='expenseRevenue'
+    )
+    forecast_revenue_totals: ForecastRevenueReference | None = Field(
+        default=None, alias='forecastRevenueTotals'
+    )
+    inclusive_revenue_totals: InclusiveRevenueReference | None = Field(
+        default=None, alias='inclusiveRevenueTotals'
+    )
+    recurring_total: float | None = Field(default=None, alias='recurringTotal')
+    won_revenue: WonRevenueReference | None = Field(default=None, alias='wonRevenue')
+    lost_revenue: LostRevenueReference | None = Field(default=None, alias='lostRevenue')
+    open_revenue: OpenRevenueReference | None = Field(default=None, alias='openRevenue')
+    other_revenue1: Other1RevenueReference | None = Field(
+        default=None, alias='otherRevenue1'
+    )
+    other_revenue2: Other2RevenueReference | None = Field(
+        default=None, alias='otherRevenue2'
+    )
+    sales_tax_revenue: float | None = Field(default=None, alias='salesTaxRevenue')
+    forecast_total_with_taxes: float | None = Field(
+        default=None, alias='forecastTotalWithTaxes'
+    )
+    expected_probability: int | None = Field(default=None, alias='expectedProbability')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
+    )
+    currency: CurrencyReference | None = None
+    info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WisePayPayment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class GLExportAdjustmentTransaction(ConnectWiseModel):
+    id: str | None = None
+    document_type: str | None = Field(default=None, alias='documentType')
+    document_date: str | None = Field(default=None, alias='documentDate')
+    gl_type_id: str | None = Field(default=None, alias='glTypeID')
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    memo: str | None = None
+    gl_class: str | None = Field(default=None, alias='glClass')
+    adjustment_description: str | None = Field(
+        default=None, alias='adjustmentDescription'
     )
-    payment_date_utc: str | None = Field(default=None, alias='paymentDateUtc')
-    wise_pay_reference: str | None = Field(default=None, alias='wisePayReference')
-    batch_payment: WisePayBatchPayment | None = Field(
-        default=None, alias='batchPayment'
+    adjustment_detail: list[GLExportAdjustmentTransactionDetail] | None = Field(
+        default=None, alias='adjustmentDetail'
     )
-    fee_invoice: WisePayFeeInvoice | None = Field(default=None, alias='feeInvoice')
 
 
-class WonRevenueReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GLExportExpense(ConnectWiseModel):
     id: int | None = None
-    revenue: float | None = None
-    cost: float | None = None
-    margin: float | None = None
-    percentage: float | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
+    document_date: str | None = Field(default=None, alias='documentDate')
+    document_type: str | None = Field(default=None, alias='documentType')
+    ap_account_number: str | None = Field(default=None, alias='apAccountNumber')
+    ap_class: str | None = Field(default=None, alias='apClass')
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    gl_class: str | None = Field(default=None, alias='glClass')
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    memo: str | None = None
+    description: str | None = None
+    period_start_date: str | None = Field(default=None, alias='periodStartDate')
+    period_end_date: str | None = Field(default=None, alias='periodEndDate')
+    member: MemberReference | None = None
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    company: CompanyReference | None = None
+    company_account_number: str | None = Field(
+        default=None, alias='companyAccountNumber'
+    )
+    project: ProjectReference | None = None
+    currency: CurrencyReference | None = None
+    total: float | None = None
+    offset: GLExportExpenseOffset | None = None
 
 
-class WorkRole(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class GLExportPurchaseTransaction(ConnectWiseModel):
+    id: str | None = None
+    document_date: str | None = Field(default=None, alias='documentDate')
+    document_number: str | None = Field(default=None, alias='documentNumber')
+    description: str | None = None
+    memo: str | None = None
+    ap_account_number: str | None = Field(default=None, alias='apAccountNumber')
+    purchase_date: str | None = Field(default=None, alias='purchaseDate')
+    company: CompanyReference | None = None
+    company_type: CompanyTypeReference | None = Field(default=None, alias='companyType')
+    contact: ContactReference | None = None
+    site: SiteReference | None = None
+    purchase_class: str | None = Field(default=None, alias='purchaseClass')
+    freight_amount: float | None = Field(default=None, alias='freightAmount')
+    freight_packing_slip: str | None = Field(default=None, alias='freightPackingSlip')
+    packing_slip: str | None = Field(default=None, alias='packingSlip')
+    dropship_flag: bool | None = Field(default=None, alias='dropshipFlag')
+    currency: CurrencyReference | None = None
+    total: float | None = None
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    integration_xref: str | None = Field(default=None, alias='integrationXref')
-    """
-     Max length: 50;
-    """
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    add_all_locations: bool | None = Field(default=None, alias='addAllLocations')
-    remove_all_locations: bool | None = Field(default=None, alias='removeAllLocations')
-    add_all_agreement_exclusions: bool | None = Field(
-        default=None, alias='addAllAgreementExclusions'
+    billing_terms_xref: str | None = Field(default=None, alias='billingTermsXref')
+    due_days: int | None = Field(default=None, alias='dueDays')
+    vendor_number: str | None = Field(default=None, alias='vendorNumber')
+    vendor_account_number: str | None = Field(default=None, alias='vendorAccountNumber')
+    vendor_invoice_date: str | None = Field(default=None, alias='vendorInvoiceDate')
+    vendor_invoice_number: str | None = Field(default=None, alias='vendorInvoiceNumber')
+    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
+    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
+    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
+    city_tax_xref: str | None = Field(default=None, alias='cityTaxXref')
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
     )
-    """
-    Used only on create to add the work role to all agreement and agreement type exclusion lists
-    """
-    location_ids: list[int] | None = Field(default=None, alias='locationIds')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkRoleExemption(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ship_to_company_account_number: str | None = Field(
+        default=None, alias='shipToCompanyAccountNumber'
     )
-    id: int | None = None
-    work_role: WorkRoleReference = Field(..., alias='workRole')
-    taxable_levels: list[int] | None = Field(default=None, alias='taxableLevels')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkRoleInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ship_to_company_type: CompanyTypeReference | None = Field(
+        default=None, alias='shipToCompanyType'
     )
-    id: int | None = None
-    name: str | None = None
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkRoleLocation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ship_to_contact: ContactReference | None = Field(
+        default=None, alias='shipToContact'
     )
-    id: int | None = None
-    location: SystemLocationReference | None = None
-    hourly_rate: float | None = Field(default=None, alias='hourlyRate')
-    work_role: WorkRoleReference | None = Field(default=None, alias='workRole')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkRoleReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    ship_to_site: SiteReference | None = Field(default=None, alias='shipToSite')
+    ship_to_tax_group: str | None = Field(default=None, alias='shipToTaxGroup')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    tax_group_rate: float | None = Field(default=None, alias='taxGroupRate')
+    use_avalara_tax_flag: bool | None = Field(default=None, alias='useAvalaraTaxFlag')
+    purchase_header_tax_group: str | None = Field(
+        default=None, alias='purchaseHeaderTaxGroup'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    purchase_header_taxable_flag: bool | None = Field(
+        default=None, alias='purchaseHeaderTaxableFlag'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 50;
-    """
-    bill_time: BillTime11 = Field(..., alias='billTime')
-    rate_type: RateType5 = Field(..., alias='rateType')
-    rate: float
-    hours_min: float | None = Field(default=None, alias='hoursMin')
-    hours_max: float | None = Field(default=None, alias='hoursMax')
-    round_bill_hours_to: float | None = Field(default=None, alias='roundBillHoursTo')
-    accrual_type: AccrualType2 | None = Field(default=None, alias='accrualType')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    overall_default_flag: bool | None = Field(default=None, alias='overallDefaultFlag')
-    activity_default_flag: bool | None = Field(
-        default=None, alias='activityDefaultFlag'
+    purchase_header_freight_taxable_flag: bool | None = Field(
+        default=None, alias='purchaseHeaderFreightTaxableFlag'
     )
-    utilization_flag: bool | None = Field(default=None, alias='utilizationFlag')
-    cost_multiplier: float | None = Field(default=None, alias='costMultiplier')
-    integration_x_ref: str | None = Field(default=None, alias='integrationXRef')
-    """
-     Max length: 50;
-    """
-    add_all_agreement_exclusions: bool | None = Field(
-        default=None, alias='addAllAgreementExclusions'
+    tax_levels: list[GLExportPurchaseTransactionTaxLevel] | None = Field(
+        default=None, alias='taxLevels'
     )
-    """
-    Used only on create to add the work type to all agreement and agreement type exclusion lists
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    purchase_detail: list[GLExportPurchaseTransactionDetail] | None = Field(
+        default=None, alias='purchaseDetail'
     )
-    id: int | None = None
-    name: str | None = None
-    default_flag: bool | None = Field(default=None, alias='defaultFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    activity_default_flag: bool | None = Field(
-        default=None, alias='activityDefaultFlag'
+    purchase_detail_tax: list[GLExportPurchaseTransactionDetailTax] | None = Field(
+        default=None, alias='purchaseDetailTax'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WorkTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class GLExportTransaction(ConnectWiseModel):
     id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class Workflow(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    gl_class: str | None = Field(default=None, alias='glClass')
+    gl_type_id: str | None = Field(default=None, alias='glTypeId')
+    document_date: str | None = Field(default=None, alias='documentDate')
+    document_number: str | None = Field(default=None, alias='documentNumber')
+    document_type: str | None = Field(default=None, alias='documentType')
+    memo: str | None = None
+    description: str | None = None
+    attention: str | None = None
+    sales_territory: str | None = Field(default=None, alias='salesTerritory')
+    company: CompanyReference | None = None
+    company_type: CompanyTypeReference | None = Field(default=None, alias='companyType')
+    company_account_number: str | None = Field(
+        default=None, alias='companyAccountNumber'
     )
-    id: int | None = None
-    name: str
-    """
-     Max length: 100;
-    """
-    table_type: WorkflowTableTypeReference | None = Field(
-        default=None, alias='tableType'
+    site: SiteReference | None = None
+    billing_terms: BillingTermsReference | None = Field(
+        default=None, alias='billingTerms'
     )
-    location: SystemLocationReference | None = None
-    department: SystemDepartmentReference | None = None
-    activate_flag: bool | None = Field(default=None, alias='activateFlag')
-    """
-    Batches can not be turned on until after the workflow is created and it has atleast one event associated with it
-    """
-    batch_interval: int | None = Field(default=None, alias='batchInterval')
-    batch_frequency_unit: BatchFrequencyUnit | None = Field(
-        default=None, alias='batchFrequencyUnit'
+    billing_terms_xref: str | None = Field(default=None, alias='billingTermsXref')
+    due_days: int | None = Field(default=None, alias='dueDays')
+    due_date: str | None = Field(default=None, alias='dueDate')
+    email_delivery_flag: bool | None = Field(default=None, alias='emailDeliveryFlag')
+    print_delivery_flag: bool | None = Field(default=None, alias='printDeliveryFlag')
+    agreement_pre_payment_flag: bool | None = Field(
+        default=None, alias='agreementPrePaymentFlag'
+    )
+    account_number: str | None = Field(default=None, alias='accountNumber')
+    billing_type: str | None = Field(default=None, alias='billingType')
+    gl_entry_ids: str | None = Field(default=None, alias='glEntryIds')
+    purchase_order: PurchaseOrderReference | None = Field(
+        default=None, alias='purchaseOrder'
+    )
+    project: ProjectReference | None = None
+    currency: CurrencyReference | None = None
+    total: float | None = None
+    sales_rep_id: str | None = Field(default=None, alias='salesRepId')
+    sales_rep_name: str | None = Field(default=None, alias='salesRepName')
+    taxable: bool | None = None
+    taxable_total: float | None = Field(default=None, alias='taxableTotal')
+    tax_code: TaxCodeReference | None = Field(default=None, alias='taxCode')
+    tax_group_rate: float | None = Field(default=None, alias='taxGroupRate')
+    piggy_back_flag: bool | None = Field(default=None, alias='piggyBackFlag')
+    tax_account_number: str | None = Field(default=None, alias='taxAccountNumber')
+    sales_tax: float | None = Field(default=None, alias='salesTax')
+    state_tax: float | None = Field(default=None, alias='stateTax')
+    county_tax: float | None = Field(default=None, alias='countyTax')
+    city_tax: float | None = Field(default=None, alias='cityTax')
+    taxable_amount1: float | None = Field(default=None, alias='taxableAmount1')
+    taxable_amount2: float | None = Field(default=None, alias='taxableAmount2')
+    taxable_amount3: float | None = Field(default=None, alias='taxableAmount3')
+    taxable_amount4: float | None = Field(default=None, alias='taxableAmount4')
+    taxable_amount5: float | None = Field(default=None, alias='taxableAmount5')
+    tax_agency_xref: str | None = Field(default=None, alias='taxAgencyXref')
+    state_tax_xref: str | None = Field(default=None, alias='stateTaxXref')
+    county_tax_xref: str | None = Field(default=None, alias='countyTaxXref')
+    tax_id: str | None = Field(default=None, alias='taxId')
+    tax_dp_applied_flag: bool | None = Field(default=None, alias='taxDpAppliedFlag')
+    use_avalara_flag: bool | None = Field(default=None, alias='useAvalaraFlag')
+    send_avalara_tax_flag: bool | None = Field(default=None, alias='sendAvalaraTaxFlag')
+    ship_to_company: CompanyReference | None = Field(
+        default=None, alias='shipToCompany'
+    )
+    ship_to_company_account_number: str | None = Field(
+        default=None, alias='shipToCompanyAccountNumber'
+    )
+    ship_to_company_type: CompanyTypeReference | None = Field(
+        default=None, alias='shipToCompanyType'
+    )
+    ship_to_tax_id: str | None = Field(default=None, alias='shipToTaxId')
+    ship_site: SiteReference | None = Field(default=None, alias='shipSite')
+    ship_contact: str | None = Field(default=None, alias='shipContact')
+    detail: list[GLExportTransactionDetail] | None = None
+    tax_levels: list[GLExportTransactionTaxLevel] | None = Field(
+        default=None, alias='taxLevels'
     )
-    """
-    If not specified, defaults to Minutes. Months is not supported as month length varies
-    """
-    batch_last_ran: datetime | None = Field(default=None, alias='batchLastRan')
-    batch_schedule: BatchSchedule | None = Field(default=None, alias='batchSchedule')
-    """
-    If activateFlag is true, batchSchedule is required
-    """
-    board: BoardReference | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WorkflowAction(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
+class InvoiceInfo(ConnectWiseModel):
     id: int | None = None
-    notify_type: NotifyTypeReference = Field(..., alias='notifyType')
-    notify_who: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyWho'
+    invoice: Invoice | None = None
+    invoice_template: InvoiceTemplate | None = Field(
+        default=None, alias='invoiceTemplate'
     )
-    specific_member_to: MemberReference | None = Field(
-        default=None, alias='specificMemberTo'
+    products: list[ProductItem] | None = None
+    bundled_components_info: list[ProductComponent] | None = Field(
+        default=None, alias='bundledComponentsInfo'
     )
-    email_recipient: str | None = Field(default=None, alias='emailRecipient')
-    """
-    Required when notifyWho is set to: "Email Address" Max length: 250;
-    """
-    notify_from: NotificationRecipientReference | None = Field(
-        default=None, alias='notifyFrom'
+    expenses: list[ExpenseEntry] | None = None
+    time_entries: list[TimeEntry] | None = Field(default=None, alias='timeEntries')
+    logo: DocumentInfo | None = None
+    billing_setup: BillingSetup | None = Field(default=None, alias='billingSetup')
+    agreement_billing_info: list[AgreementBillingInfo] | None = Field(
+        default=None, alias='agreementBillingInfo'
     )
-    specific_member_from: MemberReference | None = Field(
-        default=None, alias='specificMemberFrom'
+    info: dict[str, str] | None = Field(default=None, alias='_info')
+
+
+class MemberDeactivation(ConnectWiseModel):
+    activity: MemberDeactivationSalesActivity | None = None
+    service_team: MemberDeactivationServiceTeam | None = Field(
+        default=None, alias='serviceTeam'
+    )
+    company_team: list[MemberDeactivationCompanyTeam] | None = Field(
+        default=None, alias='companyTeam'
     )
-    email_from: str | None = Field(default=None, alias='emailFrom')
-    """
-    Required when notifyFrom is set to: "Email Address" Max length: 250;
-    """
-    cc_contact: ContactReference | None = Field(default=None, alias='ccContact')
-    bcc_contact: ContactReference | None = Field(default=None, alias='bccContact')
-    subject: str | None = None
     """
-    Required when notifyType is set to: "Create Activity", "Send Email", "Assign Resource" Max length: 100;
+    A list of customers for which the member holds a team role
     """
-    notes: str | None = None
-    activity_status: ActivityStatusReference | None = Field(
-        default=None, alias='activityStatus'
-    )
-    activity_type: ActivityTypeReference | None = Field(
-        default=None, alias='activityType'
-    )
-    attached_track: TrackReference | None = Field(default=None, alias='attachedTrack')
-    days_to_execute: int | None = Field(default=None, alias='daysToExecute')
-    board: BoardReference | None = None
-    board_status: ServiceStatusReference | None = Field(
-        default=None, alias='boardStatus'
-    )
-    service_type: ServiceTypeReference | None = Field(default=None, alias='serviceType')
-    service_sub_type: ServiceSubTypeReference | None = Field(
-        default=None, alias='serviceSubType'
-    )
-    service_item: ServiceItemReference | None = Field(default=None, alias='serviceItem')
-    group: GroupReference | None = None
-    service_template: ServiceTemplateReference | None = Field(
-        default=None, alias='serviceTemplate'
+    workflow_email: MemberDeactivationWorkflow | None = Field(
+        default=None, alias='workflowEmail'
     )
-    invoice_min_days: int | None = Field(default=None, alias='invoiceMinDays')
-    automate_script: AutomateScriptReference | None = Field(
-        default=None, alias='automateScript'
+    service_status_workflow: list[MemberDeactivationStatusWorkflow] | None = Field(
+        default=None, alias='serviceStatusWorkflow'
     )
-    script_success_status: ServiceStatusReference | None = Field(
-        default=None, alias='scriptSuccessStatus'
+    ticket_template: MemberDeactivationServiceTemplate | None = Field(
+        default=None, alias='ticketTemplate'
     )
-    script_fail_status: ServiceStatusReference | None = Field(
-        default=None, alias='scriptFailStatus'
+    opportunity: MemberDeactivationOpportunity | None = None
+    sales_team: MemberDeactivationSalesTeam | None = Field(
+        default=None, alias='salesTeam'
     )
-    detail_notes_flag: bool | None = Field(default=None, alias='detailNotesFlag')
-    internal_notes_flag: bool | None = Field(default=None, alias='internalNotesFlag')
-    audit_notes_flag: bool | None = Field(default=None, alias='auditNotesFlag')
-    service_priority: PriorityReference | None = Field(
-        default=None, alias='servicePriority'
+    project_manager: MemberDeactivationProjectManager | None = Field(
+        default=None, alias='projectManager'
     )
-    update_owner_flag: bool | None = Field(default=None, alias='updateOwnerFlag')
-    sales_order_status: OrderStatusReference | None = Field(
-        default=None, alias='salesOrderStatus'
+    project_time_approver: MemberDeactivationProjectManager | None = Field(
+        default=None, alias='projectTimeApprover'
     )
-    project_status: ProjectStatusReference | None = Field(
-        default=None, alias='projectStatus'
+    project_expense_approver: MemberDeactivationProjectManager | None = Field(
+        default=None, alias='projectExpenseApprover'
     )
-    company_status: CompanyStatusReference | None = Field(
-        default=None, alias='companyStatus'
+    knowledge_base_article: MemberDeactivationKnowledgebaseArticle | None = Field(
+        default=None, alias='knowledgeBaseArticle'
     )
-    attachments: list[int] | None = None
-    service_survey: ServiceSurveyReference | None = Field(
-        default=None, alias='serviceSurvey'
+    my_company_president: MemberDeactivationMyCompanyPresidentRole | None = Field(
+        default=None, alias='myCompanyPresident'
     )
-    specific_team_to: GenericBoardTeamReference | None = Field(
-        default=None, alias='specificTeamTo'
+    my_company_coo: MemberDeactivationMyCompanyCOORole | None = Field(
+        default=None, alias='myCompanyCOO'
     )
-    attach_configurations_for: AttachConfigurationsFor | None = Field(
-        default=None, alias='attachConfigurationsFor'
+    my_company_controller: MemberDeactivationMyCompanyControllerRole | None = Field(
+        default=None, alias='myCompanyController'
     )
-    """
-    Required when notifyType is set to: "Attach Configuration"
-    """
-    configuration_type: ConfigurationTypeReference | None = Field(
-        default=None, alias='configurationType'
+    my_company_dispatch: MemberDeactivationMyCompanyDispatchRole | None = Field(
+        default=None, alias='myCompanyDispatch'
     )
-    configuration_status: ConfigurationStatusReference | None = Field(
-        default=None, alias='configurationStatus'
+    my_company_service_manager: MemberDeactivationMyCompanyServiceManagerRole | None = (
+        Field(default=None, alias='myCompanyServiceManager')
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowActionAutomateParameter(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    my_company_duty_manager_role: MemberDeactivationMyCompanyDutyManagerRole | None = (
+        Field(default=None, alias='myCompanyDutyManagerRole')
     )
-    id: int | None = None
-    name: str
-    value: str | None = None
-
-
-class WorkflowActionUserDefinedField(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    department_manager: MemberDeactivationDepartmentMananager | None = Field(
+        default=None, alias='departmentManager'
     )
-    id: int | None = None
-    event_id: int | None = Field(default=None, alias='eventId')
-    action_id: int | None = Field(default=None, alias='actionId')
-    caption: str | None = None
-    user_defined_field_id: int | None = Field(default=None, alias='userDefinedFieldId')
-    value: str | None = None
-    overwrite_flag: bool | None = Field(default=None, alias='overwriteFlag')
-    pod_description: str | None = Field(default=None, alias='podDescription')
-    field_type_id: str | None = Field(default=None, alias='fieldTypeId')
-    entry_type_id: str | None = Field(default=None, alias='entryTypeId')
-    required_flag: bool | None = Field(default=None, alias='requiredFlag')
-    inactive_flag: bool | None = Field(default=None, alias='inactiveFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowAttachment(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    dispatch_member: MemberDeactivationDispatchMember | None = Field(
+        default=None, alias='dispatchMember'
     )
-    id: int | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowEvent(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    service_manager: MemberDeactivationServiceManger | None = Field(
+        default=None, alias='serviceManager'
     )
-    id: int | None = None
-    name: str | None = None
-    event_condition: str = Field(..., alias='eventCondition')
-    frequency_unit: FrequencyUnit | None = Field(default=None, alias='frequencyUnit')
-    """
-    Required when exectionTimes is set to MultipleTimes or Continuously
-    """
-    frequency_of_execution: int | None = Field(
-        default=None, alias='frequencyOfExecution'
+    duty_manager: MemberDeactivationDutyManager | None = Field(
+        default=None, alias='dutyManager'
     )
-    """
-    Required when exectionTimes is set to MultipleTimes or Continuously
-    """
-    max_number_of_execution: int | None = Field(
-        default=None, alias='maxNumberOfExecution'
+    send_from_email_notify: MemberDeactivationSendFromEmailNotify | None = Field(
+        default=None, alias='sendFromEmailNotify'
     )
-    """
-    Required when exectionTimes is set to MultipleTimes
-    """
-    execution_time: ExecutionTime | None = Field(default=None, alias='executionTime')
-    """
-    Defaults to Once when not specified
-    """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowNotifyType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    delete_open_time_sheets_flag: bool | None = Field(
+        default=None, alias='deleteOpenTimeSheetsFlag'
     )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    is_setup_flag: bool | None = Field(default=None, alias='isSetupFlag')
-    """
-    If the current action is available because it is already set up. Pertains to integrations such as Automate
     """
-    external_flag: bool | None = Field(default=None, alias='externalFlag')
-    """
-    If the current action effects external objects e.g. integrations or sending an email
+    By default, this is set to false
+                If there is any open timesheets, system will return error message
+                that there is open timesheets still attached to this member
+                If user would like to delete member with open timesheets, they can set this boolean to TRUE
+                System will delete member and any associated open timesheets
     """
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowNotifyTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    is_setup_flag: bool | None = Field(default=None, alias='isSetupFlag')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowTableType(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowTableTypeInfo(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
-    )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-class WorkflowTableTypeReference(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+class GLExport(ConnectWiseModel):
+    export_settings: GLExportSettings | None = Field(
+        default=None, alias='exportSettings'
     )
-    id: int | None = None
-    identifier: str | None = None
-    name: str | None = None
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowTrigger(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    vendors: list[GLExportVendor] | None = None
+    customers: list[GLExportCustomer] | None = None
+    transactions: list[GLExportTransaction] | None = None
+    expenses: list[GLExportExpense] | None = None
+    expense_bills: list[GLExportExpenseBill] | None = Field(
+        default=None, alias='expenseBills'
     )
-    id: int | None = None
-    name: str | None = None
-    description: str | None = None
-    has_options_flag: bool | None = Field(default=None, alias='hasOptionsFlag')
-    has_operator_flag: bool | None = Field(default=None, alias='hasOperatorFlag')
-    custom_field: UserDefinedFieldReference | None = Field(
-        default=None, alias='customField'
+    purchase_transactions: list[GLExportPurchaseTransaction] | None = Field(
+        default=None, alias='purchaseTransactions'
     )
-    expected_type: str | None = Field(default=None, alias='expectedType')
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
-
-
-class WorkflowTriggerOption(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True,
+    adjustment_transactions: list[GLExportAdjustmentTransaction] | None = Field(
+        default=None, alias='adjustmentTransactions'
     )
-    value: str | None = None
-    name: str | None = None
-    custom_field: UserDefinedFieldReference | None = Field(
-        default=None, alias='customField'
+    inventory_transfers: list[GLExportInventoryTransfer] | None = Field(
+        default=None, alias='inventoryTransfers'
     )
-    field_info: dict[str, str] | None = Field(default=None, alias='_info')
 
 
-Manager.update_forward_refs()
+Manager.model_rebuild()
diff --git a/src/pyconnectwise/utils/generator/endpoint_gen.py b/src/pyconnectwise/utils/generator/endpoint_gen.py
index ab6457a17..d299fe55f 100644
--- a/src/pyconnectwise/utils/generator/endpoint_gen.py
+++ b/src/pyconnectwise/utils/generator/endpoint_gen.py
@@ -30,7 +30,8 @@ def generate_endpoint(
     operations = list(path_info.keys())
 
     child_endpoints = list(
-        set(format_endpoint_path(child) for child in relationships.get(path, []))
+        set(format_endpoint_path(child)
+            for child in relationships.get(path, []))
     )
 
     print(f"Generating {endpoint_class_name}")
@@ -95,17 +96,24 @@ def generate_endpoint(
 
         for response in operation_responses.values():
             if response.get("content") is None:
+                # op_definitions.append(
+                #     {
+                #         "name": operation,
+                #         "return_type": "GenericMessageModel",
+                #         "return_class": "GenericMessageModel",
+                #         "returns_single": True,
+                #     }
+                # )
                 op_definitions.append(
                     {
                         "name": operation,
-                        "return_type": "GenericMessageModel",
-                        "return_class": "GenericMessageModel",
-                        "returns_single": True,
+                        "void": True
                     }
                 )
             else:
                 resp_content = response.get("content")
-                schema_object = resp_content.get(list(resp_content)[0]).get("schema")
+                schema_object = resp_content.get(
+                    list(resp_content)[0]).get("schema")
                 schema_ref = None
                 is_array = False
 
@@ -117,27 +125,19 @@ def generate_endpoint(
                     and schema_object.get("additionalProperties") is not None
                     and schema_object.get("$ref") is not None
                 ):
-                    schema_ref = schema_object.get("additionalProperties").get("$ref")
+                    schema_ref = schema_object.get(
+                        "additionalProperties").get("$ref")
                 else:
                     schema_ref = schema_object.get("$ref")
 
                 if schema_ref:
                     model_name = schema_ref.split("/")[-1]
-                    absolute_model_name = ".".join(model_name.split(".")[:-1])
-                    if not absolute_model_name:
-                        absolute_model_name = model_name
-
-                    nested_import = False
-                    if len(absolute_model_name.split(".")) > 1:
-                        nested_import = True
-
-                    if nested_import:
-                        model_name = model_name.split(".")[-1]
+                    split = model_name.split(".")
+                    if len(split) >= 2:
+                        model_name = split[0] + split[-1]
                     else:
-                        model_name = absolute_model_name
-
+                        model_name = "".join(model_name.split("."))
                     return_type = model_name
-                    return_class = return_type
 
                     for param in operation_params:
                         param_name = param.get("name")
@@ -146,24 +146,19 @@ def generate_endpoint(
                                 pagination_model_class = model_name
 
                     if is_array:
-                        return_type = f"list[{return_type}]"
-
-                    if absolute_model_name not in imported_models:
-                        if nested_import:
-                            additional_imports.append(
-                                f"from pyconnectwise.models.{model_import_directory}.{absolute_model_name} import {model_name}"
-                            )
-                        else:
-                            additional_imports.append(
-                                f"from pyconnectwise.models.{model_import_directory} import {model_name}"
-                            )
-                        imported_models.append(absolute_model_name)
+                        return_type = f"list[{model_name}]"
+
+                    if model_name not in imported_models:
+                        additional_imports.append(
+                            f"from pyconnectwise.models.{model_import_directory} import {model_name}"
+                        )
+                        imported_models.append(model_name)
 
                     op_definitions.append(
                         {
                             "name": operation,
                             "return_type": return_type,
-                            "return_class": return_class,
+                            "return_class": model_name,
                             "returns_single": not is_array,
                         }
                     )
@@ -173,7 +168,8 @@ def generate_endpoint(
         model_class=model_class_name,
         model_module=model_module_name,
         pagination_model_class=pagination_model_class,
-        endpoint_path=normalize_path_parameters(path.split("/")[-1]).rstrip("/"),
+        endpoint_path=normalize_path_parameters(
+            path.split("/")[-1]).rstrip("/"),
         operations=op_definitions,
         child_endpoints=child_endpoint_definitions,
         additional_imports=additional_imports,
@@ -183,6 +179,7 @@ def generate_endpoint(
     )
 
     save_py_file(
-        os.path.join(endpoint_output_directory, endpoint_class_name), endpoint_code
+        os.path.join(endpoint_output_directory,
+                     endpoint_class_name), endpoint_code
     )
     return endpoint_class_name
diff --git a/src/pyconnectwise/utils/generator/normalize_schema_refs.py b/src/pyconnectwise/utils/generator/normalize_schema_refs.py
new file mode 100644
index 000000000..e83d355f7
--- /dev/null
+++ b/src/pyconnectwise/utils/generator/normalize_schema_refs.py
@@ -0,0 +1,53 @@
+import json
+import argparse
+
+def normalize_schema_name(schema_name):
+    """Extracts the part of the schema name after the last dot."""
+    split = schema_name.split('.')
+    if len(split) >= 2:
+        return split[0]+split[-1]
+    return ''.join(schema_name.split('.'))
+
+def update_schema_references(data, name_mapping):
+    """Updates all $ref entries with the new names from the name_mapping."""
+    if isinstance(data, dict):
+        for key, value in data.items():
+            if key == '$ref':
+                # Extract schema name from the reference
+                ref_schema_name = value.split('/')[-1]
+                # Update the reference if the schema name is in name_mapping
+                if ref_schema_name in name_mapping:
+                    data[key] = value.replace(ref_schema_name, name_mapping[ref_schema_name])
+            else:
+                update_schema_references(value, name_mapping)
+    elif isinstance(data, list):
+        for item in data:
+            update_schema_references(item, name_mapping)
+
+def main():
+    # Parsing command-line arguments
+    parser = argparse.ArgumentParser(description='Normalize OpenAPI JSON schema names.')
+    parser.add_argument('--input', type=str, required=True, help='Path to the OpenAPI JSON file.')
+    args = parser.parse_args()
+
+    # Loading the JSON file
+    with open(args.input, 'r') as file:
+        data = json.load(file)
+
+    # Normalizing schema names and storing the old-new name mapping
+    name_mapping = {}
+    schemas = data.get('components', {}).get('schemas', {})
+    for schema_name in list(schemas.keys()):
+        new_name = normalize_schema_name(schema_name)
+        name_mapping[schema_name] = new_name
+        schemas[new_name] = schemas.pop(schema_name)
+
+    # Updating all path references
+    update_schema_references(data, name_mapping)
+
+    # Writing the updated JSON back to the file
+    with open(args.input, 'w') as file:
+        json.dump(data, file, indent=4)
+
+if __name__ == '__main__':
+    main()
diff --git a/src/pyconnectwise/utils/generator/templates.py b/src/pyconnectwise/utils/generator/templates.py
index fb5467849..df40a6903 100644
--- a/src/pyconnectwise/utils/generator/templates.py
+++ b/src/pyconnectwise/utils/generator/templates.py
@@ -1,8 +1,7 @@
 from jinja2 import Template
 
 endpoint_template = Template(
-    """from pyconnectwise.models.base.message_model import GenericMessageModel
-from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
+    """from pyconnectwise.endpoints.base.connectwise_endpoint import ConnectWiseEndpoint
 from pyconnectwise.responses.paginated_response import PaginatedResponse
 from typing import Any
 {%- if additional_imports is defined %}
@@ -64,18 +63,23 @@ def paginated(self, page: int, page_size: int, params: dict[str, int | str] = {}
     {% endif %}
 
     {%- for operation in operations %}
-    def {{ operation.name }}(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> {{ operation.return_type }}:
+    def {{ operation.name }}(self, data: dict[str, Any] = {}, params: dict[str, int | str] = {}) -> {{ 'None' if operation.void else operation.return_type }}:
         \"""
         Performs a {{ operation.name.upper() }} request against the {{ raw_path }} endpoint.
 
         Parameters:
             data (dict[str, Any]): The data to send in the request body.
             params (dict[str, int | str]): The parameters to send in the request query string.
+        {%- if not operation.void %}
         Returns:
             {{ operation.return_type }}: The parsed response data.
+        {%- endif %}
         \"""
+
         {%- if operation.returns_single %}
         return self._parse_one({{operation.return_class}}, super()._make_request("{{ operation.name.upper() }}", data=data, params=params).json())
+        {% elif operation.void %}
+        super()._make_request("{{ operation.name.upper() }}", data=data, params=params)
         {% else %}
         return self._parse_many({{operation.return_class}}, super()._make_request("{{ operation.name.upper() }}", data=data, params=params).json())
         {% endif %}
@@ -118,11 +122,11 @@ def __init__(
             private_key (str): Your ConnectWise Manage API Private key.
             codebase (str, optional): Your ConnectWise Manage Codebase. If not provided, it will be fetched from the API. Defaults to None.
         \"""
-        self.client_id = client_id
-        self.company_name = company_name
-        self.manage_url = manage_url
-        self.public_key = public_key
-        self.private_key = private_key
+        self.client_id: str = client_id
+        self.company_name: str = company_name
+        self.manage_url: str = manage_url
+        self.public_key: str = public_key
+        self.private_key: str = private_key
         
         # Retrieve codebase from the API if not provided
         if not codebase:
@@ -135,7 +139,7 @@ def __init__(
             if codebase_request is None:
                 # we need to except here
                 raise Exception("Could not retrieve codebase from API.")
-            self.codebase = codebase_request
+            self.codebase: str = codebase_request
             
 
         # Initializing endpoints
@@ -237,10 +241,10 @@ def __init__(
             username (str): Your ConnectWise Automate API username.
             password (str): Your ConnectWise Automate API password.
         \"""
-        self.client_id = client_id
-        self.automate_url = automate_url
-        self.username = username
-        self.password = password
+        self.client_id: str = client_id
+        self.automate_url: str = automate_url
+        self.username: str = username
+        self.password: str = password
         self.token_expiry_time: datetime = datetime.utcnow()
 
         # Grab first access token