diff --git a/.generator/templates/api/api.mustache b/.generator/templates/api/api.mustache
index 70421bc58280..813dfd9448b8 100644
--- a/.generator/templates/api/api.mustache
+++ b/.generator/templates/api/api.mustache
@@ -1,7 +1,7 @@
 import { BaseAPIRequestFactory, RequiredError } from './baseapi{{extensionForDeno}}';
 import {Configuration, getServer, applySecurityAuthentication} from '../configuration{{extensionForDeno}}';
 import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http{{extensionForDeno}}';
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 {{#platforms}}
 {{#node}}
 import FormData from "form-data";
diff --git a/.generator/templates/http/http.mustache b/.generator/templates/http/http.mustache
index b39fc6ab17ae..a2a304a03f62 100644
--- a/.generator/templates/http/http.mustache
+++ b/.generator/templates/http/http.mustache
@@ -14,9 +14,6 @@ import URLParse from "url-parse";
 {{#platforms}}
 {{^deno}}
 {{#frameworks}}
-{{#fetch-api}}
-export * from './isomorphic-fetch';
-{{/fetch-api}}
 {{#jquery}}
 export * from './jquery';
 {{/jquery}}
diff --git a/.generator/templates/index.mustache b/.generator/templates/index.mustache
index 632029ee25a1..76f09a519fa4 100644
--- a/.generator/templates/index.mustache
+++ b/.generator/templates/index.mustache
@@ -1,4 +1,5 @@
 export * from "./http/http{{extensionForDeno}}";
+export * from './http/isomorphic-fetch';
 export * from "./auth/auth{{extensionForDeno}}";
 export { createConfiguration } from "./configuration{{extensionForDeno}}"
 export { setServerVariables } from "./configuration{{extensionForDeno}}"
diff --git a/.generator/templates/model/ObjectSerializer.mustache b/.generator/templates/model/ObjectSerializer.mustache
index 1f9e2bccf427..5d0d92297562 100644
--- a/.generator/templates/model/ObjectSerializer.mustache
+++ b/.generator/templates/model/ObjectSerializer.mustache
@@ -3,7 +3,8 @@
 import { {{classname}}{{#hasEnums}}{{#vars}}{{#isEnum}}, {{classname}}{{enumName}} {{/isEnum}} {{/vars}}{{/hasEnums}} } from './{{{ classFilename }}}{{extensionForDeno}}';
 {{/model}}
 {{/models}}
-import { logger } from "../../../index";
+import { UnparsedObject } from "../util";
+import { logger } from "../../../logger";
 
 const primitives = [
     "string",
@@ -287,19 +288,3 @@ export class ObjectSerializer {
         }
     }
 }
-
-export class UnparsedObject {
-    unparsedObject:any;
-    constructor(data:any) {
-        this.unparsedObject = data;
-    }
-}
-
-export type AttributeTypeMap = {
-    [key: string]: {
-      baseName: string;
-      type: string;
-      required?: boolean;
-      format?: string;
-    };
-}
diff --git a/.generator/templates/model/model.mustache b/.generator/templates/model/model.mustache
index c4262301dac1..aa2596b561b3 100644
--- a/.generator/templates/model/model.mustache
+++ b/.generator/templates/model/model.mustache
@@ -5,7 +5,7 @@
 import { {{classname}} } from './{{filename}}{{extensionForDeno}}';
 {{/tsImports}}
 import { HttpFile } from '../http/http{{extensionForDeno}}';
-import { AttributeTypeMap, UnparsedObject } from './ObjectSerializer';
+import { AttributeTypeMap, UnparsedObject } from '../util';
 
 {{#description}}
 /**
diff --git a/.generator/templates/util.mustache b/.generator/templates/util.mustache
index 484e07cdffaa..e4a473032395 100644
--- a/.generator/templates/util.mustache
+++ b/.generator/templates/util.mustache
@@ -26,3 +26,19 @@ export function isCodeInRange(codeRange: string, code: number): boolean {
         return true;
     }
 }
+
+export class UnparsedObject {
+    unparsedObject:any;
+    constructor(data:any) {
+        this.unparsedObject = data;
+    }
+}
+
+export type AttributeTypeMap = {
+    [key: string]: {
+      baseName: string;
+      type: string;
+      required?: boolean;
+      format?: string;
+    };
+}
diff --git a/index.ts b/index.ts
index a8b094148185..680a2358f85d 100644
--- a/index.ts
+++ b/index.ts
@@ -1,9 +1,3 @@
 export * as v1 from "./packages/datadog-api-client-v1";
 export * as v2 from "./packages/datadog-api-client-v2";
-
-import log from "loglevel";
-
-const logger = log.noConflict();
-logger.setLevel((process !== undefined && process.env.DEBUG) ? logger.levels.DEBUG : logger.levels.INFO);
-
-export { logger };
+export * from "./logger";
diff --git a/logger.ts b/logger.ts
new file mode 100644
index 000000000000..fc9c1639cc82
--- /dev/null
+++ b/logger.ts
@@ -0,0 +1,6 @@
+import log from "loglevel";
+
+const logger = log.noConflict();
+logger.setLevel((process !== undefined && process.env.DEBUG) ? logger.levels.DEBUG : logger.levels.INFO);
+
+export { logger };
diff --git a/packages/datadog-api-client-v1/apis/ServiceLevelObjectiveCorrectionsApi.ts b/packages/datadog-api-client-v1/apis/ServiceLevelObjectiveCorrectionsApi.ts
index ba2020dd8a80..747311df0b31 100644
--- a/packages/datadog-api-client-v1/apis/ServiceLevelObjectiveCorrectionsApi.ts
+++ b/packages/datadog-api-client-v1/apis/ServiceLevelObjectiveCorrectionsApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";
diff --git a/packages/datadog-api-client-v1/apis/ServiceLevelObjectivesApi.ts b/packages/datadog-api-client-v1/apis/ServiceLevelObjectivesApi.ts
index 5ae908df48bd..0ba4080d6102 100644
--- a/packages/datadog-api-client-v1/apis/ServiceLevelObjectivesApi.ts
+++ b/packages/datadog-api-client-v1/apis/ServiceLevelObjectivesApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";
diff --git a/packages/datadog-api-client-v1/apis/UsageMeteringApi.ts b/packages/datadog-api-client-v1/apis/UsageMeteringApi.ts
index d34a426e0340..c1ae0e5e4955 100644
--- a/packages/datadog-api-client-v1/apis/UsageMeteringApi.ts
+++ b/packages/datadog-api-client-v1/apis/UsageMeteringApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";
diff --git a/packages/datadog-api-client-v1/http/http.ts b/packages/datadog-api-client-v1/http/http.ts
index ab3e4cbdf6ea..b6c10c575eff 100644
--- a/packages/datadog-api-client-v1/http/http.ts
+++ b/packages/datadog-api-client-v1/http/http.ts
@@ -3,8 +3,6 @@ import { userAgent } from "../../../userAgent";
 import FormData from "form-data";
 import URLParse from "url-parse";
 
-export * from "./isomorphic-fetch";
-
 /**
  * Interface for aborting fetch requests.
  */
diff --git a/packages/datadog-api-client-v1/index.ts b/packages/datadog-api-client-v1/index.ts
index 008516a9b057..1dd19170ee24 100644
--- a/packages/datadog-api-client-v1/index.ts
+++ b/packages/datadog-api-client-v1/index.ts
@@ -1,4 +1,5 @@
 export * from "./http/http";
+export * from "./http/isomorphic-fetch";
 export * from "./auth/auth";
 export { createConfiguration } from "./configuration";
 export { setServerVariables } from "./configuration";
diff --git a/packages/datadog-api-client-v1/models/APIErrorResponse.ts b/packages/datadog-api-client-v1/models/APIErrorResponse.ts
index bda56c21f741..1042fc8d11b2 100644
--- a/packages/datadog-api-client-v1/models/APIErrorResponse.ts
+++ b/packages/datadog-api-client-v1/models/APIErrorResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Error response object.
diff --git a/packages/datadog-api-client-v1/models/AWSAccount.ts b/packages/datadog-api-client-v1/models/AWSAccount.ts
index 757f6f9b1aed..d5022ffa6436 100644
--- a/packages/datadog-api-client-v1/models/AWSAccount.ts
+++ b/packages/datadog-api-client-v1/models/AWSAccount.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Returns the AWS account associated with this integration.
diff --git a/packages/datadog-api-client-v1/models/AWSAccountAndLambdaRequest.ts b/packages/datadog-api-client-v1/models/AWSAccountAndLambdaRequest.ts
index e13219248383..99962710ba06 100644
--- a/packages/datadog-api-client-v1/models/AWSAccountAndLambdaRequest.ts
+++ b/packages/datadog-api-client-v1/models/AWSAccountAndLambdaRequest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * AWS account ID and Lambda ARN.
diff --git a/packages/datadog-api-client-v1/models/AWSAccountCreateResponse.ts b/packages/datadog-api-client-v1/models/AWSAccountCreateResponse.ts
index 5af3b2884df4..75fa5c1187ff 100644
--- a/packages/datadog-api-client-v1/models/AWSAccountCreateResponse.ts
+++ b/packages/datadog-api-client-v1/models/AWSAccountCreateResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Response returned by the AWS Create Account call.
diff --git a/packages/datadog-api-client-v1/models/AWSAccountDeleteRequest.ts b/packages/datadog-api-client-v1/models/AWSAccountDeleteRequest.ts
index 78fec3e4ad00..26538aa816a1 100644
--- a/packages/datadog-api-client-v1/models/AWSAccountDeleteRequest.ts
+++ b/packages/datadog-api-client-v1/models/AWSAccountDeleteRequest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of AWS accounts to delete.
diff --git a/packages/datadog-api-client-v1/models/AWSAccountListResponse.ts b/packages/datadog-api-client-v1/models/AWSAccountListResponse.ts
index 0cb688b7699e..5299b7c19242 100644
--- a/packages/datadog-api-client-v1/models/AWSAccountListResponse.ts
+++ b/packages/datadog-api-client-v1/models/AWSAccountListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSAccount } from "./AWSAccount";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of enabled AWS accounts.
diff --git a/packages/datadog-api-client-v1/models/AWSLogsAsyncError.ts b/packages/datadog-api-client-v1/models/AWSLogsAsyncError.ts
index 9182001dfa40..4952b98136b4 100644
--- a/packages/datadog-api-client-v1/models/AWSLogsAsyncError.ts
+++ b/packages/datadog-api-client-v1/models/AWSLogsAsyncError.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Description of errors.
diff --git a/packages/datadog-api-client-v1/models/AWSLogsAsyncResponse.ts b/packages/datadog-api-client-v1/models/AWSLogsAsyncResponse.ts
index 4e24c14f9a01..82c0debc2391 100644
--- a/packages/datadog-api-client-v1/models/AWSLogsAsyncResponse.ts
+++ b/packages/datadog-api-client-v1/models/AWSLogsAsyncResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSLogsAsyncError } from "./AWSLogsAsyncError";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A list of all Datadog-AWS logs integrations available in your Datadog organization.
diff --git a/packages/datadog-api-client-v1/models/AWSLogsLambda.ts b/packages/datadog-api-client-v1/models/AWSLogsLambda.ts
index 3686d3b020e1..88cc9550ea87 100644
--- a/packages/datadog-api-client-v1/models/AWSLogsLambda.ts
+++ b/packages/datadog-api-client-v1/models/AWSLogsLambda.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Description of the Lambdas.
diff --git a/packages/datadog-api-client-v1/models/AWSLogsListResponse.ts b/packages/datadog-api-client-v1/models/AWSLogsListResponse.ts
index 72fe259959ef..2484aa1ad7e9 100644
--- a/packages/datadog-api-client-v1/models/AWSLogsListResponse.ts
+++ b/packages/datadog-api-client-v1/models/AWSLogsListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSLogsLambda } from "./AWSLogsLambda";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A list of all Datadog-AWS logs integrations available in your Datadog organization.
diff --git a/packages/datadog-api-client-v1/models/AWSLogsListServicesResponse.ts b/packages/datadog-api-client-v1/models/AWSLogsListServicesResponse.ts
index 255536918dee..aab1ddff3c81 100644
--- a/packages/datadog-api-client-v1/models/AWSLogsListServicesResponse.ts
+++ b/packages/datadog-api-client-v1/models/AWSLogsListServicesResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The list of current AWS services for which Datadog offers automatic log collection.
diff --git a/packages/datadog-api-client-v1/models/AWSLogsServicesRequest.ts b/packages/datadog-api-client-v1/models/AWSLogsServicesRequest.ts
index 09b0e564301f..3bc51d188461 100644
--- a/packages/datadog-api-client-v1/models/AWSLogsServicesRequest.ts
+++ b/packages/datadog-api-client-v1/models/AWSLogsServicesRequest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A list of current AWS services for which Datadog offers automatic log collection.
diff --git a/packages/datadog-api-client-v1/models/AWSTagFilter.ts b/packages/datadog-api-client-v1/models/AWSTagFilter.ts
index 476f33bcdc54..3be9d9ca52b7 100644
--- a/packages/datadog-api-client-v1/models/AWSTagFilter.ts
+++ b/packages/datadog-api-client-v1/models/AWSTagFilter.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSNamespace } from "./AWSNamespace";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A tag filter.
diff --git a/packages/datadog-api-client-v1/models/AWSTagFilterCreateRequest.ts b/packages/datadog-api-client-v1/models/AWSTagFilterCreateRequest.ts
index ccdb6b0533ab..8f0318ba8cba 100644
--- a/packages/datadog-api-client-v1/models/AWSTagFilterCreateRequest.ts
+++ b/packages/datadog-api-client-v1/models/AWSTagFilterCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSNamespace } from "./AWSNamespace";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The objects used to set an AWS tag filter.
diff --git a/packages/datadog-api-client-v1/models/AWSTagFilterDeleteRequest.ts b/packages/datadog-api-client-v1/models/AWSTagFilterDeleteRequest.ts
index 4385c5dc749e..fc11c82680cc 100644
--- a/packages/datadog-api-client-v1/models/AWSTagFilterDeleteRequest.ts
+++ b/packages/datadog-api-client-v1/models/AWSTagFilterDeleteRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSNamespace } from "./AWSNamespace";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The objects used to delete an AWS tag filter entry.
diff --git a/packages/datadog-api-client-v1/models/AWSTagFilterListResponse.ts b/packages/datadog-api-client-v1/models/AWSTagFilterListResponse.ts
index 60373a9a6e82..1f881c5372fe 100644
--- a/packages/datadog-api-client-v1/models/AWSTagFilterListResponse.ts
+++ b/packages/datadog-api-client-v1/models/AWSTagFilterListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSTagFilter } from "./AWSTagFilter";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An array of tag filter rules by `namespace` and tag filter string.
diff --git a/packages/datadog-api-client-v1/models/AlertGraphWidgetDefinition.ts b/packages/datadog-api-client-v1/models/AlertGraphWidgetDefinition.ts
index 8d7dad1b7bfc..4abec2f918b5 100644
--- a/packages/datadog-api-client-v1/models/AlertGraphWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/AlertGraphWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { AlertGraphWidgetDefinitionType } from "./AlertGraphWidgetDefinitionType
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
 import { WidgetVizType } from "./WidgetVizType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Alert graphs are timeseries graphs showing the current status of any monitor defined on your system.
diff --git a/packages/datadog-api-client-v1/models/AlertValueWidgetDefinition.ts b/packages/datadog-api-client-v1/models/AlertValueWidgetDefinition.ts
index 4a301ad6be41..09d967dbe58d 100644
--- a/packages/datadog-api-client-v1/models/AlertValueWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/AlertValueWidgetDefinition.ts
@@ -10,7 +10,7 @@
 
 import { AlertValueWidgetDefinitionType } from "./AlertValueWidgetDefinitionType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Alert values are query values showing the current value of the metric in any monitor defined on your system.
diff --git a/packages/datadog-api-client-v1/models/ApiKey.ts b/packages/datadog-api-client-v1/models/ApiKey.ts
index 1cba03b30db9..da12d668fcea 100644
--- a/packages/datadog-api-client-v1/models/ApiKey.ts
+++ b/packages/datadog-api-client-v1/models/ApiKey.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Datadog API key.
diff --git a/packages/datadog-api-client-v1/models/ApiKeyListResponse.ts b/packages/datadog-api-client-v1/models/ApiKeyListResponse.ts
index 3fdde548fe49..c7c591c6dd18 100644
--- a/packages/datadog-api-client-v1/models/ApiKeyListResponse.ts
+++ b/packages/datadog-api-client-v1/models/ApiKeyListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApiKey } from "./ApiKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of API and application keys available for a given organization.
diff --git a/packages/datadog-api-client-v1/models/ApiKeyResponse.ts b/packages/datadog-api-client-v1/models/ApiKeyResponse.ts
index c09fbacd4b94..82e2c5b6f488 100644
--- a/packages/datadog-api-client-v1/models/ApiKeyResponse.ts
+++ b/packages/datadog-api-client-v1/models/ApiKeyResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApiKey } from "./ApiKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An API key with its associated metadata.
diff --git a/packages/datadog-api-client-v1/models/ApmStatsQueryColumnType.ts b/packages/datadog-api-client-v1/models/ApmStatsQueryColumnType.ts
index 9c5972610286..0d798e94216b 100644
--- a/packages/datadog-api-client-v1/models/ApmStatsQueryColumnType.ts
+++ b/packages/datadog-api-client-v1/models/ApmStatsQueryColumnType.ts
@@ -10,7 +10,7 @@
 
 import { TableWidgetCellDisplayMode } from "./TableWidgetCellDisplayMode";
 import { WidgetSort } from "./WidgetSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Column properties.
diff --git a/packages/datadog-api-client-v1/models/ApmStatsQueryDefinition.ts b/packages/datadog-api-client-v1/models/ApmStatsQueryDefinition.ts
index 47ed3109289f..7ab192220913 100644
--- a/packages/datadog-api-client-v1/models/ApmStatsQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ApmStatsQueryDefinition.ts
@@ -10,7 +10,7 @@
 
 import { ApmStatsQueryColumnType } from "./ApmStatsQueryColumnType";
 import { ApmStatsQueryRowType } from "./ApmStatsQueryRowType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The APM stats query for table and distributions widgets.
diff --git a/packages/datadog-api-client-v1/models/ApplicationKey.ts b/packages/datadog-api-client-v1/models/ApplicationKey.ts
index 07423f6d166c..0756ab2679b7 100644
--- a/packages/datadog-api-client-v1/models/ApplicationKey.ts
+++ b/packages/datadog-api-client-v1/models/ApplicationKey.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An application key with its associated metadata.
diff --git a/packages/datadog-api-client-v1/models/ApplicationKeyListResponse.ts b/packages/datadog-api-client-v1/models/ApplicationKeyListResponse.ts
index 9bd6c353df8a..20a72849af1c 100644
--- a/packages/datadog-api-client-v1/models/ApplicationKeyListResponse.ts
+++ b/packages/datadog-api-client-v1/models/ApplicationKeyListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApplicationKey } from "./ApplicationKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An application key response.
diff --git a/packages/datadog-api-client-v1/models/ApplicationKeyResponse.ts b/packages/datadog-api-client-v1/models/ApplicationKeyResponse.ts
index 486a94794b9c..df7992914e15 100644
--- a/packages/datadog-api-client-v1/models/ApplicationKeyResponse.ts
+++ b/packages/datadog-api-client-v1/models/ApplicationKeyResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApplicationKey } from "./ApplicationKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An application key response.
diff --git a/packages/datadog-api-client-v1/models/AuthenticationValidationResponse.ts b/packages/datadog-api-client-v1/models/AuthenticationValidationResponse.ts
index 4b51b23e96b3..410ac7be2008 100644
--- a/packages/datadog-api-client-v1/models/AuthenticationValidationResponse.ts
+++ b/packages/datadog-api-client-v1/models/AuthenticationValidationResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Represent validation endpoint responses.
diff --git a/packages/datadog-api-client-v1/models/AzureAccount.ts b/packages/datadog-api-client-v1/models/AzureAccount.ts
index f29880741e84..4f079495cfd0 100644
--- a/packages/datadog-api-client-v1/models/AzureAccount.ts
+++ b/packages/datadog-api-client-v1/models/AzureAccount.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Datadog-Azure integrations configured for your organization.
diff --git a/packages/datadog-api-client-v1/models/CancelDowntimesByScopeRequest.ts b/packages/datadog-api-client-v1/models/CancelDowntimesByScopeRequest.ts
index f0354f4891cc..d4d6abacf8d3 100644
--- a/packages/datadog-api-client-v1/models/CancelDowntimesByScopeRequest.ts
+++ b/packages/datadog-api-client-v1/models/CancelDowntimesByScopeRequest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Cancel downtimes according to scope.
diff --git a/packages/datadog-api-client-v1/models/CanceledDowntimesIds.ts b/packages/datadog-api-client-v1/models/CanceledDowntimesIds.ts
index 011923076107..8a0d2db593ae 100644
--- a/packages/datadog-api-client-v1/models/CanceledDowntimesIds.ts
+++ b/packages/datadog-api-client-v1/models/CanceledDowntimesIds.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing array of IDs of canceled downtimes.
diff --git a/packages/datadog-api-client-v1/models/ChangeWidgetDefinition.ts b/packages/datadog-api-client-v1/models/ChangeWidgetDefinition.ts
index 7983949452dc..e0b8922e5a58 100644
--- a/packages/datadog-api-client-v1/models/ChangeWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ChangeWidgetDefinition.ts
@@ -13,7 +13,7 @@ import { ChangeWidgetRequest } from "./ChangeWidgetRequest";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Change graph shows you the change in a value over the time period chosen.
diff --git a/packages/datadog-api-client-v1/models/ChangeWidgetRequest.ts b/packages/datadog-api-client-v1/models/ChangeWidgetRequest.ts
index 8a2fc5d3e865..db570998a9eb 100644
--- a/packages/datadog-api-client-v1/models/ChangeWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/ChangeWidgetRequest.ts
@@ -17,7 +17,7 @@ import { WidgetCompareTo } from "./WidgetCompareTo";
 import { WidgetFormula } from "./WidgetFormula";
 import { WidgetOrderBy } from "./WidgetOrderBy";
 import { WidgetSort } from "./WidgetSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated change widget.
diff --git a/packages/datadog-api-client-v1/models/CheckCanDeleteMonitorResponse.ts b/packages/datadog-api-client-v1/models/CheckCanDeleteMonitorResponse.ts
index 172f6e22ad4b..f8e7115b5ad9 100644
--- a/packages/datadog-api-client-v1/models/CheckCanDeleteMonitorResponse.ts
+++ b/packages/datadog-api-client-v1/models/CheckCanDeleteMonitorResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { CheckCanDeleteMonitorResponseData } from "./CheckCanDeleteMonitorResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response of monitor IDs that can or can't be safely deleted.
diff --git a/packages/datadog-api-client-v1/models/CheckCanDeleteMonitorResponseData.ts b/packages/datadog-api-client-v1/models/CheckCanDeleteMonitorResponseData.ts
index 4aab0febf538..bf805ed8f2ef 100644
--- a/packages/datadog-api-client-v1/models/CheckCanDeleteMonitorResponseData.ts
+++ b/packages/datadog-api-client-v1/models/CheckCanDeleteMonitorResponseData.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Wrapper object with the list of monitor IDs.
diff --git a/packages/datadog-api-client-v1/models/CheckCanDeleteSLOResponse.ts b/packages/datadog-api-client-v1/models/CheckCanDeleteSLOResponse.ts
index f3c4741b82e4..fd3890d9830f 100644
--- a/packages/datadog-api-client-v1/models/CheckCanDeleteSLOResponse.ts
+++ b/packages/datadog-api-client-v1/models/CheckCanDeleteSLOResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { CheckCanDeleteSLOResponseData } from "./CheckCanDeleteSLOResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A service level objective response containing the requested object.
diff --git a/packages/datadog-api-client-v1/models/CheckCanDeleteSLOResponseData.ts b/packages/datadog-api-client-v1/models/CheckCanDeleteSLOResponseData.ts
index 956ef407d9ae..a2503a125400 100644
--- a/packages/datadog-api-client-v1/models/CheckCanDeleteSLOResponseData.ts
+++ b/packages/datadog-api-client-v1/models/CheckCanDeleteSLOResponseData.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An array of service level objective objects.
diff --git a/packages/datadog-api-client-v1/models/CheckStatusWidgetDefinition.ts b/packages/datadog-api-client-v1/models/CheckStatusWidgetDefinition.ts
index cd4721b3aebe..d4a38fdc7b1f 100644
--- a/packages/datadog-api-client-v1/models/CheckStatusWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/CheckStatusWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { CheckStatusWidgetDefinitionType } from "./CheckStatusWidgetDefinitionTy
 import { WidgetGrouping } from "./WidgetGrouping";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Check status shows the current status or number of results for any check performed.
diff --git a/packages/datadog-api-client-v1/models/Creator.ts b/packages/datadog-api-client-v1/models/Creator.ts
index 4e3bb2c41d36..0abf6286ffd2 100644
--- a/packages/datadog-api-client-v1/models/Creator.ts
+++ b/packages/datadog-api-client-v1/models/Creator.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the creator of the shared element.
diff --git a/packages/datadog-api-client-v1/models/Dashboard.ts b/packages/datadog-api-client-v1/models/Dashboard.ts
index 546080b63e8c..36b32f97ff2b 100644
--- a/packages/datadog-api-client-v1/models/Dashboard.ts
+++ b/packages/datadog-api-client-v1/models/Dashboard.ts
@@ -13,7 +13,7 @@ import { DashboardReflowType } from "./DashboardReflowType";
 import { DashboardTemplateVariable } from "./DashboardTemplateVariable";
 import { DashboardTemplateVariablePreset } from "./DashboardTemplateVariablePreset";
 import { Widget } from "./Widget";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A dashboard is Datadog’s tool for visually tracking, analyzing, and displaying key performance metrics, which enable you to monitor the health of your infrastructure.
diff --git a/packages/datadog-api-client-v1/models/DashboardBulkActionData.ts b/packages/datadog-api-client-v1/models/DashboardBulkActionData.ts
index 60005105dc33..b4ce340d4112 100644
--- a/packages/datadog-api-client-v1/models/DashboardBulkActionData.ts
+++ b/packages/datadog-api-client-v1/models/DashboardBulkActionData.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardResourceType } from "./DashboardResourceType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Dashboard bulk action request data.
diff --git a/packages/datadog-api-client-v1/models/DashboardBulkDeleteRequest.ts b/packages/datadog-api-client-v1/models/DashboardBulkDeleteRequest.ts
index 2926634b5b09..6df04aafb2aa 100644
--- a/packages/datadog-api-client-v1/models/DashboardBulkDeleteRequest.ts
+++ b/packages/datadog-api-client-v1/models/DashboardBulkDeleteRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardBulkActionData } from "./DashboardBulkActionData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Dashboard bulk delete request body.
diff --git a/packages/datadog-api-client-v1/models/DashboardDeleteResponse.ts b/packages/datadog-api-client-v1/models/DashboardDeleteResponse.ts
index a8a3a177c8b9..8b0bf8b85ea4 100644
--- a/packages/datadog-api-client-v1/models/DashboardDeleteResponse.ts
+++ b/packages/datadog-api-client-v1/models/DashboardDeleteResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response from the delete dashboard call.
diff --git a/packages/datadog-api-client-v1/models/DashboardList.ts b/packages/datadog-api-client-v1/models/DashboardList.ts
index b2ba13e26e63..6c07cef575bd 100644
--- a/packages/datadog-api-client-v1/models/DashboardList.ts
+++ b/packages/datadog-api-client-v1/models/DashboardList.ts
@@ -9,7 +9,7 @@
  */
 
 import { Creator } from "./Creator";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Your Datadog Dashboards.
diff --git a/packages/datadog-api-client-v1/models/DashboardListDeleteResponse.ts b/packages/datadog-api-client-v1/models/DashboardListDeleteResponse.ts
index aa4433ea5301..ec7fc9409210 100644
--- a/packages/datadog-api-client-v1/models/DashboardListDeleteResponse.ts
+++ b/packages/datadog-api-client-v1/models/DashboardListDeleteResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Deleted dashboard details.
diff --git a/packages/datadog-api-client-v1/models/DashboardListListResponse.ts b/packages/datadog-api-client-v1/models/DashboardListListResponse.ts
index 143d0c96dc22..92909d0bf939 100644
--- a/packages/datadog-api-client-v1/models/DashboardListListResponse.ts
+++ b/packages/datadog-api-client-v1/models/DashboardListListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardList } from "./DashboardList";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Information on your dashboard lists.
diff --git a/packages/datadog-api-client-v1/models/DashboardRestoreRequest.ts b/packages/datadog-api-client-v1/models/DashboardRestoreRequest.ts
index 627626a1df88..eda45cccfe55 100644
--- a/packages/datadog-api-client-v1/models/DashboardRestoreRequest.ts
+++ b/packages/datadog-api-client-v1/models/DashboardRestoreRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardBulkActionData } from "./DashboardBulkActionData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Dashboard restore request body.
diff --git a/packages/datadog-api-client-v1/models/DashboardSummary.ts b/packages/datadog-api-client-v1/models/DashboardSummary.ts
index 00ef4e86ee15..50ab4b7db2ca 100644
--- a/packages/datadog-api-client-v1/models/DashboardSummary.ts
+++ b/packages/datadog-api-client-v1/models/DashboardSummary.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardSummaryDefinition } from "./DashboardSummaryDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Dashboard summary response.
diff --git a/packages/datadog-api-client-v1/models/DashboardSummaryDefinition.ts b/packages/datadog-api-client-v1/models/DashboardSummaryDefinition.ts
index 490282d90933..5361fc460963 100644
--- a/packages/datadog-api-client-v1/models/DashboardSummaryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/DashboardSummaryDefinition.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardLayoutType } from "./DashboardLayoutType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Dashboard definition.
diff --git a/packages/datadog-api-client-v1/models/DashboardTemplateVariable.ts b/packages/datadog-api-client-v1/models/DashboardTemplateVariable.ts
index f280d113e861..f71376a232fe 100644
--- a/packages/datadog-api-client-v1/models/DashboardTemplateVariable.ts
+++ b/packages/datadog-api-client-v1/models/DashboardTemplateVariable.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Template variable.
diff --git a/packages/datadog-api-client-v1/models/DashboardTemplateVariablePreset.ts b/packages/datadog-api-client-v1/models/DashboardTemplateVariablePreset.ts
index eec8526f218c..4d5e203cb093 100644
--- a/packages/datadog-api-client-v1/models/DashboardTemplateVariablePreset.ts
+++ b/packages/datadog-api-client-v1/models/DashboardTemplateVariablePreset.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardTemplateVariablePresetValue } from "./DashboardTemplateVariablePresetValue";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Template variables saved views.
diff --git a/packages/datadog-api-client-v1/models/DashboardTemplateVariablePresetValue.ts b/packages/datadog-api-client-v1/models/DashboardTemplateVariablePresetValue.ts
index e2f460037aff..df5f61353a84 100644
--- a/packages/datadog-api-client-v1/models/DashboardTemplateVariablePresetValue.ts
+++ b/packages/datadog-api-client-v1/models/DashboardTemplateVariablePresetValue.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Template variables saved views.
diff --git a/packages/datadog-api-client-v1/models/DeletedMonitor.ts b/packages/datadog-api-client-v1/models/DeletedMonitor.ts
index 32306a34e5eb..7ce8a5f92a32 100644
--- a/packages/datadog-api-client-v1/models/DeletedMonitor.ts
+++ b/packages/datadog-api-client-v1/models/DeletedMonitor.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response from the delete monitor call.
diff --git a/packages/datadog-api-client-v1/models/DistributionWidgetDefinition.ts b/packages/datadog-api-client-v1/models/DistributionWidgetDefinition.ts
index 413147c0eec9..cd0c2f3407b2 100644
--- a/packages/datadog-api-client-v1/models/DistributionWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/DistributionWidgetDefinition.ts
@@ -15,7 +15,7 @@ import { DistributionWidgetYAxis } from "./DistributionWidgetYAxis";
 import { WidgetMarker } from "./WidgetMarker";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Distribution visualization is another way of showing metrics aggregated across one or several tags, such as hosts. Unlike the heat map, a distribution graph’s x-axis is quantity rather than time.
diff --git a/packages/datadog-api-client-v1/models/DistributionWidgetRequest.ts b/packages/datadog-api-client-v1/models/DistributionWidgetRequest.ts
index 6dd653139595..31480dce9b12 100644
--- a/packages/datadog-api-client-v1/models/DistributionWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/DistributionWidgetRequest.ts
@@ -12,7 +12,7 @@ import { ApmStatsQueryDefinition } from "./ApmStatsQueryDefinition";
 import { LogQueryDefinition } from "./LogQueryDefinition";
 import { ProcessQueryDefinition } from "./ProcessQueryDefinition";
 import { WidgetStyle } from "./WidgetStyle";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated distribution widget.
diff --git a/packages/datadog-api-client-v1/models/DistributionWidgetXAxis.ts b/packages/datadog-api-client-v1/models/DistributionWidgetXAxis.ts
index ec92d214ca1c..bf166131f47d 100644
--- a/packages/datadog-api-client-v1/models/DistributionWidgetXAxis.ts
+++ b/packages/datadog-api-client-v1/models/DistributionWidgetXAxis.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * X Axis controls for the distribution widget.
diff --git a/packages/datadog-api-client-v1/models/DistributionWidgetYAxis.ts b/packages/datadog-api-client-v1/models/DistributionWidgetYAxis.ts
index 109a6f1bdb61..d5665663fadc 100644
--- a/packages/datadog-api-client-v1/models/DistributionWidgetYAxis.ts
+++ b/packages/datadog-api-client-v1/models/DistributionWidgetYAxis.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Y Axis controls for the distribution widget.
diff --git a/packages/datadog-api-client-v1/models/Downtime.ts b/packages/datadog-api-client-v1/models/Downtime.ts
index 170fdb11d574..9f6d204f2979 100644
--- a/packages/datadog-api-client-v1/models/Downtime.ts
+++ b/packages/datadog-api-client-v1/models/Downtime.ts
@@ -10,7 +10,7 @@
 
 import { DowntimeChild } from "./DowntimeChild";
 import { DowntimeRecurrence } from "./DowntimeRecurrence";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Downtiming gives you greater control over monitor notifications by allowing you to globally exclude scopes from alerting. Downtime settings, which can be scheduled with start and end times, prevent all alerting related to specified Datadog tags.
diff --git a/packages/datadog-api-client-v1/models/DowntimeChild.ts b/packages/datadog-api-client-v1/models/DowntimeChild.ts
index c8c2544244ad..e365304350d0 100644
--- a/packages/datadog-api-client-v1/models/DowntimeChild.ts
+++ b/packages/datadog-api-client-v1/models/DowntimeChild.ts
@@ -9,7 +9,7 @@
  */
 
 import { DowntimeRecurrence } from "./DowntimeRecurrence";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The downtime object definition of the active child for the original parent recurring downtime. This field will only exist on recurring downtimes.
diff --git a/packages/datadog-api-client-v1/models/DowntimeRecurrence.ts b/packages/datadog-api-client-v1/models/DowntimeRecurrence.ts
index 4b34e64ed0fa..393062696247 100644
--- a/packages/datadog-api-client-v1/models/DowntimeRecurrence.ts
+++ b/packages/datadog-api-client-v1/models/DowntimeRecurrence.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An object defining the recurrence of the downtime.
diff --git a/packages/datadog-api-client-v1/models/Event.ts b/packages/datadog-api-client-v1/models/Event.ts
index a659be059dc5..23a8a9d0a090 100644
--- a/packages/datadog-api-client-v1/models/Event.ts
+++ b/packages/datadog-api-client-v1/models/Event.ts
@@ -10,7 +10,7 @@
 
 import { EventAlertType } from "./EventAlertType";
 import { EventPriority } from "./EventPriority";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object representing an event.
diff --git a/packages/datadog-api-client-v1/models/EventCreateRequest.ts b/packages/datadog-api-client-v1/models/EventCreateRequest.ts
index b93cbde908d6..1026cc5c8972 100644
--- a/packages/datadog-api-client-v1/models/EventCreateRequest.ts
+++ b/packages/datadog-api-client-v1/models/EventCreateRequest.ts
@@ -10,7 +10,7 @@
 
 import { EventAlertType } from "./EventAlertType";
 import { EventPriority } from "./EventPriority";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object representing an event.
diff --git a/packages/datadog-api-client-v1/models/EventCreateResponse.ts b/packages/datadog-api-client-v1/models/EventCreateResponse.ts
index cef1fee02ad3..d451520a5b3d 100644
--- a/packages/datadog-api-client-v1/models/EventCreateResponse.ts
+++ b/packages/datadog-api-client-v1/models/EventCreateResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Event } from "./Event";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing an event response.
diff --git a/packages/datadog-api-client-v1/models/EventListResponse.ts b/packages/datadog-api-client-v1/models/EventListResponse.ts
index 7b895f710d38..bbe62ba2c54d 100644
--- a/packages/datadog-api-client-v1/models/EventListResponse.ts
+++ b/packages/datadog-api-client-v1/models/EventListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Event } from "./Event";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An event list response.
diff --git a/packages/datadog-api-client-v1/models/EventQueryDefinition.ts b/packages/datadog-api-client-v1/models/EventQueryDefinition.ts
index 10d1437f238b..574b4b839cdf 100644
--- a/packages/datadog-api-client-v1/models/EventQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/EventQueryDefinition.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The event query.
diff --git a/packages/datadog-api-client-v1/models/EventResponse.ts b/packages/datadog-api-client-v1/models/EventResponse.ts
index 511103f71fca..95dbfee2e393 100644
--- a/packages/datadog-api-client-v1/models/EventResponse.ts
+++ b/packages/datadog-api-client-v1/models/EventResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Event } from "./Event";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing an event response.
diff --git a/packages/datadog-api-client-v1/models/EventStreamWidgetDefinition.ts b/packages/datadog-api-client-v1/models/EventStreamWidgetDefinition.ts
index 41e1dd71fdeb..87c98038a283 100644
--- a/packages/datadog-api-client-v1/models/EventStreamWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/EventStreamWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { EventStreamWidgetDefinitionType } from "./EventStreamWidgetDefinitionTy
 import { WidgetEventSize } from "./WidgetEventSize";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The event stream is a widget version of the stream of events on the Event Stream view. Only available on FREE layout dashboards.
diff --git a/packages/datadog-api-client-v1/models/EventTimelineWidgetDefinition.ts b/packages/datadog-api-client-v1/models/EventTimelineWidgetDefinition.ts
index bda89e58f088..93dcf89610ad 100644
--- a/packages/datadog-api-client-v1/models/EventTimelineWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/EventTimelineWidgetDefinition.ts
@@ -11,7 +11,7 @@
 import { EventTimelineWidgetDefinitionType } from "./EventTimelineWidgetDefinitionType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The event timeline is a widget version of the timeline that appears at the top of the Event Stream view. Only available on FREE layout dashboards.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionApmDependencyStatsQueryDefinition.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionApmDependencyStatsQueryDefinition.ts
index 9271c3c92331..375f6e7e5d8b 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionApmDependencyStatsQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionApmDependencyStatsQueryDefinition.ts
@@ -10,7 +10,7 @@
 
 import { FormulaAndFunctionApmDependencyStatName } from "./FormulaAndFunctionApmDependencyStatName";
 import { FormulaAndFunctionApmDependencyStatsDataSource } from "./FormulaAndFunctionApmDependencyStatsDataSource";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A formula and functions APM dependency stats query.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionApmResourceStatsQueryDefinition.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionApmResourceStatsQueryDefinition.ts
index 02b545541099..21a1e4686289 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionApmResourceStatsQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionApmResourceStatsQueryDefinition.ts
@@ -10,7 +10,7 @@
 
 import { FormulaAndFunctionApmResourceStatName } from "./FormulaAndFunctionApmResourceStatName";
 import { FormulaAndFunctionApmResourceStatsDataSource } from "./FormulaAndFunctionApmResourceStatsDataSource";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * APM resource stats query using formulas and functions.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinition.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinition.ts
index 69653b51424d..5eaf05425019 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinition.ts
@@ -12,7 +12,7 @@ import { FormulaAndFunctionEventQueryDefinitionCompute } from "./FormulaAndFunct
 import { FormulaAndFunctionEventQueryDefinitionSearch } from "./FormulaAndFunctionEventQueryDefinitionSearch";
 import { FormulaAndFunctionEventQueryGroupBy } from "./FormulaAndFunctionEventQueryGroupBy";
 import { FormulaAndFunctionEventsDataSource } from "./FormulaAndFunctionEventsDataSource";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A formula and functions events query.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinitionCompute.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinitionCompute.ts
index daf98fc89023..18c78e1d6087 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinitionCompute.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinitionCompute.ts
@@ -9,7 +9,7 @@
  */
 
 import { FormulaAndFunctionEventAggregation } from "./FormulaAndFunctionEventAggregation";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Compute options.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinitionSearch.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinitionSearch.ts
index cb0120ba3b32..9ea392c66afa 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinitionSearch.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryDefinitionSearch.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Search options.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryGroupBy.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryGroupBy.ts
index a82f4c908d33..5fd2c32e0fc4 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryGroupBy.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryGroupBy.ts
@@ -9,7 +9,7 @@
  */
 
 import { FormulaAndFunctionEventQueryGroupBySort } from "./FormulaAndFunctionEventQueryGroupBySort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of objects used to group by.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryGroupBySort.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryGroupBySort.ts
index 7625565b8af4..31a2d01c2fe8 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryGroupBySort.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionEventQueryGroupBySort.ts
@@ -10,7 +10,7 @@
 
 import { FormulaAndFunctionEventAggregation } from "./FormulaAndFunctionEventAggregation";
 import { QuerySortOrder } from "./QuerySortOrder";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Options for sorting group by results.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionMetricQueryDefinition.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionMetricQueryDefinition.ts
index 6831701e488e..d21b2ac675df 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionMetricQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionMetricQueryDefinition.ts
@@ -10,7 +10,7 @@
 
 import { FormulaAndFunctionMetricAggregation } from "./FormulaAndFunctionMetricAggregation";
 import { FormulaAndFunctionMetricDataSource } from "./FormulaAndFunctionMetricDataSource";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A formula and functions metrics query.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionProcessQueryDefinition.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionProcessQueryDefinition.ts
index c344c6b08cdf..2965e979e99d 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionProcessQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionProcessQueryDefinition.ts
@@ -11,7 +11,7 @@
 import { FormulaAndFunctionMetricAggregation } from "./FormulaAndFunctionMetricAggregation";
 import { FormulaAndFunctionProcessQueryDataSource } from "./FormulaAndFunctionProcessQueryDataSource";
 import { QuerySortOrder } from "./QuerySortOrder";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Process query using formulas and functions.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionQueryDefinition.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionQueryDefinition.ts
index 80645a037ff0..4b23e054285c 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionQueryDefinition.ts
@@ -13,7 +13,7 @@ import { FormulaAndFunctionApmResourceStatsQueryDefinition } from "./FormulaAndF
 import { FormulaAndFunctionEventQueryDefinition } from "./FormulaAndFunctionEventQueryDefinition";
 import { FormulaAndFunctionMetricQueryDefinition } from "./FormulaAndFunctionMetricQueryDefinition";
 import { FormulaAndFunctionProcessQueryDefinition } from "./FormulaAndFunctionProcessQueryDefinition";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * A formula and function query.
diff --git a/packages/datadog-api-client-v1/models/FreeTextWidgetDefinition.ts b/packages/datadog-api-client-v1/models/FreeTextWidgetDefinition.ts
index 159bb66622a5..896f5163cab8 100644
--- a/packages/datadog-api-client-v1/models/FreeTextWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FreeTextWidgetDefinition.ts
@@ -10,7 +10,7 @@
 
 import { FreeTextWidgetDefinitionType } from "./FreeTextWidgetDefinitionType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Free text is a widget that allows you to add headings to your screenboard. Commonly used to state the overall purpose of the dashboard. Only available on FREE layout dashboards.
diff --git a/packages/datadog-api-client-v1/models/FunnelQuery.ts b/packages/datadog-api-client-v1/models/FunnelQuery.ts
index 6efe2f7d13d5..d3a9997f4383 100644
--- a/packages/datadog-api-client-v1/models/FunnelQuery.ts
+++ b/packages/datadog-api-client-v1/models/FunnelQuery.ts
@@ -10,7 +10,7 @@
 
 import { FunnelSource } from "./FunnelSource";
 import { FunnelStep } from "./FunnelStep";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated funnel widget.
diff --git a/packages/datadog-api-client-v1/models/FunnelStep.ts b/packages/datadog-api-client-v1/models/FunnelStep.ts
index e1a37be1f25b..ef53d48dc664 100644
--- a/packages/datadog-api-client-v1/models/FunnelStep.ts
+++ b/packages/datadog-api-client-v1/models/FunnelStep.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The funnel step.
diff --git a/packages/datadog-api-client-v1/models/FunnelWidgetDefinition.ts b/packages/datadog-api-client-v1/models/FunnelWidgetDefinition.ts
index eba3c085b994..6dd31d53d8bf 100644
--- a/packages/datadog-api-client-v1/models/FunnelWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FunnelWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { FunnelWidgetDefinitionType } from "./FunnelWidgetDefinitionType";
 import { FunnelWidgetRequest } from "./FunnelWidgetRequest";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The funnel visualization displays a funnel of user sessions that maps a sequence of view navigation and user interaction in your application.
diff --git a/packages/datadog-api-client-v1/models/FunnelWidgetRequest.ts b/packages/datadog-api-client-v1/models/FunnelWidgetRequest.ts
index 83f9c062ef17..71a042ac4b99 100644
--- a/packages/datadog-api-client-v1/models/FunnelWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/FunnelWidgetRequest.ts
@@ -10,7 +10,7 @@
 
 import { FunnelQuery } from "./FunnelQuery";
 import { FunnelRequestType } from "./FunnelRequestType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated funnel widget.
diff --git a/packages/datadog-api-client-v1/models/GCPAccount.ts b/packages/datadog-api-client-v1/models/GCPAccount.ts
index d9047e7ab15f..9169cf2c86ec 100644
--- a/packages/datadog-api-client-v1/models/GCPAccount.ts
+++ b/packages/datadog-api-client-v1/models/GCPAccount.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Your Google Cloud Platform Account.
diff --git a/packages/datadog-api-client-v1/models/GeomapWidgetDefinition.ts b/packages/datadog-api-client-v1/models/GeomapWidgetDefinition.ts
index 138ddbcffc98..4ef0b0bf1726 100644
--- a/packages/datadog-api-client-v1/models/GeomapWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/GeomapWidgetDefinition.ts
@@ -15,7 +15,7 @@ import { GeomapWidgetRequest } from "./GeomapWidgetRequest";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * This visualization displays a series of values by country on a world map.
diff --git a/packages/datadog-api-client-v1/models/GeomapWidgetDefinitionStyle.ts b/packages/datadog-api-client-v1/models/GeomapWidgetDefinitionStyle.ts
index e6c71d27f31f..0bf9d6e36024 100644
--- a/packages/datadog-api-client-v1/models/GeomapWidgetDefinitionStyle.ts
+++ b/packages/datadog-api-client-v1/models/GeomapWidgetDefinitionStyle.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The style to apply to the widget.
diff --git a/packages/datadog-api-client-v1/models/GeomapWidgetDefinitionView.ts b/packages/datadog-api-client-v1/models/GeomapWidgetDefinitionView.ts
index ae23de56896d..ae34e296a08e 100644
--- a/packages/datadog-api-client-v1/models/GeomapWidgetDefinitionView.ts
+++ b/packages/datadog-api-client-v1/models/GeomapWidgetDefinitionView.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The view of the world that the map should render.
diff --git a/packages/datadog-api-client-v1/models/GeomapWidgetRequest.ts b/packages/datadog-api-client-v1/models/GeomapWidgetRequest.ts
index f2af76d279a6..faa054f43dc6 100644
--- a/packages/datadog-api-client-v1/models/GeomapWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/GeomapWidgetRequest.ts
@@ -12,7 +12,7 @@ import { FormulaAndFunctionQueryDefinition } from "./FormulaAndFunctionQueryDefi
 import { FormulaAndFunctionResponseFormat } from "./FormulaAndFunctionResponseFormat";
 import { LogQueryDefinition } from "./LogQueryDefinition";
 import { WidgetFormula } from "./WidgetFormula";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An updated geomap widget.
diff --git a/packages/datadog-api-client-v1/models/GraphSnapshot.ts b/packages/datadog-api-client-v1/models/GraphSnapshot.ts
index c474b07ec38d..2aee23de5518 100644
--- a/packages/datadog-api-client-v1/models/GraphSnapshot.ts
+++ b/packages/datadog-api-client-v1/models/GraphSnapshot.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object representing a graph snapshot.
diff --git a/packages/datadog-api-client-v1/models/GroupWidgetDefinition.ts b/packages/datadog-api-client-v1/models/GroupWidgetDefinition.ts
index 6fc4f44a74ff..d503af787dec 100644
--- a/packages/datadog-api-client-v1/models/GroupWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/GroupWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { GroupWidgetDefinitionType } from "./GroupWidgetDefinitionType";
 import { Widget } from "./Widget";
 import { WidgetLayoutType } from "./WidgetLayoutType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The groups widget allows you to keep similar graphs together on your timeboard. Each group has a custom header, can hold one to many graphs, and is collapsible.
diff --git a/packages/datadog-api-client-v1/models/HTTPLogError.ts b/packages/datadog-api-client-v1/models/HTTPLogError.ts
index 1c8e4b52b4d0..e4d61bd037b7 100644
--- a/packages/datadog-api-client-v1/models/HTTPLogError.ts
+++ b/packages/datadog-api-client-v1/models/HTTPLogError.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Invalid query performed.
diff --git a/packages/datadog-api-client-v1/models/HTTPLogItem.ts b/packages/datadog-api-client-v1/models/HTTPLogItem.ts
index 48bf6599dc93..d61c5e0e4a8a 100644
--- a/packages/datadog-api-client-v1/models/HTTPLogItem.ts
+++ b/packages/datadog-api-client-v1/models/HTTPLogItem.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Logs that are sent over HTTP.
diff --git a/packages/datadog-api-client-v1/models/HeatMapWidgetDefinition.ts b/packages/datadog-api-client-v1/models/HeatMapWidgetDefinition.ts
index d93651382d24..639b7fced35b 100644
--- a/packages/datadog-api-client-v1/models/HeatMapWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/HeatMapWidgetDefinition.ts
@@ -15,7 +15,7 @@ import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetEvent } from "./WidgetEvent";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The heat map visualization shows metrics aggregated across many tags, such as hosts. The more hosts that have a particular value, the darker that square is.
diff --git a/packages/datadog-api-client-v1/models/HeatMapWidgetRequest.ts b/packages/datadog-api-client-v1/models/HeatMapWidgetRequest.ts
index 0693f7d00c76..ce9b2b623b41 100644
--- a/packages/datadog-api-client-v1/models/HeatMapWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/HeatMapWidgetRequest.ts
@@ -12,7 +12,7 @@ import { EventQueryDefinition } from "./EventQueryDefinition";
 import { LogQueryDefinition } from "./LogQueryDefinition";
 import { ProcessQueryDefinition } from "./ProcessQueryDefinition";
 import { WidgetStyle } from "./WidgetStyle";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated heat map widget.
diff --git a/packages/datadog-api-client-v1/models/Host.ts b/packages/datadog-api-client-v1/models/Host.ts
index 0d60716c300b..b2e116684e0d 100644
--- a/packages/datadog-api-client-v1/models/Host.ts
+++ b/packages/datadog-api-client-v1/models/Host.ts
@@ -10,7 +10,7 @@
 
 import { HostMeta } from "./HostMeta";
 import { HostMetrics } from "./HostMetrics";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object representing a host.
diff --git a/packages/datadog-api-client-v1/models/HostListResponse.ts b/packages/datadog-api-client-v1/models/HostListResponse.ts
index 69358ad83aa5..eb53bd970b73 100644
--- a/packages/datadog-api-client-v1/models/HostListResponse.ts
+++ b/packages/datadog-api-client-v1/models/HostListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Host } from "./Host";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with Host information from Datadog.
diff --git a/packages/datadog-api-client-v1/models/HostMapRequest.ts b/packages/datadog-api-client-v1/models/HostMapRequest.ts
index 3d27ef5c4427..3f785901aa9b 100644
--- a/packages/datadog-api-client-v1/models/HostMapRequest.ts
+++ b/packages/datadog-api-client-v1/models/HostMapRequest.ts
@@ -10,7 +10,7 @@
 
 import { LogQueryDefinition } from "./LogQueryDefinition";
 import { ProcessQueryDefinition } from "./ProcessQueryDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated host map.
diff --git a/packages/datadog-api-client-v1/models/HostMapWidgetDefinition.ts b/packages/datadog-api-client-v1/models/HostMapWidgetDefinition.ts
index b320714465b4..8a7d6392f31f 100644
--- a/packages/datadog-api-client-v1/models/HostMapWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/HostMapWidgetDefinition.ts
@@ -14,7 +14,7 @@ import { HostMapWidgetDefinitionType } from "./HostMapWidgetDefinitionType";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetNodeType } from "./WidgetNodeType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The host map widget graphs any metric across your hosts using the same visualization available from the main Host Map page.
diff --git a/packages/datadog-api-client-v1/models/HostMapWidgetDefinitionRequests.ts b/packages/datadog-api-client-v1/models/HostMapWidgetDefinitionRequests.ts
index 9a695178ee87..a44037771db5 100644
--- a/packages/datadog-api-client-v1/models/HostMapWidgetDefinitionRequests.ts
+++ b/packages/datadog-api-client-v1/models/HostMapWidgetDefinitionRequests.ts
@@ -9,7 +9,7 @@
  */
 
 import { HostMapRequest } from "./HostMapRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of definitions.
diff --git a/packages/datadog-api-client-v1/models/HostMapWidgetDefinitionStyle.ts b/packages/datadog-api-client-v1/models/HostMapWidgetDefinitionStyle.ts
index 61a655bbbda2..42660a222c84 100644
--- a/packages/datadog-api-client-v1/models/HostMapWidgetDefinitionStyle.ts
+++ b/packages/datadog-api-client-v1/models/HostMapWidgetDefinitionStyle.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The style to apply to the widget.
diff --git a/packages/datadog-api-client-v1/models/HostMeta.ts b/packages/datadog-api-client-v1/models/HostMeta.ts
index 4ac6e75ecf2c..a7dec3493d91 100644
--- a/packages/datadog-api-client-v1/models/HostMeta.ts
+++ b/packages/datadog-api-client-v1/models/HostMeta.ts
@@ -9,7 +9,7 @@
  */
 
 import { HostMetaInstallMethod } from "./HostMetaInstallMethod";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Metadata associated with your host.
diff --git a/packages/datadog-api-client-v1/models/HostMetaInstallMethod.ts b/packages/datadog-api-client-v1/models/HostMetaInstallMethod.ts
index 73831fb30bbf..75e2bff85a3d 100644
--- a/packages/datadog-api-client-v1/models/HostMetaInstallMethod.ts
+++ b/packages/datadog-api-client-v1/models/HostMetaInstallMethod.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Agent install method.
diff --git a/packages/datadog-api-client-v1/models/HostMetrics.ts b/packages/datadog-api-client-v1/models/HostMetrics.ts
index 279396b16cc4..05947aa0b2fe 100644
--- a/packages/datadog-api-client-v1/models/HostMetrics.ts
+++ b/packages/datadog-api-client-v1/models/HostMetrics.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Host Metrics collected.
diff --git a/packages/datadog-api-client-v1/models/HostMuteResponse.ts b/packages/datadog-api-client-v1/models/HostMuteResponse.ts
index 155799d7c1da..e71c70b46ea2 100644
--- a/packages/datadog-api-client-v1/models/HostMuteResponse.ts
+++ b/packages/datadog-api-client-v1/models/HostMuteResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with the list of muted host for your organization.
diff --git a/packages/datadog-api-client-v1/models/HostMuteSettings.ts b/packages/datadog-api-client-v1/models/HostMuteSettings.ts
index 86b1204cc75b..02736448b8eb 100644
--- a/packages/datadog-api-client-v1/models/HostMuteSettings.ts
+++ b/packages/datadog-api-client-v1/models/HostMuteSettings.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Combination of settings to mute a host.
diff --git a/packages/datadog-api-client-v1/models/HostTags.ts b/packages/datadog-api-client-v1/models/HostTags.ts
index d60e3b847b6f..976224a074ef 100644
--- a/packages/datadog-api-client-v1/models/HostTags.ts
+++ b/packages/datadog-api-client-v1/models/HostTags.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Set of tags to associate with your host.
diff --git a/packages/datadog-api-client-v1/models/HostTotals.ts b/packages/datadog-api-client-v1/models/HostTotals.ts
index da7c3de2cc51..ee30ca9824d8 100644
--- a/packages/datadog-api-client-v1/models/HostTotals.ts
+++ b/packages/datadog-api-client-v1/models/HostTotals.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Total number of host currently monitored by Datadog.
diff --git a/packages/datadog-api-client-v1/models/HourlyUsageAttributionBody.ts b/packages/datadog-api-client-v1/models/HourlyUsageAttributionBody.ts
index 5effb7d1de9c..eecc98efedf6 100644
--- a/packages/datadog-api-client-v1/models/HourlyUsageAttributionBody.ts
+++ b/packages/datadog-api-client-v1/models/HourlyUsageAttributionBody.ts
@@ -9,7 +9,7 @@
  */
 
 import { HourlyUsageAttributionUsageType } from "./HourlyUsageAttributionUsageType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The usage for one set of tags for one hour.
diff --git a/packages/datadog-api-client-v1/models/HourlyUsageAttributionMetadata.ts b/packages/datadog-api-client-v1/models/HourlyUsageAttributionMetadata.ts
index d12da4beaac7..69efffadb9cd 100644
--- a/packages/datadog-api-client-v1/models/HourlyUsageAttributionMetadata.ts
+++ b/packages/datadog-api-client-v1/models/HourlyUsageAttributionMetadata.ts
@@ -9,7 +9,7 @@
  */
 
 import { HourlyUsageAttributionPagination } from "./HourlyUsageAttributionPagination";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing document metadata.
diff --git a/packages/datadog-api-client-v1/models/HourlyUsageAttributionPagination.ts b/packages/datadog-api-client-v1/models/HourlyUsageAttributionPagination.ts
index dc7bab6f1722..506bd118c82c 100644
--- a/packages/datadog-api-client-v1/models/HourlyUsageAttributionPagination.ts
+++ b/packages/datadog-api-client-v1/models/HourlyUsageAttributionPagination.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata for the current pagination.
diff --git a/packages/datadog-api-client-v1/models/HourlyUsageAttributionResponse.ts b/packages/datadog-api-client-v1/models/HourlyUsageAttributionResponse.ts
index 4cd766f78056..f0ef1cd0c4d0 100644
--- a/packages/datadog-api-client-v1/models/HourlyUsageAttributionResponse.ts
+++ b/packages/datadog-api-client-v1/models/HourlyUsageAttributionResponse.ts
@@ -10,7 +10,7 @@
 
 import { HourlyUsageAttributionBody } from "./HourlyUsageAttributionBody";
 import { HourlyUsageAttributionMetadata } from "./HourlyUsageAttributionMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the hourly usage attribution by tag(s).
diff --git a/packages/datadog-api-client-v1/models/IFrameWidgetDefinition.ts b/packages/datadog-api-client-v1/models/IFrameWidgetDefinition.ts
index a752fdefce98..33d6071a26db 100644
--- a/packages/datadog-api-client-v1/models/IFrameWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/IFrameWidgetDefinition.ts
@@ -9,7 +9,7 @@
  */
 
 import { IFrameWidgetDefinitionType } from "./IFrameWidgetDefinitionType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The iframe widget allows you to embed a portion of any other web page on your dashboard. Only available on FREE layout dashboards.
diff --git a/packages/datadog-api-client-v1/models/IPPrefixesAPI.ts b/packages/datadog-api-client-v1/models/IPPrefixesAPI.ts
index c8276fbebe14..be2c972e80f3 100644
--- a/packages/datadog-api-client-v1/models/IPPrefixesAPI.ts
+++ b/packages/datadog-api-client-v1/models/IPPrefixesAPI.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Available prefix information for the API endpoints.
diff --git a/packages/datadog-api-client-v1/models/IPPrefixesAPM.ts b/packages/datadog-api-client-v1/models/IPPrefixesAPM.ts
index 5e3c74e9997f..9d5481fb94eb 100644
--- a/packages/datadog-api-client-v1/models/IPPrefixesAPM.ts
+++ b/packages/datadog-api-client-v1/models/IPPrefixesAPM.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Available prefix information for the APM endpoints.
diff --git a/packages/datadog-api-client-v1/models/IPPrefixesAgents.ts b/packages/datadog-api-client-v1/models/IPPrefixesAgents.ts
index 207c396d4344..2653e8cbff75 100644
--- a/packages/datadog-api-client-v1/models/IPPrefixesAgents.ts
+++ b/packages/datadog-api-client-v1/models/IPPrefixesAgents.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Available prefix information for the Agent endpoints.
diff --git a/packages/datadog-api-client-v1/models/IPPrefixesLogs.ts b/packages/datadog-api-client-v1/models/IPPrefixesLogs.ts
index 39997e14733f..3da5e7f76dbf 100644
--- a/packages/datadog-api-client-v1/models/IPPrefixesLogs.ts
+++ b/packages/datadog-api-client-v1/models/IPPrefixesLogs.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Available prefix information for the Logs endpoints.
diff --git a/packages/datadog-api-client-v1/models/IPPrefixesProcess.ts b/packages/datadog-api-client-v1/models/IPPrefixesProcess.ts
index 5737bb60b7d9..4926218e3ade 100644
--- a/packages/datadog-api-client-v1/models/IPPrefixesProcess.ts
+++ b/packages/datadog-api-client-v1/models/IPPrefixesProcess.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Available prefix information for the Process endpoints.
diff --git a/packages/datadog-api-client-v1/models/IPPrefixesSynthetics.ts b/packages/datadog-api-client-v1/models/IPPrefixesSynthetics.ts
index 7d24b40e0040..9d87ec030fcb 100644
--- a/packages/datadog-api-client-v1/models/IPPrefixesSynthetics.ts
+++ b/packages/datadog-api-client-v1/models/IPPrefixesSynthetics.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Available prefix information for the Synthetics endpoints.
diff --git a/packages/datadog-api-client-v1/models/IPPrefixesWebhooks.ts b/packages/datadog-api-client-v1/models/IPPrefixesWebhooks.ts
index 829496962cd8..c5afc1fee784 100644
--- a/packages/datadog-api-client-v1/models/IPPrefixesWebhooks.ts
+++ b/packages/datadog-api-client-v1/models/IPPrefixesWebhooks.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Available prefix information for the Webhook endpoints.
diff --git a/packages/datadog-api-client-v1/models/IPRanges.ts b/packages/datadog-api-client-v1/models/IPRanges.ts
index 17d9aa5f196f..15530e044d0a 100644
--- a/packages/datadog-api-client-v1/models/IPRanges.ts
+++ b/packages/datadog-api-client-v1/models/IPRanges.ts
@@ -15,7 +15,7 @@ import { IPPrefixesLogs } from "./IPPrefixesLogs";
 import { IPPrefixesProcess } from "./IPPrefixesProcess";
 import { IPPrefixesSynthetics } from "./IPPrefixesSynthetics";
 import { IPPrefixesWebhooks } from "./IPPrefixesWebhooks";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * IP ranges.
diff --git a/packages/datadog-api-client-v1/models/IdpFormData.ts b/packages/datadog-api-client-v1/models/IdpFormData.ts
index baccea0c127e..05ba764bf0cf 100644
--- a/packages/datadog-api-client-v1/models/IdpFormData.ts
+++ b/packages/datadog-api-client-v1/models/IdpFormData.ts
@@ -9,7 +9,7 @@
  */
 
 import { HttpFile } from "../http/http";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the IdP configuration.
diff --git a/packages/datadog-api-client-v1/models/IdpResponse.ts b/packages/datadog-api-client-v1/models/IdpResponse.ts
index 010fff629e45..fb893ce4e0a0 100644
--- a/packages/datadog-api-client-v1/models/IdpResponse.ts
+++ b/packages/datadog-api-client-v1/models/IdpResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The IdP response object.
diff --git a/packages/datadog-api-client-v1/models/ImageWidgetDefinition.ts b/packages/datadog-api-client-v1/models/ImageWidgetDefinition.ts
index ab20a9b80f12..18d402734b2b 100644
--- a/packages/datadog-api-client-v1/models/ImageWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ImageWidgetDefinition.ts
@@ -13,7 +13,7 @@ import { WidgetHorizontalAlign } from "./WidgetHorizontalAlign";
 import { WidgetImageSizing } from "./WidgetImageSizing";
 import { WidgetMargin } from "./WidgetMargin";
 import { WidgetVerticalAlign } from "./WidgetVerticalAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The image widget allows you to embed an image on your dashboard. An image can be a PNG, JPG, or animated GIF. Only available on FREE layout dashboards.
diff --git a/packages/datadog-api-client-v1/models/IntakePayloadAccepted.ts b/packages/datadog-api-client-v1/models/IntakePayloadAccepted.ts
index 9803e6096425..14f51b721e42 100644
--- a/packages/datadog-api-client-v1/models/IntakePayloadAccepted.ts
+++ b/packages/datadog-api-client-v1/models/IntakePayloadAccepted.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The payload accepted for intake.
diff --git a/packages/datadog-api-client-v1/models/ListStreamColumn.ts b/packages/datadog-api-client-v1/models/ListStreamColumn.ts
index ab20df5594c8..a389d6823599 100644
--- a/packages/datadog-api-client-v1/models/ListStreamColumn.ts
+++ b/packages/datadog-api-client-v1/models/ListStreamColumn.ts
@@ -9,7 +9,7 @@
  */
 
 import { ListStreamColumnWidth } from "./ListStreamColumnWidth";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Widget column.
diff --git a/packages/datadog-api-client-v1/models/ListStreamQuery.ts b/packages/datadog-api-client-v1/models/ListStreamQuery.ts
index 5d962b37ad30..4cedf3553d7f 100644
--- a/packages/datadog-api-client-v1/models/ListStreamQuery.ts
+++ b/packages/datadog-api-client-v1/models/ListStreamQuery.ts
@@ -9,7 +9,7 @@
  */
 
 import { ListStreamSource } from "./ListStreamSource";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated list stream widget.
diff --git a/packages/datadog-api-client-v1/models/ListStreamWidgetDefinition.ts b/packages/datadog-api-client-v1/models/ListStreamWidgetDefinition.ts
index 3b5e8488d42f..6fe437a37194 100644
--- a/packages/datadog-api-client-v1/models/ListStreamWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ListStreamWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { ListStreamWidgetDefinitionType } from "./ListStreamWidgetDefinitionType
 import { ListStreamWidgetRequest } from "./ListStreamWidgetRequest";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The list stream visualization displays a table of recent events in your application that match a search criteria using user-defined columns.
diff --git a/packages/datadog-api-client-v1/models/ListStreamWidgetRequest.ts b/packages/datadog-api-client-v1/models/ListStreamWidgetRequest.ts
index 2a8547491ef7..5d081127c980 100644
--- a/packages/datadog-api-client-v1/models/ListStreamWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/ListStreamWidgetRequest.ts
@@ -11,7 +11,7 @@
 import { ListStreamColumn } from "./ListStreamColumn";
 import { ListStreamQuery } from "./ListStreamQuery";
 import { ListStreamResponseFormat } from "./ListStreamResponseFormat";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated list stream widget.
diff --git a/packages/datadog-api-client-v1/models/Log.ts b/packages/datadog-api-client-v1/models/Log.ts
index 2db5d8e774d7..640b29e506b3 100644
--- a/packages/datadog-api-client-v1/models/Log.ts
+++ b/packages/datadog-api-client-v1/models/Log.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogContent } from "./LogContent";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing a log after being processed and stored by Datadog.
diff --git a/packages/datadog-api-client-v1/models/LogContent.ts b/packages/datadog-api-client-v1/models/LogContent.ts
index 997366799d32..3d750ec64180 100644
--- a/packages/datadog-api-client-v1/models/LogContent.ts
+++ b/packages/datadog-api-client-v1/models/LogContent.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * JSON object containing all log attributes and their associated values.
diff --git a/packages/datadog-api-client-v1/models/LogQueryDefinition.ts b/packages/datadog-api-client-v1/models/LogQueryDefinition.ts
index 5688c25de099..6bad916f0028 100644
--- a/packages/datadog-api-client-v1/models/LogQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/LogQueryDefinition.ts
@@ -11,7 +11,7 @@
 import { LogQueryDefinitionGroupBy } from "./LogQueryDefinitionGroupBy";
 import { LogQueryDefinitionSearch } from "./LogQueryDefinitionSearch";
 import { LogsQueryCompute } from "./LogsQueryCompute";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The log query.
diff --git a/packages/datadog-api-client-v1/models/LogQueryDefinitionGroupBy.ts b/packages/datadog-api-client-v1/models/LogQueryDefinitionGroupBy.ts
index 3a92aa1a4456..43dcab88a24a 100644
--- a/packages/datadog-api-client-v1/models/LogQueryDefinitionGroupBy.ts
+++ b/packages/datadog-api-client-v1/models/LogQueryDefinitionGroupBy.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogQueryDefinitionGroupBySort } from "./LogQueryDefinitionGroupBySort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Defined items in the group.
diff --git a/packages/datadog-api-client-v1/models/LogQueryDefinitionGroupBySort.ts b/packages/datadog-api-client-v1/models/LogQueryDefinitionGroupBySort.ts
index 62a19eae8643..f1d618d9f138 100644
--- a/packages/datadog-api-client-v1/models/LogQueryDefinitionGroupBySort.ts
+++ b/packages/datadog-api-client-v1/models/LogQueryDefinitionGroupBySort.ts
@@ -9,7 +9,7 @@
  */
 
 import { WidgetSort } from "./WidgetSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Define a sorting method.
diff --git a/packages/datadog-api-client-v1/models/LogQueryDefinitionSearch.ts b/packages/datadog-api-client-v1/models/LogQueryDefinitionSearch.ts
index a2deb06e7a90..416dda9ca1c8 100644
--- a/packages/datadog-api-client-v1/models/LogQueryDefinitionSearch.ts
+++ b/packages/datadog-api-client-v1/models/LogQueryDefinitionSearch.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The query being made on the logs.
diff --git a/packages/datadog-api-client-v1/models/LogStreamWidgetDefinition.ts b/packages/datadog-api-client-v1/models/LogStreamWidgetDefinition.ts
index bf2a56f0760d..0de7072163c8 100644
--- a/packages/datadog-api-client-v1/models/LogStreamWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/LogStreamWidgetDefinition.ts
@@ -13,7 +13,7 @@ import { WidgetFieldSort } from "./WidgetFieldSort";
 import { WidgetMessageDisplay } from "./WidgetMessageDisplay";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Log Stream displays a log flow matching the defined query. Only available on FREE layout dashboards.
diff --git a/packages/datadog-api-client-v1/models/LogsAPIError.ts b/packages/datadog-api-client-v1/models/LogsAPIError.ts
index c1d3b67598f6..48aef92556e1 100644
--- a/packages/datadog-api-client-v1/models/LogsAPIError.ts
+++ b/packages/datadog-api-client-v1/models/LogsAPIError.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Error returned by the Logs API
diff --git a/packages/datadog-api-client-v1/models/LogsAPIErrorResponse.ts b/packages/datadog-api-client-v1/models/LogsAPIErrorResponse.ts
index 16449470d844..8b2932d1bd72 100644
--- a/packages/datadog-api-client-v1/models/LogsAPIErrorResponse.ts
+++ b/packages/datadog-api-client-v1/models/LogsAPIErrorResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsAPIError } from "./LogsAPIError";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response returned by the Logs API when errors occur.
diff --git a/packages/datadog-api-client-v1/models/LogsArithmeticProcessor.ts b/packages/datadog-api-client-v1/models/LogsArithmeticProcessor.ts
index 557d786988f1..f5334f6f1cd4 100644
--- a/packages/datadog-api-client-v1/models/LogsArithmeticProcessor.ts
+++ b/packages/datadog-api-client-v1/models/LogsArithmeticProcessor.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsArithmeticProcessorType } from "./LogsArithmeticProcessorType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Use the Arithmetic Processor to add a new attribute (without spaces or special characters in the new attribute name) to a log with the result of the provided formula. This enables you to remap different time attributes with different units into a single attribute, or to compute operations on attributes within the same log.  The formula can use parentheses and the basic arithmetic operators `-`, `+`, `*`, `/`.  By default, the calculation is skipped if an attribute is missing. Select “Replace missing attribute by 0” to automatically populate missing attribute values with 0 to ensure that the calculation is done. An attribute is missing if it is not found in the log attributes, or if it cannot be converted to a number.  *Notes*:  - The operator `-` needs to be space split in the formula as it can also be contained in attribute names. - If the target attribute already exists, it is overwritten by the result of the formula. - Results are rounded up to the 9th decimal. For example, if the result of the formula is `0.1234567891`,   the actual value stored for the attribute is `0.123456789`. - If you need to scale a unit of measure,   see [Scale Filter](https://docs.datadoghq.com/logs/log_configuration/parsing/?tab=filter#matcher-and-filter).
diff --git a/packages/datadog-api-client-v1/models/LogsAttributeRemapper.ts b/packages/datadog-api-client-v1/models/LogsAttributeRemapper.ts
index 2d8e36f75c84..a43bfef415a2 100644
--- a/packages/datadog-api-client-v1/models/LogsAttributeRemapper.ts
+++ b/packages/datadog-api-client-v1/models/LogsAttributeRemapper.ts
@@ -10,7 +10,7 @@
 
 import { LogsAttributeRemapperType } from "./LogsAttributeRemapperType";
 import { TargetFormatType } from "./TargetFormatType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The remapper processor remaps any source attribute(s) or tag to another target attribute or tag. Constraints on the tag/attribute name are explained in the [Tag Best Practice documentation](https://docs.datadoghq.com/logs/guide/log-parsing-best-practice). Some additional constraints are applied as `:` or `,` are not allowed in the target tag/attribute name.
diff --git a/packages/datadog-api-client-v1/models/LogsByRetention.ts b/packages/datadog-api-client-v1/models/LogsByRetention.ts
index 512e6ced7954..c06957586c2e 100644
--- a/packages/datadog-api-client-v1/models/LogsByRetention.ts
+++ b/packages/datadog-api-client-v1/models/LogsByRetention.ts
@@ -11,7 +11,7 @@
 import { LogsByRetentionMonthlyUsage } from "./LogsByRetentionMonthlyUsage";
 import { LogsByRetentionOrgs } from "./LogsByRetentionOrgs";
 import { LogsRetentionAggSumUsage } from "./LogsRetentionAggSumUsage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing logs usage data broken down by retention period.
diff --git a/packages/datadog-api-client-v1/models/LogsByRetentionMonthlyUsage.ts b/packages/datadog-api-client-v1/models/LogsByRetentionMonthlyUsage.ts
index be0bf8c11d10..8e289be8c19f 100644
--- a/packages/datadog-api-client-v1/models/LogsByRetentionMonthlyUsage.ts
+++ b/packages/datadog-api-client-v1/models/LogsByRetentionMonthlyUsage.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsRetentionSumUsage } from "./LogsRetentionSumUsage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing a summary of indexed logs usage by retention period for a single month.
diff --git a/packages/datadog-api-client-v1/models/LogsByRetentionOrgUsage.ts b/packages/datadog-api-client-v1/models/LogsByRetentionOrgUsage.ts
index 2e77e16553d8..b4ca9a3e5a4f 100644
--- a/packages/datadog-api-client-v1/models/LogsByRetentionOrgUsage.ts
+++ b/packages/datadog-api-client-v1/models/LogsByRetentionOrgUsage.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsRetentionSumUsage } from "./LogsRetentionSumUsage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Indexed logs usage by retention for a single organization.
diff --git a/packages/datadog-api-client-v1/models/LogsByRetentionOrgs.ts b/packages/datadog-api-client-v1/models/LogsByRetentionOrgs.ts
index 930e6d769a49..1facd6fc28c1 100644
--- a/packages/datadog-api-client-v1/models/LogsByRetentionOrgs.ts
+++ b/packages/datadog-api-client-v1/models/LogsByRetentionOrgs.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsByRetentionOrgUsage } from "./LogsByRetentionOrgUsage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Indexed logs usage summary for each organization for each retention period with usage.
diff --git a/packages/datadog-api-client-v1/models/LogsCategoryProcessor.ts b/packages/datadog-api-client-v1/models/LogsCategoryProcessor.ts
index 169878b78014..b6ac8c079cf3 100644
--- a/packages/datadog-api-client-v1/models/LogsCategoryProcessor.ts
+++ b/packages/datadog-api-client-v1/models/LogsCategoryProcessor.ts
@@ -10,7 +10,7 @@
 
 import { LogsCategoryProcessorCategory } from "./LogsCategoryProcessorCategory";
 import { LogsCategoryProcessorType } from "./LogsCategoryProcessorType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Use the Category Processor to add a new attribute (without spaces or special characters in the new attribute name) to a log matching a provided search query. Use categories to create groups for an analytical view. For example, URL groups, machine groups, environments, and response time buckets.  **Notes**:  - The syntax of the query is the one of Logs Explorer search bar.   The query can be done on any log attribute or tag, whether it is a facet or not.   Wildcards can also be used inside your query. - Once the log has matched one of the Processor queries, it stops.   Make sure they are properly ordered in case a log could match several queries. - The names of the categories must be unique. - Once defined in the Category Processor, you can map categories to log status using the Log Status Remapper.
diff --git a/packages/datadog-api-client-v1/models/LogsCategoryProcessorCategory.ts b/packages/datadog-api-client-v1/models/LogsCategoryProcessorCategory.ts
index ec223ca54825..8483d86b290e 100644
--- a/packages/datadog-api-client-v1/models/LogsCategoryProcessorCategory.ts
+++ b/packages/datadog-api-client-v1/models/LogsCategoryProcessorCategory.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsFilter } from "./LogsFilter";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the logs filter.
diff --git a/packages/datadog-api-client-v1/models/LogsDateRemapper.ts b/packages/datadog-api-client-v1/models/LogsDateRemapper.ts
index 83da645b23b3..6e2fc2033f27 100644
--- a/packages/datadog-api-client-v1/models/LogsDateRemapper.ts
+++ b/packages/datadog-api-client-v1/models/LogsDateRemapper.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsDateRemapperType } from "./LogsDateRemapperType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * As Datadog receives logs, it timestamps them using the value(s) from any of these default attributes.    - `timestamp`   - `date`   - `_timestamp`   - `Timestamp`   - `eventTime`   - `published_date`    If your logs put their dates in an attribute not in this list,   use the log date Remapper Processor to define their date attribute as the official log timestamp.   The recognized date formats are ISO8601, UNIX (the milliseconds EPOCH format), and RFC3164.    **Note:** If your logs don’t contain any of the default attributes   and you haven’t defined your own date attribute, Datadog timestamps   the logs with the date it received them.    If multiple log date remapper processors can be applied to a given log,   only the first one (according to the pipelines order) is taken into account.
diff --git a/packages/datadog-api-client-v1/models/LogsExclusion.ts b/packages/datadog-api-client-v1/models/LogsExclusion.ts
index 2c648f806305..99b425afd6c7 100644
--- a/packages/datadog-api-client-v1/models/LogsExclusion.ts
+++ b/packages/datadog-api-client-v1/models/LogsExclusion.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsExclusionFilter } from "./LogsExclusionFilter";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Represents the index exclusion filter object from configuration API.
diff --git a/packages/datadog-api-client-v1/models/LogsExclusionFilter.ts b/packages/datadog-api-client-v1/models/LogsExclusionFilter.ts
index e50008ad741a..9f73eb47e800 100644
--- a/packages/datadog-api-client-v1/models/LogsExclusionFilter.ts
+++ b/packages/datadog-api-client-v1/models/LogsExclusionFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Exclusion filter is defined by a query, a sampling rule, and a active/inactive toggle.
diff --git a/packages/datadog-api-client-v1/models/LogsFilter.ts b/packages/datadog-api-client-v1/models/LogsFilter.ts
index 5df2ab78feb9..bb47cf90fe4c 100644
--- a/packages/datadog-api-client-v1/models/LogsFilter.ts
+++ b/packages/datadog-api-client-v1/models/LogsFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Filter for logs.
diff --git a/packages/datadog-api-client-v1/models/LogsGeoIPParser.ts b/packages/datadog-api-client-v1/models/LogsGeoIPParser.ts
index 0dc1b43e66ba..cd80b3195df4 100644
--- a/packages/datadog-api-client-v1/models/LogsGeoIPParser.ts
+++ b/packages/datadog-api-client-v1/models/LogsGeoIPParser.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsGeoIPParserType } from "./LogsGeoIPParserType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The GeoIP parser takes an IP address attribute and extracts if available the Continent, Country, Subdivision, and City information in the target attribute path.
diff --git a/packages/datadog-api-client-v1/models/LogsGrokParser.ts b/packages/datadog-api-client-v1/models/LogsGrokParser.ts
index 9827f78fbabe..740d6e12c080 100644
--- a/packages/datadog-api-client-v1/models/LogsGrokParser.ts
+++ b/packages/datadog-api-client-v1/models/LogsGrokParser.ts
@@ -10,7 +10,7 @@
 
 import { LogsGrokParserRules } from "./LogsGrokParserRules";
 import { LogsGrokParserType } from "./LogsGrokParserType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create custom grok rules to parse the full message or [a specific attribute of your raw event](https://docs.datadoghq.com/logs/log_configuration/parsing/#advanced-settings). For more information, see the [parsing section](https://docs.datadoghq.com/logs/log_configuration/parsing).
diff --git a/packages/datadog-api-client-v1/models/LogsGrokParserRules.ts b/packages/datadog-api-client-v1/models/LogsGrokParserRules.ts
index 554e588ae3eb..b69c7ed93846 100644
--- a/packages/datadog-api-client-v1/models/LogsGrokParserRules.ts
+++ b/packages/datadog-api-client-v1/models/LogsGrokParserRules.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Set of rules for the grok parser.
diff --git a/packages/datadog-api-client-v1/models/LogsIndex.ts b/packages/datadog-api-client-v1/models/LogsIndex.ts
index 2197e96983ff..0a2caec2fd63 100644
--- a/packages/datadog-api-client-v1/models/LogsIndex.ts
+++ b/packages/datadog-api-client-v1/models/LogsIndex.ts
@@ -10,7 +10,7 @@
 
 import { LogsExclusion } from "./LogsExclusion";
 import { LogsFilter } from "./LogsFilter";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing a Datadog Log index.
diff --git a/packages/datadog-api-client-v1/models/LogsIndexListResponse.ts b/packages/datadog-api-client-v1/models/LogsIndexListResponse.ts
index 5a54ede773dc..170606fd879a 100644
--- a/packages/datadog-api-client-v1/models/LogsIndexListResponse.ts
+++ b/packages/datadog-api-client-v1/models/LogsIndexListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsIndex } from "./LogsIndex";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object with all Index configurations for a given organization.
diff --git a/packages/datadog-api-client-v1/models/LogsIndexUpdateRequest.ts b/packages/datadog-api-client-v1/models/LogsIndexUpdateRequest.ts
index ec31327a7e89..93443a67092a 100644
--- a/packages/datadog-api-client-v1/models/LogsIndexUpdateRequest.ts
+++ b/packages/datadog-api-client-v1/models/LogsIndexUpdateRequest.ts
@@ -10,7 +10,7 @@
 
 import { LogsExclusion } from "./LogsExclusion";
 import { LogsFilter } from "./LogsFilter";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for updating a Datadog Log index.
diff --git a/packages/datadog-api-client-v1/models/LogsIndexesOrder.ts b/packages/datadog-api-client-v1/models/LogsIndexesOrder.ts
index 11b4d96fcf37..70817a350f49 100644
--- a/packages/datadog-api-client-v1/models/LogsIndexesOrder.ts
+++ b/packages/datadog-api-client-v1/models/LogsIndexesOrder.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the ordered list of log index names.
diff --git a/packages/datadog-api-client-v1/models/LogsListRequest.ts b/packages/datadog-api-client-v1/models/LogsListRequest.ts
index 6da44f58ec62..aa79937552a3 100644
--- a/packages/datadog-api-client-v1/models/LogsListRequest.ts
+++ b/packages/datadog-api-client-v1/models/LogsListRequest.ts
@@ -10,7 +10,7 @@
 
 import { LogsListRequestTime } from "./LogsListRequestTime";
 import { LogsSort } from "./LogsSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to send with the request to retrieve a list of logs from your Organization.
diff --git a/packages/datadog-api-client-v1/models/LogsListRequestTime.ts b/packages/datadog-api-client-v1/models/LogsListRequestTime.ts
index 042f62737739..b6fc0c6ab167 100644
--- a/packages/datadog-api-client-v1/models/LogsListRequestTime.ts
+++ b/packages/datadog-api-client-v1/models/LogsListRequestTime.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Timeframe to retrieve the log from.
diff --git a/packages/datadog-api-client-v1/models/LogsListResponse.ts b/packages/datadog-api-client-v1/models/LogsListResponse.ts
index bf973818b83a..de50e3381028 100644
--- a/packages/datadog-api-client-v1/models/LogsListResponse.ts
+++ b/packages/datadog-api-client-v1/models/LogsListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Log } from "./Log";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object with all logs matching the request and pagination information.
diff --git a/packages/datadog-api-client-v1/models/LogsLookupProcessor.ts b/packages/datadog-api-client-v1/models/LogsLookupProcessor.ts
index 7beb6b864f30..17264e01d195 100644
--- a/packages/datadog-api-client-v1/models/LogsLookupProcessor.ts
+++ b/packages/datadog-api-client-v1/models/LogsLookupProcessor.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsLookupProcessorType } from "./LogsLookupProcessorType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Use the Lookup Processor to define a mapping between a log attribute and a human readable value saved in the processors mapping table. For example, you can use the Lookup Processor to map an internal service ID into a human readable service name. Alternatively, you could also use it to check if the MAC address that just attempted to connect to the production environment belongs to your list of stolen machines.
diff --git a/packages/datadog-api-client-v1/models/LogsMessageRemapper.ts b/packages/datadog-api-client-v1/models/LogsMessageRemapper.ts
index 75948d053025..707391414ae1 100644
--- a/packages/datadog-api-client-v1/models/LogsMessageRemapper.ts
+++ b/packages/datadog-api-client-v1/models/LogsMessageRemapper.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsMessageRemapperType } from "./LogsMessageRemapperType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The message is a key attribute in Datadog. It is displayed in the message column of the Log Explorer and you can do full string search on it. Use this Processor to define one or more attributes as the official log message.  **Note:** If multiple log message remapper processors can be applied to a given log, only the first one (according to the pipeline order) is taken into account.
diff --git a/packages/datadog-api-client-v1/models/LogsPipeline.ts b/packages/datadog-api-client-v1/models/LogsPipeline.ts
index 71a8f93a6418..53f4504fcd53 100644
--- a/packages/datadog-api-client-v1/models/LogsPipeline.ts
+++ b/packages/datadog-api-client-v1/models/LogsPipeline.ts
@@ -10,7 +10,7 @@
 
 import { LogsFilter } from "./LogsFilter";
 import { LogsProcessor } from "./LogsProcessor";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Pipelines and processors operate on incoming logs, parsing and transforming them into structured attributes for easier querying.  **Note**: These endpoints are only available for admin users. Make sure to use an application key created by an admin.
diff --git a/packages/datadog-api-client-v1/models/LogsPipelineProcessor.ts b/packages/datadog-api-client-v1/models/LogsPipelineProcessor.ts
index 63c03046e045..18d270a3a5bf 100644
--- a/packages/datadog-api-client-v1/models/LogsPipelineProcessor.ts
+++ b/packages/datadog-api-client-v1/models/LogsPipelineProcessor.ts
@@ -11,7 +11,7 @@
 import { LogsFilter } from "./LogsFilter";
 import { LogsPipelineProcessorType } from "./LogsPipelineProcessorType";
 import { LogsProcessor } from "./LogsProcessor";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Nested Pipelines are pipelines within a pipeline. Use Nested Pipelines to split the processing into two steps. For example, first use a high-level filtering such as team and then a second level of filtering based on the integration, service, or any other tag or attribute.  A pipeline can contain Nested Pipelines and Processors whereas a Nested Pipeline can only contain Processors.
diff --git a/packages/datadog-api-client-v1/models/LogsPipelinesOrder.ts b/packages/datadog-api-client-v1/models/LogsPipelinesOrder.ts
index 0c38eeba2569..55300c156981 100644
--- a/packages/datadog-api-client-v1/models/LogsPipelinesOrder.ts
+++ b/packages/datadog-api-client-v1/models/LogsPipelinesOrder.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the ordered list of pipeline IDs.
diff --git a/packages/datadog-api-client-v1/models/LogsProcessor.ts b/packages/datadog-api-client-v1/models/LogsProcessor.ts
index 56858a0a8650..c53daf024895 100644
--- a/packages/datadog-api-client-v1/models/LogsProcessor.ts
+++ b/packages/datadog-api-client-v1/models/LogsProcessor.ts
@@ -23,7 +23,7 @@ import { LogsStringBuilderProcessor } from "./LogsStringBuilderProcessor";
 import { LogsTraceRemapper } from "./LogsTraceRemapper";
 import { LogsURLParser } from "./LogsURLParser";
 import { LogsUserAgentParser } from "./LogsUserAgentParser";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Definition of a logs processor.
diff --git a/packages/datadog-api-client-v1/models/LogsQueryCompute.ts b/packages/datadog-api-client-v1/models/LogsQueryCompute.ts
index 13c913502119..082f181f1cb8 100644
--- a/packages/datadog-api-client-v1/models/LogsQueryCompute.ts
+++ b/packages/datadog-api-client-v1/models/LogsQueryCompute.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Define computation for a log query.
diff --git a/packages/datadog-api-client-v1/models/LogsRetentionAggSumUsage.ts b/packages/datadog-api-client-v1/models/LogsRetentionAggSumUsage.ts
index d71b2604e0da..b2181fa2eb6b 100644
--- a/packages/datadog-api-client-v1/models/LogsRetentionAggSumUsage.ts
+++ b/packages/datadog-api-client-v1/models/LogsRetentionAggSumUsage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing indexed logs usage aggregated across organizations and months for a retention period.
diff --git a/packages/datadog-api-client-v1/models/LogsRetentionSumUsage.ts b/packages/datadog-api-client-v1/models/LogsRetentionSumUsage.ts
index 79bb8e67afba..ccab3dd8e1fc 100644
--- a/packages/datadog-api-client-v1/models/LogsRetentionSumUsage.ts
+++ b/packages/datadog-api-client-v1/models/LogsRetentionSumUsage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing indexed logs usage grouped by retention period and summed.
diff --git a/packages/datadog-api-client-v1/models/LogsServiceRemapper.ts b/packages/datadog-api-client-v1/models/LogsServiceRemapper.ts
index 53ac1df51b52..45f2e96a7f42 100644
--- a/packages/datadog-api-client-v1/models/LogsServiceRemapper.ts
+++ b/packages/datadog-api-client-v1/models/LogsServiceRemapper.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsServiceRemapperType } from "./LogsServiceRemapperType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Use this processor if you want to assign one or more attributes as the official service.  **Note:** If multiple service remapper processors can be applied to a given log, only the first one (according to the pipeline order) is taken into account.
diff --git a/packages/datadog-api-client-v1/models/LogsStatusRemapper.ts b/packages/datadog-api-client-v1/models/LogsStatusRemapper.ts
index 8e4b50529404..49e90b8f6c92 100644
--- a/packages/datadog-api-client-v1/models/LogsStatusRemapper.ts
+++ b/packages/datadog-api-client-v1/models/LogsStatusRemapper.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsStatusRemapperType } from "./LogsStatusRemapperType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Use this Processor if you want to assign some attributes as the official status.  Each incoming status value is mapped as follows.    - Integers from 0 to 7 map to the Syslog severity standards   - Strings beginning with `emerg` or f (case-insensitive) map to `emerg` (0)   - Strings beginning with `a` (case-insensitive) map to `alert` (1)   - Strings beginning with `c` (case-insensitive) map to `critical` (2)   - Strings beginning with `err` (case-insensitive) map to `error` (3)   - Strings beginning with `w` (case-insensitive) map to `warning` (4)   - Strings beginning with `n` (case-insensitive) map to `notice` (5)   - Strings beginning with `i` (case-insensitive) map to `info` (6)   - Strings beginning with `d`, `trace` or `verbose` (case-insensitive) map to `debug` (7)   - Strings beginning with `o` or matching `OK` or `Success` (case-insensitive) map to OK   - All others map to `info` (6)    **Note:** If multiple log status remapper processors can be applied to a given log,   only the first one (according to the pipelines order) is taken into account.
diff --git a/packages/datadog-api-client-v1/models/LogsStringBuilderProcessor.ts b/packages/datadog-api-client-v1/models/LogsStringBuilderProcessor.ts
index 9439b1377316..a5404d72d972 100644
--- a/packages/datadog-api-client-v1/models/LogsStringBuilderProcessor.ts
+++ b/packages/datadog-api-client-v1/models/LogsStringBuilderProcessor.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsStringBuilderProcessorType } from "./LogsStringBuilderProcessorType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Use the string builder processor to add a new attribute (without spaces or special characters) to a log with the result of the provided template. This enables aggregation of different attributes or raw strings into a single attribute.  The template is defined by both raw text and blocks with the syntax `%{attribute_path}`.  **Notes**:  - The processor only accepts attributes with values or an array of values in the blocks. - If an attribute cannot be used (object or array of object),   it is replaced by an empty string or the entire operation is skipped depending on your selection. - If the target attribute already exists, it is overwritten by the result of the template. - Results of the template cannot exceed 256 characters.
diff --git a/packages/datadog-api-client-v1/models/LogsTraceRemapper.ts b/packages/datadog-api-client-v1/models/LogsTraceRemapper.ts
index 288a35084da7..ca1c6e8c9288 100644
--- a/packages/datadog-api-client-v1/models/LogsTraceRemapper.ts
+++ b/packages/datadog-api-client-v1/models/LogsTraceRemapper.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsTraceRemapperType } from "./LogsTraceRemapperType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * There are two ways to improve correlation between application traces and logs.    1. Follow the documentation on [how to inject a trace ID in the application logs](https://docs.datadoghq.com/tracing/connect_logs_and_traces)   and by default log integrations take care of all the rest of the setup.    2. Use the Trace remapper processor to define a log attribute as its associated trace ID.
diff --git a/packages/datadog-api-client-v1/models/LogsURLParser.ts b/packages/datadog-api-client-v1/models/LogsURLParser.ts
index 8c87ead5a4bf..5e0ce0e86a65 100644
--- a/packages/datadog-api-client-v1/models/LogsURLParser.ts
+++ b/packages/datadog-api-client-v1/models/LogsURLParser.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsURLParserType } from "./LogsURLParserType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * This processor extracts query parameters and other important parameters from a URL.
diff --git a/packages/datadog-api-client-v1/models/LogsUserAgentParser.ts b/packages/datadog-api-client-v1/models/LogsUserAgentParser.ts
index 774773b47cf9..8236357758ff 100644
--- a/packages/datadog-api-client-v1/models/LogsUserAgentParser.ts
+++ b/packages/datadog-api-client-v1/models/LogsUserAgentParser.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsUserAgentParserType } from "./LogsUserAgentParserType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The User-Agent parser takes a User-Agent attribute and extracts the OS, browser, device, and other user data. It recognizes major bots like the Google Bot, Yahoo Slurp, and Bing.
diff --git a/packages/datadog-api-client-v1/models/MetricMetadata.ts b/packages/datadog-api-client-v1/models/MetricMetadata.ts
index 13577ee37d94..607c7294ad5c 100644
--- a/packages/datadog-api-client-v1/models/MetricMetadata.ts
+++ b/packages/datadog-api-client-v1/models/MetricMetadata.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object with all metric related metadata.
diff --git a/packages/datadog-api-client-v1/models/MetricSearchResponse.ts b/packages/datadog-api-client-v1/models/MetricSearchResponse.ts
index 5f790003e965..792e0fa2e086 100644
--- a/packages/datadog-api-client-v1/models/MetricSearchResponse.ts
+++ b/packages/datadog-api-client-v1/models/MetricSearchResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricSearchResponseResults } from "./MetricSearchResponseResults";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the list of metrics matching the search query.
diff --git a/packages/datadog-api-client-v1/models/MetricSearchResponseResults.ts b/packages/datadog-api-client-v1/models/MetricSearchResponseResults.ts
index 759e9fb61def..141e2a50aae5 100644
--- a/packages/datadog-api-client-v1/models/MetricSearchResponseResults.ts
+++ b/packages/datadog-api-client-v1/models/MetricSearchResponseResults.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Search result.
diff --git a/packages/datadog-api-client-v1/models/MetricsListResponse.ts b/packages/datadog-api-client-v1/models/MetricsListResponse.ts
index 24efdfae709f..93bec5a7c201 100644
--- a/packages/datadog-api-client-v1/models/MetricsListResponse.ts
+++ b/packages/datadog-api-client-v1/models/MetricsListResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object listing all metric names stored by Datadog since a given time.
diff --git a/packages/datadog-api-client-v1/models/MetricsPayload.ts b/packages/datadog-api-client-v1/models/MetricsPayload.ts
index 3d35120f257e..228ce325cc02 100644
--- a/packages/datadog-api-client-v1/models/MetricsPayload.ts
+++ b/packages/datadog-api-client-v1/models/MetricsPayload.ts
@@ -9,7 +9,7 @@
  */
 
 import { Series } from "./Series";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metrics' payload.
diff --git a/packages/datadog-api-client-v1/models/MetricsQueryMetadata.ts b/packages/datadog-api-client-v1/models/MetricsQueryMetadata.ts
index ccf2bfccfd43..322d4be968da 100644
--- a/packages/datadog-api-client-v1/models/MetricsQueryMetadata.ts
+++ b/packages/datadog-api-client-v1/models/MetricsQueryMetadata.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricsQueryUnit } from "./MetricsQueryUnit";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing all metric names returned and their associated metadata.
diff --git a/packages/datadog-api-client-v1/models/MetricsQueryResponse.ts b/packages/datadog-api-client-v1/models/MetricsQueryResponse.ts
index 789f9ca93ce3..729d49ea5525 100644
--- a/packages/datadog-api-client-v1/models/MetricsQueryResponse.ts
+++ b/packages/datadog-api-client-v1/models/MetricsQueryResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricsQueryMetadata } from "./MetricsQueryMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response Object that includes your query and the list of metrics retrieved.
diff --git a/packages/datadog-api-client-v1/models/MetricsQueryUnit.ts b/packages/datadog-api-client-v1/models/MetricsQueryUnit.ts
index 37c0c1336e7e..263109110055 100644
--- a/packages/datadog-api-client-v1/models/MetricsQueryUnit.ts
+++ b/packages/datadog-api-client-v1/models/MetricsQueryUnit.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the metric unit family, scale factor, name, and short name.
diff --git a/packages/datadog-api-client-v1/models/Monitor.ts b/packages/datadog-api-client-v1/models/Monitor.ts
index f104e86deaa6..adeba19cb5d9 100644
--- a/packages/datadog-api-client-v1/models/Monitor.ts
+++ b/packages/datadog-api-client-v1/models/Monitor.ts
@@ -13,7 +13,7 @@ import { MonitorOptions } from "./MonitorOptions";
 import { MonitorOverallStates } from "./MonitorOverallStates";
 import { MonitorState } from "./MonitorState";
 import { MonitorType } from "./MonitorType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing a monitor.
diff --git a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinition.ts b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinition.ts
index bacc412051ac..84c934027bb6 100644
--- a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinition.ts
@@ -12,7 +12,7 @@ import { MonitorFormulaAndFunctionEventQueryDefinitionCompute } from "./MonitorF
 import { MonitorFormulaAndFunctionEventQueryDefinitionSearch } from "./MonitorFormulaAndFunctionEventQueryDefinitionSearch";
 import { MonitorFormulaAndFunctionEventQueryGroupBy } from "./MonitorFormulaAndFunctionEventQueryGroupBy";
 import { MonitorFormulaAndFunctionEventsDataSource } from "./MonitorFormulaAndFunctionEventsDataSource";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A formula and functions events query.
diff --git a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinitionCompute.ts b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinitionCompute.ts
index eda61b475297..eaa3ee67c697 100644
--- a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinitionCompute.ts
+++ b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinitionCompute.ts
@@ -9,7 +9,7 @@
  */
 
 import { MonitorFormulaAndFunctionEventAggregation } from "./MonitorFormulaAndFunctionEventAggregation";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Compute options.
diff --git a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinitionSearch.ts b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinitionSearch.ts
index adfe75b0211b..cd1fa1e192e8 100644
--- a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinitionSearch.ts
+++ b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryDefinitionSearch.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Search options.
diff --git a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryGroupBy.ts b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryGroupBy.ts
index a7f37f8fe295..42a688c7489a 100644
--- a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryGroupBy.ts
+++ b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryGroupBy.ts
@@ -9,7 +9,7 @@
  */
 
 import { MonitorFormulaAndFunctionEventQueryGroupBySort } from "./MonitorFormulaAndFunctionEventQueryGroupBySort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of objects used to group by.
diff --git a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryGroupBySort.ts b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryGroupBySort.ts
index d0915072c696..9122e1751e09 100644
--- a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryGroupBySort.ts
+++ b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionEventQueryGroupBySort.ts
@@ -10,7 +10,7 @@
 
 import { MonitorFormulaAndFunctionEventAggregation } from "./MonitorFormulaAndFunctionEventAggregation";
 import { QuerySortOrder } from "./QuerySortOrder";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Options for sorting group by results.
diff --git a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionQueryDefinition.ts b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionQueryDefinition.ts
index 284aa77c3378..34c7b3519eb3 100644
--- a/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/MonitorFormulaAndFunctionQueryDefinition.ts
@@ -9,7 +9,7 @@
  */
 
 import { MonitorFormulaAndFunctionEventQueryDefinition } from "./MonitorFormulaAndFunctionEventQueryDefinition";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * A formula and function query.
diff --git a/packages/datadog-api-client-v1/models/MonitorGroupSearchResponse.ts b/packages/datadog-api-client-v1/models/MonitorGroupSearchResponse.ts
index 22a73b5cca8a..894ae994d238 100644
--- a/packages/datadog-api-client-v1/models/MonitorGroupSearchResponse.ts
+++ b/packages/datadog-api-client-v1/models/MonitorGroupSearchResponse.ts
@@ -11,7 +11,7 @@
 import { MonitorGroupSearchResponseCounts } from "./MonitorGroupSearchResponseCounts";
 import { MonitorGroupSearchResult } from "./MonitorGroupSearchResult";
 import { MonitorSearchResponseMetadata } from "./MonitorSearchResponseMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response of a monitor group search.
diff --git a/packages/datadog-api-client-v1/models/MonitorGroupSearchResponseCounts.ts b/packages/datadog-api-client-v1/models/MonitorGroupSearchResponseCounts.ts
index 139c2d00fbae..3a75c47c8662 100644
--- a/packages/datadog-api-client-v1/models/MonitorGroupSearchResponseCounts.ts
+++ b/packages/datadog-api-client-v1/models/MonitorGroupSearchResponseCounts.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The counts of monitor groups per different criteria.
diff --git a/packages/datadog-api-client-v1/models/MonitorGroupSearchResult.ts b/packages/datadog-api-client-v1/models/MonitorGroupSearchResult.ts
index cef3330e5f76..32fd00c3a725 100644
--- a/packages/datadog-api-client-v1/models/MonitorGroupSearchResult.ts
+++ b/packages/datadog-api-client-v1/models/MonitorGroupSearchResult.ts
@@ -9,7 +9,7 @@
  */
 
 import { MonitorOverallStates } from "./MonitorOverallStates";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A single monitor group search result.
diff --git a/packages/datadog-api-client-v1/models/MonitorOptions.ts b/packages/datadog-api-client-v1/models/MonitorOptions.ts
index dded2665fab7..a0d46b12bc9b 100644
--- a/packages/datadog-api-client-v1/models/MonitorOptions.ts
+++ b/packages/datadog-api-client-v1/models/MonitorOptions.ts
@@ -14,7 +14,7 @@ import { MonitorOptionsAggregation } from "./MonitorOptionsAggregation";
 import { MonitorRenotifyStatusType } from "./MonitorRenotifyStatusType";
 import { MonitorThresholdWindowOptions } from "./MonitorThresholdWindowOptions";
 import { MonitorThresholds } from "./MonitorThresholds";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of options associated with your monitor.
diff --git a/packages/datadog-api-client-v1/models/MonitorOptionsAggregation.ts b/packages/datadog-api-client-v1/models/MonitorOptionsAggregation.ts
index 16cdb9cd6d7d..24bda9569479 100644
--- a/packages/datadog-api-client-v1/models/MonitorOptionsAggregation.ts
+++ b/packages/datadog-api-client-v1/models/MonitorOptionsAggregation.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Type of aggregation performed in the monitor query.
diff --git a/packages/datadog-api-client-v1/models/MonitorSearchResponse.ts b/packages/datadog-api-client-v1/models/MonitorSearchResponse.ts
index e88062a6003d..6e66b2a818bc 100644
--- a/packages/datadog-api-client-v1/models/MonitorSearchResponse.ts
+++ b/packages/datadog-api-client-v1/models/MonitorSearchResponse.ts
@@ -11,7 +11,7 @@
 import { MonitorSearchResponseCounts } from "./MonitorSearchResponseCounts";
 import { MonitorSearchResponseMetadata } from "./MonitorSearchResponseMetadata";
 import { MonitorSearchResult } from "./MonitorSearchResult";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response form a monitor search.
diff --git a/packages/datadog-api-client-v1/models/MonitorSearchResponseCounts.ts b/packages/datadog-api-client-v1/models/MonitorSearchResponseCounts.ts
index 8722cb2269b8..871fe6819229 100644
--- a/packages/datadog-api-client-v1/models/MonitorSearchResponseCounts.ts
+++ b/packages/datadog-api-client-v1/models/MonitorSearchResponseCounts.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The counts of monitors per different criteria.
diff --git a/packages/datadog-api-client-v1/models/MonitorSearchResponseMetadata.ts b/packages/datadog-api-client-v1/models/MonitorSearchResponseMetadata.ts
index f2e98c007cb7..276444146bee 100644
--- a/packages/datadog-api-client-v1/models/MonitorSearchResponseMetadata.ts
+++ b/packages/datadog-api-client-v1/models/MonitorSearchResponseMetadata.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Metadata about the response.
diff --git a/packages/datadog-api-client-v1/models/MonitorSearchResult.ts b/packages/datadog-api-client-v1/models/MonitorSearchResult.ts
index fcd3c7e10f5a..dc1247832d7f 100644
--- a/packages/datadog-api-client-v1/models/MonitorSearchResult.ts
+++ b/packages/datadog-api-client-v1/models/MonitorSearchResult.ts
@@ -12,7 +12,7 @@ import { Creator } from "./Creator";
 import { MonitorOverallStates } from "./MonitorOverallStates";
 import { MonitorSearchResultNotification } from "./MonitorSearchResultNotification";
 import { MonitorType } from "./MonitorType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Holds search results.
diff --git a/packages/datadog-api-client-v1/models/MonitorSearchResultNotification.ts b/packages/datadog-api-client-v1/models/MonitorSearchResultNotification.ts
index 3d355a79e2ce..335af9d1da9e 100644
--- a/packages/datadog-api-client-v1/models/MonitorSearchResultNotification.ts
+++ b/packages/datadog-api-client-v1/models/MonitorSearchResultNotification.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A notification triggered by the monitor.
diff --git a/packages/datadog-api-client-v1/models/MonitorState.ts b/packages/datadog-api-client-v1/models/MonitorState.ts
index bcd116c7835d..154dacff54de 100644
--- a/packages/datadog-api-client-v1/models/MonitorState.ts
+++ b/packages/datadog-api-client-v1/models/MonitorState.ts
@@ -9,7 +9,7 @@
  */
 
 import { MonitorStateGroup } from "./MonitorStateGroup";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Wrapper object with the different monitor states.
diff --git a/packages/datadog-api-client-v1/models/MonitorStateGroup.ts b/packages/datadog-api-client-v1/models/MonitorStateGroup.ts
index 66351ff22299..0aaa697666fc 100644
--- a/packages/datadog-api-client-v1/models/MonitorStateGroup.ts
+++ b/packages/datadog-api-client-v1/models/MonitorStateGroup.ts
@@ -9,7 +9,7 @@
  */
 
 import { MonitorOverallStates } from "./MonitorOverallStates";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Monitor state for a single group.
diff --git a/packages/datadog-api-client-v1/models/MonitorSummaryWidgetDefinition.ts b/packages/datadog-api-client-v1/models/MonitorSummaryWidgetDefinition.ts
index 6d71946d6ac9..7454de570ec9 100644
--- a/packages/datadog-api-client-v1/models/MonitorSummaryWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/MonitorSummaryWidgetDefinition.ts
@@ -14,7 +14,7 @@ import { WidgetMonitorSummaryDisplayFormat } from "./WidgetMonitorSummaryDisplay
 import { WidgetMonitorSummarySort } from "./WidgetMonitorSummarySort";
 import { WidgetSummaryType } from "./WidgetSummaryType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The monitor summary widget displays a summary view of all your Datadog monitors, or a subset based on a query. Only available on FREE layout dashboards.
diff --git a/packages/datadog-api-client-v1/models/MonitorThresholdWindowOptions.ts b/packages/datadog-api-client-v1/models/MonitorThresholdWindowOptions.ts
index f540e5f69b89..e6ba0eeb137a 100644
--- a/packages/datadog-api-client-v1/models/MonitorThresholdWindowOptions.ts
+++ b/packages/datadog-api-client-v1/models/MonitorThresholdWindowOptions.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Alerting time window options.
diff --git a/packages/datadog-api-client-v1/models/MonitorThresholds.ts b/packages/datadog-api-client-v1/models/MonitorThresholds.ts
index 913d0047e0b0..7368f9e114c6 100644
--- a/packages/datadog-api-client-v1/models/MonitorThresholds.ts
+++ b/packages/datadog-api-client-v1/models/MonitorThresholds.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of the different monitor threshold available.
diff --git a/packages/datadog-api-client-v1/models/MonitorUpdateRequest.ts b/packages/datadog-api-client-v1/models/MonitorUpdateRequest.ts
index 52b2d011a049..554366ce61dc 100644
--- a/packages/datadog-api-client-v1/models/MonitorUpdateRequest.ts
+++ b/packages/datadog-api-client-v1/models/MonitorUpdateRequest.ts
@@ -13,7 +13,7 @@ import { MonitorOptions } from "./MonitorOptions";
 import { MonitorOverallStates } from "./MonitorOverallStates";
 import { MonitorState } from "./MonitorState";
 import { MonitorType } from "./MonitorType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing a monitor update request.
diff --git a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionBody.ts b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionBody.ts
index 6e1886b44282..0c33caea8fe5 100644
--- a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionBody.ts
+++ b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionBody.ts
@@ -9,7 +9,7 @@
  */
 
 import { MonthlyUsageAttributionValues } from "./MonthlyUsageAttributionValues";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Usage Summary by tag for a given organization.
diff --git a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionMetadata.ts b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionMetadata.ts
index 263c672b5036..d358e805544f 100644
--- a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionMetadata.ts
+++ b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionMetadata.ts
@@ -10,7 +10,7 @@
 
 import { MonthlyUsageAttributionPagination } from "./MonthlyUsageAttributionPagination";
 import { UsageAttributionAggregatesBody } from "./UsageAttributionAggregatesBody";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing document metadata.
diff --git a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionPagination.ts b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionPagination.ts
index 9fb9a03e8105..4a24eba2fbc4 100644
--- a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionPagination.ts
+++ b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionPagination.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata for the current pagination.
diff --git a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionResponse.ts b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionResponse.ts
index f5b7e940d769..25e5d889b975 100644
--- a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionResponse.ts
+++ b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionResponse.ts
@@ -10,7 +10,7 @@
 
 import { MonthlyUsageAttributionBody } from "./MonthlyUsageAttributionBody";
 import { MonthlyUsageAttributionMetadata } from "./MonthlyUsageAttributionMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the monthly Usage Summary by tag(s).
diff --git a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionValues.ts b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionValues.ts
index f20723dad9e7..76156122083f 100644
--- a/packages/datadog-api-client-v1/models/MonthlyUsageAttributionValues.ts
+++ b/packages/datadog-api-client-v1/models/MonthlyUsageAttributionValues.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Fields in Usage Summary by tag(s).
diff --git a/packages/datadog-api-client-v1/models/NoteWidgetDefinition.ts b/packages/datadog-api-client-v1/models/NoteWidgetDefinition.ts
index 24f12253ec24..00f45f887c66 100644
--- a/packages/datadog-api-client-v1/models/NoteWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/NoteWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { NoteWidgetDefinitionType } from "./NoteWidgetDefinitionType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTickEdge } from "./WidgetTickEdge";
 import { WidgetVerticalAlign } from "./WidgetVerticalAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The notes and links widget is similar to free text widget, but allows for more formatting options.
diff --git a/packages/datadog-api-client-v1/models/NotebookAbsoluteTime.ts b/packages/datadog-api-client-v1/models/NotebookAbsoluteTime.ts
index 60f1395c8c01..2983f060b686 100644
--- a/packages/datadog-api-client-v1/models/NotebookAbsoluteTime.ts
+++ b/packages/datadog-api-client-v1/models/NotebookAbsoluteTime.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Absolute timeframe.
diff --git a/packages/datadog-api-client-v1/models/NotebookAuthor.ts b/packages/datadog-api-client-v1/models/NotebookAuthor.ts
index 872da1c92e30..dfa50a93a892 100644
--- a/packages/datadog-api-client-v1/models/NotebookAuthor.ts
+++ b/packages/datadog-api-client-v1/models/NotebookAuthor.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of user object returned by the API.
diff --git a/packages/datadog-api-client-v1/models/NotebookCellCreateRequest.ts b/packages/datadog-api-client-v1/models/NotebookCellCreateRequest.ts
index fb9df4f5c456..abd3961acb14 100644
--- a/packages/datadog-api-client-v1/models/NotebookCellCreateRequest.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCellCreateRequest.ts
@@ -10,7 +10,7 @@
 
 import { NotebookCellCreateRequestAttributes } from "./NotebookCellCreateRequestAttributes";
 import { NotebookCellResourceType } from "./NotebookCellResourceType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The description of a notebook cell create request.
diff --git a/packages/datadog-api-client-v1/models/NotebookCellCreateRequestAttributes.ts b/packages/datadog-api-client-v1/models/NotebookCellCreateRequestAttributes.ts
index 89a4c8dc5394..fe7dbfe051f6 100644
--- a/packages/datadog-api-client-v1/models/NotebookCellCreateRequestAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCellCreateRequestAttributes.ts
@@ -14,7 +14,7 @@ import { NotebookLogStreamCellAttributes } from "./NotebookLogStreamCellAttribut
 import { NotebookMarkdownCellAttributes } from "./NotebookMarkdownCellAttributes";
 import { NotebookTimeseriesCellAttributes } from "./NotebookTimeseriesCellAttributes";
 import { NotebookToplistCellAttributes } from "./NotebookToplistCellAttributes";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * The attributes of a notebook cell in create cell request. Valid cell types are `markdown`, `timeseries`, `toplist`, `heatmap`, `distribution`, `log_stream`. [More information on each graph visualization type.](https://docs.datadoghq.com/dashboards/widgets/)
diff --git a/packages/datadog-api-client-v1/models/NotebookCellResponse.ts b/packages/datadog-api-client-v1/models/NotebookCellResponse.ts
index 5fd8e8c73886..1da1446eba78 100644
--- a/packages/datadog-api-client-v1/models/NotebookCellResponse.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCellResponse.ts
@@ -10,7 +10,7 @@
 
 import { NotebookCellResourceType } from "./NotebookCellResourceType";
 import { NotebookCellResponseAttributes } from "./NotebookCellResponseAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The description of a notebook cell response.
diff --git a/packages/datadog-api-client-v1/models/NotebookCellResponseAttributes.ts b/packages/datadog-api-client-v1/models/NotebookCellResponseAttributes.ts
index 2cd8c5ce62e9..dd5ed0d5b7c0 100644
--- a/packages/datadog-api-client-v1/models/NotebookCellResponseAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCellResponseAttributes.ts
@@ -14,7 +14,7 @@ import { NotebookLogStreamCellAttributes } from "./NotebookLogStreamCellAttribut
 import { NotebookMarkdownCellAttributes } from "./NotebookMarkdownCellAttributes";
 import { NotebookTimeseriesCellAttributes } from "./NotebookTimeseriesCellAttributes";
 import { NotebookToplistCellAttributes } from "./NotebookToplistCellAttributes";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * The attributes of a notebook cell response. Valid cell types are `markdown`, `timeseries`, `toplist`, `heatmap`, `distribution`, `log_stream`. [More information on each graph visualization type.](https://docs.datadoghq.com/dashboards/widgets/)
diff --git a/packages/datadog-api-client-v1/models/NotebookCellTime.ts b/packages/datadog-api-client-v1/models/NotebookCellTime.ts
index c02ec23077ed..080eac9d5d94 100644
--- a/packages/datadog-api-client-v1/models/NotebookCellTime.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCellTime.ts
@@ -10,7 +10,7 @@
 
 import { NotebookAbsoluteTime } from "./NotebookAbsoluteTime";
 import { NotebookRelativeTime } from "./NotebookRelativeTime";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Timeframe for the notebook cell. When 'null', the notebook global time is used.
diff --git a/packages/datadog-api-client-v1/models/NotebookCellUpdateRequest.ts b/packages/datadog-api-client-v1/models/NotebookCellUpdateRequest.ts
index 07d11bca457f..4b2090bebc16 100644
--- a/packages/datadog-api-client-v1/models/NotebookCellUpdateRequest.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCellUpdateRequest.ts
@@ -10,7 +10,7 @@
 
 import { NotebookCellResourceType } from "./NotebookCellResourceType";
 import { NotebookCellUpdateRequestAttributes } from "./NotebookCellUpdateRequestAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The description of a notebook cell update request.
diff --git a/packages/datadog-api-client-v1/models/NotebookCellUpdateRequestAttributes.ts b/packages/datadog-api-client-v1/models/NotebookCellUpdateRequestAttributes.ts
index 02f929cf4095..38f39d292768 100644
--- a/packages/datadog-api-client-v1/models/NotebookCellUpdateRequestAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCellUpdateRequestAttributes.ts
@@ -14,7 +14,7 @@ import { NotebookLogStreamCellAttributes } from "./NotebookLogStreamCellAttribut
 import { NotebookMarkdownCellAttributes } from "./NotebookMarkdownCellAttributes";
 import { NotebookTimeseriesCellAttributes } from "./NotebookTimeseriesCellAttributes";
 import { NotebookToplistCellAttributes } from "./NotebookToplistCellAttributes";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * The attributes of a notebook cell in update cell request. Valid cell types are `markdown`, `timeseries`, `toplist`, `heatmap`, `distribution`, `log_stream`. [More information on each graph visualization type.](https://docs.datadoghq.com/dashboards/widgets/)
diff --git a/packages/datadog-api-client-v1/models/NotebookCreateData.ts b/packages/datadog-api-client-v1/models/NotebookCreateData.ts
index cae77c84aa63..854d1a70f1ab 100644
--- a/packages/datadog-api-client-v1/models/NotebookCreateData.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCreateData.ts
@@ -10,7 +10,7 @@
 
 import { NotebookCreateDataAttributes } from "./NotebookCreateDataAttributes";
 import { NotebookResourceType } from "./NotebookResourceType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The data for a notebook create request.
diff --git a/packages/datadog-api-client-v1/models/NotebookCreateDataAttributes.ts b/packages/datadog-api-client-v1/models/NotebookCreateDataAttributes.ts
index bb0879e52ab7..c6ba83c6c1f0 100644
--- a/packages/datadog-api-client-v1/models/NotebookCreateDataAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCreateDataAttributes.ts
@@ -12,7 +12,7 @@ import { NotebookCellCreateRequest } from "./NotebookCellCreateRequest";
 import { NotebookGlobalTime } from "./NotebookGlobalTime";
 import { NotebookMetadata } from "./NotebookMetadata";
 import { NotebookStatus } from "./NotebookStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The data attributes of a notebook.
diff --git a/packages/datadog-api-client-v1/models/NotebookCreateRequest.ts b/packages/datadog-api-client-v1/models/NotebookCreateRequest.ts
index 69660a8defd2..22254f5d7bd8 100644
--- a/packages/datadog-api-client-v1/models/NotebookCreateRequest.ts
+++ b/packages/datadog-api-client-v1/models/NotebookCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { NotebookCreateData } from "./NotebookCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The description of a notebook create request.
diff --git a/packages/datadog-api-client-v1/models/NotebookDistributionCellAttributes.ts b/packages/datadog-api-client-v1/models/NotebookDistributionCellAttributes.ts
index 11831c5ddb67..19861063448a 100644
--- a/packages/datadog-api-client-v1/models/NotebookDistributionCellAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookDistributionCellAttributes.ts
@@ -12,7 +12,7 @@ import { DistributionWidgetDefinition } from "./DistributionWidgetDefinition";
 import { NotebookCellTime } from "./NotebookCellTime";
 import { NotebookGraphSize } from "./NotebookGraphSize";
 import { NotebookSplitBy } from "./NotebookSplitBy";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of a notebook `distribution` cell.
diff --git a/packages/datadog-api-client-v1/models/NotebookGlobalTime.ts b/packages/datadog-api-client-v1/models/NotebookGlobalTime.ts
index 154092d381fd..05e8ac6da6fc 100644
--- a/packages/datadog-api-client-v1/models/NotebookGlobalTime.ts
+++ b/packages/datadog-api-client-v1/models/NotebookGlobalTime.ts
@@ -10,7 +10,7 @@
 
 import { NotebookAbsoluteTime } from "./NotebookAbsoluteTime";
 import { NotebookRelativeTime } from "./NotebookRelativeTime";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Notebook global timeframe.
diff --git a/packages/datadog-api-client-v1/models/NotebookHeatMapCellAttributes.ts b/packages/datadog-api-client-v1/models/NotebookHeatMapCellAttributes.ts
index 77e8e7c01517..c5dc5b301fd0 100644
--- a/packages/datadog-api-client-v1/models/NotebookHeatMapCellAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookHeatMapCellAttributes.ts
@@ -12,7 +12,7 @@ import { HeatMapWidgetDefinition } from "./HeatMapWidgetDefinition";
 import { NotebookCellTime } from "./NotebookCellTime";
 import { NotebookGraphSize } from "./NotebookGraphSize";
 import { NotebookSplitBy } from "./NotebookSplitBy";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of a notebook `heatmap` cell.
diff --git a/packages/datadog-api-client-v1/models/NotebookLogStreamCellAttributes.ts b/packages/datadog-api-client-v1/models/NotebookLogStreamCellAttributes.ts
index 697942d77a56..11658db1e8f3 100644
--- a/packages/datadog-api-client-v1/models/NotebookLogStreamCellAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookLogStreamCellAttributes.ts
@@ -11,7 +11,7 @@
 import { LogStreamWidgetDefinition } from "./LogStreamWidgetDefinition";
 import { NotebookCellTime } from "./NotebookCellTime";
 import { NotebookGraphSize } from "./NotebookGraphSize";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of a notebook `log_stream` cell.
diff --git a/packages/datadog-api-client-v1/models/NotebookMarkdownCellAttributes.ts b/packages/datadog-api-client-v1/models/NotebookMarkdownCellAttributes.ts
index 452b2a17afa2..abf71dd84a29 100644
--- a/packages/datadog-api-client-v1/models/NotebookMarkdownCellAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookMarkdownCellAttributes.ts
@@ -9,7 +9,7 @@
  */
 
 import { NotebookMarkdownCellDefinition } from "./NotebookMarkdownCellDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of a notebook `markdown` cell.
diff --git a/packages/datadog-api-client-v1/models/NotebookMarkdownCellDefinition.ts b/packages/datadog-api-client-v1/models/NotebookMarkdownCellDefinition.ts
index cedf3bca543e..54b3b9a3fa72 100644
--- a/packages/datadog-api-client-v1/models/NotebookMarkdownCellDefinition.ts
+++ b/packages/datadog-api-client-v1/models/NotebookMarkdownCellDefinition.ts
@@ -9,7 +9,7 @@
  */
 
 import { NotebookMarkdownCellDefinitionType } from "./NotebookMarkdownCellDefinitionType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Text in a notebook is formatted with [Markdown](https://daringfireball.net/projects/markdown/), which enables the use of headings, subheadings, links, images, lists, and code blocks.
diff --git a/packages/datadog-api-client-v1/models/NotebookMetadata.ts b/packages/datadog-api-client-v1/models/NotebookMetadata.ts
index c63d83e4d6ff..35d8af50faeb 100644
--- a/packages/datadog-api-client-v1/models/NotebookMetadata.ts
+++ b/packages/datadog-api-client-v1/models/NotebookMetadata.ts
@@ -9,7 +9,7 @@
  */
 
 import { NotebookMetadataType } from "./NotebookMetadataType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Metadata associated with the notebook.
diff --git a/packages/datadog-api-client-v1/models/NotebookRelativeTime.ts b/packages/datadog-api-client-v1/models/NotebookRelativeTime.ts
index e93cdf20693b..f5c5f225a97a 100644
--- a/packages/datadog-api-client-v1/models/NotebookRelativeTime.ts
+++ b/packages/datadog-api-client-v1/models/NotebookRelativeTime.ts
@@ -9,7 +9,7 @@
  */
 
 import { WidgetLiveSpan } from "./WidgetLiveSpan";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relative timeframe.
diff --git a/packages/datadog-api-client-v1/models/NotebookResponse.ts b/packages/datadog-api-client-v1/models/NotebookResponse.ts
index 9e506e72a051..7704e06079b3 100644
--- a/packages/datadog-api-client-v1/models/NotebookResponse.ts
+++ b/packages/datadog-api-client-v1/models/NotebookResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { NotebookResponseData } from "./NotebookResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The description of a notebook response.
diff --git a/packages/datadog-api-client-v1/models/NotebookResponseData.ts b/packages/datadog-api-client-v1/models/NotebookResponseData.ts
index e04853008992..a2f9eed0026b 100644
--- a/packages/datadog-api-client-v1/models/NotebookResponseData.ts
+++ b/packages/datadog-api-client-v1/models/NotebookResponseData.ts
@@ -10,7 +10,7 @@
 
 import { NotebookResourceType } from "./NotebookResourceType";
 import { NotebookResponseDataAttributes } from "./NotebookResponseDataAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The data for a notebook.
diff --git a/packages/datadog-api-client-v1/models/NotebookResponseDataAttributes.ts b/packages/datadog-api-client-v1/models/NotebookResponseDataAttributes.ts
index e9679119f4e5..3af068cdda78 100644
--- a/packages/datadog-api-client-v1/models/NotebookResponseDataAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookResponseDataAttributes.ts
@@ -13,7 +13,7 @@ import { NotebookCellResponse } from "./NotebookCellResponse";
 import { NotebookGlobalTime } from "./NotebookGlobalTime";
 import { NotebookMetadata } from "./NotebookMetadata";
 import { NotebookStatus } from "./NotebookStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of a notebook.
diff --git a/packages/datadog-api-client-v1/models/NotebookSplitBy.ts b/packages/datadog-api-client-v1/models/NotebookSplitBy.ts
index 8419d666268a..adc547a6d8f4 100644
--- a/packages/datadog-api-client-v1/models/NotebookSplitBy.ts
+++ b/packages/datadog-api-client-v1/models/NotebookSplitBy.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing how to split the graph to display multiple visualizations per request.
diff --git a/packages/datadog-api-client-v1/models/NotebookTimeseriesCellAttributes.ts b/packages/datadog-api-client-v1/models/NotebookTimeseriesCellAttributes.ts
index 4ee558dc5901..6b0520860768 100644
--- a/packages/datadog-api-client-v1/models/NotebookTimeseriesCellAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookTimeseriesCellAttributes.ts
@@ -12,7 +12,7 @@ import { NotebookCellTime } from "./NotebookCellTime";
 import { NotebookGraphSize } from "./NotebookGraphSize";
 import { NotebookSplitBy } from "./NotebookSplitBy";
 import { TimeseriesWidgetDefinition } from "./TimeseriesWidgetDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of a notebook `timeseries` cell.
diff --git a/packages/datadog-api-client-v1/models/NotebookToplistCellAttributes.ts b/packages/datadog-api-client-v1/models/NotebookToplistCellAttributes.ts
index cd06e15dabdf..58fcf15cce6f 100644
--- a/packages/datadog-api-client-v1/models/NotebookToplistCellAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookToplistCellAttributes.ts
@@ -12,7 +12,7 @@ import { NotebookCellTime } from "./NotebookCellTime";
 import { NotebookGraphSize } from "./NotebookGraphSize";
 import { NotebookSplitBy } from "./NotebookSplitBy";
 import { ToplistWidgetDefinition } from "./ToplistWidgetDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of a notebook `toplist` cell.
diff --git a/packages/datadog-api-client-v1/models/NotebookUpdateCell.ts b/packages/datadog-api-client-v1/models/NotebookUpdateCell.ts
index 56f489fdaa0f..16d4726a9b03 100644
--- a/packages/datadog-api-client-v1/models/NotebookUpdateCell.ts
+++ b/packages/datadog-api-client-v1/models/NotebookUpdateCell.ts
@@ -10,7 +10,7 @@
 
 import { NotebookCellCreateRequest } from "./NotebookCellCreateRequest";
 import { NotebookCellUpdateRequest } from "./NotebookCellUpdateRequest";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Updating a notebook can either insert new cell(s) or update existing cell(s) by including the cell `id`. To delete existing cell(s), simply omit it from the list of cells.
diff --git a/packages/datadog-api-client-v1/models/NotebookUpdateData.ts b/packages/datadog-api-client-v1/models/NotebookUpdateData.ts
index 249da1161a00..6d4ba18c2d8c 100644
--- a/packages/datadog-api-client-v1/models/NotebookUpdateData.ts
+++ b/packages/datadog-api-client-v1/models/NotebookUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { NotebookResourceType } from "./NotebookResourceType";
 import { NotebookUpdateDataAttributes } from "./NotebookUpdateDataAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The data for a notebook update request.
diff --git a/packages/datadog-api-client-v1/models/NotebookUpdateDataAttributes.ts b/packages/datadog-api-client-v1/models/NotebookUpdateDataAttributes.ts
index e3fc8ef8f6e2..c22983b24ffd 100644
--- a/packages/datadog-api-client-v1/models/NotebookUpdateDataAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebookUpdateDataAttributes.ts
@@ -12,7 +12,7 @@ import { NotebookGlobalTime } from "./NotebookGlobalTime";
 import { NotebookMetadata } from "./NotebookMetadata";
 import { NotebookStatus } from "./NotebookStatus";
 import { NotebookUpdateCell } from "./NotebookUpdateCell";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The data attributes of a notebook.
diff --git a/packages/datadog-api-client-v1/models/NotebookUpdateRequest.ts b/packages/datadog-api-client-v1/models/NotebookUpdateRequest.ts
index 89d6ffda6978..46b4f52cc4e5 100644
--- a/packages/datadog-api-client-v1/models/NotebookUpdateRequest.ts
+++ b/packages/datadog-api-client-v1/models/NotebookUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { NotebookUpdateData } from "./NotebookUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The description of a notebook update request.
diff --git a/packages/datadog-api-client-v1/models/NotebooksResponse.ts b/packages/datadog-api-client-v1/models/NotebooksResponse.ts
index ab7e2160d712..9419af1b5ee6 100644
--- a/packages/datadog-api-client-v1/models/NotebooksResponse.ts
+++ b/packages/datadog-api-client-v1/models/NotebooksResponse.ts
@@ -10,7 +10,7 @@
 
 import { NotebooksResponseData } from "./NotebooksResponseData";
 import { NotebooksResponseMeta } from "./NotebooksResponseMeta";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Notebooks get all response.
diff --git a/packages/datadog-api-client-v1/models/NotebooksResponseData.ts b/packages/datadog-api-client-v1/models/NotebooksResponseData.ts
index a644c63899d3..aecb213dfb92 100644
--- a/packages/datadog-api-client-v1/models/NotebooksResponseData.ts
+++ b/packages/datadog-api-client-v1/models/NotebooksResponseData.ts
@@ -10,7 +10,7 @@
 
 import { NotebookResourceType } from "./NotebookResourceType";
 import { NotebooksResponseDataAttributes } from "./NotebooksResponseDataAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The data for a notebook in get all response.
diff --git a/packages/datadog-api-client-v1/models/NotebooksResponseDataAttributes.ts b/packages/datadog-api-client-v1/models/NotebooksResponseDataAttributes.ts
index c5f64159e495..d2d6f0d33714 100644
--- a/packages/datadog-api-client-v1/models/NotebooksResponseDataAttributes.ts
+++ b/packages/datadog-api-client-v1/models/NotebooksResponseDataAttributes.ts
@@ -13,7 +13,7 @@ import { NotebookCellResponse } from "./NotebookCellResponse";
 import { NotebookGlobalTime } from "./NotebookGlobalTime";
 import { NotebookMetadata } from "./NotebookMetadata";
 import { NotebookStatus } from "./NotebookStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of a notebook in get all response.
diff --git a/packages/datadog-api-client-v1/models/NotebooksResponseMeta.ts b/packages/datadog-api-client-v1/models/NotebooksResponseMeta.ts
index 7ceabe43d07d..ec0836d316af 100644
--- a/packages/datadog-api-client-v1/models/NotebooksResponseMeta.ts
+++ b/packages/datadog-api-client-v1/models/NotebooksResponseMeta.ts
@@ -9,7 +9,7 @@
  */
 
 import { NotebooksResponsePage } from "./NotebooksResponsePage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Searches metadata returned by the API.
diff --git a/packages/datadog-api-client-v1/models/NotebooksResponsePage.ts b/packages/datadog-api-client-v1/models/NotebooksResponsePage.ts
index e3c1a1ec4c22..d7f746ef5751 100644
--- a/packages/datadog-api-client-v1/models/NotebooksResponsePage.ts
+++ b/packages/datadog-api-client-v1/models/NotebooksResponsePage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Pagination metadata returned by the API.
diff --git a/packages/datadog-api-client-v1/models/ObjectSerializer.ts b/packages/datadog-api-client-v1/models/ObjectSerializer.ts
index 1621526a87f4..3fd3208ce563 100644
--- a/packages/datadog-api-client-v1/models/ObjectSerializer.ts
+++ b/packages/datadog-api-client-v1/models/ObjectSerializer.ts
@@ -500,7 +500,8 @@ import { WidgetMarker } from "./WidgetMarker";
 import { WidgetRequestStyle } from "./WidgetRequestStyle";
 import { WidgetStyle } from "./WidgetStyle";
 import { WidgetTime } from "./WidgetTime";
-import { logger } from "../../../index";
+import { UnparsedObject } from "../util";
+import { logger } from "../../../logger";
 
 const primitives = [
   "string",
@@ -2093,19 +2094,3 @@ export class ObjectSerializer {
     }
   }
 }
-
-export class UnparsedObject {
-  unparsedObject: any;
-  constructor(data: any) {
-    this.unparsedObject = data;
-  }
-}
-
-export type AttributeTypeMap = {
-  [key: string]: {
-    baseName: string;
-    type: string;
-    required?: boolean;
-    format?: string;
-  };
-};
diff --git a/packages/datadog-api-client-v1/models/Organization.ts b/packages/datadog-api-client-v1/models/Organization.ts
index d40971576873..65e9023af10e 100644
--- a/packages/datadog-api-client-v1/models/Organization.ts
+++ b/packages/datadog-api-client-v1/models/Organization.ts
@@ -11,7 +11,7 @@
 import { OrganizationBilling } from "./OrganizationBilling";
 import { OrganizationSettings } from "./OrganizationSettings";
 import { OrganizationSubscription } from "./OrganizationSubscription";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create, edit, and manage organizations.
diff --git a/packages/datadog-api-client-v1/models/OrganizationBilling.ts b/packages/datadog-api-client-v1/models/OrganizationBilling.ts
index 1469f2ba6aa2..8bdcefa8dd98 100644
--- a/packages/datadog-api-client-v1/models/OrganizationBilling.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationBilling.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A JSON array of billing type.
diff --git a/packages/datadog-api-client-v1/models/OrganizationCreateBody.ts b/packages/datadog-api-client-v1/models/OrganizationCreateBody.ts
index 2e5a813da403..49e3dc12c12b 100644
--- a/packages/datadog-api-client-v1/models/OrganizationCreateBody.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationCreateBody.ts
@@ -10,7 +10,7 @@
 
 import { OrganizationBilling } from "./OrganizationBilling";
 import { OrganizationSubscription } from "./OrganizationSubscription";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing an organization to create.
diff --git a/packages/datadog-api-client-v1/models/OrganizationCreateResponse.ts b/packages/datadog-api-client-v1/models/OrganizationCreateResponse.ts
index 5e693e26c9a9..54d3432ce50c 100644
--- a/packages/datadog-api-client-v1/models/OrganizationCreateResponse.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationCreateResponse.ts
@@ -12,7 +12,7 @@ import { ApiKey } from "./ApiKey";
 import { ApplicationKey } from "./ApplicationKey";
 import { Organization } from "./Organization";
 import { User } from "./User";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object for an organization creation.
diff --git a/packages/datadog-api-client-v1/models/OrganizationListResponse.ts b/packages/datadog-api-client-v1/models/OrganizationListResponse.ts
index 71bdb787e2f6..d4e08db062da 100644
--- a/packages/datadog-api-client-v1/models/OrganizationListResponse.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Organization } from "./Organization";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with the list of organizations.
diff --git a/packages/datadog-api-client-v1/models/OrganizationResponse.ts b/packages/datadog-api-client-v1/models/OrganizationResponse.ts
index ea4d46d49a97..8bd15af8ef40 100644
--- a/packages/datadog-api-client-v1/models/OrganizationResponse.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Organization } from "./Organization";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with an organization.
diff --git a/packages/datadog-api-client-v1/models/OrganizationSettings.ts b/packages/datadog-api-client-v1/models/OrganizationSettings.ts
index 29f0e66c4fa6..6168357652f1 100644
--- a/packages/datadog-api-client-v1/models/OrganizationSettings.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationSettings.ts
@@ -13,7 +13,7 @@ import { OrganizationSettingsSaml } from "./OrganizationSettingsSaml";
 import { OrganizationSettingsSamlAutocreateUsersDomains } from "./OrganizationSettingsSamlAutocreateUsersDomains";
 import { OrganizationSettingsSamlIdpInitiatedLogin } from "./OrganizationSettingsSamlIdpInitiatedLogin";
 import { OrganizationSettingsSamlStrictMode } from "./OrganizationSettingsSamlStrictMode";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A JSON array of settings.
diff --git a/packages/datadog-api-client-v1/models/OrganizationSettingsSaml.ts b/packages/datadog-api-client-v1/models/OrganizationSettingsSaml.ts
index d38f1669ddd1..e45980564be9 100644
--- a/packages/datadog-api-client-v1/models/OrganizationSettingsSaml.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationSettingsSaml.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Set the boolean property enabled to enable or disable single sign on with SAML. See the SAML documentation for more information about all SAML settings.
diff --git a/packages/datadog-api-client-v1/models/OrganizationSettingsSamlAutocreateUsersDomains.ts b/packages/datadog-api-client-v1/models/OrganizationSettingsSamlAutocreateUsersDomains.ts
index 2a01ea747232..fb8c18c2bb74 100644
--- a/packages/datadog-api-client-v1/models/OrganizationSettingsSamlAutocreateUsersDomains.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationSettingsSamlAutocreateUsersDomains.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Has two properties, `enabled` (boolean) and `domains`, which is a list of domains without the @ symbol.
diff --git a/packages/datadog-api-client-v1/models/OrganizationSettingsSamlIdpInitiatedLogin.ts b/packages/datadog-api-client-v1/models/OrganizationSettingsSamlIdpInitiatedLogin.ts
index 093275ed2427..1170516ca2af 100644
--- a/packages/datadog-api-client-v1/models/OrganizationSettingsSamlIdpInitiatedLogin.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationSettingsSamlIdpInitiatedLogin.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Has one property enabled (boolean).
diff --git a/packages/datadog-api-client-v1/models/OrganizationSettingsSamlStrictMode.ts b/packages/datadog-api-client-v1/models/OrganizationSettingsSamlStrictMode.ts
index c89bef516a07..77f2dbe4ce69 100644
--- a/packages/datadog-api-client-v1/models/OrganizationSettingsSamlStrictMode.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationSettingsSamlStrictMode.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Has one property enabled (boolean).
diff --git a/packages/datadog-api-client-v1/models/OrganizationSubscription.ts b/packages/datadog-api-client-v1/models/OrganizationSubscription.ts
index d31037f2db75..cabf3147c541 100644
--- a/packages/datadog-api-client-v1/models/OrganizationSubscription.ts
+++ b/packages/datadog-api-client-v1/models/OrganizationSubscription.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Subscription definition.
diff --git a/packages/datadog-api-client-v1/models/PagerDutyService.ts b/packages/datadog-api-client-v1/models/PagerDutyService.ts
index 1fd931d331fc..6efa5cf3bea0 100644
--- a/packages/datadog-api-client-v1/models/PagerDutyService.ts
+++ b/packages/datadog-api-client-v1/models/PagerDutyService.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The PagerDuty service that is available for integration with Datadog.
diff --git a/packages/datadog-api-client-v1/models/PagerDutyServiceKey.ts b/packages/datadog-api-client-v1/models/PagerDutyServiceKey.ts
index dc3351012ad8..8e388b99ea75 100644
--- a/packages/datadog-api-client-v1/models/PagerDutyServiceKey.ts
+++ b/packages/datadog-api-client-v1/models/PagerDutyServiceKey.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * PagerDuty service object key.
diff --git a/packages/datadog-api-client-v1/models/PagerDutyServiceName.ts b/packages/datadog-api-client-v1/models/PagerDutyServiceName.ts
index 90f5196e2c0a..75093622e3eb 100644
--- a/packages/datadog-api-client-v1/models/PagerDutyServiceName.ts
+++ b/packages/datadog-api-client-v1/models/PagerDutyServiceName.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * PagerDuty service object name.
diff --git a/packages/datadog-api-client-v1/models/Pagination.ts b/packages/datadog-api-client-v1/models/Pagination.ts
index df6ef23712d4..60775f81f2b5 100644
--- a/packages/datadog-api-client-v1/models/Pagination.ts
+++ b/packages/datadog-api-client-v1/models/Pagination.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Pagination object.
diff --git a/packages/datadog-api-client-v1/models/ProcessQueryDefinition.ts b/packages/datadog-api-client-v1/models/ProcessQueryDefinition.ts
index 577d4084598a..fe7e2bf757bf 100644
--- a/packages/datadog-api-client-v1/models/ProcessQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ProcessQueryDefinition.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The process query to use in the widget.
diff --git a/packages/datadog-api-client-v1/models/QueryValueWidgetDefinition.ts b/packages/datadog-api-client-v1/models/QueryValueWidgetDefinition.ts
index 4c62bf917499..7e25351f616e 100644
--- a/packages/datadog-api-client-v1/models/QueryValueWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/QueryValueWidgetDefinition.ts
@@ -13,7 +13,7 @@ import { QueryValueWidgetRequest } from "./QueryValueWidgetRequest";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Query values display the current value of a given metric, APM, or log query.
diff --git a/packages/datadog-api-client-v1/models/QueryValueWidgetRequest.ts b/packages/datadog-api-client-v1/models/QueryValueWidgetRequest.ts
index 24893cd67665..ed1be009e7aa 100644
--- a/packages/datadog-api-client-v1/models/QueryValueWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/QueryValueWidgetRequest.ts
@@ -15,7 +15,7 @@ import { ProcessQueryDefinition } from "./ProcessQueryDefinition";
 import { WidgetAggregator } from "./WidgetAggregator";
 import { WidgetConditionalFormat } from "./WidgetConditionalFormat";
 import { WidgetFormula } from "./WidgetFormula";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated query value widget.
diff --git a/packages/datadog-api-client-v1/models/ResponseMetaAttributes.ts b/packages/datadog-api-client-v1/models/ResponseMetaAttributes.ts
index 0a98ca570145..0d4de11fef9e 100644
--- a/packages/datadog-api-client-v1/models/ResponseMetaAttributes.ts
+++ b/packages/datadog-api-client-v1/models/ResponseMetaAttributes.ts
@@ -9,7 +9,7 @@
  */
 
 import { Pagination } from "./Pagination";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing meta attributes of response.
diff --git a/packages/datadog-api-client-v1/models/SLOBulkDeleteError.ts b/packages/datadog-api-client-v1/models/SLOBulkDeleteError.ts
index 7e7f9fc5edb1..6ddb11ebd958 100644
--- a/packages/datadog-api-client-v1/models/SLOBulkDeleteError.ts
+++ b/packages/datadog-api-client-v1/models/SLOBulkDeleteError.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOErrorTimeframe } from "./SLOErrorTimeframe";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the error.
diff --git a/packages/datadog-api-client-v1/models/SLOBulkDeleteResponse.ts b/packages/datadog-api-client-v1/models/SLOBulkDeleteResponse.ts
index 9e2f206308e4..0759cfd80226 100644
--- a/packages/datadog-api-client-v1/models/SLOBulkDeleteResponse.ts
+++ b/packages/datadog-api-client-v1/models/SLOBulkDeleteResponse.ts
@@ -10,7 +10,7 @@
 
 import { SLOBulkDeleteError } from "./SLOBulkDeleteError";
 import { SLOBulkDeleteResponseData } from "./SLOBulkDeleteResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The bulk partial delete service level objective object endpoint response.  This endpoint operates on multiple service level objective objects, so it may be partially successful. In such cases, the \"data\" and \"error\" fields in this response indicate which deletions succeeded and failed.
diff --git a/packages/datadog-api-client-v1/models/SLOBulkDeleteResponseData.ts b/packages/datadog-api-client-v1/models/SLOBulkDeleteResponseData.ts
index 6f2cb2a686c7..e1c83e92faf8 100644
--- a/packages/datadog-api-client-v1/models/SLOBulkDeleteResponseData.ts
+++ b/packages/datadog-api-client-v1/models/SLOBulkDeleteResponseData.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An array of service level objective objects.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrection.ts b/packages/datadog-api-client-v1/models/SLOCorrection.ts
index 5de7a45f557b..6f8459c749cc 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrection.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrection.ts
@@ -10,7 +10,7 @@
 
 import { SLOCorrectionResponseAttributes } from "./SLOCorrectionResponseAttributes";
 import { SLOCorrectionType } from "./SLOCorrectionType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response object of a list of SLO corrections.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionCreateData.ts b/packages/datadog-api-client-v1/models/SLOCorrectionCreateData.ts
index 4ef276fd1465..5842c5c088ac 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionCreateData.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionCreateData.ts
@@ -10,7 +10,7 @@
 
 import { SLOCorrectionCreateRequestAttributes } from "./SLOCorrectionCreateRequestAttributes";
 import { SLOCorrectionType } from "./SLOCorrectionType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The data object associated with the SLO correction to be created.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionCreateRequest.ts b/packages/datadog-api-client-v1/models/SLOCorrectionCreateRequest.ts
index 1069700014da..56b89e160635 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionCreateRequest.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOCorrectionCreateData } from "./SLOCorrectionCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An object that defines a correction to be applied to an SLO.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionCreateRequestAttributes.ts b/packages/datadog-api-client-v1/models/SLOCorrectionCreateRequestAttributes.ts
index 3f5f2a5b86e6..73bdad9b5525 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionCreateRequestAttributes.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionCreateRequestAttributes.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOCorrectionCategory } from "./SLOCorrectionCategory";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attribute object associated with the SLO correction to be created.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionListResponse.ts b/packages/datadog-api-client-v1/models/SLOCorrectionListResponse.ts
index a53633f73505..6e194ab53a34 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionListResponse.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionListResponse.ts
@@ -10,7 +10,7 @@
 
 import { ResponseMetaAttributes } from "./ResponseMetaAttributes";
 import { SLOCorrection } from "./SLOCorrection";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A list of  SLO correction objects.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionResponse.ts b/packages/datadog-api-client-v1/models/SLOCorrectionResponse.ts
index 16e149c01332..cfc5413f7f85 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionResponse.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOCorrection } from "./SLOCorrection";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response object of an SLO correction.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionResponseAttributes.ts b/packages/datadog-api-client-v1/models/SLOCorrectionResponseAttributes.ts
index 5fd324533c63..4c871c76aead 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionResponseAttributes.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionResponseAttributes.ts
@@ -11,7 +11,7 @@
 import { Creator } from "./Creator";
 import { SLOCorrectionCategory } from "./SLOCorrectionCategory";
 import { SLOCorrectionResponseAttributesModifier } from "./SLOCorrectionResponseAttributesModifier";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attribute object associated with the SLO correction.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionResponseAttributesModifier.ts b/packages/datadog-api-client-v1/models/SLOCorrectionResponseAttributesModifier.ts
index bce478a482a7..c098d0bb572c 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionResponseAttributesModifier.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionResponseAttributesModifier.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Modifier of the object.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionUpdateData.ts b/packages/datadog-api-client-v1/models/SLOCorrectionUpdateData.ts
index 56967ff3239d..7ccd48b7ea68 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionUpdateData.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { SLOCorrectionType } from "./SLOCorrectionType";
 import { SLOCorrectionUpdateRequestAttributes } from "./SLOCorrectionUpdateRequestAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The data object associated with the SLO correction to be updated.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionUpdateRequest.ts b/packages/datadog-api-client-v1/models/SLOCorrectionUpdateRequest.ts
index 84254dff073b..cb1a1a6df352 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionUpdateRequest.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOCorrectionUpdateData } from "./SLOCorrectionUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An object that defines a correction to be applied to an SLO.
diff --git a/packages/datadog-api-client-v1/models/SLOCorrectionUpdateRequestAttributes.ts b/packages/datadog-api-client-v1/models/SLOCorrectionUpdateRequestAttributes.ts
index 42486dcd6089..c8924797ffd2 100644
--- a/packages/datadog-api-client-v1/models/SLOCorrectionUpdateRequestAttributes.ts
+++ b/packages/datadog-api-client-v1/models/SLOCorrectionUpdateRequestAttributes.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOCorrectionCategory } from "./SLOCorrectionCategory";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attribute object associated with the SLO correction to be updated.
diff --git a/packages/datadog-api-client-v1/models/SLODeleteResponse.ts b/packages/datadog-api-client-v1/models/SLODeleteResponse.ts
index ceddf2b9fe69..94d77f22db42 100644
--- a/packages/datadog-api-client-v1/models/SLODeleteResponse.ts
+++ b/packages/datadog-api-client-v1/models/SLODeleteResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A response list of all service level objective deleted.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryMetrics.ts b/packages/datadog-api-client-v1/models/SLOHistoryMetrics.ts
index 976c9491067b..904ae2cb6b18 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryMetrics.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryMetrics.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOHistoryMetricsSeries } from "./SLOHistoryMetricsSeries";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A `metric` based SLO history response.  This is not included in responses for `monitor` based SLOs.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeries.ts b/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeries.ts
index 6b135c47ef46..25f70210e2e8 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeries.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeries.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOHistoryMetricsSeriesMetadata } from "./SLOHistoryMetricsSeriesMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A representation of `metric` based SLO time series for the provided queries. This is the same response type from `batch_query` endpoint.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeriesMetadata.ts b/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeriesMetadata.ts
index a3280c683780..eee24300fdb7 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeriesMetadata.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeriesMetadata.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOHistoryMetricsSeriesMetadataUnit } from "./SLOHistoryMetricsSeriesMetadataUnit";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Query metadata.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeriesMetadataUnit.ts b/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeriesMetadataUnit.ts
index 0f9af0beb7ca..9a1fe7f8c553 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeriesMetadataUnit.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryMetricsSeriesMetadataUnit.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An Object of metric units.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryMonitor.ts b/packages/datadog-api-client-v1/models/SLOHistoryMonitor.ts
index a29b1d384e4d..2eb9959d8aab 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryMonitor.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryMonitor.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOHistoryResponseErrorWithType } from "./SLOHistoryResponseErrorWithType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An object that holds an SLI value and its associated data. It can represent an SLO's overall SLI value. This can also represent the SLI value for a specific monitor in multi-monitor SLOs, or a group in grouped SLOs.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryResponse.ts b/packages/datadog-api-client-v1/models/SLOHistoryResponse.ts
index 077a80045e50..5a8227e61df3 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryResponse.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryResponse.ts
@@ -10,7 +10,7 @@
 
 import { SLOHistoryResponseData } from "./SLOHistoryResponseData";
 import { SLOHistoryResponseError } from "./SLOHistoryResponseError";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A service level objective history response.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryResponseData.ts b/packages/datadog-api-client-v1/models/SLOHistoryResponseData.ts
index 485599599e50..65760ec94622 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryResponseData.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryResponseData.ts
@@ -14,7 +14,7 @@ import { SLOHistorySLIData } from "./SLOHistorySLIData";
 import { SLOThreshold } from "./SLOThreshold";
 import { SLOType } from "./SLOType";
 import { SLOTypeNumeric } from "./SLOTypeNumeric";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An array of service level objective objects.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryResponseError.ts b/packages/datadog-api-client-v1/models/SLOHistoryResponseError.ts
index 69693ea85157..066f9bd9aba1 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryResponseError.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryResponseError.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A list of errors while querying the history data for the service level objective.
diff --git a/packages/datadog-api-client-v1/models/SLOHistoryResponseErrorWithType.ts b/packages/datadog-api-client-v1/models/SLOHistoryResponseErrorWithType.ts
index 7efc9045dcd9..4b9ca8878a28 100644
--- a/packages/datadog-api-client-v1/models/SLOHistoryResponseErrorWithType.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistoryResponseErrorWithType.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An object describing the error with error type and error message.
diff --git a/packages/datadog-api-client-v1/models/SLOHistorySLIData.ts b/packages/datadog-api-client-v1/models/SLOHistorySLIData.ts
index 5e7f4e8414d9..90981cd17a91 100644
--- a/packages/datadog-api-client-v1/models/SLOHistorySLIData.ts
+++ b/packages/datadog-api-client-v1/models/SLOHistorySLIData.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOHistoryResponseErrorWithType } from "./SLOHistoryResponseErrorWithType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An object that holds an SLI value and its associated data. It can represent an SLO's overall SLI value. This can also represent the SLI value for a specific monitor in multi-monitor SLOs, or a group in grouped SLOs.
diff --git a/packages/datadog-api-client-v1/models/SLOListResponse.ts b/packages/datadog-api-client-v1/models/SLOListResponse.ts
index c025678bdd55..ae79df355d0d 100644
--- a/packages/datadog-api-client-v1/models/SLOListResponse.ts
+++ b/packages/datadog-api-client-v1/models/SLOListResponse.ts
@@ -10,7 +10,7 @@
 
 import { SLOListResponseMetadata } from "./SLOListResponseMetadata";
 import { ServiceLevelObjective } from "./ServiceLevelObjective";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A response with one or more service level objective.
diff --git a/packages/datadog-api-client-v1/models/SLOListResponseMetadata.ts b/packages/datadog-api-client-v1/models/SLOListResponseMetadata.ts
index 202135bce69d..26f32e8164dd 100644
--- a/packages/datadog-api-client-v1/models/SLOListResponseMetadata.ts
+++ b/packages/datadog-api-client-v1/models/SLOListResponseMetadata.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOListResponseMetadataPage } from "./SLOListResponseMetadataPage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata object containing additional information about the list of SLOs.
diff --git a/packages/datadog-api-client-v1/models/SLOListResponseMetadataPage.ts b/packages/datadog-api-client-v1/models/SLOListResponseMetadataPage.ts
index d9c69498553d..69af13d43e09 100644
--- a/packages/datadog-api-client-v1/models/SLOListResponseMetadataPage.ts
+++ b/packages/datadog-api-client-v1/models/SLOListResponseMetadataPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing information about the pages of the list of SLOs.
diff --git a/packages/datadog-api-client-v1/models/SLOResponse.ts b/packages/datadog-api-client-v1/models/SLOResponse.ts
index c97a207d62af..9fde1c482456 100644
--- a/packages/datadog-api-client-v1/models/SLOResponse.ts
+++ b/packages/datadog-api-client-v1/models/SLOResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOResponseData } from "./SLOResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A service level objective response containing a single service level objective.
diff --git a/packages/datadog-api-client-v1/models/SLOResponseData.ts b/packages/datadog-api-client-v1/models/SLOResponseData.ts
index 9454bbfe46b7..d8b189c9c9bb 100644
--- a/packages/datadog-api-client-v1/models/SLOResponseData.ts
+++ b/packages/datadog-api-client-v1/models/SLOResponseData.ts
@@ -12,7 +12,7 @@ import { Creator } from "./Creator";
 import { SLOThreshold } from "./SLOThreshold";
 import { SLOType } from "./SLOType";
 import { ServiceLevelObjectiveQuery } from "./ServiceLevelObjectiveQuery";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A service level objective object includes a service level indicator, thresholds for one or more timeframes, and metadata (`name`, `description`, `tags`, etc.).
diff --git a/packages/datadog-api-client-v1/models/SLOThreshold.ts b/packages/datadog-api-client-v1/models/SLOThreshold.ts
index 915b84fbe613..e016bac5f8d9 100644
--- a/packages/datadog-api-client-v1/models/SLOThreshold.ts
+++ b/packages/datadog-api-client-v1/models/SLOThreshold.ts
@@ -9,7 +9,7 @@
  */
 
 import { SLOTimeframe } from "./SLOTimeframe";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * SLO thresholds (target and optionally warning) for a single time window.
diff --git a/packages/datadog-api-client-v1/models/SLOWidgetDefinition.ts b/packages/datadog-api-client-v1/models/SLOWidgetDefinition.ts
index 9b4992e79b62..0b07ed9a93f9 100644
--- a/packages/datadog-api-client-v1/models/SLOWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/SLOWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { SLOWidgetDefinitionType } from "./SLOWidgetDefinitionType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTimeWindows } from "./WidgetTimeWindows";
 import { WidgetViewMode } from "./WidgetViewMode";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Use the SLO and uptime widget to track your SLOs (Service Level Objectives) and uptime on screenboards and timeboards.
diff --git a/packages/datadog-api-client-v1/models/ScatterPlotRequest.ts b/packages/datadog-api-client-v1/models/ScatterPlotRequest.ts
index 513eed29b7ad..65fe8fadc6b0 100644
--- a/packages/datadog-api-client-v1/models/ScatterPlotRequest.ts
+++ b/packages/datadog-api-client-v1/models/ScatterPlotRequest.ts
@@ -11,7 +11,7 @@
 import { LogQueryDefinition } from "./LogQueryDefinition";
 import { ProcessQueryDefinition } from "./ProcessQueryDefinition";
 import { ScatterplotWidgetAggregator } from "./ScatterplotWidgetAggregator";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated scatter plot.
diff --git a/packages/datadog-api-client-v1/models/ScatterPlotWidgetDefinition.ts b/packages/datadog-api-client-v1/models/ScatterPlotWidgetDefinition.ts
index b0ebe3d3a505..07e9fd3c7fd7 100644
--- a/packages/datadog-api-client-v1/models/ScatterPlotWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ScatterPlotWidgetDefinition.ts
@@ -14,7 +14,7 @@ import { WidgetAxis } from "./WidgetAxis";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The scatter plot visualization allows you to graph a chosen scope over two different metrics with their respective aggregation.
diff --git a/packages/datadog-api-client-v1/models/ScatterPlotWidgetDefinitionRequests.ts b/packages/datadog-api-client-v1/models/ScatterPlotWidgetDefinitionRequests.ts
index ed67a582004a..b4417cea564e 100644
--- a/packages/datadog-api-client-v1/models/ScatterPlotWidgetDefinitionRequests.ts
+++ b/packages/datadog-api-client-v1/models/ScatterPlotWidgetDefinitionRequests.ts
@@ -10,7 +10,7 @@
 
 import { ScatterPlotRequest } from "./ScatterPlotRequest";
 import { ScatterplotTableRequest } from "./ScatterplotTableRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Widget definition.
diff --git a/packages/datadog-api-client-v1/models/ScatterplotTableRequest.ts b/packages/datadog-api-client-v1/models/ScatterplotTableRequest.ts
index 0ba41d15b80c..d135a2770803 100644
--- a/packages/datadog-api-client-v1/models/ScatterplotTableRequest.ts
+++ b/packages/datadog-api-client-v1/models/ScatterplotTableRequest.ts
@@ -11,7 +11,7 @@
 import { FormulaAndFunctionQueryDefinition } from "./FormulaAndFunctionQueryDefinition";
 import { FormulaAndFunctionResponseFormat } from "./FormulaAndFunctionResponseFormat";
 import { ScatterplotWidgetFormula } from "./ScatterplotWidgetFormula";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Scatterplot request containing formulas and functions.
diff --git a/packages/datadog-api-client-v1/models/ScatterplotWidgetFormula.ts b/packages/datadog-api-client-v1/models/ScatterplotWidgetFormula.ts
index a4ec1758b77d..d3c11765ff48 100644
--- a/packages/datadog-api-client-v1/models/ScatterplotWidgetFormula.ts
+++ b/packages/datadog-api-client-v1/models/ScatterplotWidgetFormula.ts
@@ -9,7 +9,7 @@
  */
 
 import { ScatterplotDimension } from "./ScatterplotDimension";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Formula to be used in a Scatterplot widget query.
diff --git a/packages/datadog-api-client-v1/models/Series.ts b/packages/datadog-api-client-v1/models/Series.ts
index 32b2a809db26..cfefe144b6a5 100644
--- a/packages/datadog-api-client-v1/models/Series.ts
+++ b/packages/datadog-api-client-v1/models/Series.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A metric to submit to Datadog. See [Datadog metrics](https://docs.datadoghq.com/developers/metrics/#custom-metrics-properties).
diff --git a/packages/datadog-api-client-v1/models/ServiceCheck.ts b/packages/datadog-api-client-v1/models/ServiceCheck.ts
index dbac3f491671..763afc8b49a5 100644
--- a/packages/datadog-api-client-v1/models/ServiceCheck.ts
+++ b/packages/datadog-api-client-v1/models/ServiceCheck.ts
@@ -9,7 +9,7 @@
  */
 
 import { ServiceCheckStatus } from "./ServiceCheckStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An object containing service check and status.
diff --git a/packages/datadog-api-client-v1/models/ServiceLevelObjective.ts b/packages/datadog-api-client-v1/models/ServiceLevelObjective.ts
index 35adc88355d0..d89b06bf1253 100644
--- a/packages/datadog-api-client-v1/models/ServiceLevelObjective.ts
+++ b/packages/datadog-api-client-v1/models/ServiceLevelObjective.ts
@@ -12,7 +12,7 @@ import { Creator } from "./Creator";
 import { SLOThreshold } from "./SLOThreshold";
 import { SLOType } from "./SLOType";
 import { ServiceLevelObjectiveQuery } from "./ServiceLevelObjectiveQuery";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A service level objective object includes a service level indicator, thresholds for one or more timeframes, and metadata (`name`, `description`, `tags`, etc.).
diff --git a/packages/datadog-api-client-v1/models/ServiceLevelObjectiveQuery.ts b/packages/datadog-api-client-v1/models/ServiceLevelObjectiveQuery.ts
index e92b8a0d9291..473fcf6e8907 100644
--- a/packages/datadog-api-client-v1/models/ServiceLevelObjectiveQuery.ts
+++ b/packages/datadog-api-client-v1/models/ServiceLevelObjectiveQuery.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A metric SLI query. **Required if type is `metric`**. Note that Datadog only allows the sum by aggregator to be used because this will sum up all request counts instead of averaging them, or taking the max or min of all of those requests.
diff --git a/packages/datadog-api-client-v1/models/ServiceLevelObjectiveRequest.ts b/packages/datadog-api-client-v1/models/ServiceLevelObjectiveRequest.ts
index 095832ba1010..d6f6130f30d4 100644
--- a/packages/datadog-api-client-v1/models/ServiceLevelObjectiveRequest.ts
+++ b/packages/datadog-api-client-v1/models/ServiceLevelObjectiveRequest.ts
@@ -11,7 +11,7 @@
 import { SLOThreshold } from "./SLOThreshold";
 import { SLOType } from "./SLOType";
 import { ServiceLevelObjectiveQuery } from "./ServiceLevelObjectiveQuery";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A service level objective object includes a service level indicator, thresholds for one or more timeframes, and metadata (`name`, `description`, `tags`, etc.).
diff --git a/packages/datadog-api-client-v1/models/ServiceMapWidgetDefinition.ts b/packages/datadog-api-client-v1/models/ServiceMapWidgetDefinition.ts
index 2a00f46e9924..e7c834f5c250 100644
--- a/packages/datadog-api-client-v1/models/ServiceMapWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ServiceMapWidgetDefinition.ts
@@ -11,7 +11,7 @@
 import { ServiceMapWidgetDefinitionType } from "./ServiceMapWidgetDefinitionType";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetTextAlign } from "./WidgetTextAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * This widget displays a map of a service to all of the services that call it, and all of the services that it calls.
diff --git a/packages/datadog-api-client-v1/models/ServiceSummaryWidgetDefinition.ts b/packages/datadog-api-client-v1/models/ServiceSummaryWidgetDefinition.ts
index bc063f3a5a64..a8541e31b233 100644
--- a/packages/datadog-api-client-v1/models/ServiceSummaryWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ServiceSummaryWidgetDefinition.ts
@@ -13,7 +13,7 @@ import { WidgetServiceSummaryDisplayFormat } from "./WidgetServiceSummaryDisplay
 import { WidgetSizeFormat } from "./WidgetSizeFormat";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The service summary displays the graphs of a chosen service in your screenboard. Only available on FREE layout dashboards.
diff --git a/packages/datadog-api-client-v1/models/SlackIntegrationChannel.ts b/packages/datadog-api-client-v1/models/SlackIntegrationChannel.ts
index 708f10d2eed5..ce81a05e563a 100644
--- a/packages/datadog-api-client-v1/models/SlackIntegrationChannel.ts
+++ b/packages/datadog-api-client-v1/models/SlackIntegrationChannel.ts
@@ -9,7 +9,7 @@
  */
 
 import { SlackIntegrationChannelDisplay } from "./SlackIntegrationChannelDisplay";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Slack channel configuration.
diff --git a/packages/datadog-api-client-v1/models/SlackIntegrationChannelDisplay.ts b/packages/datadog-api-client-v1/models/SlackIntegrationChannelDisplay.ts
index f1f7b9c95dfa..53188675f1eb 100644
--- a/packages/datadog-api-client-v1/models/SlackIntegrationChannelDisplay.ts
+++ b/packages/datadog-api-client-v1/models/SlackIntegrationChannelDisplay.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Configuration options for what is shown in an alert event message.
diff --git a/packages/datadog-api-client-v1/models/SunburstWidgetDefinition.ts b/packages/datadog-api-client-v1/models/SunburstWidgetDefinition.ts
index b5fde12c3b40..ff3145830fe5 100644
--- a/packages/datadog-api-client-v1/models/SunburstWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/SunburstWidgetDefinition.ts
@@ -14,7 +14,7 @@ import { SunburstWidgetRequest } from "./SunburstWidgetRequest";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Sunbursts are spot on to highlight how groups contribute to the total of a query.
diff --git a/packages/datadog-api-client-v1/models/SunburstWidgetLegend.ts b/packages/datadog-api-client-v1/models/SunburstWidgetLegend.ts
index e7e3312f5e39..4d19625249cd 100644
--- a/packages/datadog-api-client-v1/models/SunburstWidgetLegend.ts
+++ b/packages/datadog-api-client-v1/models/SunburstWidgetLegend.ts
@@ -10,7 +10,7 @@
 
 import { SunburstWidgetLegendInlineAutomatic } from "./SunburstWidgetLegendInlineAutomatic";
 import { SunburstWidgetLegendTable } from "./SunburstWidgetLegendTable";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Configuration of the legend.
diff --git a/packages/datadog-api-client-v1/models/SunburstWidgetLegendInlineAutomatic.ts b/packages/datadog-api-client-v1/models/SunburstWidgetLegendInlineAutomatic.ts
index 19ca0eafa95a..faf8afc37ff9 100644
--- a/packages/datadog-api-client-v1/models/SunburstWidgetLegendInlineAutomatic.ts
+++ b/packages/datadog-api-client-v1/models/SunburstWidgetLegendInlineAutomatic.ts
@@ -9,7 +9,7 @@
  */
 
 import { SunburstWidgetLegendInlineAutomaticType } from "./SunburstWidgetLegendInlineAutomaticType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Configuration of inline or automatic legends.
diff --git a/packages/datadog-api-client-v1/models/SunburstWidgetLegendTable.ts b/packages/datadog-api-client-v1/models/SunburstWidgetLegendTable.ts
index 73f2ec96a5ef..e7d9fe099407 100644
--- a/packages/datadog-api-client-v1/models/SunburstWidgetLegendTable.ts
+++ b/packages/datadog-api-client-v1/models/SunburstWidgetLegendTable.ts
@@ -9,7 +9,7 @@
  */
 
 import { SunburstWidgetLegendTableType } from "./SunburstWidgetLegendTableType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Configuration of table-based legend.
diff --git a/packages/datadog-api-client-v1/models/SunburstWidgetRequest.ts b/packages/datadog-api-client-v1/models/SunburstWidgetRequest.ts
index 71d0dc6ead8a..4eae6b2a422c 100644
--- a/packages/datadog-api-client-v1/models/SunburstWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/SunburstWidgetRequest.ts
@@ -13,7 +13,7 @@ import { FormulaAndFunctionResponseFormat } from "./FormulaAndFunctionResponseFo
 import { LogQueryDefinition } from "./LogQueryDefinition";
 import { ProcessQueryDefinition } from "./ProcessQueryDefinition";
 import { WidgetFormula } from "./WidgetFormula";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request definition of sunburst widget.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAPIStep.ts b/packages/datadog-api-client-v1/models/SyntheticsAPIStep.ts
index 394f35defa8b..41eb4623fcb5 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAPIStep.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAPIStep.ts
@@ -13,7 +13,7 @@ import { SyntheticsAssertion } from "./SyntheticsAssertion";
 import { SyntheticsParsingOptions } from "./SyntheticsParsingOptions";
 import { SyntheticsTestOptionsRetry } from "./SyntheticsTestOptionsRetry";
 import { SyntheticsTestRequest } from "./SyntheticsTestRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The steps used in a Synthetics multistep API test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAPITest.ts b/packages/datadog-api-client-v1/models/SyntheticsAPITest.ts
index d110a6511dec..fa059b2a3028 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAPITest.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAPITest.ts
@@ -13,7 +13,7 @@ import { SyntheticsAPITestType } from "./SyntheticsAPITestType";
 import { SyntheticsTestDetailsSubType } from "./SyntheticsTestDetailsSubType";
 import { SyntheticsTestOptions } from "./SyntheticsTestOptions";
 import { SyntheticsTestPauseStatus } from "./SyntheticsTestPauseStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing details about a Synthetic API test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAPITestConfig.ts b/packages/datadog-api-client-v1/models/SyntheticsAPITestConfig.ts
index 14cc16d84d81..c30b6cd9c6a2 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAPITestConfig.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAPITestConfig.ts
@@ -12,7 +12,7 @@ import { SyntheticsAPIStep } from "./SyntheticsAPIStep";
 import { SyntheticsAssertion } from "./SyntheticsAssertion";
 import { SyntheticsConfigVariable } from "./SyntheticsConfigVariable";
 import { SyntheticsTestRequest } from "./SyntheticsTestRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Configuration object for a Synthetic API test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultData.ts b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultData.ts
index 217ca1580fa6..0ee5be0c8402 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultData.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultData.ts
@@ -12,7 +12,7 @@ import { SyntheticsApiTestResultFailure } from "./SyntheticsApiTestResultFailure
 import { SyntheticsSSLCertificate } from "./SyntheticsSSLCertificate";
 import { SyntheticsTestProcessStatus } from "./SyntheticsTestProcessStatus";
 import { SyntheticsTiming } from "./SyntheticsTiming";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing results for your Synthetic API test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultFull.ts b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultFull.ts
index a449149fc112..d2693679c04e 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultFull.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultFull.ts
@@ -11,7 +11,7 @@
 import { SyntheticsAPITestResultData } from "./SyntheticsAPITestResultData";
 import { SyntheticsAPITestResultFullCheck } from "./SyntheticsAPITestResultFullCheck";
 import { SyntheticsTestMonitorStatus } from "./SyntheticsTestMonitorStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object returned describing a API test result.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultFullCheck.ts b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultFullCheck.ts
index 321260a31c31..79fc1e1ffa34 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultFullCheck.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultFullCheck.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsTestConfig } from "./SyntheticsTestConfig";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the API test configuration.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultShort.ts b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultShort.ts
index cb8494bea526..07c068f62e3b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultShort.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultShort.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsAPITestResultShortResult } from "./SyntheticsAPITestResultShortResult";
 import { SyntheticsTestMonitorStatus } from "./SyntheticsTestMonitorStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object with the results of a single Synthetic API test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultShortResult.ts b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultShortResult.ts
index 9130b1bc8b67..69d45ceb20ab 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAPITestResultShortResult.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAPITestResultShortResult.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsTiming } from "./SyntheticsTiming";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Result of the last API test run.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsApiTestResultFailure.ts b/packages/datadog-api-client-v1/models/SyntheticsApiTestResultFailure.ts
index d351b7adc8f0..6668e0a9145b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsApiTestResultFailure.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsApiTestResultFailure.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsApiTestFailureCode } from "./SyntheticsApiTestFailureCode";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The API test failure details.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAssertion.ts b/packages/datadog-api-client-v1/models/SyntheticsAssertion.ts
index 9d0c0a6e4228..7d25187ad657 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAssertion.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAssertion.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsAssertionJSONPathTarget } from "./SyntheticsAssertionJSONPathTarget";
 import { SyntheticsAssertionTarget } from "./SyntheticsAssertionTarget";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Object describing the assertions type, their associated operator, which property they apply, and upon which target.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAssertionJSONPathTarget.ts b/packages/datadog-api-client-v1/models/SyntheticsAssertionJSONPathTarget.ts
index 898366640f44..9b7cba899422 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAssertionJSONPathTarget.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAssertionJSONPathTarget.ts
@@ -11,7 +11,7 @@
 import { SyntheticsAssertionJSONPathOperator } from "./SyntheticsAssertionJSONPathOperator";
 import { SyntheticsAssertionJSONPathTargetTarget } from "./SyntheticsAssertionJSONPathTargetTarget";
 import { SyntheticsAssertionType } from "./SyntheticsAssertionType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An assertion for the `validatesJSONPath` operator.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAssertionJSONPathTargetTarget.ts b/packages/datadog-api-client-v1/models/SyntheticsAssertionJSONPathTargetTarget.ts
index 5423b19e5469..02fd713331be 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAssertionJSONPathTargetTarget.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAssertionJSONPathTargetTarget.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Composed target for `validatesJSONPath` operator.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsAssertionTarget.ts b/packages/datadog-api-client-v1/models/SyntheticsAssertionTarget.ts
index 696f2c31e74b..b5e62edd1c6b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsAssertionTarget.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsAssertionTarget.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsAssertionOperator } from "./SyntheticsAssertionOperator";
 import { SyntheticsAssertionType } from "./SyntheticsAssertionType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An assertion which uses a simple target.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBasicAuth.ts b/packages/datadog-api-client-v1/models/SyntheticsBasicAuth.ts
index a8c11a841198..f24ae31b55e6 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBasicAuth.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBasicAuth.ts
@@ -11,7 +11,7 @@
 import { SyntheticsBasicAuthNTLM } from "./SyntheticsBasicAuthNTLM";
 import { SyntheticsBasicAuthSigv4 } from "./SyntheticsBasicAuthSigv4";
 import { SyntheticsBasicAuthWeb } from "./SyntheticsBasicAuthWeb";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Object to handle basic authentication when performing the test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBasicAuthNTLM.ts b/packages/datadog-api-client-v1/models/SyntheticsBasicAuthNTLM.ts
index 2bb6a52dc440..6d1d1e006533 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBasicAuthNTLM.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBasicAuthNTLM.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsBasicAuthNTLMType } from "./SyntheticsBasicAuthNTLMType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to handle `NTLM` authentication when performing the test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBasicAuthSigv4.ts b/packages/datadog-api-client-v1/models/SyntheticsBasicAuthSigv4.ts
index e56b5ba098d5..789337919899 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBasicAuthSigv4.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBasicAuthSigv4.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsBasicAuthSigv4Type } from "./SyntheticsBasicAuthSigv4Type";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to handle `SIGV4` authentication when performing the test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBasicAuthWeb.ts b/packages/datadog-api-client-v1/models/SyntheticsBasicAuthWeb.ts
index c9868796d3ef..98eeb72bc939 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBasicAuthWeb.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBasicAuthWeb.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsBasicAuthWebType } from "./SyntheticsBasicAuthWebType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to handle basic authentication when performing the test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBatchDetails.ts b/packages/datadog-api-client-v1/models/SyntheticsBatchDetails.ts
index ff7696b47779..c06580986151 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBatchDetails.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBatchDetails.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsBatchDetailsData } from "./SyntheticsBatchDetailsData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Details about a batch response.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBatchDetailsData.ts b/packages/datadog-api-client-v1/models/SyntheticsBatchDetailsData.ts
index fce138a0b4b3..c449747e100b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBatchDetailsData.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBatchDetailsData.ts
@@ -11,7 +11,7 @@
 import { SyntheticsBatchResult } from "./SyntheticsBatchResult";
 import { SyntheticsCIBatchMetadata } from "./SyntheticsCIBatchMetadata";
 import { SyntheticsStatus } from "./SyntheticsStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Wrapper object that contains the details of a batch.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBatchResult.ts b/packages/datadog-api-client-v1/models/SyntheticsBatchResult.ts
index a206e1f72a9c..e5de3252a0e0 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBatchResult.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBatchResult.ts
@@ -12,7 +12,7 @@ import { SyntheticsDeviceID } from "./SyntheticsDeviceID";
 import { SyntheticsStatus } from "./SyntheticsStatus";
 import { SyntheticsTestDetailsType } from "./SyntheticsTestDetailsType";
 import { SyntheticsTestExecutionRule } from "./SyntheticsTestExecutionRule";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object with the results of a Synthetics batch.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserError.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserError.ts
index efca6ae20437..a90f8818e264 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserError.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserError.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsBrowserErrorType } from "./SyntheticsBrowserErrorType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Error response object for a browser test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserTest.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserTest.ts
index 13f6d595e410..6825dd89e62f 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserTest.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserTest.ts
@@ -13,7 +13,7 @@ import { SyntheticsBrowserTestType } from "./SyntheticsBrowserTestType";
 import { SyntheticsStep } from "./SyntheticsStep";
 import { SyntheticsTestOptions } from "./SyntheticsTestOptions";
 import { SyntheticsTestPauseStatus } from "./SyntheticsTestPauseStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing details about a Synthetic browser test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestConfig.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestConfig.ts
index 98d8ab729099..3b12fbc67666 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestConfig.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestConfig.ts
@@ -12,7 +12,7 @@ import { SyntheticsAssertion } from "./SyntheticsAssertion";
 import { SyntheticsBrowserVariable } from "./SyntheticsBrowserVariable";
 import { SyntheticsConfigVariable } from "./SyntheticsConfigVariable";
 import { SyntheticsTestRequest } from "./SyntheticsTestRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Configuration object for a Synthetic browser test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultData.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultData.ts
index 90fa25621112..cd8022ba99ee 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultData.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultData.ts
@@ -11,7 +11,7 @@
 import { SyntheticsBrowserTestResultFailure } from "./SyntheticsBrowserTestResultFailure";
 import { SyntheticsDevice } from "./SyntheticsDevice";
 import { SyntheticsStepDetail } from "./SyntheticsStepDetail";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing results for your Synthetic browser test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFailure.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFailure.ts
index 71fb6080a8b5..140641e9e955 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFailure.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFailure.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsBrowserTestFailureCode } from "./SyntheticsBrowserTestFailureCode";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The browser test failure details.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFull.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFull.ts
index 87d7c5a6a964..6f4c36c2d73e 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFull.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFull.ts
@@ -11,7 +11,7 @@
 import { SyntheticsBrowserTestResultData } from "./SyntheticsBrowserTestResultData";
 import { SyntheticsBrowserTestResultFullCheck } from "./SyntheticsBrowserTestResultFullCheck";
 import { SyntheticsTestMonitorStatus } from "./SyntheticsTestMonitorStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object returned describing a browser test result.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFullCheck.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFullCheck.ts
index b00e9d6dc8ab..eefde5fda4bc 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFullCheck.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultFullCheck.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsTestConfig } from "./SyntheticsTestConfig";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the browser test configuration.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultShort.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultShort.ts
index f13ff36d1a33..41eeef52058b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultShort.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultShort.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsBrowserTestResultShortResult } from "./SyntheticsBrowserTestResultShortResult";
 import { SyntheticsTestMonitorStatus } from "./SyntheticsTestMonitorStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object with the results of a single Synthetic browser test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultShortResult.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultShortResult.ts
index 613b3766993d..a2ca7b44c62d 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultShortResult.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserTestResultShortResult.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsDevice } from "./SyntheticsDevice";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object with the result of the last browser test run.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsBrowserVariable.ts b/packages/datadog-api-client-v1/models/SyntheticsBrowserVariable.ts
index eeac8294c41c..8045703e4cdf 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsBrowserVariable.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsBrowserVariable.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsBrowserVariableType } from "./SyntheticsBrowserVariableType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object defining a variable that can be used in your browser test. Learn more in the [Browser test Actions documentation](https://docs.datadoghq.com/synthetics/browser_tests/actions#variable).
diff --git a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadata.ts b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadata.ts
index de654dcf53f7..f8d3048f17b7 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadata.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadata.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsCIBatchMetadataCI } from "./SyntheticsCIBatchMetadataCI";
 import { SyntheticsCIBatchMetadataGit } from "./SyntheticsCIBatchMetadataGit";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Metadata for the Synthetics tests run.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataCI.ts b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataCI.ts
index 8d192fce1b4c..3cf6a1af1183 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataCI.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataCI.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsCIBatchMetadataPipeline } from "./SyntheticsCIBatchMetadataPipeline";
 import { SyntheticsCIBatchMetadataProvider } from "./SyntheticsCIBatchMetadataProvider";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Description of the CI provider.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataGit.ts b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataGit.ts
index ddfd866f898c..7b33ffbd1831 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataGit.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataGit.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Git information.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataPipeline.ts b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataPipeline.ts
index a658c5ec4c89..8ea281fe96bd 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataPipeline.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataPipeline.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Description of the CI pipeline.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataProvider.ts b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataProvider.ts
index 1d641c08ebfc..0a8dbaf23d00 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataProvider.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsCIBatchMetadataProvider.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Description of the CI provider.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsCITest.ts b/packages/datadog-api-client-v1/models/SyntheticsCITest.ts
index 665dc4e0c988..aec665a7d021 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsCITest.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsCITest.ts
@@ -12,7 +12,7 @@ import { SyntheticsBasicAuth } from "./SyntheticsBasicAuth";
 import { SyntheticsCIBatchMetadata } from "./SyntheticsCIBatchMetadata";
 import { SyntheticsDeviceID } from "./SyntheticsDeviceID";
 import { SyntheticsTestOptionsRetry } from "./SyntheticsTestOptionsRetry";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Test configuration for Synthetics CI
diff --git a/packages/datadog-api-client-v1/models/SyntheticsCITestBody.ts b/packages/datadog-api-client-v1/models/SyntheticsCITestBody.ts
index fc49fd024bed..43b094968235 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsCITestBody.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsCITestBody.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsCITest } from "./SyntheticsCITest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the synthetics tests to trigger.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsConfigVariable.ts b/packages/datadog-api-client-v1/models/SyntheticsConfigVariable.ts
index 0a960f79f5fc..fe80d2bbe82a 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsConfigVariable.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsConfigVariable.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsConfigVariableType } from "./SyntheticsConfigVariableType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object defining a variable that can be used in your test configuration.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsCoreWebVitals.ts b/packages/datadog-api-client-v1/models/SyntheticsCoreWebVitals.ts
index 84bfb3b63d7f..1b784b8c733a 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsCoreWebVitals.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsCoreWebVitals.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Core Web Vitals attached to a browser test step.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsDeleteTestsPayload.ts b/packages/datadog-api-client-v1/models/SyntheticsDeleteTestsPayload.ts
index 74baccbf1d78..3dd893f43ab3 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsDeleteTestsPayload.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsDeleteTestsPayload.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A JSON list of the ID or IDs of the Synthetic tests that you want to delete.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsDeleteTestsResponse.ts b/packages/datadog-api-client-v1/models/SyntheticsDeleteTestsResponse.ts
index 992e4909057f..9b66aa6cdf3b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsDeleteTestsResponse.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsDeleteTestsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsDeletedTest } from "./SyntheticsDeletedTest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object for deleting Synthetic tests.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsDeletedTest.ts b/packages/datadog-api-client-v1/models/SyntheticsDeletedTest.ts
index 125d28956216..68a7f52836f1 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsDeletedTest.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsDeletedTest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing a deleted Synthetic test ID with the associated deletion timestamp.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsDevice.ts b/packages/datadog-api-client-v1/models/SyntheticsDevice.ts
index 2f6d8fd06bf4..39540c573745 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsDevice.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsDevice.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsDeviceID } from "./SyntheticsDeviceID";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the device used to perform the Synthetic test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsGetAPITestLatestResultsResponse.ts b/packages/datadog-api-client-v1/models/SyntheticsGetAPITestLatestResultsResponse.ts
index 943f5bd4652b..b55f8e60c14b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsGetAPITestLatestResultsResponse.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsGetAPITestLatestResultsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsAPITestResultShort } from "./SyntheticsAPITestResultShort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object with the latest Synthetic API test run.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsGetBrowserTestLatestResultsResponse.ts b/packages/datadog-api-client-v1/models/SyntheticsGetBrowserTestLatestResultsResponse.ts
index 85410d063bc0..c8be9d0c4a3b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsGetBrowserTestLatestResultsResponse.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsGetBrowserTestLatestResultsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsBrowserTestResultShort } from "./SyntheticsBrowserTestResultShort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object with the latest Synthetic browser test run.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsGlobalVariable.ts b/packages/datadog-api-client-v1/models/SyntheticsGlobalVariable.ts
index badb8029ba42..f420c579a5bd 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsGlobalVariable.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsGlobalVariable.ts
@@ -11,7 +11,7 @@
 import { SyntheticsGlobalVariableAttributes } from "./SyntheticsGlobalVariableAttributes";
 import { SyntheticsGlobalVariableParseTestOptions } from "./SyntheticsGlobalVariableParseTestOptions";
 import { SyntheticsGlobalVariableValue } from "./SyntheticsGlobalVariableValue";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Synthetics global variable.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableAttributes.ts b/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableAttributes.ts
index 1d9b1ac2f987..11ee1fd75dd0 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableAttributes.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of the global variable.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableParseTestOptions.ts b/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableParseTestOptions.ts
index ed247e5c57f7..b93d8ac70cc0 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableParseTestOptions.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableParseTestOptions.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsGlobalVariableParseTestOptionsType } from "./SyntheticsGlobalVariableParseTestOptionsType";
 import { SyntheticsVariableParser } from "./SyntheticsVariableParser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Parser options to use for retrieving a Synthetics global variable from a Synthetics Test. Used in conjunction with `parse_test_public_id`.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableValue.ts b/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableValue.ts
index 627bed4f4569..f0477db91bdf 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableValue.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsGlobalVariableValue.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Value of the global variable.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsListGlobalVariablesResponse.ts b/packages/datadog-api-client-v1/models/SyntheticsListGlobalVariablesResponse.ts
index eefbeb171ce1..7b5f82f28d8c 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsListGlobalVariablesResponse.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsListGlobalVariablesResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsGlobalVariable } from "./SyntheticsGlobalVariable";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing an array of Synthetic global variables.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsListTestsResponse.ts b/packages/datadog-api-client-v1/models/SyntheticsListTestsResponse.ts
index a80faed14306..0d42d8ba2675 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsListTestsResponse.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsListTestsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsTestDetails } from "./SyntheticsTestDetails";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing an array of Synthetic tests configuration.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsLocation.ts b/packages/datadog-api-client-v1/models/SyntheticsLocation.ts
index 3f2fb5f38995..9e08ea936b81 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsLocation.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsLocation.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Synthetic location that can be used when creating or editing a test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsLocations.ts b/packages/datadog-api-client-v1/models/SyntheticsLocations.ts
index dbea880d3a16..d3f540d76b77 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsLocations.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsLocations.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsLocation } from "./SyntheticsLocation";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of Synthetics locations.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsParsingOptions.ts b/packages/datadog-api-client-v1/models/SyntheticsParsingOptions.ts
index c299026973f6..7f4253d67bd6 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsParsingOptions.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsParsingOptions.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsGlobalVariableParseTestOptionsType } from "./SyntheticsGlobalVariableParseTestOptionsType";
 import { SyntheticsVariableParser } from "./SyntheticsVariableParser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Parsing options for variables to extract.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocation.ts b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocation.ts
index 01743ddc1538..c178f7bdebad 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocation.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocation.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsPrivateLocationSecrets } from "./SyntheticsPrivateLocationSecrets";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing information about the private location to create.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationCreationResponse.ts b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationCreationResponse.ts
index 9a76f75a28bf..ed5b9f9c3034 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationCreationResponse.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationCreationResponse.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsPrivateLocation } from "./SyntheticsPrivateLocation";
 import { SyntheticsPrivateLocationCreationResponseResultEncryption } from "./SyntheticsPrivateLocationCreationResponseResultEncryption";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object that contains the new private location, the public key for result encryption, and the configuration skeleton.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationCreationResponseResultEncryption.ts b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationCreationResponseResultEncryption.ts
index 04d04ff854e0..220540ca5be8 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationCreationResponseResultEncryption.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationCreationResponseResultEncryption.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Public key for the result encryption.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecrets.ts b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecrets.ts
index d4173b8cfe39..3ddcb8ce2a63 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecrets.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecrets.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsPrivateLocationSecretsAuthentication } from "./SyntheticsPrivateLocationSecretsAuthentication";
 import { SyntheticsPrivateLocationSecretsConfigDecryption } from "./SyntheticsPrivateLocationSecretsConfigDecryption";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Secrets for the private location. Only present in the response when creating the private location.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecretsAuthentication.ts b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecretsAuthentication.ts
index b0bee48960f6..6b86b72e494e 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecretsAuthentication.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecretsAuthentication.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Authentication part of the secrets.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecretsConfigDecryption.ts b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecretsConfigDecryption.ts
index 95ee723bf63a..393dd7fc16bc 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecretsConfigDecryption.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsPrivateLocationSecretsConfigDecryption.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Private key for the private location.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsSSLCertificate.ts b/packages/datadog-api-client-v1/models/SyntheticsSSLCertificate.ts
index cd0f2a16eedb..48f80b26ddb3 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsSSLCertificate.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsSSLCertificate.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsSSLCertificateIssuer } from "./SyntheticsSSLCertificateIssuer";
 import { SyntheticsSSLCertificateSubject } from "./SyntheticsSSLCertificateSubject";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the SSL certificate used for a Synthetic test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsSSLCertificateIssuer.ts b/packages/datadog-api-client-v1/models/SyntheticsSSLCertificateIssuer.ts
index 1a46067288ce..0a3806fe8e23 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsSSLCertificateIssuer.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsSSLCertificateIssuer.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the issuer of a SSL certificate.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsSSLCertificateSubject.ts b/packages/datadog-api-client-v1/models/SyntheticsSSLCertificateSubject.ts
index 67be50097929..815585ff0bfc 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsSSLCertificateSubject.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsSSLCertificateSubject.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the SSL certificate used for the test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsStep.ts b/packages/datadog-api-client-v1/models/SyntheticsStep.ts
index e2c8cb91d2dc..11039fdd3eb7 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsStep.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsStep.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsStepType } from "./SyntheticsStepType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The steps used in a Synthetics browser test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsStepDetail.ts b/packages/datadog-api-client-v1/models/SyntheticsStepDetail.ts
index cc1cd68a982f..46d73b08c39e 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsStepDetail.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsStepDetail.ts
@@ -14,7 +14,7 @@ import { SyntheticsCoreWebVitals } from "./SyntheticsCoreWebVitals";
 import { SyntheticsPlayingTab } from "./SyntheticsPlayingTab";
 import { SyntheticsStepDetailWarning } from "./SyntheticsStepDetailWarning";
 import { SyntheticsStepType } from "./SyntheticsStepType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing a step for a Synthetic test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsStepDetailWarning.ts b/packages/datadog-api-client-v1/models/SyntheticsStepDetailWarning.ts
index 81236f2a4087..37a4b0caaf7f 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsStepDetailWarning.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsStepDetailWarning.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsWarningType } from "./SyntheticsWarningType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object collecting warnings for a given step.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestConfig.ts b/packages/datadog-api-client-v1/models/SyntheticsTestConfig.ts
index 30c2b8c73edc..acede0985fcd 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestConfig.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestConfig.ts
@@ -12,7 +12,7 @@ import { SyntheticsAssertion } from "./SyntheticsAssertion";
 import { SyntheticsBrowserVariable } from "./SyntheticsBrowserVariable";
 import { SyntheticsConfigVariable } from "./SyntheticsConfigVariable";
 import { SyntheticsTestRequest } from "./SyntheticsTestRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Configuration object for a Synthetic test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestDetails.ts b/packages/datadog-api-client-v1/models/SyntheticsTestDetails.ts
index db708d85b107..e65280918261 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestDetails.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestDetails.ts
@@ -15,7 +15,7 @@ import { SyntheticsTestDetailsSubType } from "./SyntheticsTestDetailsSubType";
 import { SyntheticsTestDetailsType } from "./SyntheticsTestDetailsType";
 import { SyntheticsTestOptions } from "./SyntheticsTestOptions";
 import { SyntheticsTestPauseStatus } from "./SyntheticsTestPauseStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing details about your Synthetic test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestOptions.ts b/packages/datadog-api-client-v1/models/SyntheticsTestOptions.ts
index eaadd319d5b4..3d5db8abebc8 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestOptions.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestOptions.ts
@@ -11,7 +11,7 @@
 import { SyntheticsDeviceID } from "./SyntheticsDeviceID";
 import { SyntheticsTestOptionsMonitorOptions } from "./SyntheticsTestOptionsMonitorOptions";
 import { SyntheticsTestOptionsRetry } from "./SyntheticsTestOptionsRetry";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the extra options for a Synthetic test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestOptionsMonitorOptions.ts b/packages/datadog-api-client-v1/models/SyntheticsTestOptionsMonitorOptions.ts
index 3df8689dea07..090adc1d0324 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestOptionsMonitorOptions.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestOptionsMonitorOptions.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the options for a Synthetic test as a monitor (for example, renotification).
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestOptionsRetry.ts b/packages/datadog-api-client-v1/models/SyntheticsTestOptionsRetry.ts
index 1b651924b4a5..abb3f773ab9e 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestOptionsRetry.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestOptionsRetry.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the retry strategy to apply to a Synthetic test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestRequest.ts b/packages/datadog-api-client-v1/models/SyntheticsTestRequest.ts
index 136d036f2b77..a2f71ad2f52c 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestRequest.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestRequest.ts
@@ -12,7 +12,7 @@ import { HTTPMethod } from "./HTTPMethod";
 import { SyntheticsBasicAuth } from "./SyntheticsBasicAuth";
 import { SyntheticsTestRequestCertificate } from "./SyntheticsTestRequestCertificate";
 import { SyntheticsTestRequestProxy } from "./SyntheticsTestRequestProxy";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the Synthetic test request.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestRequestCertificate.ts b/packages/datadog-api-client-v1/models/SyntheticsTestRequestCertificate.ts
index abed2048a9e3..ab14904a2669 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestRequestCertificate.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestRequestCertificate.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsTestRequestCertificateItem } from "./SyntheticsTestRequestCertificateItem";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Client certificate to use when performing the test request.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestRequestCertificateItem.ts b/packages/datadog-api-client-v1/models/SyntheticsTestRequestCertificateItem.ts
index ba676ff72e1f..8073270e6c6c 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestRequestCertificateItem.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestRequestCertificateItem.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Define a request certificate.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTestRequestProxy.ts b/packages/datadog-api-client-v1/models/SyntheticsTestRequestProxy.ts
index bb0e32ea6bb2..dc388c1bc852 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTestRequestProxy.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTestRequestProxy.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The proxy to perform the test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTiming.ts b/packages/datadog-api-client-v1/models/SyntheticsTiming.ts
index bb01da7fd1d2..6c1c6bafbb44 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTiming.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTiming.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing all metrics and their values collected for a Synthetic API test. Learn more about those metrics in [Synthetics documentation](https://docs.datadoghq.com/synthetics/#metrics).
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTriggerBody.ts b/packages/datadog-api-client-v1/models/SyntheticsTriggerBody.ts
index 497073810095..be24d6b8f9eb 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTriggerBody.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTriggerBody.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsTriggerTest } from "./SyntheticsTriggerTest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing the synthetics tests to trigger.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestLocation.ts b/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestLocation.ts
index 58b4d665eab3..48e249627668 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestLocation.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestLocation.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Synthetics location.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestRunResult.ts b/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestRunResult.ts
index 957f2e6f02ba..0cff377ffc8b 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestRunResult.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestRunResult.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsDeviceID } from "./SyntheticsDeviceID";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Information about a single test run.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestsResponse.ts b/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestsResponse.ts
index 952e05aefe56..84e6b09f7ebe 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestsResponse.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTriggerCITestsResponse.ts
@@ -10,7 +10,7 @@
 
 import { SyntheticsTriggerCITestLocation } from "./SyntheticsTriggerCITestLocation";
 import { SyntheticsTriggerCITestRunResult } from "./SyntheticsTriggerCITestRunResult";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing information about the tests triggered.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsTriggerTest.ts b/packages/datadog-api-client-v1/models/SyntheticsTriggerTest.ts
index 7cb066d37ee0..b48266fde8a7 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsTriggerTest.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsTriggerTest.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsCIBatchMetadata } from "./SyntheticsCIBatchMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Test configuration for Synthetics
diff --git a/packages/datadog-api-client-v1/models/SyntheticsUpdateTestPauseStatusPayload.ts b/packages/datadog-api-client-v1/models/SyntheticsUpdateTestPauseStatusPayload.ts
index 222cea64d65c..c5c8d3c2aa05 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsUpdateTestPauseStatusPayload.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsUpdateTestPauseStatusPayload.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsTestPauseStatus } from "./SyntheticsTestPauseStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to start or pause an existing Synthetic test.
diff --git a/packages/datadog-api-client-v1/models/SyntheticsVariableParser.ts b/packages/datadog-api-client-v1/models/SyntheticsVariableParser.ts
index 7a38bcd3be99..bba03fbe7414 100644
--- a/packages/datadog-api-client-v1/models/SyntheticsVariableParser.ts
+++ b/packages/datadog-api-client-v1/models/SyntheticsVariableParser.ts
@@ -9,7 +9,7 @@
  */
 
 import { SyntheticsGlobalVariableParserType } from "./SyntheticsGlobalVariableParserType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Details of the parser to use for the global variable.
diff --git a/packages/datadog-api-client-v1/models/TableWidgetDefinition.ts b/packages/datadog-api-client-v1/models/TableWidgetDefinition.ts
index befbdbd20649..228a5e7d533e 100644
--- a/packages/datadog-api-client-v1/models/TableWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/TableWidgetDefinition.ts
@@ -14,7 +14,7 @@ import { TableWidgetRequest } from "./TableWidgetRequest";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The table visualization is available on timeboards and screenboards. It displays columns of metrics grouped by tag key.
diff --git a/packages/datadog-api-client-v1/models/TableWidgetRequest.ts b/packages/datadog-api-client-v1/models/TableWidgetRequest.ts
index b6563131df95..a90ecb77f05c 100644
--- a/packages/datadog-api-client-v1/models/TableWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/TableWidgetRequest.ts
@@ -18,7 +18,7 @@ import { WidgetAggregator } from "./WidgetAggregator";
 import { WidgetConditionalFormat } from "./WidgetConditionalFormat";
 import { WidgetFormula } from "./WidgetFormula";
 import { WidgetSort } from "./WidgetSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated table widget.
diff --git a/packages/datadog-api-client-v1/models/TagToHosts.ts b/packages/datadog-api-client-v1/models/TagToHosts.ts
index 4099aeb06be6..3f4bc117a0fc 100644
--- a/packages/datadog-api-client-v1/models/TagToHosts.ts
+++ b/packages/datadog-api-client-v1/models/TagToHosts.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * In this object, the key is the tag, the value is a list of host names that are reporting that tag.
diff --git a/packages/datadog-api-client-v1/models/TimeseriesWidgetDefinition.ts b/packages/datadog-api-client-v1/models/TimeseriesWidgetDefinition.ts
index e39789025991..a144fdae18fd 100644
--- a/packages/datadog-api-client-v1/models/TimeseriesWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/TimeseriesWidgetDefinition.ts
@@ -18,7 +18,7 @@ import { WidgetEvent } from "./WidgetEvent";
 import { WidgetMarker } from "./WidgetMarker";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The timeseries visualization allows you to display the evolution of one or more metrics, log events, or Indexed Spans over time.
diff --git a/packages/datadog-api-client-v1/models/TimeseriesWidgetExpressionAlias.ts b/packages/datadog-api-client-v1/models/TimeseriesWidgetExpressionAlias.ts
index bec5381bc096..b56adf1528b3 100644
--- a/packages/datadog-api-client-v1/models/TimeseriesWidgetExpressionAlias.ts
+++ b/packages/datadog-api-client-v1/models/TimeseriesWidgetExpressionAlias.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Define an expression alias.
diff --git a/packages/datadog-api-client-v1/models/TimeseriesWidgetRequest.ts b/packages/datadog-api-client-v1/models/TimeseriesWidgetRequest.ts
index 64a477a98c40..c1cf60bcca8b 100644
--- a/packages/datadog-api-client-v1/models/TimeseriesWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/TimeseriesWidgetRequest.ts
@@ -16,7 +16,7 @@ import { TimeseriesWidgetExpressionAlias } from "./TimeseriesWidgetExpressionAli
 import { WidgetDisplayType } from "./WidgetDisplayType";
 import { WidgetFormula } from "./WidgetFormula";
 import { WidgetRequestStyle } from "./WidgetRequestStyle";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated timeseries widget.
diff --git a/packages/datadog-api-client-v1/models/ToplistWidgetDefinition.ts b/packages/datadog-api-client-v1/models/ToplistWidgetDefinition.ts
index a4c79e6659b7..b5aa2f27f15a 100644
--- a/packages/datadog-api-client-v1/models/ToplistWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/ToplistWidgetDefinition.ts
@@ -13,7 +13,7 @@ import { ToplistWidgetRequest } from "./ToplistWidgetRequest";
 import { WidgetCustomLink } from "./WidgetCustomLink";
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The top list visualization enables you to display a list of Tag value like hostname or service with the most or least of any metric value, such as highest consumers of CPU, hosts with the least disk space, etc.
diff --git a/packages/datadog-api-client-v1/models/ToplistWidgetRequest.ts b/packages/datadog-api-client-v1/models/ToplistWidgetRequest.ts
index 1a74d710eb73..616e0aaae2d3 100644
--- a/packages/datadog-api-client-v1/models/ToplistWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/ToplistWidgetRequest.ts
@@ -15,7 +15,7 @@ import { ProcessQueryDefinition } from "./ProcessQueryDefinition";
 import { WidgetConditionalFormat } from "./WidgetConditionalFormat";
 import { WidgetFormula } from "./WidgetFormula";
 import { WidgetRequestStyle } from "./WidgetRequestStyle";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Updated top list widget.
diff --git a/packages/datadog-api-client-v1/models/TreeMapWidgetDefinition.ts b/packages/datadog-api-client-v1/models/TreeMapWidgetDefinition.ts
index 19bb2bef9ac2..1fdc6abcb77e 100644
--- a/packages/datadog-api-client-v1/models/TreeMapWidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/TreeMapWidgetDefinition.ts
@@ -13,7 +13,7 @@ import { TreeMapGroupBy } from "./TreeMapGroupBy";
 import { TreeMapSizeBy } from "./TreeMapSizeBy";
 import { TreeMapWidgetDefinitionType } from "./TreeMapWidgetDefinitionType";
 import { TreeMapWidgetRequest } from "./TreeMapWidgetRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The treemap visualization found on the Host Dashboards comes from the output of `ps auxww`. This is not continuously run on your hosts. Instead, it’s run once on Agent start/restart. The treemap is only supported for process data on a single host dashboard — this may not be reused in other dashboards or for other metrics.
diff --git a/packages/datadog-api-client-v1/models/TreeMapWidgetRequest.ts b/packages/datadog-api-client-v1/models/TreeMapWidgetRequest.ts
index 5ec77dab018a..24d80591fc43 100644
--- a/packages/datadog-api-client-v1/models/TreeMapWidgetRequest.ts
+++ b/packages/datadog-api-client-v1/models/TreeMapWidgetRequest.ts
@@ -11,7 +11,7 @@
 import { FormulaAndFunctionQueryDefinition } from "./FormulaAndFunctionQueryDefinition";
 import { FormulaAndFunctionResponseFormat } from "./FormulaAndFunctionResponseFormat";
 import { WidgetFormula } from "./WidgetFormula";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An updated treemap widget.
diff --git a/packages/datadog-api-client-v1/models/UsageAnalyzedLogsHour.ts b/packages/datadog-api-client-v1/models/UsageAnalyzedLogsHour.ts
index df6e6e0245af..ebc4e8af41dd 100644
--- a/packages/datadog-api-client-v1/models/UsageAnalyzedLogsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageAnalyzedLogsHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The number of analyzed logs for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageAnalyzedLogsResponse.ts b/packages/datadog-api-client-v1/models/UsageAnalyzedLogsResponse.ts
index a0c956dfa9bd..6489c5dbc926 100644
--- a/packages/datadog-api-client-v1/models/UsageAnalyzedLogsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageAnalyzedLogsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageAnalyzedLogsHour } from "./UsageAnalyzedLogsHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A response containing the number of analyzed logs for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionAggregatesBody.ts b/packages/datadog-api-client-v1/models/UsageAttributionAggregatesBody.ts
index a245a408e42f..5c6100a33c79 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionAggregatesBody.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionAggregatesBody.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing the aggregates.
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionBody.ts b/packages/datadog-api-client-v1/models/UsageAttributionBody.ts
index dce1bee5aa59..242c5cef9950 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionBody.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionBody.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageAttributionValues } from "./UsageAttributionValues";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Usage Summary by tag for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionMetadata.ts b/packages/datadog-api-client-v1/models/UsageAttributionMetadata.ts
index e56410e6ca85..3e4de1beab21 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionMetadata.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionMetadata.ts
@@ -10,7 +10,7 @@
 
 import { UsageAttributionAggregatesBody } from "./UsageAttributionAggregatesBody";
 import { UsageAttributionPagination } from "./UsageAttributionPagination";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing document metadata.
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionPagination.ts b/packages/datadog-api-client-v1/models/UsageAttributionPagination.ts
index ad6beb1fe0fb..bc67328a1d78 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionPagination.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionPagination.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata for the current pagination.
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionResponse.ts b/packages/datadog-api-client-v1/models/UsageAttributionResponse.ts
index 4345f662cfed..85f3fa6b1998 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionResponse.ts
@@ -10,7 +10,7 @@
 
 import { UsageAttributionBody } from "./UsageAttributionBody";
 import { UsageAttributionMetadata } from "./UsageAttributionMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the Usage Summary by tag(s).
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionValues.ts b/packages/datadog-api-client-v1/models/UsageAttributionValues.ts
index 190b4edc6142..f362b93ad1eb 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionValues.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionValues.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Fields in Usage Summary by tag(s).
diff --git a/packages/datadog-api-client-v1/models/UsageAuditLogsHour.ts b/packages/datadog-api-client-v1/models/UsageAuditLogsHour.ts
index 3d28b835d3fe..e587aa09455f 100644
--- a/packages/datadog-api-client-v1/models/UsageAuditLogsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageAuditLogsHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Audit logs usage for a given organization for a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageAuditLogsResponse.ts b/packages/datadog-api-client-v1/models/UsageAuditLogsResponse.ts
index e37d6a81035f..a7bcc0a211fa 100644
--- a/packages/datadog-api-client-v1/models/UsageAuditLogsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageAuditLogsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageAuditLogsHour } from "./UsageAuditLogsHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the audit logs usage for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageBillableSummaryBody.ts b/packages/datadog-api-client-v1/models/UsageBillableSummaryBody.ts
index d0928b1ee9c1..9e0c816a4196 100644
--- a/packages/datadog-api-client-v1/models/UsageBillableSummaryBody.ts
+++ b/packages/datadog-api-client-v1/models/UsageBillableSummaryBody.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with properties for each aggregated usage type.
diff --git a/packages/datadog-api-client-v1/models/UsageBillableSummaryHour.ts b/packages/datadog-api-client-v1/models/UsageBillableSummaryHour.ts
index 5d31f1521945..210813de1edc 100644
--- a/packages/datadog-api-client-v1/models/UsageBillableSummaryHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageBillableSummaryHour.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageBillableSummaryKeys } from "./UsageBillableSummaryKeys";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with monthly summary of data billed by Datadog.
diff --git a/packages/datadog-api-client-v1/models/UsageBillableSummaryKeys.ts b/packages/datadog-api-client-v1/models/UsageBillableSummaryKeys.ts
index e10c73390bff..3b6833bad6a1 100644
--- a/packages/datadog-api-client-v1/models/UsageBillableSummaryKeys.ts
+++ b/packages/datadog-api-client-v1/models/UsageBillableSummaryKeys.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageBillableSummaryBody } from "./UsageBillableSummaryBody";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with aggregated usage types.
diff --git a/packages/datadog-api-client-v1/models/UsageBillableSummaryResponse.ts b/packages/datadog-api-client-v1/models/UsageBillableSummaryResponse.ts
index 44400a173528..00dc668761b9 100644
--- a/packages/datadog-api-client-v1/models/UsageBillableSummaryResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageBillableSummaryResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageBillableSummaryHour } from "./UsageBillableSummaryHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with monthly summary of data billed by Datadog.
diff --git a/packages/datadog-api-client-v1/models/UsageCIVisibilityHour.ts b/packages/datadog-api-client-v1/models/UsageCIVisibilityHour.ts
index 8aef52f4789e..bf6740974569 100644
--- a/packages/datadog-api-client-v1/models/UsageCIVisibilityHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageCIVisibilityHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * CI visibility usage in a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageCIVisibilityResponse.ts b/packages/datadog-api-client-v1/models/UsageCIVisibilityResponse.ts
index 4f15379b36c2..e90b12f63095 100644
--- a/packages/datadog-api-client-v1/models/UsageCIVisibilityResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageCIVisibilityResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageCIVisibilityHour } from "./UsageCIVisibilityHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * CI visibility usage response
diff --git a/packages/datadog-api-client-v1/models/UsageCWSHour.ts b/packages/datadog-api-client-v1/models/UsageCWSHour.ts
index 3aab15b2fb05..9c5cf856e970 100644
--- a/packages/datadog-api-client-v1/models/UsageCWSHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageCWSHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Cloud Workload Security usage for a given organization for a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageCWSResponse.ts b/packages/datadog-api-client-v1/models/UsageCWSResponse.ts
index aaccf7f8e976..ae354589c032 100644
--- a/packages/datadog-api-client-v1/models/UsageCWSResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageCWSResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageCWSHour } from "./UsageCWSHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the Cloud Workload Security usage for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageCloudSecurityPostureManagementHour.ts b/packages/datadog-api-client-v1/models/UsageCloudSecurityPostureManagementHour.ts
index b6488e966a10..3ebf52888383 100644
--- a/packages/datadog-api-client-v1/models/UsageCloudSecurityPostureManagementHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageCloudSecurityPostureManagementHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Cloud Security Posture Management usage for a given organization for a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageCloudSecurityPostureManagementResponse.ts b/packages/datadog-api-client-v1/models/UsageCloudSecurityPostureManagementResponse.ts
index 734f1f7aa2d9..84095f91a7b0 100644
--- a/packages/datadog-api-client-v1/models/UsageCloudSecurityPostureManagementResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageCloudSecurityPostureManagementResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageCloudSecurityPostureManagementHour } from "./UsageCloudSecurityPostureManagementHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response containing the Cloud Security Posture Management usage for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageCustomReportsAttributes.ts b/packages/datadog-api-client-v1/models/UsageCustomReportsAttributes.ts
index f2ca430f9388..428a42415791 100644
--- a/packages/datadog-api-client-v1/models/UsageCustomReportsAttributes.ts
+++ b/packages/datadog-api-client-v1/models/UsageCustomReportsAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response containing attributes for custom reports.
diff --git a/packages/datadog-api-client-v1/models/UsageCustomReportsData.ts b/packages/datadog-api-client-v1/models/UsageCustomReportsData.ts
index 2523abcb9552..1cddfe8556c1 100644
--- a/packages/datadog-api-client-v1/models/UsageCustomReportsData.ts
+++ b/packages/datadog-api-client-v1/models/UsageCustomReportsData.ts
@@ -10,7 +10,7 @@
 
 import { UsageCustomReportsAttributes } from "./UsageCustomReportsAttributes";
 import { UsageReportsType } from "./UsageReportsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response containing the date and type for custom reports.
diff --git a/packages/datadog-api-client-v1/models/UsageCustomReportsMeta.ts b/packages/datadog-api-client-v1/models/UsageCustomReportsMeta.ts
index c80df8a2d04b..33b389006d9b 100644
--- a/packages/datadog-api-client-v1/models/UsageCustomReportsMeta.ts
+++ b/packages/datadog-api-client-v1/models/UsageCustomReportsMeta.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageCustomReportsPage } from "./UsageCustomReportsPage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing document metadata.
diff --git a/packages/datadog-api-client-v1/models/UsageCustomReportsPage.ts b/packages/datadog-api-client-v1/models/UsageCustomReportsPage.ts
index f3d8a75d7cd0..a68fd712b8a9 100644
--- a/packages/datadog-api-client-v1/models/UsageCustomReportsPage.ts
+++ b/packages/datadog-api-client-v1/models/UsageCustomReportsPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing page total count.
diff --git a/packages/datadog-api-client-v1/models/UsageCustomReportsResponse.ts b/packages/datadog-api-client-v1/models/UsageCustomReportsResponse.ts
index 590aa0722595..2910234aa292 100644
--- a/packages/datadog-api-client-v1/models/UsageCustomReportsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageCustomReportsResponse.ts
@@ -10,7 +10,7 @@
 
 import { UsageCustomReportsData } from "./UsageCustomReportsData";
 import { UsageCustomReportsMeta } from "./UsageCustomReportsMeta";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing available custom reports.
diff --git a/packages/datadog-api-client-v1/models/UsageDBMHour.ts b/packages/datadog-api-client-v1/models/UsageDBMHour.ts
index 208b9cce71a5..a420400f0f2e 100644
--- a/packages/datadog-api-client-v1/models/UsageDBMHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageDBMHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Database Monitoring usage for a given organization for a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageDBMResponse.ts b/packages/datadog-api-client-v1/models/UsageDBMResponse.ts
index 64eaafdc5f24..6dd871c15298 100644
--- a/packages/datadog-api-client-v1/models/UsageDBMResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageDBMResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageDBMHour } from "./UsageDBMHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the Database Monitoring usage for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageFargateHour.ts b/packages/datadog-api-client-v1/models/UsageFargateHour.ts
index 61d529d0d72b..5416cef32853 100644
--- a/packages/datadog-api-client-v1/models/UsageFargateHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageFargateHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of Fargate tasks run and hourly usage.
diff --git a/packages/datadog-api-client-v1/models/UsageFargateResponse.ts b/packages/datadog-api-client-v1/models/UsageFargateResponse.ts
index 56deb1879033..373b8f9710d2 100644
--- a/packages/datadog-api-client-v1/models/UsageFargateResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageFargateResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageFargateHour } from "./UsageFargateHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of Fargate tasks run and hourly usage.
diff --git a/packages/datadog-api-client-v1/models/UsageHostHour.ts b/packages/datadog-api-client-v1/models/UsageHostHour.ts
index 5133a264f1b6..c581eefc5a42 100644
--- a/packages/datadog-api-client-v1/models/UsageHostHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageHostHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of hosts/containers recorded for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageHostsResponse.ts b/packages/datadog-api-client-v1/models/UsageHostsResponse.ts
index 27193b9a19cc..4aa048c4a792 100644
--- a/packages/datadog-api-client-v1/models/UsageHostsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageHostsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageHostHour } from "./UsageHostHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Host usage response.
diff --git a/packages/datadog-api-client-v1/models/UsageIncidentManagementHour.ts b/packages/datadog-api-client-v1/models/UsageIncidentManagementHour.ts
index a7056ac8efdd..da855feed940 100644
--- a/packages/datadog-api-client-v1/models/UsageIncidentManagementHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageIncidentManagementHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident management usage for a given organization for a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageIncidentManagementResponse.ts b/packages/datadog-api-client-v1/models/UsageIncidentManagementResponse.ts
index 77edfcbfbca6..b55fa69ac34e 100644
--- a/packages/datadog-api-client-v1/models/UsageIncidentManagementResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageIncidentManagementResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageIncidentManagementHour } from "./UsageIncidentManagementHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the incident management usage for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageIndexedSpansHour.ts b/packages/datadog-api-client-v1/models/UsageIndexedSpansHour.ts
index 7b5629a58c2a..e2b7c9625966 100644
--- a/packages/datadog-api-client-v1/models/UsageIndexedSpansHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageIndexedSpansHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The hours of indexed spans usage.
diff --git a/packages/datadog-api-client-v1/models/UsageIndexedSpansResponse.ts b/packages/datadog-api-client-v1/models/UsageIndexedSpansResponse.ts
index 312fd4f4358f..e19fca228ffe 100644
--- a/packages/datadog-api-client-v1/models/UsageIndexedSpansResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageIndexedSpansResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageIndexedSpansHour } from "./UsageIndexedSpansHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A response containing indexed spans usage.
diff --git a/packages/datadog-api-client-v1/models/UsageIngestedSpansHour.ts b/packages/datadog-api-client-v1/models/UsageIngestedSpansHour.ts
index cd09519c41ed..45ea82c3a063 100644
--- a/packages/datadog-api-client-v1/models/UsageIngestedSpansHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageIngestedSpansHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Ingested spans usage for a given organization for a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageIngestedSpansResponse.ts b/packages/datadog-api-client-v1/models/UsageIngestedSpansResponse.ts
index a9e0aab22a9e..23f5529d2911 100644
--- a/packages/datadog-api-client-v1/models/UsageIngestedSpansResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageIngestedSpansResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageIngestedSpansHour } from "./UsageIngestedSpansHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the ingested spans usage for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageIoTHour.ts b/packages/datadog-api-client-v1/models/UsageIoTHour.ts
index 33f749794e52..c6d2dac0b03f 100644
--- a/packages/datadog-api-client-v1/models/UsageIoTHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageIoTHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * IoT usage for a given organization for a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageIoTResponse.ts b/packages/datadog-api-client-v1/models/UsageIoTResponse.ts
index a3e32441172b..7fedf440ee23 100644
--- a/packages/datadog-api-client-v1/models/UsageIoTResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageIoTResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageIoTHour } from "./UsageIoTHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the IoT usage for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageLambdaHour.ts b/packages/datadog-api-client-v1/models/UsageLambdaHour.ts
index 593e47c1a58c..bc569ec15ac2 100644
--- a/packages/datadog-api-client-v1/models/UsageLambdaHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageLambdaHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of lambda functions and sum of the invocations of all lambda functions for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageLambdaResponse.ts b/packages/datadog-api-client-v1/models/UsageLambdaResponse.ts
index 1d3a4305dc84..056f70c88adf 100644
--- a/packages/datadog-api-client-v1/models/UsageLambdaResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageLambdaResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageLambdaHour } from "./UsageLambdaHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of lambda functions and sum of the invocations of all lambda functions for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageLogsByIndexHour.ts b/packages/datadog-api-client-v1/models/UsageLogsByIndexHour.ts
index 3fb1b7089847..3fad368d03bb 100644
--- a/packages/datadog-api-client-v1/models/UsageLogsByIndexHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageLogsByIndexHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of indexed logs for each hour and index for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageLogsByIndexResponse.ts b/packages/datadog-api-client-v1/models/UsageLogsByIndexResponse.ts
index ab635d6ce824..3b3a6171f072 100644
--- a/packages/datadog-api-client-v1/models/UsageLogsByIndexResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageLogsByIndexResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageLogsByIndexHour } from "./UsageLogsByIndexHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of indexed logs for each hour and index for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageLogsByRetentionHour.ts b/packages/datadog-api-client-v1/models/UsageLogsByRetentionHour.ts
index 6bca4d231b00..3562d2a199ed 100644
--- a/packages/datadog-api-client-v1/models/UsageLogsByRetentionHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageLogsByRetentionHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The number of indexed logs for each hour for a given organization broken down by retention period.
diff --git a/packages/datadog-api-client-v1/models/UsageLogsByRetentionResponse.ts b/packages/datadog-api-client-v1/models/UsageLogsByRetentionResponse.ts
index c0207cf4b881..965d0bedf019 100644
--- a/packages/datadog-api-client-v1/models/UsageLogsByRetentionResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageLogsByRetentionResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageLogsByRetentionHour } from "./UsageLogsByRetentionHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the indexed logs usage broken down by retention period for an organization during a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageLogsHour.ts b/packages/datadog-api-client-v1/models/UsageLogsHour.ts
index 87db14d2e9b2..1fdb73d9cebe 100644
--- a/packages/datadog-api-client-v1/models/UsageLogsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageLogsHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Hour usage for logs.
diff --git a/packages/datadog-api-client-v1/models/UsageLogsResponse.ts b/packages/datadog-api-client-v1/models/UsageLogsResponse.ts
index 81b552d7243d..a760610c4f45 100644
--- a/packages/datadog-api-client-v1/models/UsageLogsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageLogsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageLogsHour } from "./UsageLogsHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of logs for each hour.
diff --git a/packages/datadog-api-client-v1/models/UsageNetworkFlowsHour.ts b/packages/datadog-api-client-v1/models/UsageNetworkFlowsHour.ts
index 725b2126a324..3a0a4f6d5598 100644
--- a/packages/datadog-api-client-v1/models/UsageNetworkFlowsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageNetworkFlowsHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of netflow events indexed for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageNetworkFlowsResponse.ts b/packages/datadog-api-client-v1/models/UsageNetworkFlowsResponse.ts
index 4674b4a923d7..256da1a7c223 100644
--- a/packages/datadog-api-client-v1/models/UsageNetworkFlowsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageNetworkFlowsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageNetworkFlowsHour } from "./UsageNetworkFlowsHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of netflow events indexed for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageNetworkHostsHour.ts b/packages/datadog-api-client-v1/models/UsageNetworkHostsHour.ts
index db6a9c5e2699..04c29e85d798 100644
--- a/packages/datadog-api-client-v1/models/UsageNetworkHostsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageNetworkHostsHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of active NPM hosts for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageNetworkHostsResponse.ts b/packages/datadog-api-client-v1/models/UsageNetworkHostsResponse.ts
index 3fb884374971..79ce6689809c 100644
--- a/packages/datadog-api-client-v1/models/UsageNetworkHostsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageNetworkHostsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageNetworkHostsHour } from "./UsageNetworkHostsHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of active NPM hosts for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageOnlineArchiveHour.ts b/packages/datadog-api-client-v1/models/UsageOnlineArchiveHour.ts
index 3ddd7dafeee6..0a0aab289496 100644
--- a/packages/datadog-api-client-v1/models/UsageOnlineArchiveHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageOnlineArchiveHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Online Archive usage in a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageOnlineArchiveResponse.ts b/packages/datadog-api-client-v1/models/UsageOnlineArchiveResponse.ts
index c32025da9fe9..4c63cfc8ede1 100644
--- a/packages/datadog-api-client-v1/models/UsageOnlineArchiveResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageOnlineArchiveResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageOnlineArchiveHour } from "./UsageOnlineArchiveHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Online Archive usage response.
diff --git a/packages/datadog-api-client-v1/models/UsageProfilingHour.ts b/packages/datadog-api-client-v1/models/UsageProfilingHour.ts
index 2c46575cf4d4..c48e8f4d0fce 100644
--- a/packages/datadog-api-client-v1/models/UsageProfilingHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageProfilingHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The number of profiled hosts for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageProfilingResponse.ts b/packages/datadog-api-client-v1/models/UsageProfilingResponse.ts
index b5e1be700101..0793c55e12b4 100644
--- a/packages/datadog-api-client-v1/models/UsageProfilingResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageProfilingResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageProfilingHour } from "./UsageProfilingHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of profiled hosts for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageRumSessionsHour.ts b/packages/datadog-api-client-v1/models/UsageRumSessionsHour.ts
index 8577d66f7b6b..c4fb4b6d3d3f 100644
--- a/packages/datadog-api-client-v1/models/UsageRumSessionsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageRumSessionsHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of RUM Sessions recorded for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageRumSessionsResponse.ts b/packages/datadog-api-client-v1/models/UsageRumSessionsResponse.ts
index c8d37e895de0..edb051f98c9b 100644
--- a/packages/datadog-api-client-v1/models/UsageRumSessionsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageRumSessionsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageRumSessionsHour } from "./UsageRumSessionsHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of RUM Sessions for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageRumUnitsHour.ts b/packages/datadog-api-client-v1/models/UsageRumUnitsHour.ts
index fab1ec23f590..8af779cde4be 100644
--- a/packages/datadog-api-client-v1/models/UsageRumUnitsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageRumUnitsHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of RUM Units used for each hour for a given organization (data available as of November 1, 2021).
diff --git a/packages/datadog-api-client-v1/models/UsageRumUnitsResponse.ts b/packages/datadog-api-client-v1/models/UsageRumUnitsResponse.ts
index 6fdd26dbd781..75db2df1e1b8 100644
--- a/packages/datadog-api-client-v1/models/UsageRumUnitsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageRumUnitsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageRumUnitsHour } from "./UsageRumUnitsHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of RUM Units for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSDSHour.ts b/packages/datadog-api-client-v1/models/UsageSDSHour.ts
index 022edc91632e..bc1a1eaf9726 100644
--- a/packages/datadog-api-client-v1/models/UsageSDSHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageSDSHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Sensitive Data Scanner usage for a given organization for a given hour.
diff --git a/packages/datadog-api-client-v1/models/UsageSDSResponse.ts b/packages/datadog-api-client-v1/models/UsageSDSResponse.ts
index 4cbb2e9383ed..8b3e7a3b7007 100644
--- a/packages/datadog-api-client-v1/models/UsageSDSResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageSDSResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageSDSHour } from "./UsageSDSHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the Sensitive Data Scanner usage for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSNMPHour.ts b/packages/datadog-api-client-v1/models/UsageSNMPHour.ts
index 89f93cb7405c..0cd7c0cef219 100644
--- a/packages/datadog-api-client-v1/models/UsageSNMPHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageSNMPHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The number of SNMP devices for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSNMPResponse.ts b/packages/datadog-api-client-v1/models/UsageSNMPResponse.ts
index 015880653ba4..d283ffb59976 100644
--- a/packages/datadog-api-client-v1/models/UsageSNMPResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageSNMPResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageSNMPHour } from "./UsageSNMPHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of SNMP devices for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsAttributes.ts b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsAttributes.ts
index b2b6158fb4bd..e876b0b5a0da 100644
--- a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsAttributes.ts
+++ b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response containing attributes for specified custom reports.
diff --git a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsData.ts b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsData.ts
index ce07c4b3e46a..91574f324d8e 100644
--- a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsData.ts
+++ b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsData.ts
@@ -10,7 +10,7 @@
 
 import { UsageReportsType } from "./UsageReportsType";
 import { UsageSpecifiedCustomReportsAttributes } from "./UsageSpecifiedCustomReportsAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing date and type for specified custom reports.
diff --git a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsMeta.ts b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsMeta.ts
index 7586b907064c..7e54d6462137 100644
--- a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsMeta.ts
+++ b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsMeta.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageSpecifiedCustomReportsPage } from "./UsageSpecifiedCustomReportsPage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing document metadata.
diff --git a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsPage.ts b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsPage.ts
index 4bb30d70afef..1245a5135695 100644
--- a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsPage.ts
+++ b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing page total count for specified ID.
diff --git a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsResponse.ts b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsResponse.ts
index 71c7c008a19c..f9e39ec20d72 100644
--- a/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageSpecifiedCustomReportsResponse.ts
@@ -10,7 +10,7 @@
 
 import { UsageSpecifiedCustomReportsData } from "./UsageSpecifiedCustomReportsData";
 import { UsageSpecifiedCustomReportsMeta } from "./UsageSpecifiedCustomReportsMeta";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Returns available specified custom reports.
diff --git a/packages/datadog-api-client-v1/models/UsageSummaryDate.ts b/packages/datadog-api-client-v1/models/UsageSummaryDate.ts
index 5185f67ac410..e8b1f36531b1 100644
--- a/packages/datadog-api-client-v1/models/UsageSummaryDate.ts
+++ b/packages/datadog-api-client-v1/models/UsageSummaryDate.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageSummaryDateOrg } from "./UsageSummaryDateOrg";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with hourly report of all data billed by Datadog all organizations.
diff --git a/packages/datadog-api-client-v1/models/UsageSummaryDateOrg.ts b/packages/datadog-api-client-v1/models/UsageSummaryDateOrg.ts
index 736853d2830c..359ed16e32a8 100644
--- a/packages/datadog-api-client-v1/models/UsageSummaryDateOrg.ts
+++ b/packages/datadog-api-client-v1/models/UsageSummaryDateOrg.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Global hourly report of all data billed by Datadog for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSummaryResponse.ts b/packages/datadog-api-client-v1/models/UsageSummaryResponse.ts
index cd065bfe18d4..509ec38c367b 100644
--- a/packages/datadog-api-client-v1/models/UsageSummaryResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageSummaryResponse.ts
@@ -10,7 +10,7 @@
 
 import { LogsByRetention } from "./LogsByRetention";
 import { UsageSummaryDate } from "./UsageSummaryDate";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response summarizing all usage aggregated across the months in the request for all organizations, and broken down by month and by organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSyntheticsAPIHour.ts b/packages/datadog-api-client-v1/models/UsageSyntheticsAPIHour.ts
index 41d8458ca90b..ba1e4033481e 100644
--- a/packages/datadog-api-client-v1/models/UsageSyntheticsAPIHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageSyntheticsAPIHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of Synthetics API tests run for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSyntheticsAPIResponse.ts b/packages/datadog-api-client-v1/models/UsageSyntheticsAPIResponse.ts
index 20f1d7f0eb08..ec24f9ffdfcc 100644
--- a/packages/datadog-api-client-v1/models/UsageSyntheticsAPIResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageSyntheticsAPIResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageSyntheticsAPIHour } from "./UsageSyntheticsAPIHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of Synthetics API tests run for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSyntheticsBrowserHour.ts b/packages/datadog-api-client-v1/models/UsageSyntheticsBrowserHour.ts
index 3b861d664cbc..70c3bcf67de9 100644
--- a/packages/datadog-api-client-v1/models/UsageSyntheticsBrowserHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageSyntheticsBrowserHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of Synthetics Browser tests run for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSyntheticsBrowserResponse.ts b/packages/datadog-api-client-v1/models/UsageSyntheticsBrowserResponse.ts
index e606c75982a0..91228e312e64 100644
--- a/packages/datadog-api-client-v1/models/UsageSyntheticsBrowserResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageSyntheticsBrowserResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageSyntheticsBrowserHour } from "./UsageSyntheticsBrowserHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of Synthetics Browser tests run for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSyntheticsHour.ts b/packages/datadog-api-client-v1/models/UsageSyntheticsHour.ts
index 676513e3b290..fb08ca5ba39c 100644
--- a/packages/datadog-api-client-v1/models/UsageSyntheticsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageSyntheticsHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The number of synthetics tests run for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageSyntheticsResponse.ts b/packages/datadog-api-client-v1/models/UsageSyntheticsResponse.ts
index c8bfb334a32e..a1487a08493a 100644
--- a/packages/datadog-api-client-v1/models/UsageSyntheticsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageSyntheticsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageSyntheticsHour } from "./UsageSyntheticsHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of Synthetics API tests run for each hour for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageTimeseriesHour.ts b/packages/datadog-api-client-v1/models/UsageTimeseriesHour.ts
index e98ca4b4a6cb..ae1bdeed573c 100644
--- a/packages/datadog-api-client-v1/models/UsageTimeseriesHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageTimeseriesHour.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The hourly usage of timeseries.
diff --git a/packages/datadog-api-client-v1/models/UsageTimeseriesResponse.ts b/packages/datadog-api-client-v1/models/UsageTimeseriesResponse.ts
index 15db891709e3..5d9dc2a3837c 100644
--- a/packages/datadog-api-client-v1/models/UsageTimeseriesResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageTimeseriesResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageTimeseriesHour } from "./UsageTimeseriesHour";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing hourly usage of timeseries.
diff --git a/packages/datadog-api-client-v1/models/UsageTopAvgMetricsHour.ts b/packages/datadog-api-client-v1/models/UsageTopAvgMetricsHour.ts
index ac2554d18cfb..2674615ffb23 100644
--- a/packages/datadog-api-client-v1/models/UsageTopAvgMetricsHour.ts
+++ b/packages/datadog-api-client-v1/models/UsageTopAvgMetricsHour.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageMetricCategory } from "./UsageMetricCategory";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Number of hourly recorded custom metrics for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UsageTopAvgMetricsMetadata.ts b/packages/datadog-api-client-v1/models/UsageTopAvgMetricsMetadata.ts
index 6c97be015dcc..4c10296f307d 100644
--- a/packages/datadog-api-client-v1/models/UsageTopAvgMetricsMetadata.ts
+++ b/packages/datadog-api-client-v1/models/UsageTopAvgMetricsMetadata.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsageTopAvgMetricsPagination } from "./UsageTopAvgMetricsPagination";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing document metadata.
diff --git a/packages/datadog-api-client-v1/models/UsageTopAvgMetricsPagination.ts b/packages/datadog-api-client-v1/models/UsageTopAvgMetricsPagination.ts
index bd0840f627da..16be9500e9d5 100644
--- a/packages/datadog-api-client-v1/models/UsageTopAvgMetricsPagination.ts
+++ b/packages/datadog-api-client-v1/models/UsageTopAvgMetricsPagination.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata for the current pagination.
diff --git a/packages/datadog-api-client-v1/models/UsageTopAvgMetricsResponse.ts b/packages/datadog-api-client-v1/models/UsageTopAvgMetricsResponse.ts
index 89b9d01330d6..2ddd1a319226 100644
--- a/packages/datadog-api-client-v1/models/UsageTopAvgMetricsResponse.ts
+++ b/packages/datadog-api-client-v1/models/UsageTopAvgMetricsResponse.ts
@@ -10,7 +10,7 @@
 
 import { UsageTopAvgMetricsHour } from "./UsageTopAvgMetricsHour";
 import { UsageTopAvgMetricsMetadata } from "./UsageTopAvgMetricsMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing the number of hourly recorded custom metrics for a given organization.
diff --git a/packages/datadog-api-client-v1/models/User.ts b/packages/datadog-api-client-v1/models/User.ts
index 3a3e3a1b6022..9547af9e467f 100644
--- a/packages/datadog-api-client-v1/models/User.ts
+++ b/packages/datadog-api-client-v1/models/User.ts
@@ -9,7 +9,7 @@
  */
 
 import { AccessRole } from "./AccessRole";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create, edit, and disable users.
diff --git a/packages/datadog-api-client-v1/models/UserDisableResponse.ts b/packages/datadog-api-client-v1/models/UserDisableResponse.ts
index 3121a9f9c1d1..de572601ba7f 100644
--- a/packages/datadog-api-client-v1/models/UserDisableResponse.ts
+++ b/packages/datadog-api-client-v1/models/UserDisableResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Array of user disabled for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UserListResponse.ts b/packages/datadog-api-client-v1/models/UserListResponse.ts
index 637db44e608d..500059ebf643 100644
--- a/packages/datadog-api-client-v1/models/UserListResponse.ts
+++ b/packages/datadog-api-client-v1/models/UserListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { User } from "./User";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Array of Datadog users for a given organization.
diff --git a/packages/datadog-api-client-v1/models/UserResponse.ts b/packages/datadog-api-client-v1/models/UserResponse.ts
index 8e3fe6582a5b..eecc73b1fcb0 100644
--- a/packages/datadog-api-client-v1/models/UserResponse.ts
+++ b/packages/datadog-api-client-v1/models/UserResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { User } from "./User";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A Datadog User.
diff --git a/packages/datadog-api-client-v1/models/WebhooksIntegration.ts b/packages/datadog-api-client-v1/models/WebhooksIntegration.ts
index 21bfb1006e9b..f059beb0fffe 100644
--- a/packages/datadog-api-client-v1/models/WebhooksIntegration.ts
+++ b/packages/datadog-api-client-v1/models/WebhooksIntegration.ts
@@ -9,7 +9,7 @@
  */
 
 import { WebhooksIntegrationEncoding } from "./WebhooksIntegrationEncoding";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Datadog-Webhooks integration.
diff --git a/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariable.ts b/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariable.ts
index 4175e6286591..48e4e9c1c8f0 100644
--- a/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariable.ts
+++ b/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariable.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Custom variable for Webhook integration.
diff --git a/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariableResponse.ts b/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariableResponse.ts
index 9bfc83fa3900..0a1e6d00c1e8 100644
--- a/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariableResponse.ts
+++ b/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariableResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Custom variable for Webhook integration.
diff --git a/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariableUpdateRequest.ts b/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariableUpdateRequest.ts
index 434163bf29c7..313eda94f51a 100644
--- a/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariableUpdateRequest.ts
+++ b/packages/datadog-api-client-v1/models/WebhooksIntegrationCustomVariableUpdateRequest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update request of a custom variable object.  *All properties are optional.*
diff --git a/packages/datadog-api-client-v1/models/WebhooksIntegrationUpdateRequest.ts b/packages/datadog-api-client-v1/models/WebhooksIntegrationUpdateRequest.ts
index 6a1cd1a1457d..4581e9dcc863 100644
--- a/packages/datadog-api-client-v1/models/WebhooksIntegrationUpdateRequest.ts
+++ b/packages/datadog-api-client-v1/models/WebhooksIntegrationUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { WebhooksIntegrationEncoding } from "./WebhooksIntegrationEncoding";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update request of a Webhooks integration object.  *All properties are optional.*
diff --git a/packages/datadog-api-client-v1/models/Widget.ts b/packages/datadog-api-client-v1/models/Widget.ts
index 66b8636e708f..f8fe3208b27a 100644
--- a/packages/datadog-api-client-v1/models/Widget.ts
+++ b/packages/datadog-api-client-v1/models/Widget.ts
@@ -10,7 +10,7 @@
 
 import { WidgetDefinition } from "./WidgetDefinition";
 import { WidgetLayout } from "./WidgetLayout";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Information about widget.  **Note**: The `layout` property is required for widgets in dashboards with `free` `layout_type`.       For the **new dashboard layout**, the `layout` property depends on the `reflow_type` of the dashboard.       - If `reflow_type` is `fixed`, `layout` is required.       - If `reflow_type` is `auto`, `layout` should not be set.
diff --git a/packages/datadog-api-client-v1/models/WidgetAxis.ts b/packages/datadog-api-client-v1/models/WidgetAxis.ts
index f2e5115bc8bd..9c34df5e7814 100644
--- a/packages/datadog-api-client-v1/models/WidgetAxis.ts
+++ b/packages/datadog-api-client-v1/models/WidgetAxis.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Axis controls for the widget.
diff --git a/packages/datadog-api-client-v1/models/WidgetConditionalFormat.ts b/packages/datadog-api-client-v1/models/WidgetConditionalFormat.ts
index ff3a25dc8ad4..e2fe167ffa61 100644
--- a/packages/datadog-api-client-v1/models/WidgetConditionalFormat.ts
+++ b/packages/datadog-api-client-v1/models/WidgetConditionalFormat.ts
@@ -10,7 +10,7 @@
 
 import { WidgetComparator } from "./WidgetComparator";
 import { WidgetPalette } from "./WidgetPalette";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Define a conditional format for the widget.
diff --git a/packages/datadog-api-client-v1/models/WidgetCustomLink.ts b/packages/datadog-api-client-v1/models/WidgetCustomLink.ts
index 1a9282aaf5a9..b514f277ef0c 100644
--- a/packages/datadog-api-client-v1/models/WidgetCustomLink.ts
+++ b/packages/datadog-api-client-v1/models/WidgetCustomLink.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Custom links help you connect a data value to a URL, like a Datadog page or your AWS console.
diff --git a/packages/datadog-api-client-v1/models/WidgetDefinition.ts b/packages/datadog-api-client-v1/models/WidgetDefinition.ts
index a2411c7b138d..3aa7d64266d9 100644
--- a/packages/datadog-api-client-v1/models/WidgetDefinition.ts
+++ b/packages/datadog-api-client-v1/models/WidgetDefinition.ts
@@ -37,7 +37,7 @@ import { TableWidgetDefinition } from "./TableWidgetDefinition";
 import { TimeseriesWidgetDefinition } from "./TimeseriesWidgetDefinition";
 import { ToplistWidgetDefinition } from "./ToplistWidgetDefinition";
 import { TreeMapWidgetDefinition } from "./TreeMapWidgetDefinition";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * [Definition of the widget](https://docs.datadoghq.com/dashboards/widgets/).
diff --git a/packages/datadog-api-client-v1/models/WidgetEvent.ts b/packages/datadog-api-client-v1/models/WidgetEvent.ts
index ab3b11fb9641..7a0ef9818eba 100644
--- a/packages/datadog-api-client-v1/models/WidgetEvent.ts
+++ b/packages/datadog-api-client-v1/models/WidgetEvent.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Event overlay control options.  See the dedicated [Events JSON schema documentation](https://docs.datadoghq.com/dashboards/graphing_json/widget_json/#events-schema) to learn how to build the `<EVENTS_SCHEMA>`.
diff --git a/packages/datadog-api-client-v1/models/WidgetFieldSort.ts b/packages/datadog-api-client-v1/models/WidgetFieldSort.ts
index c5ca8995d23d..640fe736f35d 100644
--- a/packages/datadog-api-client-v1/models/WidgetFieldSort.ts
+++ b/packages/datadog-api-client-v1/models/WidgetFieldSort.ts
@@ -9,7 +9,7 @@
  */
 
 import { WidgetSort } from "./WidgetSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Which column and order to sort by
diff --git a/packages/datadog-api-client-v1/models/WidgetFormula.ts b/packages/datadog-api-client-v1/models/WidgetFormula.ts
index acab19a5e03f..91dd68cabcf4 100644
--- a/packages/datadog-api-client-v1/models/WidgetFormula.ts
+++ b/packages/datadog-api-client-v1/models/WidgetFormula.ts
@@ -11,7 +11,7 @@
 import { TableWidgetCellDisplayMode } from "./TableWidgetCellDisplayMode";
 import { WidgetConditionalFormat } from "./WidgetConditionalFormat";
 import { WidgetFormulaLimit } from "./WidgetFormulaLimit";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Formula to be used in a widget query.
diff --git a/packages/datadog-api-client-v1/models/WidgetFormulaLimit.ts b/packages/datadog-api-client-v1/models/WidgetFormulaLimit.ts
index 8026d090edfc..a2ed8d66ff76 100644
--- a/packages/datadog-api-client-v1/models/WidgetFormulaLimit.ts
+++ b/packages/datadog-api-client-v1/models/WidgetFormulaLimit.ts
@@ -9,7 +9,7 @@
  */
 
 import { QuerySortOrder } from "./QuerySortOrder";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Options for limiting results returned.
diff --git a/packages/datadog-api-client-v1/models/WidgetLayout.ts b/packages/datadog-api-client-v1/models/WidgetLayout.ts
index 11ff945b4391..066b09fbd518 100644
--- a/packages/datadog-api-client-v1/models/WidgetLayout.ts
+++ b/packages/datadog-api-client-v1/models/WidgetLayout.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The layout for a widget on a `free` or **new dashboard layout** dashboard.
diff --git a/packages/datadog-api-client-v1/models/WidgetMarker.ts b/packages/datadog-api-client-v1/models/WidgetMarker.ts
index 43c4668c7597..ecc76d435726 100644
--- a/packages/datadog-api-client-v1/models/WidgetMarker.ts
+++ b/packages/datadog-api-client-v1/models/WidgetMarker.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Markers allow you to add visual conditional formatting for your graphs.
diff --git a/packages/datadog-api-client-v1/models/WidgetRequestStyle.ts b/packages/datadog-api-client-v1/models/WidgetRequestStyle.ts
index aa22d4850b28..0f14d6930d29 100644
--- a/packages/datadog-api-client-v1/models/WidgetRequestStyle.ts
+++ b/packages/datadog-api-client-v1/models/WidgetRequestStyle.ts
@@ -10,7 +10,7 @@
 
 import { WidgetLineType } from "./WidgetLineType";
 import { WidgetLineWidth } from "./WidgetLineWidth";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Define request widget style.
diff --git a/packages/datadog-api-client-v1/models/WidgetStyle.ts b/packages/datadog-api-client-v1/models/WidgetStyle.ts
index dbc98d734195..ed98aed527c8 100644
--- a/packages/datadog-api-client-v1/models/WidgetStyle.ts
+++ b/packages/datadog-api-client-v1/models/WidgetStyle.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Widget style definition.
diff --git a/packages/datadog-api-client-v1/models/WidgetTime.ts b/packages/datadog-api-client-v1/models/WidgetTime.ts
index fb39e99226a3..a6c98c33e7ee 100644
--- a/packages/datadog-api-client-v1/models/WidgetTime.ts
+++ b/packages/datadog-api-client-v1/models/WidgetTime.ts
@@ -9,7 +9,7 @@
  */
 
 import { WidgetLiveSpan } from "./WidgetLiveSpan";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Time setting for the widget.
diff --git a/packages/datadog-api-client-v1/util.ts b/packages/datadog-api-client-v1/util.ts
index 91172cde2cb2..37479aa2f5a4 100644
--- a/packages/datadog-api-client-v1/util.ts
+++ b/packages/datadog-api-client-v1/util.ts
@@ -29,3 +29,19 @@ export function isCodeInRange(codeRange: string, code: number): boolean {
     return true;
   }
 }
+
+export class UnparsedObject {
+  unparsedObject: any;
+  constructor(data: any) {
+    this.unparsedObject = data;
+  }
+}
+
+export type AttributeTypeMap = {
+  [key: string]: {
+    baseName: string;
+    type: string;
+    required?: boolean;
+    format?: string;
+  };
+};
diff --git a/packages/datadog-api-client-v2/apis/IncidentServicesApi.ts b/packages/datadog-api-client-v2/apis/IncidentServicesApi.ts
index 1570123d1897..23f9b72d0c74 100644
--- a/packages/datadog-api-client-v2/apis/IncidentServicesApi.ts
+++ b/packages/datadog-api-client-v2/apis/IncidentServicesApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";
diff --git a/packages/datadog-api-client-v2/apis/IncidentTeamsApi.ts b/packages/datadog-api-client-v2/apis/IncidentTeamsApi.ts
index 3d5ca913824d..5e147dccc943 100644
--- a/packages/datadog-api-client-v2/apis/IncidentTeamsApi.ts
+++ b/packages/datadog-api-client-v2/apis/IncidentTeamsApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";
diff --git a/packages/datadog-api-client-v2/apis/IncidentsApi.ts b/packages/datadog-api-client-v2/apis/IncidentsApi.ts
index 6b2944668ec8..011f023eb76a 100644
--- a/packages/datadog-api-client-v2/apis/IncidentsApi.ts
+++ b/packages/datadog-api-client-v2/apis/IncidentsApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";
diff --git a/packages/datadog-api-client-v2/apis/MetricsApi.ts b/packages/datadog-api-client-v2/apis/MetricsApi.ts
index 24b82019c1cb..c2d9af4a0cc1 100644
--- a/packages/datadog-api-client-v2/apis/MetricsApi.ts
+++ b/packages/datadog-api-client-v2/apis/MetricsApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";
diff --git a/packages/datadog-api-client-v2/apis/SecurityMonitoringApi.ts b/packages/datadog-api-client-v2/apis/SecurityMonitoringApi.ts
index ae812520f775..8e077ede20d9 100644
--- a/packages/datadog-api-client-v2/apis/SecurityMonitoringApi.ts
+++ b/packages/datadog-api-client-v2/apis/SecurityMonitoringApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";
diff --git a/packages/datadog-api-client-v2/http/http.ts b/packages/datadog-api-client-v2/http/http.ts
index ab3e4cbdf6ea..b6c10c575eff 100644
--- a/packages/datadog-api-client-v2/http/http.ts
+++ b/packages/datadog-api-client-v2/http/http.ts
@@ -3,8 +3,6 @@ import { userAgent } from "../../../userAgent";
 import FormData from "form-data";
 import URLParse from "url-parse";
 
-export * from "./isomorphic-fetch";
-
 /**
  * Interface for aborting fetch requests.
  */
diff --git a/packages/datadog-api-client-v2/index.ts b/packages/datadog-api-client-v2/index.ts
index c85633c07f3b..298cab560f01 100644
--- a/packages/datadog-api-client-v2/index.ts
+++ b/packages/datadog-api-client-v2/index.ts
@@ -1,4 +1,5 @@
 export * from "./http/http";
+export * from "./http/isomorphic-fetch";
 export * from "./auth/auth";
 export { createConfiguration } from "./configuration";
 export { setServerVariables } from "./configuration";
diff --git a/packages/datadog-api-client-v2/models/APIErrorResponse.ts b/packages/datadog-api-client-v2/models/APIErrorResponse.ts
index fe2bcaa08a51..2f48d43c9733 100644
--- a/packages/datadog-api-client-v2/models/APIErrorResponse.ts
+++ b/packages/datadog-api-client-v2/models/APIErrorResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * API error response.
diff --git a/packages/datadog-api-client-v2/models/APIKeyCreateAttributes.ts b/packages/datadog-api-client-v2/models/APIKeyCreateAttributes.ts
index b8cb7c5b05db..9161c446bcc3 100644
--- a/packages/datadog-api-client-v2/models/APIKeyCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes used to create an API Key.
diff --git a/packages/datadog-api-client-v2/models/APIKeyCreateData.ts b/packages/datadog-api-client-v2/models/APIKeyCreateData.ts
index 26ccbe887e01..5d8f994ed7bb 100644
--- a/packages/datadog-api-client-v2/models/APIKeyCreateData.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyCreateData.ts
@@ -10,7 +10,7 @@
 
 import { APIKeyCreateAttributes } from "./APIKeyCreateAttributes";
 import { APIKeysType } from "./APIKeysType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object used to create an API key.
diff --git a/packages/datadog-api-client-v2/models/APIKeyCreateRequest.ts b/packages/datadog-api-client-v2/models/APIKeyCreateRequest.ts
index a509afd037a7..9bdbd7432c11 100644
--- a/packages/datadog-api-client-v2/models/APIKeyCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { APIKeyCreateData } from "./APIKeyCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request used to create an API key.
diff --git a/packages/datadog-api-client-v2/models/APIKeyRelationships.ts b/packages/datadog-api-client-v2/models/APIKeyRelationships.ts
index 5909765bbc31..46d2dfdce8bb 100644
--- a/packages/datadog-api-client-v2/models/APIKeyRelationships.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToUser } from "./RelationshipToUser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Resources related to the API key.
diff --git a/packages/datadog-api-client-v2/models/APIKeyResponse.ts b/packages/datadog-api-client-v2/models/APIKeyResponse.ts
index 62a0e9db25b8..7dca9bb2c0bd 100644
--- a/packages/datadog-api-client-v2/models/APIKeyResponse.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyResponse.ts
@@ -10,7 +10,7 @@
 
 import { APIKeyResponseIncludedItem } from "./APIKeyResponseIncludedItem";
 import { FullAPIKey } from "./FullAPIKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response for retrieving an API key.
diff --git a/packages/datadog-api-client-v2/models/APIKeyResponseIncludedItem.ts b/packages/datadog-api-client-v2/models/APIKeyResponseIncludedItem.ts
index 777d5cb4f247..3afe8a6f8907 100644
--- a/packages/datadog-api-client-v2/models/APIKeyResponseIncludedItem.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyResponseIncludedItem.ts
@@ -9,7 +9,7 @@
  */
 
 import { User } from "./User";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * An object related to an API key.
diff --git a/packages/datadog-api-client-v2/models/APIKeyUpdateAttributes.ts b/packages/datadog-api-client-v2/models/APIKeyUpdateAttributes.ts
index d2a506739001..1986e8493cb4 100644
--- a/packages/datadog-api-client-v2/models/APIKeyUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyUpdateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes used to update an API Key.
diff --git a/packages/datadog-api-client-v2/models/APIKeyUpdateData.ts b/packages/datadog-api-client-v2/models/APIKeyUpdateData.ts
index 5ee7e2b0276a..386e3e7b24bc 100644
--- a/packages/datadog-api-client-v2/models/APIKeyUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { APIKeyUpdateAttributes } from "./APIKeyUpdateAttributes";
 import { APIKeysType } from "./APIKeysType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object used to update an API key.
diff --git a/packages/datadog-api-client-v2/models/APIKeyUpdateRequest.ts b/packages/datadog-api-client-v2/models/APIKeyUpdateRequest.ts
index 7a3915267b68..a53c0077ccdf 100644
--- a/packages/datadog-api-client-v2/models/APIKeyUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/APIKeyUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { APIKeyUpdateData } from "./APIKeyUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request used to update an API key.
diff --git a/packages/datadog-api-client-v2/models/APIKeysResponse.ts b/packages/datadog-api-client-v2/models/APIKeysResponse.ts
index b2fa9eeae3e9..5c6692c2d2d0 100644
--- a/packages/datadog-api-client-v2/models/APIKeysResponse.ts
+++ b/packages/datadog-api-client-v2/models/APIKeysResponse.ts
@@ -10,7 +10,7 @@
 
 import { APIKeyResponseIncludedItem } from "./APIKeyResponseIncludedItem";
 import { PartialAPIKey } from "./PartialAPIKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response for a list of API keys.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyCreateAttributes.ts b/packages/datadog-api-client-v2/models/ApplicationKeyCreateAttributes.ts
index 18d6b9eae04f..cb1ad4dfea0b 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes used to create an application Key.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyCreateData.ts b/packages/datadog-api-client-v2/models/ApplicationKeyCreateData.ts
index 98fd0e6f0bb0..d2b4c4e3e3e3 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyCreateData.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyCreateData.ts
@@ -10,7 +10,7 @@
 
 import { ApplicationKeyCreateAttributes } from "./ApplicationKeyCreateAttributes";
 import { ApplicationKeysType } from "./ApplicationKeysType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object used to create an application key.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyCreateRequest.ts b/packages/datadog-api-client-v2/models/ApplicationKeyCreateRequest.ts
index 39520fbc7358..eb78ee9a1168 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApplicationKeyCreateData } from "./ApplicationKeyCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request used to create an application key.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyRelationships.ts b/packages/datadog-api-client-v2/models/ApplicationKeyRelationships.ts
index b5a077bef836..ea1c036cbac7 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyRelationships.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToUser } from "./RelationshipToUser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Resources related to the application key.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyResponse.ts b/packages/datadog-api-client-v2/models/ApplicationKeyResponse.ts
index d51026650ca8..1ca8a1b4ba25 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyResponse.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyResponse.ts
@@ -10,7 +10,7 @@
 
 import { ApplicationKeyResponseIncludedItem } from "./ApplicationKeyResponseIncludedItem";
 import { FullApplicationKey } from "./FullApplicationKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response for retrieving an application key.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyResponseIncludedItem.ts b/packages/datadog-api-client-v2/models/ApplicationKeyResponseIncludedItem.ts
index cdfdd3bfde44..efa9adf46289 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyResponseIncludedItem.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyResponseIncludedItem.ts
@@ -10,7 +10,7 @@
 
 import { Role } from "./Role";
 import { User } from "./User";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * An object related to an application key.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyUpdateAttributes.ts b/packages/datadog-api-client-v2/models/ApplicationKeyUpdateAttributes.ts
index 2d934e5bf8a8..3a5212ddcd41 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyUpdateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes used to update an application Key.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyUpdateData.ts b/packages/datadog-api-client-v2/models/ApplicationKeyUpdateData.ts
index 0f91a4a77d8f..d529f8ead642 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { ApplicationKeyUpdateAttributes } from "./ApplicationKeyUpdateAttributes";
 import { ApplicationKeysType } from "./ApplicationKeysType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object used to update an application key.
diff --git a/packages/datadog-api-client-v2/models/ApplicationKeyUpdateRequest.ts b/packages/datadog-api-client-v2/models/ApplicationKeyUpdateRequest.ts
index 17519724eb67..cf40bb04e736 100644
--- a/packages/datadog-api-client-v2/models/ApplicationKeyUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/ApplicationKeyUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApplicationKeyUpdateData } from "./ApplicationKeyUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request used to update an application key.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsEvent.ts b/packages/datadog-api-client-v2/models/AuditLogsEvent.ts
index 8a7b7da0f9cc..f33e8b655926 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsEvent.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsEvent.ts
@@ -10,7 +10,7 @@
 
 import { AuditLogsEventAttributes } from "./AuditLogsEventAttributes";
 import { AuditLogsEventType } from "./AuditLogsEventType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object description of an Audit Logs event after it is processed and stored by Datadog.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsEventAttributes.ts b/packages/datadog-api-client-v2/models/AuditLogsEventAttributes.ts
index dc9af04ab75d..2d719695eb48 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsEventAttributes.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsEventAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * JSON object containing all event attributes and their associated values.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsEventsResponse.ts b/packages/datadog-api-client-v2/models/AuditLogsEventsResponse.ts
index 2e7564d89dac..5e906d14d381 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsEventsResponse.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsEventsResponse.ts
@@ -11,7 +11,7 @@
 import { AuditLogsEvent } from "./AuditLogsEvent";
 import { AuditLogsResponseLinks } from "./AuditLogsResponseLinks";
 import { AuditLogsResponseMetadata } from "./AuditLogsResponseMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object with all events matching the request and pagination information.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsQueryFilter.ts b/packages/datadog-api-client-v2/models/AuditLogsQueryFilter.ts
index 015d572de281..15689fd06056 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsQueryFilter.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsQueryFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Search and filter query settings.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsQueryOptions.ts b/packages/datadog-api-client-v2/models/AuditLogsQueryOptions.ts
index 936fa046ea2e..b30406ee8c5f 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsQueryOptions.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsQueryOptions.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Global query options that are used during the query. Note: Specify either timezone or time offset, not both. Otherwise, the query fails.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsQueryPageOptions.ts b/packages/datadog-api-client-v2/models/AuditLogsQueryPageOptions.ts
index 3872480625e8..c7a3c574b864 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsQueryPageOptions.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsQueryPageOptions.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging attributes for listing events.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsResponseLinks.ts b/packages/datadog-api-client-v2/models/AuditLogsResponseLinks.ts
index 9960b6d947bd..70d82fdf11b9 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsResponseLinks.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsResponseLinks.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Links attributes.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsResponseMetadata.ts b/packages/datadog-api-client-v2/models/AuditLogsResponseMetadata.ts
index 9640626e6bf5..597618eb799a 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsResponseMetadata.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsResponseMetadata.ts
@@ -11,7 +11,7 @@
 import { AuditLogsResponsePage } from "./AuditLogsResponsePage";
 import { AuditLogsResponseStatus } from "./AuditLogsResponseStatus";
 import { AuditLogsWarning } from "./AuditLogsWarning";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata associated with a request.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsResponsePage.ts b/packages/datadog-api-client-v2/models/AuditLogsResponsePage.ts
index ecce62f0a0bc..9de5f4b054b8 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsResponsePage.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsResponsePage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging attributes.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsSearchEventsRequest.ts b/packages/datadog-api-client-v2/models/AuditLogsSearchEventsRequest.ts
index 126c86c17269..88dc3634781e 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsSearchEventsRequest.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsSearchEventsRequest.ts
@@ -12,7 +12,7 @@ import { AuditLogsQueryFilter } from "./AuditLogsQueryFilter";
 import { AuditLogsQueryOptions } from "./AuditLogsQueryOptions";
 import { AuditLogsQueryPageOptions } from "./AuditLogsQueryPageOptions";
 import { AuditLogsSort } from "./AuditLogsSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The request for a Audit Logs events list.
diff --git a/packages/datadog-api-client-v2/models/AuditLogsWarning.ts b/packages/datadog-api-client-v2/models/AuditLogsWarning.ts
index 01fed9884296..23bac239d133 100644
--- a/packages/datadog-api-client-v2/models/AuditLogsWarning.ts
+++ b/packages/datadog-api-client-v2/models/AuditLogsWarning.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Warning message indicating something that went wrong with the query.
diff --git a/packages/datadog-api-client-v2/models/AuthNMapping.ts b/packages/datadog-api-client-v2/models/AuthNMapping.ts
index 077d68b27a42..2f6f2aea815e 100644
--- a/packages/datadog-api-client-v2/models/AuthNMapping.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMapping.ts
@@ -12,7 +12,7 @@ import { AuthNMappingAttributes } from "./AuthNMappingAttributes";
 import { AuthNMappingIncluded } from "./AuthNMappingIncluded";
 import { AuthNMappingRelationships } from "./AuthNMappingRelationships";
 import { AuthNMappingsType } from "./AuthNMappingsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The AuthN Mapping object returned by API.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingAttributes.ts b/packages/datadog-api-client-v2/models/AuthNMappingAttributes.ts
index 6d8e8fdf10fb..764f18391c21 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingAttributes.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of AuthN Mapping.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingCreateAttributes.ts b/packages/datadog-api-client-v2/models/AuthNMappingCreateAttributes.ts
index d9f521545d65..e6ba4ef1526e 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Key/Value pair of attributes used for create request.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingCreateData.ts b/packages/datadog-api-client-v2/models/AuthNMappingCreateData.ts
index fd771a2b6871..3a6080264b02 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingCreateData.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingCreateData.ts
@@ -11,7 +11,7 @@
 import { AuthNMappingCreateAttributes } from "./AuthNMappingCreateAttributes";
 import { AuthNMappingCreateRelationships } from "./AuthNMappingCreateRelationships";
 import { AuthNMappingsType } from "./AuthNMappingsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Data for creating an AuthN Mapping.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingCreateRelationships.ts b/packages/datadog-api-client-v2/models/AuthNMappingCreateRelationships.ts
index f31b359f1019..2576c33e628a 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingCreateRelationships.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingCreateRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToRole } from "./RelationshipToRole";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship of AuthN Mapping create object to Role.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingCreateRequest.ts b/packages/datadog-api-client-v2/models/AuthNMappingCreateRequest.ts
index 645afbf4c922..d468dfd35896 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { AuthNMappingCreateData } from "./AuthNMappingCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request for creating an AuthN Mapping.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingIncluded.ts b/packages/datadog-api-client-v2/models/AuthNMappingIncluded.ts
index 4aeb08a56462..ea10c02d058b 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingIncluded.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingIncluded.ts
@@ -10,7 +10,7 @@
 
 import { Role } from "./Role";
 import { SAMLAssertionAttribute } from "./SAMLAssertionAttribute";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Included data in the AuthN Mapping response.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingRelationships.ts b/packages/datadog-api-client-v2/models/AuthNMappingRelationships.ts
index 8302f9a213ab..20e03325c922 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingRelationships.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingRelationships.ts
@@ -10,7 +10,7 @@
 
 import { RelationshipToRole } from "./RelationshipToRole";
 import { RelationshipToSAMLAssertionAttribute } from "./RelationshipToSAMLAssertionAttribute";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * All relationships associated with AuthN Mapping.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingResponse.ts b/packages/datadog-api-client-v2/models/AuthNMappingResponse.ts
index 7d5e82980c93..f5a4f27fcf29 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingResponse.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AuthNMapping } from "./AuthNMapping";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * AuthN Mapping response from the API.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingUpdateAttributes.ts b/packages/datadog-api-client-v2/models/AuthNMappingUpdateAttributes.ts
index 62deab36096f..4546a7bb52c5 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingUpdateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Key/Value pair of attributes used for update request.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingUpdateData.ts b/packages/datadog-api-client-v2/models/AuthNMappingUpdateData.ts
index a1c8b6c8f615..133629478328 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingUpdateData.ts
@@ -11,7 +11,7 @@
 import { AuthNMappingUpdateAttributes } from "./AuthNMappingUpdateAttributes";
 import { AuthNMappingUpdateRelationships } from "./AuthNMappingUpdateRelationships";
 import { AuthNMappingsType } from "./AuthNMappingsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Data for updating an AuthN Mapping.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingUpdateRelationships.ts b/packages/datadog-api-client-v2/models/AuthNMappingUpdateRelationships.ts
index ec3e2faeae6a..abb113ecf962 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingUpdateRelationships.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingUpdateRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToRole } from "./RelationshipToRole";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship of AuthN Mapping update object to Role.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingUpdateRequest.ts b/packages/datadog-api-client-v2/models/AuthNMappingUpdateRequest.ts
index 5620d76dc800..a783ebe4859a 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { AuthNMappingUpdateData } from "./AuthNMappingUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request to update an AuthN Mapping.
diff --git a/packages/datadog-api-client-v2/models/AuthNMappingsResponse.ts b/packages/datadog-api-client-v2/models/AuthNMappingsResponse.ts
index 82c93e4f1700..6144f0e0fece 100644
--- a/packages/datadog-api-client-v2/models/AuthNMappingsResponse.ts
+++ b/packages/datadog-api-client-v2/models/AuthNMappingsResponse.ts
@@ -10,7 +10,7 @@
 
 import { AuthNMapping } from "./AuthNMapping";
 import { ResponseMetaAttributes } from "./ResponseMetaAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Array of AuthN Mappings response.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleAttributes.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleAttributes.ts
index 0ca7afd136ce..b23ce8820a55 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleAttributes.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleAttributes.ts
@@ -10,7 +10,7 @@
 
 import { CloudWorkloadSecurityAgentRuleCreatorAttributes } from "./CloudWorkloadSecurityAgentRuleCreatorAttributes";
 import { CloudWorkloadSecurityAgentRuleUpdaterAttributes } from "./CloudWorkloadSecurityAgentRuleUpdaterAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A Cloud Workload Security Agent rule returned by the API.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateAttributes.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateAttributes.ts
index 1d7f06c818f5..cac380d5eed8 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create a new Cloud Workload Security Agent rule.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateData.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateData.ts
index 5d87ea2b57aa..38ceb4a15ed3 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateData.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateData.ts
@@ -10,7 +10,7 @@
 
 import { CloudWorkloadSecurityAgentRuleCreateAttributes } from "./CloudWorkloadSecurityAgentRuleCreateAttributes";
 import { CloudWorkloadSecurityAgentRuleType } from "./CloudWorkloadSecurityAgentRuleType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single Agent rule.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateRequest.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateRequest.ts
index c0b82a9a8b0a..5f100ee0755d 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { CloudWorkloadSecurityAgentRuleCreateData } from "./CloudWorkloadSecurityAgentRuleCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request object that includes the Agent rule to create.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreatorAttributes.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreatorAttributes.ts
index 39a009bdc909..b3a43286ae1c 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreatorAttributes.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleCreatorAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of the user who created the Agent rule.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleData.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleData.ts
index 3c833eab9928..7a68c4ce965a 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleData.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleData.ts
@@ -10,7 +10,7 @@
 
 import { CloudWorkloadSecurityAgentRuleAttributes } from "./CloudWorkloadSecurityAgentRuleAttributes";
 import { CloudWorkloadSecurityAgentRuleType } from "./CloudWorkloadSecurityAgentRuleType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single Agent rule.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleResponse.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleResponse.ts
index 50fdecac552d..fd6a41047bd5 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleResponse.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { CloudWorkloadSecurityAgentRuleData } from "./CloudWorkloadSecurityAgentRuleData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object that includes an Agent rule.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateAttributes.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateAttributes.ts
index 83a9dc7351d5..7b5bbd9f01df 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update an existing Cloud Workload Security Agent rule.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateData.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateData.ts
index 7fc00eb84f3b..1b38e243b03f 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { CloudWorkloadSecurityAgentRuleType } from "./CloudWorkloadSecurityAgentRuleType";
 import { CloudWorkloadSecurityAgentRuleUpdateAttributes } from "./CloudWorkloadSecurityAgentRuleUpdateAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single Agent rule.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateRequest.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateRequest.ts
index 41e85ab3583d..86998626c6a5 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { CloudWorkloadSecurityAgentRuleUpdateData } from "./CloudWorkloadSecurityAgentRuleUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request object that includes the Agent rule with the attributes to update.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdaterAttributes.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdaterAttributes.ts
index 66786af6bc43..1ccfebace739 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdaterAttributes.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRuleUpdaterAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes of the user who last updated the Agent rule.
diff --git a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRulesListResponse.ts b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRulesListResponse.ts
index bfd861ee6972..830c327aae95 100644
--- a/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRulesListResponse.ts
+++ b/packages/datadog-api-client-v2/models/CloudWorkloadSecurityAgentRulesListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { CloudWorkloadSecurityAgentRuleData } from "./CloudWorkloadSecurityAgentRuleData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object that includes a list of Agent rule.
diff --git a/packages/datadog-api-client-v2/models/Creator.ts b/packages/datadog-api-client-v2/models/Creator.ts
index 4677eab21dc1..c8e4e8670d99 100644
--- a/packages/datadog-api-client-v2/models/Creator.ts
+++ b/packages/datadog-api-client-v2/models/Creator.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Creator of the object.
diff --git a/packages/datadog-api-client-v2/models/DashboardListAddItemsRequest.ts b/packages/datadog-api-client-v2/models/DashboardListAddItemsRequest.ts
index 7803754a9f05..d470e1f165ac 100644
--- a/packages/datadog-api-client-v2/models/DashboardListAddItemsRequest.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListAddItemsRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardListItemRequest } from "./DashboardListItemRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request containing a list of dashboards to add.
diff --git a/packages/datadog-api-client-v2/models/DashboardListAddItemsResponse.ts b/packages/datadog-api-client-v2/models/DashboardListAddItemsResponse.ts
index 623eb7b22ebe..b2a76822b7d6 100644
--- a/packages/datadog-api-client-v2/models/DashboardListAddItemsResponse.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListAddItemsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardListItemResponse } from "./DashboardListItemResponse";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing a list of added dashboards.
diff --git a/packages/datadog-api-client-v2/models/DashboardListDeleteItemsRequest.ts b/packages/datadog-api-client-v2/models/DashboardListDeleteItemsRequest.ts
index 3881e629d959..e2da0dbdcfc3 100644
--- a/packages/datadog-api-client-v2/models/DashboardListDeleteItemsRequest.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListDeleteItemsRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardListItemRequest } from "./DashboardListItemRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request containing a list of dashboards to delete.
diff --git a/packages/datadog-api-client-v2/models/DashboardListDeleteItemsResponse.ts b/packages/datadog-api-client-v2/models/DashboardListDeleteItemsResponse.ts
index b6b7c38033d8..c0c89f93b85c 100644
--- a/packages/datadog-api-client-v2/models/DashboardListDeleteItemsResponse.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListDeleteItemsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardListItemResponse } from "./DashboardListItemResponse";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing a list of deleted dashboards.
diff --git a/packages/datadog-api-client-v2/models/DashboardListItem.ts b/packages/datadog-api-client-v2/models/DashboardListItem.ts
index 420567512611..e119597ad04a 100644
--- a/packages/datadog-api-client-v2/models/DashboardListItem.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListItem.ts
@@ -10,7 +10,7 @@
 
 import { Creator } from "./Creator";
 import { DashboardType } from "./DashboardType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A dashboard within a list.
diff --git a/packages/datadog-api-client-v2/models/DashboardListItemRequest.ts b/packages/datadog-api-client-v2/models/DashboardListItemRequest.ts
index 153dec2d0e14..6bfaebfb4107 100644
--- a/packages/datadog-api-client-v2/models/DashboardListItemRequest.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListItemRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardType } from "./DashboardType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A dashboard within a list.
diff --git a/packages/datadog-api-client-v2/models/DashboardListItemResponse.ts b/packages/datadog-api-client-v2/models/DashboardListItemResponse.ts
index 5aff180ed61c..8c90349f719c 100644
--- a/packages/datadog-api-client-v2/models/DashboardListItemResponse.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListItemResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardType } from "./DashboardType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A dashboard within a list.
diff --git a/packages/datadog-api-client-v2/models/DashboardListItems.ts b/packages/datadog-api-client-v2/models/DashboardListItems.ts
index db8f342f5d63..4381ea2c91e2 100644
--- a/packages/datadog-api-client-v2/models/DashboardListItems.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListItems.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardListItem } from "./DashboardListItem";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Dashboards within a list.
diff --git a/packages/datadog-api-client-v2/models/DashboardListUpdateItemsRequest.ts b/packages/datadog-api-client-v2/models/DashboardListUpdateItemsRequest.ts
index 090571128d73..4d3817e4756d 100644
--- a/packages/datadog-api-client-v2/models/DashboardListUpdateItemsRequest.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListUpdateItemsRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardListItemRequest } from "./DashboardListItemRequest";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request containing the list of dashboards to update to.
diff --git a/packages/datadog-api-client-v2/models/DashboardListUpdateItemsResponse.ts b/packages/datadog-api-client-v2/models/DashboardListUpdateItemsResponse.ts
index 44d6301ed7c9..3326ea9f3aa8 100644
--- a/packages/datadog-api-client-v2/models/DashboardListUpdateItemsResponse.ts
+++ b/packages/datadog-api-client-v2/models/DashboardListUpdateItemsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { DashboardListItemResponse } from "./DashboardListItemResponse";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing a list of updated dashboards.
diff --git a/packages/datadog-api-client-v2/models/FullAPIKey.ts b/packages/datadog-api-client-v2/models/FullAPIKey.ts
index fe75a52b6f60..3788fc71311f 100644
--- a/packages/datadog-api-client-v2/models/FullAPIKey.ts
+++ b/packages/datadog-api-client-v2/models/FullAPIKey.ts
@@ -11,7 +11,7 @@
 import { APIKeyRelationships } from "./APIKeyRelationships";
 import { APIKeysType } from "./APIKeysType";
 import { FullAPIKeyAttributes } from "./FullAPIKeyAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Datadog API key.
diff --git a/packages/datadog-api-client-v2/models/FullAPIKeyAttributes.ts b/packages/datadog-api-client-v2/models/FullAPIKeyAttributes.ts
index 0deb50928e74..e35683ff7220 100644
--- a/packages/datadog-api-client-v2/models/FullAPIKeyAttributes.ts
+++ b/packages/datadog-api-client-v2/models/FullAPIKeyAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of a full API key.
diff --git a/packages/datadog-api-client-v2/models/FullApplicationKey.ts b/packages/datadog-api-client-v2/models/FullApplicationKey.ts
index 4d7ee835aeec..8ced1b74d0d5 100644
--- a/packages/datadog-api-client-v2/models/FullApplicationKey.ts
+++ b/packages/datadog-api-client-v2/models/FullApplicationKey.ts
@@ -11,7 +11,7 @@
 import { ApplicationKeyRelationships } from "./ApplicationKeyRelationships";
 import { ApplicationKeysType } from "./ApplicationKeysType";
 import { FullApplicationKeyAttributes } from "./FullApplicationKeyAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Datadog application key.
diff --git a/packages/datadog-api-client-v2/models/FullApplicationKeyAttributes.ts b/packages/datadog-api-client-v2/models/FullApplicationKeyAttributes.ts
index 09cb575d16f6..2ed3a8496bbb 100644
--- a/packages/datadog-api-client-v2/models/FullApplicationKeyAttributes.ts
+++ b/packages/datadog-api-client-v2/models/FullApplicationKeyAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of a full application key.
diff --git a/packages/datadog-api-client-v2/models/HTTPLogError.ts b/packages/datadog-api-client-v2/models/HTTPLogError.ts
index 68962583c791..f83ef3f32423 100644
--- a/packages/datadog-api-client-v2/models/HTTPLogError.ts
+++ b/packages/datadog-api-client-v2/models/HTTPLogError.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of errors.
diff --git a/packages/datadog-api-client-v2/models/HTTPLogErrors.ts b/packages/datadog-api-client-v2/models/HTTPLogErrors.ts
index cbb06ba67248..c0dea0739bb0 100644
--- a/packages/datadog-api-client-v2/models/HTTPLogErrors.ts
+++ b/packages/datadog-api-client-v2/models/HTTPLogErrors.ts
@@ -9,7 +9,7 @@
  */
 
 import { HTTPLogError } from "./HTTPLogError";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Invalid query performed.
diff --git a/packages/datadog-api-client-v2/models/HTTPLogItem.ts b/packages/datadog-api-client-v2/models/HTTPLogItem.ts
index 56b8f1452799..302c2d3cd171 100644
--- a/packages/datadog-api-client-v2/models/HTTPLogItem.ts
+++ b/packages/datadog-api-client-v2/models/HTTPLogItem.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Logs that are sent over HTTP.
diff --git a/packages/datadog-api-client-v2/models/IncidentCreateAttributes.ts b/packages/datadog-api-client-v2/models/IncidentCreateAttributes.ts
index bb70c5db84af..f970679d3995 100644
--- a/packages/datadog-api-client-v2/models/IncidentCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentCreateAttributes.ts
@@ -11,7 +11,7 @@
 import { IncidentFieldAttributes } from "./IncidentFieldAttributes";
 import { IncidentNotificationHandle } from "./IncidentNotificationHandle";
 import { IncidentTimelineCellCreateAttributes } from "./IncidentTimelineCellCreateAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident's attributes for a create request.
diff --git a/packages/datadog-api-client-v2/models/IncidentCreateData.ts b/packages/datadog-api-client-v2/models/IncidentCreateData.ts
index da871777e0b1..5cc93401889a 100644
--- a/packages/datadog-api-client-v2/models/IncidentCreateData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentCreateData.ts
@@ -11,7 +11,7 @@
 import { IncidentCreateAttributes } from "./IncidentCreateAttributes";
 import { IncidentCreateRelationships } from "./IncidentCreateRelationships";
 import { IncidentType } from "./IncidentType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident data for a create request.
diff --git a/packages/datadog-api-client-v2/models/IncidentCreateRelationships.ts b/packages/datadog-api-client-v2/models/IncidentCreateRelationships.ts
index c7d95a9e95cb..aef62f2709a4 100644
--- a/packages/datadog-api-client-v2/models/IncidentCreateRelationships.ts
+++ b/packages/datadog-api-client-v2/models/IncidentCreateRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { NullableRelationshipToUser } from "./NullableRelationshipToUser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The relationships the incident will have with other resources once created.
diff --git a/packages/datadog-api-client-v2/models/IncidentCreateRequest.ts b/packages/datadog-api-client-v2/models/IncidentCreateRequest.ts
index a8a0f6f40cf8..a3425db29f60 100644
--- a/packages/datadog-api-client-v2/models/IncidentCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/IncidentCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentCreateData } from "./IncidentCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create request for an incident.
diff --git a/packages/datadog-api-client-v2/models/IncidentFieldAttributes.ts b/packages/datadog-api-client-v2/models/IncidentFieldAttributes.ts
index 700db044f5bf..cbcc9161ace2 100644
--- a/packages/datadog-api-client-v2/models/IncidentFieldAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentFieldAttributes.ts
@@ -10,7 +10,7 @@
 
 import { IncidentFieldAttributesMultipleValue } from "./IncidentFieldAttributesMultipleValue";
 import { IncidentFieldAttributesSingleValue } from "./IncidentFieldAttributesSingleValue";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Dynamic fields for which selections can be made, with field names as keys.
diff --git a/packages/datadog-api-client-v2/models/IncidentFieldAttributesMultipleValue.ts b/packages/datadog-api-client-v2/models/IncidentFieldAttributesMultipleValue.ts
index 88f7ec888dad..11754e41b33e 100644
--- a/packages/datadog-api-client-v2/models/IncidentFieldAttributesMultipleValue.ts
+++ b/packages/datadog-api-client-v2/models/IncidentFieldAttributesMultipleValue.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentFieldAttributesValueType } from "./IncidentFieldAttributesValueType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A field with potentially multiple values selected.
diff --git a/packages/datadog-api-client-v2/models/IncidentFieldAttributesSingleValue.ts b/packages/datadog-api-client-v2/models/IncidentFieldAttributesSingleValue.ts
index af4d1f79faa5..ec61cacf34f5 100644
--- a/packages/datadog-api-client-v2/models/IncidentFieldAttributesSingleValue.ts
+++ b/packages/datadog-api-client-v2/models/IncidentFieldAttributesSingleValue.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentFieldAttributesSingleValueType } from "./IncidentFieldAttributesSingleValueType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A field with a single value selected.
diff --git a/packages/datadog-api-client-v2/models/IncidentNotificationHandle.ts b/packages/datadog-api-client-v2/models/IncidentNotificationHandle.ts
index 5f305abd01eb..857a4b0a3484 100644
--- a/packages/datadog-api-client-v2/models/IncidentNotificationHandle.ts
+++ b/packages/datadog-api-client-v2/models/IncidentNotificationHandle.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A notification handle that will be notified at incident creation.
diff --git a/packages/datadog-api-client-v2/models/IncidentResponse.ts b/packages/datadog-api-client-v2/models/IncidentResponse.ts
index a67a71416fdb..a6a8e1f29807 100644
--- a/packages/datadog-api-client-v2/models/IncidentResponse.ts
+++ b/packages/datadog-api-client-v2/models/IncidentResponse.ts
@@ -10,7 +10,7 @@
 
 import { IncidentResponseData } from "./IncidentResponseData";
 import { IncidentResponseIncludedItem } from "./IncidentResponseIncludedItem";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with an incident.
diff --git a/packages/datadog-api-client-v2/models/IncidentResponseAttributes.ts b/packages/datadog-api-client-v2/models/IncidentResponseAttributes.ts
index 3e6fbf505be2..600b2002f017 100644
--- a/packages/datadog-api-client-v2/models/IncidentResponseAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentResponseAttributes.ts
@@ -10,7 +10,7 @@
 
 import { IncidentFieldAttributes } from "./IncidentFieldAttributes";
 import { IncidentNotificationHandle } from "./IncidentNotificationHandle";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident's attributes from a response.
diff --git a/packages/datadog-api-client-v2/models/IncidentResponseData.ts b/packages/datadog-api-client-v2/models/IncidentResponseData.ts
index 63d4717ab73e..4e771e3123c6 100644
--- a/packages/datadog-api-client-v2/models/IncidentResponseData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentResponseData.ts
@@ -11,7 +11,7 @@
 import { IncidentResponseAttributes } from "./IncidentResponseAttributes";
 import { IncidentResponseRelationships } from "./IncidentResponseRelationships";
 import { IncidentType } from "./IncidentType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident data from a response.
diff --git a/packages/datadog-api-client-v2/models/IncidentResponseIncludedItem.ts b/packages/datadog-api-client-v2/models/IncidentResponseIncludedItem.ts
index d277ff543859..93315bb751f8 100644
--- a/packages/datadog-api-client-v2/models/IncidentResponseIncludedItem.ts
+++ b/packages/datadog-api-client-v2/models/IncidentResponseIncludedItem.ts
@@ -9,7 +9,7 @@
  */
 
 import { User } from "./User";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * An object related to an incident that is included in the response.
diff --git a/packages/datadog-api-client-v2/models/IncidentResponseMeta.ts b/packages/datadog-api-client-v2/models/IncidentResponseMeta.ts
index deabd3836b3d..f2d2a4c378d4 100644
--- a/packages/datadog-api-client-v2/models/IncidentResponseMeta.ts
+++ b/packages/datadog-api-client-v2/models/IncidentResponseMeta.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentResponseMetaPagination } from "./IncidentResponseMetaPagination";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata object containing pagination metadata.
diff --git a/packages/datadog-api-client-v2/models/IncidentResponseMetaPagination.ts b/packages/datadog-api-client-v2/models/IncidentResponseMetaPagination.ts
index 1145c18d61ae..e9fc94dfcec1 100644
--- a/packages/datadog-api-client-v2/models/IncidentResponseMetaPagination.ts
+++ b/packages/datadog-api-client-v2/models/IncidentResponseMetaPagination.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Pagination properties.
diff --git a/packages/datadog-api-client-v2/models/IncidentResponseRelationships.ts b/packages/datadog-api-client-v2/models/IncidentResponseRelationships.ts
index f1cf70e72f7e..667b40541e0f 100644
--- a/packages/datadog-api-client-v2/models/IncidentResponseRelationships.ts
+++ b/packages/datadog-api-client-v2/models/IncidentResponseRelationships.ts
@@ -12,7 +12,7 @@ import { NullableRelationshipToUser } from "./NullableRelationshipToUser";
 import { RelationshipToIncidentIntegrationMetadatas } from "./RelationshipToIncidentIntegrationMetadatas";
 import { RelationshipToIncidentPostmortem } from "./RelationshipToIncidentPostmortem";
 import { RelationshipToUser } from "./RelationshipToUser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident's relationships from a response.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceCreateAttributes.ts b/packages/datadog-api-client-v2/models/IncidentServiceCreateAttributes.ts
index 13f871c5936f..b28f99df731e 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident service's attributes for a create request.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceCreateData.ts b/packages/datadog-api-client-v2/models/IncidentServiceCreateData.ts
index b16c04795921..e484b0eb8f42 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceCreateData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceCreateData.ts
@@ -11,7 +11,7 @@
 import { IncidentServiceCreateAttributes } from "./IncidentServiceCreateAttributes";
 import { IncidentServiceRelationships } from "./IncidentServiceRelationships";
 import { IncidentServiceType } from "./IncidentServiceType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident Service payload for create requests.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceCreateRequest.ts b/packages/datadog-api-client-v2/models/IncidentServiceCreateRequest.ts
index d71e57db8667..3ba4f244bd23 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentServiceCreateData } from "./IncidentServiceCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create request with an incident service payload.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceIncludedItems.ts b/packages/datadog-api-client-v2/models/IncidentServiceIncludedItems.ts
index 5ed0f99a3b36..0f865c748453 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceIncludedItems.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceIncludedItems.ts
@@ -9,7 +9,7 @@
  */
 
 import { User } from "./User";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * An object related to an incident service which is present in the included payload.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceRelationships.ts b/packages/datadog-api-client-v2/models/IncidentServiceRelationships.ts
index 152456504e05..07adc1de062f 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceRelationships.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToUser } from "./RelationshipToUser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident service's relationships.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceResponse.ts b/packages/datadog-api-client-v2/models/IncidentServiceResponse.ts
index c64a473a0e1b..38e7d12ffdeb 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceResponse.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceResponse.ts
@@ -10,7 +10,7 @@
 
 import { IncidentServiceIncludedItems } from "./IncidentServiceIncludedItems";
 import { IncidentServiceResponseData } from "./IncidentServiceResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with an incident service payload.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceResponseAttributes.ts b/packages/datadog-api-client-v2/models/IncidentServiceResponseAttributes.ts
index 29f1aee39649..0345e53f120e 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceResponseAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceResponseAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident service's attributes from a response.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceResponseData.ts b/packages/datadog-api-client-v2/models/IncidentServiceResponseData.ts
index b99e24616bd7..91d08c5a0b88 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceResponseData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceResponseData.ts
@@ -11,7 +11,7 @@
 import { IncidentServiceRelationships } from "./IncidentServiceRelationships";
 import { IncidentServiceResponseAttributes } from "./IncidentServiceResponseAttributes";
 import { IncidentServiceType } from "./IncidentServiceType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident Service data from responses.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceUpdateAttributes.ts b/packages/datadog-api-client-v2/models/IncidentServiceUpdateAttributes.ts
index 10afb9736df9..c6dcb9da1a1e 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceUpdateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident service's attributes for an update request.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceUpdateData.ts b/packages/datadog-api-client-v2/models/IncidentServiceUpdateData.ts
index 410e9f71ea9d..caab28f7e989 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceUpdateData.ts
@@ -11,7 +11,7 @@
 import { IncidentServiceRelationships } from "./IncidentServiceRelationships";
 import { IncidentServiceType } from "./IncidentServiceType";
 import { IncidentServiceUpdateAttributes } from "./IncidentServiceUpdateAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident Service payload for update requests.
diff --git a/packages/datadog-api-client-v2/models/IncidentServiceUpdateRequest.ts b/packages/datadog-api-client-v2/models/IncidentServiceUpdateRequest.ts
index d780837b1430..f60e2a1fffd1 100644
--- a/packages/datadog-api-client-v2/models/IncidentServiceUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServiceUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentServiceUpdateData } from "./IncidentServiceUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update request with an incident service payload.
diff --git a/packages/datadog-api-client-v2/models/IncidentServicesResponse.ts b/packages/datadog-api-client-v2/models/IncidentServicesResponse.ts
index 4c297d3d1618..865fd0fe55b7 100644
--- a/packages/datadog-api-client-v2/models/IncidentServicesResponse.ts
+++ b/packages/datadog-api-client-v2/models/IncidentServicesResponse.ts
@@ -11,7 +11,7 @@
 import { IncidentResponseMeta } from "./IncidentResponseMeta";
 import { IncidentServiceIncludedItems } from "./IncidentServiceIncludedItems";
 import { IncidentServiceResponseData } from "./IncidentServiceResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with a list of incident service payloads.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamCreateAttributes.ts b/packages/datadog-api-client-v2/models/IncidentTeamCreateAttributes.ts
index 12ee1de52391..e53b11e17b67 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident team's attributes for a create request.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamCreateData.ts b/packages/datadog-api-client-v2/models/IncidentTeamCreateData.ts
index 31a3f368d3ee..3418b2a972a1 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamCreateData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamCreateData.ts
@@ -11,7 +11,7 @@
 import { IncidentTeamCreateAttributes } from "./IncidentTeamCreateAttributes";
 import { IncidentTeamRelationships } from "./IncidentTeamRelationships";
 import { IncidentTeamType } from "./IncidentTeamType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident Team data for a create request.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamCreateRequest.ts b/packages/datadog-api-client-v2/models/IncidentTeamCreateRequest.ts
index 0638335ddd7f..1f48fcfd3445 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentTeamCreateData } from "./IncidentTeamCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create request with an incident team payload.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamIncludedItems.ts b/packages/datadog-api-client-v2/models/IncidentTeamIncludedItems.ts
index 78bd8ce250a6..9708f7b2c905 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamIncludedItems.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamIncludedItems.ts
@@ -9,7 +9,7 @@
  */
 
 import { User } from "./User";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * An object related to an incident team which is present in the included payload.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamRelationships.ts b/packages/datadog-api-client-v2/models/IncidentTeamRelationships.ts
index 270d142fc8cf..0617f3d8ff55 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamRelationships.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToUser } from "./RelationshipToUser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident team's relationships.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamResponse.ts b/packages/datadog-api-client-v2/models/IncidentTeamResponse.ts
index c61ad59cc0d2..59cfb8715a95 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamResponse.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamResponse.ts
@@ -10,7 +10,7 @@
 
 import { IncidentTeamIncludedItems } from "./IncidentTeamIncludedItems";
 import { IncidentTeamResponseData } from "./IncidentTeamResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with an incident team payload.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamResponseAttributes.ts b/packages/datadog-api-client-v2/models/IncidentTeamResponseAttributes.ts
index 707ca2d0e529..3d6291c1c29a 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamResponseAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamResponseAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident team's attributes from a response.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamResponseData.ts b/packages/datadog-api-client-v2/models/IncidentTeamResponseData.ts
index 328d3de4f052..f0e67c299e70 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamResponseData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamResponseData.ts
@@ -11,7 +11,7 @@
 import { IncidentTeamRelationships } from "./IncidentTeamRelationships";
 import { IncidentTeamResponseAttributes } from "./IncidentTeamResponseAttributes";
 import { IncidentTeamType } from "./IncidentTeamType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident Team data from a response.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamUpdateAttributes.ts b/packages/datadog-api-client-v2/models/IncidentTeamUpdateAttributes.ts
index 1be2bb5852c7..1666045dc53d 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamUpdateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident team's attributes for an update request.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamUpdateData.ts b/packages/datadog-api-client-v2/models/IncidentTeamUpdateData.ts
index dc2718d9d151..804fd57be6e6 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamUpdateData.ts
@@ -11,7 +11,7 @@
 import { IncidentTeamRelationships } from "./IncidentTeamRelationships";
 import { IncidentTeamType } from "./IncidentTeamType";
 import { IncidentTeamUpdateAttributes } from "./IncidentTeamUpdateAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident Team data for an update request.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamUpdateRequest.ts b/packages/datadog-api-client-v2/models/IncidentTeamUpdateRequest.ts
index a4c7d2583900..7099156e4ec7 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentTeamUpdateData } from "./IncidentTeamUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update request with an incident team payload.
diff --git a/packages/datadog-api-client-v2/models/IncidentTeamsResponse.ts b/packages/datadog-api-client-v2/models/IncidentTeamsResponse.ts
index 86f287fe6179..36062b6b42bf 100644
--- a/packages/datadog-api-client-v2/models/IncidentTeamsResponse.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTeamsResponse.ts
@@ -11,7 +11,7 @@
 import { IncidentResponseMeta } from "./IncidentResponseMeta";
 import { IncidentTeamIncludedItems } from "./IncidentTeamIncludedItems";
 import { IncidentTeamResponseData } from "./IncidentTeamResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with a list of incident team payloads.
diff --git a/packages/datadog-api-client-v2/models/IncidentTimelineCellCreateAttributes.ts b/packages/datadog-api-client-v2/models/IncidentTimelineCellCreateAttributes.ts
index b1aa41507aff..717870ca3868 100644
--- a/packages/datadog-api-client-v2/models/IncidentTimelineCellCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTimelineCellCreateAttributes.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentTimelineCellMarkdownCreateAttributes } from "./IncidentTimelineCellMarkdownCreateAttributes";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * The timeline cell's attributes for a create request.
diff --git a/packages/datadog-api-client-v2/models/IncidentTimelineCellMarkdownCreateAttributes.ts b/packages/datadog-api-client-v2/models/IncidentTimelineCellMarkdownCreateAttributes.ts
index 74d914439054..edce042880c4 100644
--- a/packages/datadog-api-client-v2/models/IncidentTimelineCellMarkdownCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTimelineCellMarkdownCreateAttributes.ts
@@ -10,7 +10,7 @@
 
 import { IncidentTimelineCellMarkdownContentType } from "./IncidentTimelineCellMarkdownContentType";
 import { IncidentTimelineCellMarkdownCreateAttributesContent } from "./IncidentTimelineCellMarkdownCreateAttributesContent";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Timeline cell data for Markdown timeline cells for a create request.
diff --git a/packages/datadog-api-client-v2/models/IncidentTimelineCellMarkdownCreateAttributesContent.ts b/packages/datadog-api-client-v2/models/IncidentTimelineCellMarkdownCreateAttributesContent.ts
index 5d4596d02e17..e527baecca62 100644
--- a/packages/datadog-api-client-v2/models/IncidentTimelineCellMarkdownCreateAttributesContent.ts
+++ b/packages/datadog-api-client-v2/models/IncidentTimelineCellMarkdownCreateAttributesContent.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Markdown timeline cell contents.
diff --git a/packages/datadog-api-client-v2/models/IncidentUpdateAttributes.ts b/packages/datadog-api-client-v2/models/IncidentUpdateAttributes.ts
index 0b3186034b49..dce9bbb9fb84 100644
--- a/packages/datadog-api-client-v2/models/IncidentUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/IncidentUpdateAttributes.ts
@@ -10,7 +10,7 @@
 
 import { IncidentFieldAttributes } from "./IncidentFieldAttributes";
 import { IncidentNotificationHandle } from "./IncidentNotificationHandle";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident's attributes for an update request.
diff --git a/packages/datadog-api-client-v2/models/IncidentUpdateData.ts b/packages/datadog-api-client-v2/models/IncidentUpdateData.ts
index a13532745897..57fb35d0be2c 100644
--- a/packages/datadog-api-client-v2/models/IncidentUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/IncidentUpdateData.ts
@@ -11,7 +11,7 @@
 import { IncidentType } from "./IncidentType";
 import { IncidentUpdateAttributes } from "./IncidentUpdateAttributes";
 import { IncidentUpdateRelationships } from "./IncidentUpdateRelationships";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Incident data for an update request.
diff --git a/packages/datadog-api-client-v2/models/IncidentUpdateRelationships.ts b/packages/datadog-api-client-v2/models/IncidentUpdateRelationships.ts
index 12d9bd1ccf76..d94cbccdb108 100644
--- a/packages/datadog-api-client-v2/models/IncidentUpdateRelationships.ts
+++ b/packages/datadog-api-client-v2/models/IncidentUpdateRelationships.ts
@@ -11,7 +11,7 @@
 import { NullableRelationshipToUser } from "./NullableRelationshipToUser";
 import { RelationshipToIncidentIntegrationMetadatas } from "./RelationshipToIncidentIntegrationMetadatas";
 import { RelationshipToIncidentPostmortem } from "./RelationshipToIncidentPostmortem";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The incident's relationships for an update request.
diff --git a/packages/datadog-api-client-v2/models/IncidentUpdateRequest.ts b/packages/datadog-api-client-v2/models/IncidentUpdateRequest.ts
index 9669e81d5a76..07c689c2d983 100644
--- a/packages/datadog-api-client-v2/models/IncidentUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/IncidentUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentUpdateData } from "./IncidentUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update request for an incident.
diff --git a/packages/datadog-api-client-v2/models/IncidentsResponse.ts b/packages/datadog-api-client-v2/models/IncidentsResponse.ts
index 9febd1014809..a52bbb5090c6 100644
--- a/packages/datadog-api-client-v2/models/IncidentsResponse.ts
+++ b/packages/datadog-api-client-v2/models/IncidentsResponse.ts
@@ -11,7 +11,7 @@
 import { IncidentResponseData } from "./IncidentResponseData";
 import { IncidentResponseIncludedItem } from "./IncidentResponseIncludedItem";
 import { IncidentResponseMeta } from "./IncidentResponseMeta";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response with a list of incidents.
diff --git a/packages/datadog-api-client-v2/models/ListApplicationKeysResponse.ts b/packages/datadog-api-client-v2/models/ListApplicationKeysResponse.ts
index a95ee4b61118..30b57aeb2e95 100644
--- a/packages/datadog-api-client-v2/models/ListApplicationKeysResponse.ts
+++ b/packages/datadog-api-client-v2/models/ListApplicationKeysResponse.ts
@@ -10,7 +10,7 @@
 
 import { ApplicationKeyResponseIncludedItem } from "./ApplicationKeyResponseIncludedItem";
 import { PartialApplicationKey } from "./PartialApplicationKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response for a list of application keys.
diff --git a/packages/datadog-api-client-v2/models/Log.ts b/packages/datadog-api-client-v2/models/Log.ts
index cb2619409dc7..c5ef964c5548 100644
--- a/packages/datadog-api-client-v2/models/Log.ts
+++ b/packages/datadog-api-client-v2/models/Log.ts
@@ -10,7 +10,7 @@
 
 import { LogAttributes } from "./LogAttributes";
 import { LogType } from "./LogType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object description of a log after being processed and stored by Datadog.
diff --git a/packages/datadog-api-client-v2/models/LogAttributes.ts b/packages/datadog-api-client-v2/models/LogAttributes.ts
index c0b7bdbafc1c..466a04159e51 100644
--- a/packages/datadog-api-client-v2/models/LogAttributes.ts
+++ b/packages/datadog-api-client-v2/models/LogAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * JSON object containing all log attributes and their associated values.
diff --git a/packages/datadog-api-client-v2/models/LogsAggregateBucket.ts b/packages/datadog-api-client-v2/models/LogsAggregateBucket.ts
index 2b85368a2c5c..8b9fdcab51df 100644
--- a/packages/datadog-api-client-v2/models/LogsAggregateBucket.ts
+++ b/packages/datadog-api-client-v2/models/LogsAggregateBucket.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsAggregateBucketValue } from "./LogsAggregateBucketValue";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A bucket values
diff --git a/packages/datadog-api-client-v2/models/LogsAggregateBucketValue.ts b/packages/datadog-api-client-v2/models/LogsAggregateBucketValue.ts
index da3b3aa310ea..de6a245d47a8 100644
--- a/packages/datadog-api-client-v2/models/LogsAggregateBucketValue.ts
+++ b/packages/datadog-api-client-v2/models/LogsAggregateBucketValue.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsAggregateBucketValueTimeseriesPoint } from "./LogsAggregateBucketValueTimeseriesPoint";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * A bucket value, can be either a timeseries or a single value
diff --git a/packages/datadog-api-client-v2/models/LogsAggregateBucketValueTimeseriesPoint.ts b/packages/datadog-api-client-v2/models/LogsAggregateBucketValueTimeseriesPoint.ts
index 2f033e19ce16..a52ac718cfab 100644
--- a/packages/datadog-api-client-v2/models/LogsAggregateBucketValueTimeseriesPoint.ts
+++ b/packages/datadog-api-client-v2/models/LogsAggregateBucketValueTimeseriesPoint.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A timeseries point
diff --git a/packages/datadog-api-client-v2/models/LogsAggregateRequest.ts b/packages/datadog-api-client-v2/models/LogsAggregateRequest.ts
index 42c79759b4e6..bab06ea5a424 100644
--- a/packages/datadog-api-client-v2/models/LogsAggregateRequest.ts
+++ b/packages/datadog-api-client-v2/models/LogsAggregateRequest.ts
@@ -13,7 +13,7 @@ import { LogsCompute } from "./LogsCompute";
 import { LogsGroupBy } from "./LogsGroupBy";
 import { LogsQueryFilter } from "./LogsQueryFilter";
 import { LogsQueryOptions } from "./LogsQueryOptions";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object sent with the request to retrieve a list of logs from your organization.
diff --git a/packages/datadog-api-client-v2/models/LogsAggregateRequestPage.ts b/packages/datadog-api-client-v2/models/LogsAggregateRequestPage.ts
index 2e4b94f50213..196e56f30af8 100644
--- a/packages/datadog-api-client-v2/models/LogsAggregateRequestPage.ts
+++ b/packages/datadog-api-client-v2/models/LogsAggregateRequestPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging settings
diff --git a/packages/datadog-api-client-v2/models/LogsAggregateResponse.ts b/packages/datadog-api-client-v2/models/LogsAggregateResponse.ts
index 4d1f03798bcf..5f795390a22c 100644
--- a/packages/datadog-api-client-v2/models/LogsAggregateResponse.ts
+++ b/packages/datadog-api-client-v2/models/LogsAggregateResponse.ts
@@ -10,7 +10,7 @@
 
 import { LogsAggregateResponseData } from "./LogsAggregateResponseData";
 import { LogsResponseMetadata } from "./LogsResponseMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response object for the logs aggregate API endpoint
diff --git a/packages/datadog-api-client-v2/models/LogsAggregateResponseData.ts b/packages/datadog-api-client-v2/models/LogsAggregateResponseData.ts
index f1ff4176ece2..84fc1dc1b118 100644
--- a/packages/datadog-api-client-v2/models/LogsAggregateResponseData.ts
+++ b/packages/datadog-api-client-v2/models/LogsAggregateResponseData.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsAggregateBucket } from "./LogsAggregateBucket";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The query results
diff --git a/packages/datadog-api-client-v2/models/LogsAggregateSort.ts b/packages/datadog-api-client-v2/models/LogsAggregateSort.ts
index 6e0b52f210ee..7d7f1ee0c641 100644
--- a/packages/datadog-api-client-v2/models/LogsAggregateSort.ts
+++ b/packages/datadog-api-client-v2/models/LogsAggregateSort.ts
@@ -11,7 +11,7 @@
 import { LogsAggregateSortType } from "./LogsAggregateSortType";
 import { LogsAggregationFunction } from "./LogsAggregationFunction";
 import { LogsSortOrder } from "./LogsSortOrder";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A sort rule
diff --git a/packages/datadog-api-client-v2/models/LogsArchive.ts b/packages/datadog-api-client-v2/models/LogsArchive.ts
index a05711a3b562..080feefa82c5 100644
--- a/packages/datadog-api-client-v2/models/LogsArchive.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchive.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsArchiveDefinition } from "./LogsArchiveDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The logs archive.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveAttributes.ts b/packages/datadog-api-client-v2/models/LogsArchiveAttributes.ts
index 66059b0a3856..63ae1cfc1dd1 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveAttributes.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveAttributes.ts
@@ -10,7 +10,7 @@
 
 import { LogsArchiveDestination } from "./LogsArchiveDestination";
 import { LogsArchiveState } from "./LogsArchiveState";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes associated with the archive.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveCreateRequest.ts b/packages/datadog-api-client-v2/models/LogsArchiveCreateRequest.ts
index 359fca7be5e3..c2c0bf12afd1 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsArchiveCreateRequestDefinition } from "./LogsArchiveCreateRequestDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The logs archive.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestAttributes.ts b/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestAttributes.ts
index 67c0e27cedd2..f1fbb5cd86d4 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestAttributes.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestAttributes.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsArchiveCreateRequestDestination } from "./LogsArchiveCreateRequestDestination";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes associated with the archive.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestDefinition.ts b/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestDefinition.ts
index ad4a9ab2eb27..109d82d74a01 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestDefinition.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestDefinition.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsArchiveCreateRequestAttributes } from "./LogsArchiveCreateRequestAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The definition of an archive.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestDestination.ts b/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestDestination.ts
index bc1de0377c4e..e40b2900c605 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestDestination.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveCreateRequestDestination.ts
@@ -11,7 +11,7 @@
 import { LogsArchiveDestinationAzure } from "./LogsArchiveDestinationAzure";
 import { LogsArchiveDestinationGCS } from "./LogsArchiveDestinationGCS";
 import { LogsArchiveDestinationS3 } from "./LogsArchiveDestinationS3";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * An archive's destination.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveDefinition.ts b/packages/datadog-api-client-v2/models/LogsArchiveDefinition.ts
index f82b7f34adc4..43fde3fa61a8 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveDefinition.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveDefinition.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsArchiveAttributes } from "./LogsArchiveAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The definition of an archive.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveDestination.ts b/packages/datadog-api-client-v2/models/LogsArchiveDestination.ts
index 9f97d34504ff..74fc6771f425 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveDestination.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveDestination.ts
@@ -11,7 +11,7 @@
 import { LogsArchiveDestinationAzure } from "./LogsArchiveDestinationAzure";
 import { LogsArchiveDestinationGCS } from "./LogsArchiveDestinationGCS";
 import { LogsArchiveDestinationS3 } from "./LogsArchiveDestinationS3";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * An archive's destination.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveDestinationAzure.ts b/packages/datadog-api-client-v2/models/LogsArchiveDestinationAzure.ts
index d13f14f8a6de..3f818822ce52 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveDestinationAzure.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveDestinationAzure.ts
@@ -10,7 +10,7 @@
 
 import { LogsArchiveDestinationAzureType } from "./LogsArchiveDestinationAzureType";
 import { LogsArchiveIntegrationAzure } from "./LogsArchiveIntegrationAzure";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Azure archive destination.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveDestinationGCS.ts b/packages/datadog-api-client-v2/models/LogsArchiveDestinationGCS.ts
index d7521a6b8d08..47e47b29c8e9 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveDestinationGCS.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveDestinationGCS.ts
@@ -10,7 +10,7 @@
 
 import { LogsArchiveDestinationGCSType } from "./LogsArchiveDestinationGCSType";
 import { LogsArchiveIntegrationGCS } from "./LogsArchiveIntegrationGCS";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The GCS archive destination.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveDestinationS3.ts b/packages/datadog-api-client-v2/models/LogsArchiveDestinationS3.ts
index 102fc96a7783..87cce695da27 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveDestinationS3.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveDestinationS3.ts
@@ -10,7 +10,7 @@
 
 import { LogsArchiveDestinationS3Type } from "./LogsArchiveDestinationS3Type";
 import { LogsArchiveIntegrationS3 } from "./LogsArchiveIntegrationS3";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The S3 archive destination.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveIntegrationAzure.ts b/packages/datadog-api-client-v2/models/LogsArchiveIntegrationAzure.ts
index a1901bd387b9..f5daa9dc52b3 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveIntegrationAzure.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveIntegrationAzure.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Azure archive's integration destination.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveIntegrationGCS.ts b/packages/datadog-api-client-v2/models/LogsArchiveIntegrationGCS.ts
index 720110b9568c..a23bfd5143f5 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveIntegrationGCS.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveIntegrationGCS.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The GCS archive's integration destination.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveIntegrationS3.ts b/packages/datadog-api-client-v2/models/LogsArchiveIntegrationS3.ts
index 1bf9c3c78365..add8c9ac7e51 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveIntegrationS3.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveIntegrationS3.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The S3 Archive's integration destination.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveOrder.ts b/packages/datadog-api-client-v2/models/LogsArchiveOrder.ts
index e74c805f8e34..5fae817ef6e8 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveOrder.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveOrder.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsArchiveOrderDefinition } from "./LogsArchiveOrderDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A ordered list of archive IDs.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveOrderAttributes.ts b/packages/datadog-api-client-v2/models/LogsArchiveOrderAttributes.ts
index 38d37ba3cd5c..0ea73c361371 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveOrderAttributes.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveOrderAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The attributes associated with the archive order.
diff --git a/packages/datadog-api-client-v2/models/LogsArchiveOrderDefinition.ts b/packages/datadog-api-client-v2/models/LogsArchiveOrderDefinition.ts
index 087d9c167d60..f315fa47c5fd 100644
--- a/packages/datadog-api-client-v2/models/LogsArchiveOrderDefinition.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchiveOrderDefinition.ts
@@ -10,7 +10,7 @@
 
 import { LogsArchiveOrderAttributes } from "./LogsArchiveOrderAttributes";
 import { LogsArchiveOrderDefinitionType } from "./LogsArchiveOrderDefinitionType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The definition of an archive order.
diff --git a/packages/datadog-api-client-v2/models/LogsArchives.ts b/packages/datadog-api-client-v2/models/LogsArchives.ts
index 83f18295a74b..d07e1be8ac27 100644
--- a/packages/datadog-api-client-v2/models/LogsArchives.ts
+++ b/packages/datadog-api-client-v2/models/LogsArchives.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsArchiveDefinition } from "./LogsArchiveDefinition";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The available archives.
diff --git a/packages/datadog-api-client-v2/models/LogsCompute.ts b/packages/datadog-api-client-v2/models/LogsCompute.ts
index b51e8f97d50e..1aec01718d85 100644
--- a/packages/datadog-api-client-v2/models/LogsCompute.ts
+++ b/packages/datadog-api-client-v2/models/LogsCompute.ts
@@ -10,7 +10,7 @@
 
 import { LogsAggregationFunction } from "./LogsAggregationFunction";
 import { LogsComputeType } from "./LogsComputeType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A compute rule to compute metrics or timeseries
diff --git a/packages/datadog-api-client-v2/models/LogsGroupBy.ts b/packages/datadog-api-client-v2/models/LogsGroupBy.ts
index c77fedb753ba..95ef4dcd7e0b 100644
--- a/packages/datadog-api-client-v2/models/LogsGroupBy.ts
+++ b/packages/datadog-api-client-v2/models/LogsGroupBy.ts
@@ -12,7 +12,7 @@ import { LogsAggregateSort } from "./LogsAggregateSort";
 import { LogsGroupByHistogram } from "./LogsGroupByHistogram";
 import { LogsGroupByMissing } from "./LogsGroupByMissing";
 import { LogsGroupByTotal } from "./LogsGroupByTotal";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A group by rule
diff --git a/packages/datadog-api-client-v2/models/LogsGroupByHistogram.ts b/packages/datadog-api-client-v2/models/LogsGroupByHistogram.ts
index e6341b856e94..1b81eb071aae 100644
--- a/packages/datadog-api-client-v2/models/LogsGroupByHistogram.ts
+++ b/packages/datadog-api-client-v2/models/LogsGroupByHistogram.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Used to perform a histogram computation (only for measure facets). Note: At most 100 buckets are allowed, the number of buckets is (max - min)/interval.
diff --git a/packages/datadog-api-client-v2/models/LogsGroupByMissing.ts b/packages/datadog-api-client-v2/models/LogsGroupByMissing.ts
index 1b4901f8551a..cc8212741142 100644
--- a/packages/datadog-api-client-v2/models/LogsGroupByMissing.ts
+++ b/packages/datadog-api-client-v2/models/LogsGroupByMissing.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * The value to use for logs that don't have the facet used to group by
diff --git a/packages/datadog-api-client-v2/models/LogsGroupByTotal.ts b/packages/datadog-api-client-v2/models/LogsGroupByTotal.ts
index fc09ab40b7b6..17395c05de1c 100644
--- a/packages/datadog-api-client-v2/models/LogsGroupByTotal.ts
+++ b/packages/datadog-api-client-v2/models/LogsGroupByTotal.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * A resulting object to put the given computes in over all the matching records.
diff --git a/packages/datadog-api-client-v2/models/LogsListRequest.ts b/packages/datadog-api-client-v2/models/LogsListRequest.ts
index 848a2589ae91..d22b82a356d4 100644
--- a/packages/datadog-api-client-v2/models/LogsListRequest.ts
+++ b/packages/datadog-api-client-v2/models/LogsListRequest.ts
@@ -12,7 +12,7 @@ import { LogsListRequestPage } from "./LogsListRequestPage";
 import { LogsQueryFilter } from "./LogsQueryFilter";
 import { LogsQueryOptions } from "./LogsQueryOptions";
 import { LogsSort } from "./LogsSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The request for a logs list.
diff --git a/packages/datadog-api-client-v2/models/LogsListRequestPage.ts b/packages/datadog-api-client-v2/models/LogsListRequestPage.ts
index 4c9ab56cedfa..ded6eaeb6137 100644
--- a/packages/datadog-api-client-v2/models/LogsListRequestPage.ts
+++ b/packages/datadog-api-client-v2/models/LogsListRequestPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging attributes for listing logs.
diff --git a/packages/datadog-api-client-v2/models/LogsListResponse.ts b/packages/datadog-api-client-v2/models/LogsListResponse.ts
index 9e19810a8bdc..785b87925aa0 100644
--- a/packages/datadog-api-client-v2/models/LogsListResponse.ts
+++ b/packages/datadog-api-client-v2/models/LogsListResponse.ts
@@ -11,7 +11,7 @@
 import { Log } from "./Log";
 import { LogsListResponseLinks } from "./LogsListResponseLinks";
 import { LogsResponseMetadata } from "./LogsResponseMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object with all logs matching the request and pagination information.
diff --git a/packages/datadog-api-client-v2/models/LogsListResponseLinks.ts b/packages/datadog-api-client-v2/models/LogsListResponseLinks.ts
index c0f511380c4b..99cbebb092fa 100644
--- a/packages/datadog-api-client-v2/models/LogsListResponseLinks.ts
+++ b/packages/datadog-api-client-v2/models/LogsListResponseLinks.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Links attributes.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricCompute.ts b/packages/datadog-api-client-v2/models/LogsMetricCompute.ts
index cbb3a8aba4c3..231ba5b92279 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricCompute.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricCompute.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsMetricComputeAggregationType } from "./LogsMetricComputeAggregationType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The compute rule to compute the log-based metric.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricCreateAttributes.ts b/packages/datadog-api-client-v2/models/LogsMetricCreateAttributes.ts
index c70f8f78c771..7893ff6f018a 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricCreateAttributes.ts
@@ -11,7 +11,7 @@
 import { LogsMetricCompute } from "./LogsMetricCompute";
 import { LogsMetricFilter } from "./LogsMetricFilter";
 import { LogsMetricGroupBy } from "./LogsMetricGroupBy";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object describing the Datadog log-based metric to create.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricCreateData.ts b/packages/datadog-api-client-v2/models/LogsMetricCreateData.ts
index 9a6fb7e75265..e45b8424e396 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricCreateData.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricCreateData.ts
@@ -10,7 +10,7 @@
 
 import { LogsMetricCreateAttributes } from "./LogsMetricCreateAttributes";
 import { LogsMetricType } from "./LogsMetricType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The new log-based metric properties.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricCreateRequest.ts b/packages/datadog-api-client-v2/models/LogsMetricCreateRequest.ts
index a11398fcae2d..a5e7d0002696 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsMetricCreateData } from "./LogsMetricCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The new log-based metric body.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricFilter.ts b/packages/datadog-api-client-v2/models/LogsMetricFilter.ts
index 6e6ae4055828..6e033a4ed930 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricFilter.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The log-based metric filter. Logs matching this filter will be aggregated in this metric.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricGroupBy.ts b/packages/datadog-api-client-v2/models/LogsMetricGroupBy.ts
index 3761bdd4e7ce..2119718ecee5 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricGroupBy.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricGroupBy.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A group by rule.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricResponse.ts b/packages/datadog-api-client-v2/models/LogsMetricResponse.ts
index e82453fe00e0..bb51f7a53592 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricResponse.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsMetricResponseData } from "./LogsMetricResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The log-based metric object.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricResponseAttributes.ts b/packages/datadog-api-client-v2/models/LogsMetricResponseAttributes.ts
index 1523fb6a31c0..11a547655a3e 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricResponseAttributes.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricResponseAttributes.ts
@@ -11,7 +11,7 @@
 import { LogsMetricResponseCompute } from "./LogsMetricResponseCompute";
 import { LogsMetricResponseFilter } from "./LogsMetricResponseFilter";
 import { LogsMetricResponseGroupBy } from "./LogsMetricResponseGroupBy";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object describing a Datadog log-based metric.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricResponseCompute.ts b/packages/datadog-api-client-v2/models/LogsMetricResponseCompute.ts
index 06619ce3e785..8a2606e0a839 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricResponseCompute.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricResponseCompute.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsMetricResponseComputeAggregationType } from "./LogsMetricResponseComputeAggregationType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The compute rule to compute the log-based metric.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricResponseData.ts b/packages/datadog-api-client-v2/models/LogsMetricResponseData.ts
index 3d42ae556a3b..abd9583e7ce2 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricResponseData.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricResponseData.ts
@@ -10,7 +10,7 @@
 
 import { LogsMetricResponseAttributes } from "./LogsMetricResponseAttributes";
 import { LogsMetricType } from "./LogsMetricType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The log-based metric properties.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricResponseFilter.ts b/packages/datadog-api-client-v2/models/LogsMetricResponseFilter.ts
index 3780aa29a0c2..43e030b76302 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricResponseFilter.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricResponseFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The log-based metric filter. Logs matching this filter will be aggregated in this metric.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricResponseGroupBy.ts b/packages/datadog-api-client-v2/models/LogsMetricResponseGroupBy.ts
index b8b38b05aad8..678b43110974 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricResponseGroupBy.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricResponseGroupBy.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A group by rule.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricUpdateAttributes.ts b/packages/datadog-api-client-v2/models/LogsMetricUpdateAttributes.ts
index 70011a2adedd..5c6bafc140d1 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricUpdateAttributes.ts
@@ -10,7 +10,7 @@
 
 import { LogsMetricFilter } from "./LogsMetricFilter";
 import { LogsMetricGroupBy } from "./LogsMetricGroupBy";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The log-based metric properties that will be updated.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricUpdateData.ts b/packages/datadog-api-client-v2/models/LogsMetricUpdateData.ts
index 687247338767..fd6eba4db62e 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { LogsMetricType } from "./LogsMetricType";
 import { LogsMetricUpdateAttributes } from "./LogsMetricUpdateAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The new log-based metric properties.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricUpdateRequest.ts b/packages/datadog-api-client-v2/models/LogsMetricUpdateRequest.ts
index 79fd8d003288..c124c6bb9613 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsMetricUpdateData } from "./LogsMetricUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The new log-based metric body.
diff --git a/packages/datadog-api-client-v2/models/LogsMetricsResponse.ts b/packages/datadog-api-client-v2/models/LogsMetricsResponse.ts
index 04d203c3103d..15e290572510 100644
--- a/packages/datadog-api-client-v2/models/LogsMetricsResponse.ts
+++ b/packages/datadog-api-client-v2/models/LogsMetricsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { LogsMetricResponseData } from "./LogsMetricResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * All the available log-based metric objects.
diff --git a/packages/datadog-api-client-v2/models/LogsQueryFilter.ts b/packages/datadog-api-client-v2/models/LogsQueryFilter.ts
index 90e0d62fd05f..686ab4729f76 100644
--- a/packages/datadog-api-client-v2/models/LogsQueryFilter.ts
+++ b/packages/datadog-api-client-v2/models/LogsQueryFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The search and filter query settings
diff --git a/packages/datadog-api-client-v2/models/LogsQueryOptions.ts b/packages/datadog-api-client-v2/models/LogsQueryOptions.ts
index 6f0dda91f9e2..6f4bc1734d78 100644
--- a/packages/datadog-api-client-v2/models/LogsQueryOptions.ts
+++ b/packages/datadog-api-client-v2/models/LogsQueryOptions.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Global query options that are used during the query. Note: You should only supply timezone or time offset but not both otherwise the query will fail.
diff --git a/packages/datadog-api-client-v2/models/LogsResponseMetadata.ts b/packages/datadog-api-client-v2/models/LogsResponseMetadata.ts
index 28572cb8dc05..14b540a83f99 100644
--- a/packages/datadog-api-client-v2/models/LogsResponseMetadata.ts
+++ b/packages/datadog-api-client-v2/models/LogsResponseMetadata.ts
@@ -11,7 +11,7 @@
 import { LogsAggregateResponseStatus } from "./LogsAggregateResponseStatus";
 import { LogsResponseMetadataPage } from "./LogsResponseMetadataPage";
 import { LogsWarning } from "./LogsWarning";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata associated with a request
diff --git a/packages/datadog-api-client-v2/models/LogsResponseMetadataPage.ts b/packages/datadog-api-client-v2/models/LogsResponseMetadataPage.ts
index 14a533796590..e2a0e297999e 100644
--- a/packages/datadog-api-client-v2/models/LogsResponseMetadataPage.ts
+++ b/packages/datadog-api-client-v2/models/LogsResponseMetadataPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging attributes.
diff --git a/packages/datadog-api-client-v2/models/LogsWarning.ts b/packages/datadog-api-client-v2/models/LogsWarning.ts
index 7c8032827e2a..05b5ff5b5b25 100644
--- a/packages/datadog-api-client-v2/models/LogsWarning.ts
+++ b/packages/datadog-api-client-v2/models/LogsWarning.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A warning message indicating something that went wrong with the query
diff --git a/packages/datadog-api-client-v2/models/Metric.ts b/packages/datadog-api-client-v2/models/Metric.ts
index efabd6a1d5d5..b1a01d355d03 100644
--- a/packages/datadog-api-client-v2/models/Metric.ts
+++ b/packages/datadog-api-client-v2/models/Metric.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricType } from "./MetricType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single metric tag configuration.
diff --git a/packages/datadog-api-client-v2/models/MetricAllTags.ts b/packages/datadog-api-client-v2/models/MetricAllTags.ts
index 80d4738309f2..214eedcdb609 100644
--- a/packages/datadog-api-client-v2/models/MetricAllTags.ts
+++ b/packages/datadog-api-client-v2/models/MetricAllTags.ts
@@ -10,7 +10,7 @@
 
 import { MetricAllTagsAttributes } from "./MetricAllTagsAttributes";
 import { MetricType } from "./MetricType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single metric's indexed tags.
diff --git a/packages/datadog-api-client-v2/models/MetricAllTagsAttributes.ts b/packages/datadog-api-client-v2/models/MetricAllTagsAttributes.ts
index 24c19dc811fa..4929d1f74e88 100644
--- a/packages/datadog-api-client-v2/models/MetricAllTagsAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricAllTagsAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the definition of a metric's tags.
diff --git a/packages/datadog-api-client-v2/models/MetricAllTagsResponse.ts b/packages/datadog-api-client-v2/models/MetricAllTagsResponse.ts
index d4053d2d12e6..24de7bde9ce5 100644
--- a/packages/datadog-api-client-v2/models/MetricAllTagsResponse.ts
+++ b/packages/datadog-api-client-v2/models/MetricAllTagsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricAllTags } from "./MetricAllTags";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object that includes a single metric's indexed tags.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreate.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreate.ts
index 278614ef2070..29f9b462e08b 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreate.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreate.ts
@@ -10,7 +10,7 @@
 
 import { MetricBulkConfigureTagsType } from "./MetricBulkConfigureTagsType";
 import { MetricBulkTagConfigCreateAttributes } from "./MetricBulkTagConfigCreateAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request object to bulk configure tags for metrics matching the given prefix.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreateAttributes.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreateAttributes.ts
index 096c387ef0a0..015ac1a5a398 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Optional parameters for bulk creating metric tag configurations.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreateRequest.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreateRequest.ts
index be4063eb3cc8..fcee52d71899 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricBulkTagConfigCreate } from "./MetricBulkTagConfigCreate";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Wrapper object for a single bulk tag configuration request.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigDelete.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigDelete.ts
index 354e9770cf34..7d8f3dd31f49 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigDelete.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigDelete.ts
@@ -10,7 +10,7 @@
 
 import { MetricBulkConfigureTagsType } from "./MetricBulkConfigureTagsType";
 import { MetricBulkTagConfigDeleteAttributes } from "./MetricBulkTagConfigDeleteAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request object to bulk delete all tag configurations for metrics matching the given prefix.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigDeleteAttributes.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigDeleteAttributes.ts
index 34933ace50a9..f7814cc11f29 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigDeleteAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigDeleteAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Optional parameters for bulk deleting metric tag configurations.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigDeleteRequest.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigDeleteRequest.ts
index 437cd7e394a8..24fc7e2b405a 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigDeleteRequest.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigDeleteRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricBulkTagConfigDelete } from "./MetricBulkTagConfigDelete";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Wrapper object for a single bulk tag deletion request.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigResponse.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigResponse.ts
index 82fe623af6ea..ef26713c27ec 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigResponse.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricBulkTagConfigStatus } from "./MetricBulkTagConfigStatus";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Wrapper for a single bulk tag configuration status response.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigStatus.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigStatus.ts
index 6bd4d483ec7c..ee0bead0971b 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigStatus.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigStatus.ts
@@ -10,7 +10,7 @@
 
 import { MetricBulkConfigureTagsType } from "./MetricBulkConfigureTagsType";
 import { MetricBulkTagConfigStatusAttributes } from "./MetricBulkTagConfigStatusAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The status of a request to bulk configure metric tags. It contains the fields from the original request for reference.
diff --git a/packages/datadog-api-client-v2/models/MetricBulkTagConfigStatusAttributes.ts b/packages/datadog-api-client-v2/models/MetricBulkTagConfigStatusAttributes.ts
index cefc8bd5a913..12d38c0b0a6f 100644
--- a/packages/datadog-api-client-v2/models/MetricBulkTagConfigStatusAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricBulkTagConfigStatusAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Optional attributes for the status of a bulk tag configuration request.
diff --git a/packages/datadog-api-client-v2/models/MetricCustomAggregation.ts b/packages/datadog-api-client-v2/models/MetricCustomAggregation.ts
index b5d78c0032c9..0e9b03dcd67b 100644
--- a/packages/datadog-api-client-v2/models/MetricCustomAggregation.ts
+++ b/packages/datadog-api-client-v2/models/MetricCustomAggregation.ts
@@ -10,7 +10,7 @@
 
 import { MetricCustomSpaceAggregation } from "./MetricCustomSpaceAggregation";
 import { MetricCustomTimeAggregation } from "./MetricCustomTimeAggregation";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A time and space aggregation combination for use in query.
diff --git a/packages/datadog-api-client-v2/models/MetricDistinctVolume.ts b/packages/datadog-api-client-v2/models/MetricDistinctVolume.ts
index f779b33e4e51..50d825512b80 100644
--- a/packages/datadog-api-client-v2/models/MetricDistinctVolume.ts
+++ b/packages/datadog-api-client-v2/models/MetricDistinctVolume.ts
@@ -10,7 +10,7 @@
 
 import { MetricDistinctVolumeAttributes } from "./MetricDistinctVolumeAttributes";
 import { MetricDistinctVolumeType } from "./MetricDistinctVolumeType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single metric's distinct volume.
diff --git a/packages/datadog-api-client-v2/models/MetricDistinctVolumeAttributes.ts b/packages/datadog-api-client-v2/models/MetricDistinctVolumeAttributes.ts
index bcb4fdafff7f..46abacee7049 100644
--- a/packages/datadog-api-client-v2/models/MetricDistinctVolumeAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricDistinctVolumeAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the definition of a metric's distinct volume.
diff --git a/packages/datadog-api-client-v2/models/MetricIngestedIndexedVolume.ts b/packages/datadog-api-client-v2/models/MetricIngestedIndexedVolume.ts
index cdee68bc0f22..bd957881adcc 100644
--- a/packages/datadog-api-client-v2/models/MetricIngestedIndexedVolume.ts
+++ b/packages/datadog-api-client-v2/models/MetricIngestedIndexedVolume.ts
@@ -10,7 +10,7 @@
 
 import { MetricIngestedIndexedVolumeAttributes } from "./MetricIngestedIndexedVolumeAttributes";
 import { MetricIngestedIndexedVolumeType } from "./MetricIngestedIndexedVolumeType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single metric's ingested and indexed volume.
diff --git a/packages/datadog-api-client-v2/models/MetricIngestedIndexedVolumeAttributes.ts b/packages/datadog-api-client-v2/models/MetricIngestedIndexedVolumeAttributes.ts
index 96088688d5cd..44f0afaff7b8 100644
--- a/packages/datadog-api-client-v2/models/MetricIngestedIndexedVolumeAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricIngestedIndexedVolumeAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the definition of a metric's ingested and indexed volume.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfiguration.ts b/packages/datadog-api-client-v2/models/MetricTagConfiguration.ts
index ff8bba4eb80c..3cca067cee2a 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfiguration.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfiguration.ts
@@ -10,7 +10,7 @@
 
 import { MetricTagConfigurationAttributes } from "./MetricTagConfigurationAttributes";
 import { MetricTagConfigurationType } from "./MetricTagConfigurationType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single metric tag configuration.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfigurationAttributes.ts b/packages/datadog-api-client-v2/models/MetricTagConfigurationAttributes.ts
index 666d412994ae..a4bac60145ab 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfigurationAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfigurationAttributes.ts
@@ -10,7 +10,7 @@
 
 import { MetricCustomAggregation } from "./MetricCustomAggregation";
 import { MetricTagConfigurationMetricTypes } from "./MetricTagConfigurationMetricTypes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the definition of a metric tag configuration attributes.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateAttributes.ts b/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateAttributes.ts
index 3a99d034ed1e..0e60e1782616 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateAttributes.ts
@@ -10,7 +10,7 @@
 
 import { MetricCustomAggregation } from "./MetricCustomAggregation";
 import { MetricTagConfigurationMetricTypes } from "./MetricTagConfigurationMetricTypes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the definition of a metric tag configuration to be created.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateData.ts b/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateData.ts
index fc16142b16ac..cb8465869b54 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateData.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateData.ts
@@ -10,7 +10,7 @@
 
 import { MetricTagConfigurationCreateAttributes } from "./MetricTagConfigurationCreateAttributes";
 import { MetricTagConfigurationType } from "./MetricTagConfigurationType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single metric to be configure tags on.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateRequest.ts b/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateRequest.ts
index dad94a50a7f6..5c26499e9382 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfigurationCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricTagConfigurationCreateData } from "./MetricTagConfigurationCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request object that includes the metric that you would like to configure tags for.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfigurationResponse.ts b/packages/datadog-api-client-v2/models/MetricTagConfigurationResponse.ts
index cab135d7daef..228854125bf4 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfigurationResponse.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfigurationResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricTagConfiguration } from "./MetricTagConfiguration";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object which includes a single metric's tag configuration.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateAttributes.ts b/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateAttributes.ts
index 6b8a2c3a7be9..e7e66761cadf 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateAttributes.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricCustomAggregation } from "./MetricCustomAggregation";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the definition of a metric tag configuration to be updated.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateData.ts b/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateData.ts
index 5e28c2e6d268..b9569f380eb0 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { MetricTagConfigurationType } from "./MetricTagConfigurationType";
 import { MetricTagConfigurationUpdateAttributes } from "./MetricTagConfigurationUpdateAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single tag configuration to be edited.
diff --git a/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateRequest.ts b/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateRequest.ts
index 5bc6a2214040..ee4551ff9200 100644
--- a/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/MetricTagConfigurationUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricTagConfigurationUpdateData } from "./MetricTagConfigurationUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request object that includes the metric that you would like to edit the tag configuration on.
diff --git a/packages/datadog-api-client-v2/models/MetricVolumes.ts b/packages/datadog-api-client-v2/models/MetricVolumes.ts
index 31750beef253..2a88d28a0fd9 100644
--- a/packages/datadog-api-client-v2/models/MetricVolumes.ts
+++ b/packages/datadog-api-client-v2/models/MetricVolumes.ts
@@ -10,7 +10,7 @@
 
 import { MetricDistinctVolume } from "./MetricDistinctVolume";
 import { MetricIngestedIndexedVolume } from "./MetricIngestedIndexedVolume";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Possible response objects for a metric's volume.
diff --git a/packages/datadog-api-client-v2/models/MetricVolumesResponse.ts b/packages/datadog-api-client-v2/models/MetricVolumesResponse.ts
index ed1fc7a54a9c..8fd85d679ffd 100644
--- a/packages/datadog-api-client-v2/models/MetricVolumesResponse.ts
+++ b/packages/datadog-api-client-v2/models/MetricVolumesResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricVolumes } from "./MetricVolumes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object which includes a single metric's volume.
diff --git a/packages/datadog-api-client-v2/models/MetricsAndMetricTagConfigurations.ts b/packages/datadog-api-client-v2/models/MetricsAndMetricTagConfigurations.ts
index 450ce3d34114..13707777c5a1 100644
--- a/packages/datadog-api-client-v2/models/MetricsAndMetricTagConfigurations.ts
+++ b/packages/datadog-api-client-v2/models/MetricsAndMetricTagConfigurations.ts
@@ -10,7 +10,7 @@
 
 import { Metric } from "./Metric";
 import { MetricTagConfiguration } from "./MetricTagConfiguration";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * Object for a metrics and metric tag configurations.
diff --git a/packages/datadog-api-client-v2/models/MetricsAndMetricTagConfigurationsResponse.ts b/packages/datadog-api-client-v2/models/MetricsAndMetricTagConfigurationsResponse.ts
index 147ba77cabba..dd70afb392a8 100644
--- a/packages/datadog-api-client-v2/models/MetricsAndMetricTagConfigurationsResponse.ts
+++ b/packages/datadog-api-client-v2/models/MetricsAndMetricTagConfigurationsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { MetricsAndMetricTagConfigurations } from "./MetricsAndMetricTagConfigurations";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object that includes metrics and metric tag configurations.
diff --git a/packages/datadog-api-client-v2/models/NullableRelationshipToUser.ts b/packages/datadog-api-client-v2/models/NullableRelationshipToUser.ts
index d21af3321a39..2272ffd9e671 100644
--- a/packages/datadog-api-client-v2/models/NullableRelationshipToUser.ts
+++ b/packages/datadog-api-client-v2/models/NullableRelationshipToUser.ts
@@ -9,7 +9,7 @@
  */
 
 import { NullableRelationshipToUserData } from "./NullableRelationshipToUserData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to user.
diff --git a/packages/datadog-api-client-v2/models/NullableRelationshipToUserData.ts b/packages/datadog-api-client-v2/models/NullableRelationshipToUserData.ts
index 4a5dc99a01ee..715183a424ff 100644
--- a/packages/datadog-api-client-v2/models/NullableRelationshipToUserData.ts
+++ b/packages/datadog-api-client-v2/models/NullableRelationshipToUserData.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsersType } from "./UsersType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to user object.
diff --git a/packages/datadog-api-client-v2/models/ObjectSerializer.ts b/packages/datadog-api-client-v2/models/ObjectSerializer.ts
index 9b9c388ef852..a98a43847e4a 100644
--- a/packages/datadog-api-client-v2/models/ObjectSerializer.ts
+++ b/packages/datadog-api-client-v2/models/ObjectSerializer.ts
@@ -329,7 +329,8 @@ import { UserUpdateAttributes } from "./UserUpdateAttributes";
 import { UserUpdateData } from "./UserUpdateData";
 import { UserUpdateRequest } from "./UserUpdateRequest";
 import { UsersResponse } from "./UsersResponse";
-import { logger } from "../../../index";
+import { UnparsedObject } from "../util";
+import { logger } from "../../../logger";
 
 const primitives = [
   "string",
@@ -1216,19 +1217,3 @@ export class ObjectSerializer {
     }
   }
 }
-
-export class UnparsedObject {
-  unparsedObject: any;
-  constructor(data: any) {
-    this.unparsedObject = data;
-  }
-}
-
-export type AttributeTypeMap = {
-  [key: string]: {
-    baseName: string;
-    type: string;
-    required?: boolean;
-    format?: string;
-  };
-};
diff --git a/packages/datadog-api-client-v2/models/Organization.ts b/packages/datadog-api-client-v2/models/Organization.ts
index 97af59a0c607..85caebca941e 100644
--- a/packages/datadog-api-client-v2/models/Organization.ts
+++ b/packages/datadog-api-client-v2/models/Organization.ts
@@ -10,7 +10,7 @@
 
 import { OrganizationAttributes } from "./OrganizationAttributes";
 import { OrganizationsType } from "./OrganizationsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Organization object.
diff --git a/packages/datadog-api-client-v2/models/OrganizationAttributes.ts b/packages/datadog-api-client-v2/models/OrganizationAttributes.ts
index 11349e0e2ae3..d7619efe5275 100644
--- a/packages/datadog-api-client-v2/models/OrganizationAttributes.ts
+++ b/packages/datadog-api-client-v2/models/OrganizationAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of the organization.
diff --git a/packages/datadog-api-client-v2/models/Pagination.ts b/packages/datadog-api-client-v2/models/Pagination.ts
index df6ef23712d4..60775f81f2b5 100644
--- a/packages/datadog-api-client-v2/models/Pagination.ts
+++ b/packages/datadog-api-client-v2/models/Pagination.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Pagination object.
diff --git a/packages/datadog-api-client-v2/models/PartialAPIKey.ts b/packages/datadog-api-client-v2/models/PartialAPIKey.ts
index 9a1d16f00da2..0c168059bd3e 100644
--- a/packages/datadog-api-client-v2/models/PartialAPIKey.ts
+++ b/packages/datadog-api-client-v2/models/PartialAPIKey.ts
@@ -11,7 +11,7 @@
 import { APIKeyRelationships } from "./APIKeyRelationships";
 import { APIKeysType } from "./APIKeysType";
 import { PartialAPIKeyAttributes } from "./PartialAPIKeyAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Partial Datadog API key.
diff --git a/packages/datadog-api-client-v2/models/PartialAPIKeyAttributes.ts b/packages/datadog-api-client-v2/models/PartialAPIKeyAttributes.ts
index 55972a92b5b6..421eb7f29eb0 100644
--- a/packages/datadog-api-client-v2/models/PartialAPIKeyAttributes.ts
+++ b/packages/datadog-api-client-v2/models/PartialAPIKeyAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of a partial API key.
diff --git a/packages/datadog-api-client-v2/models/PartialApplicationKey.ts b/packages/datadog-api-client-v2/models/PartialApplicationKey.ts
index b1c5c3c7312f..85835930e13d 100644
--- a/packages/datadog-api-client-v2/models/PartialApplicationKey.ts
+++ b/packages/datadog-api-client-v2/models/PartialApplicationKey.ts
@@ -11,7 +11,7 @@
 import { ApplicationKeyRelationships } from "./ApplicationKeyRelationships";
 import { ApplicationKeysType } from "./ApplicationKeysType";
 import { PartialApplicationKeyAttributes } from "./PartialApplicationKeyAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Partial Datadog application key.
diff --git a/packages/datadog-api-client-v2/models/PartialApplicationKeyAttributes.ts b/packages/datadog-api-client-v2/models/PartialApplicationKeyAttributes.ts
index 4742af136412..0accc8f08f91 100644
--- a/packages/datadog-api-client-v2/models/PartialApplicationKeyAttributes.ts
+++ b/packages/datadog-api-client-v2/models/PartialApplicationKeyAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of a partial application key.
diff --git a/packages/datadog-api-client-v2/models/PartialApplicationKeyResponse.ts b/packages/datadog-api-client-v2/models/PartialApplicationKeyResponse.ts
index d4c83a27b5be..4c3e016a8a00 100644
--- a/packages/datadog-api-client-v2/models/PartialApplicationKeyResponse.ts
+++ b/packages/datadog-api-client-v2/models/PartialApplicationKeyResponse.ts
@@ -10,7 +10,7 @@
 
 import { ApplicationKeyResponseIncludedItem } from "./ApplicationKeyResponseIncludedItem";
 import { PartialApplicationKey } from "./PartialApplicationKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response for retrieving a partial application key.
diff --git a/packages/datadog-api-client-v2/models/Permission.ts b/packages/datadog-api-client-v2/models/Permission.ts
index 2a5858f1c8b5..22747b67dc67 100644
--- a/packages/datadog-api-client-v2/models/Permission.ts
+++ b/packages/datadog-api-client-v2/models/Permission.ts
@@ -10,7 +10,7 @@
 
 import { PermissionAttributes } from "./PermissionAttributes";
 import { PermissionsType } from "./PermissionsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Permission object.
diff --git a/packages/datadog-api-client-v2/models/PermissionAttributes.ts b/packages/datadog-api-client-v2/models/PermissionAttributes.ts
index d36ff68d9d48..11e0ae62db8e 100644
--- a/packages/datadog-api-client-v2/models/PermissionAttributes.ts
+++ b/packages/datadog-api-client-v2/models/PermissionAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of a permission.
diff --git a/packages/datadog-api-client-v2/models/PermissionsResponse.ts b/packages/datadog-api-client-v2/models/PermissionsResponse.ts
index c676888518f8..912f81a11c36 100644
--- a/packages/datadog-api-client-v2/models/PermissionsResponse.ts
+++ b/packages/datadog-api-client-v2/models/PermissionsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Permission } from "./Permission";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Payload with API-returned permissions.
diff --git a/packages/datadog-api-client-v2/models/ProcessSummariesMeta.ts b/packages/datadog-api-client-v2/models/ProcessSummariesMeta.ts
index 135b50caf4c5..b7ac93be29b6 100644
--- a/packages/datadog-api-client-v2/models/ProcessSummariesMeta.ts
+++ b/packages/datadog-api-client-v2/models/ProcessSummariesMeta.ts
@@ -9,7 +9,7 @@
  */
 
 import { ProcessSummariesMetaPage } from "./ProcessSummariesMetaPage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response metadata object.
diff --git a/packages/datadog-api-client-v2/models/ProcessSummariesMetaPage.ts b/packages/datadog-api-client-v2/models/ProcessSummariesMetaPage.ts
index 1d0b14134c76..9678d391dc3e 100644
--- a/packages/datadog-api-client-v2/models/ProcessSummariesMetaPage.ts
+++ b/packages/datadog-api-client-v2/models/ProcessSummariesMetaPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging attributes.
diff --git a/packages/datadog-api-client-v2/models/ProcessSummariesResponse.ts b/packages/datadog-api-client-v2/models/ProcessSummariesResponse.ts
index 5999945f83c5..08bd736aa8cf 100644
--- a/packages/datadog-api-client-v2/models/ProcessSummariesResponse.ts
+++ b/packages/datadog-api-client-v2/models/ProcessSummariesResponse.ts
@@ -10,7 +10,7 @@
 
 import { ProcessSummariesMeta } from "./ProcessSummariesMeta";
 import { ProcessSummary } from "./ProcessSummary";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of process summaries.
diff --git a/packages/datadog-api-client-v2/models/ProcessSummary.ts b/packages/datadog-api-client-v2/models/ProcessSummary.ts
index 9f8b6f70b107..f8d8800038cd 100644
--- a/packages/datadog-api-client-v2/models/ProcessSummary.ts
+++ b/packages/datadog-api-client-v2/models/ProcessSummary.ts
@@ -10,7 +10,7 @@
 
 import { ProcessSummaryAttributes } from "./ProcessSummaryAttributes";
 import { ProcessSummaryType } from "./ProcessSummaryType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Process summary object.
diff --git a/packages/datadog-api-client-v2/models/ProcessSummaryAttributes.ts b/packages/datadog-api-client-v2/models/ProcessSummaryAttributes.ts
index 2e1fb848a1f0..d8e6c05658ff 100644
--- a/packages/datadog-api-client-v2/models/ProcessSummaryAttributes.ts
+++ b/packages/datadog-api-client-v2/models/ProcessSummaryAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes for a process summary.
diff --git a/packages/datadog-api-client-v2/models/RUMAggregateBucketValue.ts b/packages/datadog-api-client-v2/models/RUMAggregateBucketValue.ts
index 3014326e9f57..3ac22081a4b9 100644
--- a/packages/datadog-api-client-v2/models/RUMAggregateBucketValue.ts
+++ b/packages/datadog-api-client-v2/models/RUMAggregateBucketValue.ts
@@ -9,7 +9,7 @@
  */
 
 import { RUMAggregateBucketValueTimeseriesPoint } from "./RUMAggregateBucketValueTimeseriesPoint";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * A bucket value, can be either a timeseries or a single value.
diff --git a/packages/datadog-api-client-v2/models/RUMAggregateBucketValueTimeseriesPoint.ts b/packages/datadog-api-client-v2/models/RUMAggregateBucketValueTimeseriesPoint.ts
index 37509e000a3f..b733bf31ba27 100644
--- a/packages/datadog-api-client-v2/models/RUMAggregateBucketValueTimeseriesPoint.ts
+++ b/packages/datadog-api-client-v2/models/RUMAggregateBucketValueTimeseriesPoint.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A timeseries point.
diff --git a/packages/datadog-api-client-v2/models/RUMAggregateRequest.ts b/packages/datadog-api-client-v2/models/RUMAggregateRequest.ts
index 2019c654c2d7..59a892d427af 100644
--- a/packages/datadog-api-client-v2/models/RUMAggregateRequest.ts
+++ b/packages/datadog-api-client-v2/models/RUMAggregateRequest.ts
@@ -13,7 +13,7 @@ import { RUMGroupBy } from "./RUMGroupBy";
 import { RUMQueryFilter } from "./RUMQueryFilter";
 import { RUMQueryOptions } from "./RUMQueryOptions";
 import { RUMQueryPageOptions } from "./RUMQueryPageOptions";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object sent with the request to retrieve aggregation buckets of RUM events from your organization.
diff --git a/packages/datadog-api-client-v2/models/RUMAggregateSort.ts b/packages/datadog-api-client-v2/models/RUMAggregateSort.ts
index 7032379e3d91..35be0146de84 100644
--- a/packages/datadog-api-client-v2/models/RUMAggregateSort.ts
+++ b/packages/datadog-api-client-v2/models/RUMAggregateSort.ts
@@ -11,7 +11,7 @@
 import { RUMAggregateSortType } from "./RUMAggregateSortType";
 import { RUMAggregationFunction } from "./RUMAggregationFunction";
 import { RUMSortOrder } from "./RUMSortOrder";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A sort rule.
diff --git a/packages/datadog-api-client-v2/models/RUMAggregationBucketsResponse.ts b/packages/datadog-api-client-v2/models/RUMAggregationBucketsResponse.ts
index f6fabc5fd342..5404d6625e78 100644
--- a/packages/datadog-api-client-v2/models/RUMAggregationBucketsResponse.ts
+++ b/packages/datadog-api-client-v2/models/RUMAggregationBucketsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { RUMBucketResponse } from "./RUMBucketResponse";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The query results.
diff --git a/packages/datadog-api-client-v2/models/RUMAnalyticsAggregateResponse.ts b/packages/datadog-api-client-v2/models/RUMAnalyticsAggregateResponse.ts
index 9596bcb9d2cf..4b5606323347 100644
--- a/packages/datadog-api-client-v2/models/RUMAnalyticsAggregateResponse.ts
+++ b/packages/datadog-api-client-v2/models/RUMAnalyticsAggregateResponse.ts
@@ -11,7 +11,7 @@
 import { RUMAggregationBucketsResponse } from "./RUMAggregationBucketsResponse";
 import { RUMResponseLinks } from "./RUMResponseLinks";
 import { RUMResponseMetadata } from "./RUMResponseMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response object for the RUM events aggregate API endpoint.
diff --git a/packages/datadog-api-client-v2/models/RUMBucketResponse.ts b/packages/datadog-api-client-v2/models/RUMBucketResponse.ts
index 85f7d8dbacb3..2a629d88d108 100644
--- a/packages/datadog-api-client-v2/models/RUMBucketResponse.ts
+++ b/packages/datadog-api-client-v2/models/RUMBucketResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { RUMAggregateBucketValue } from "./RUMAggregateBucketValue";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Bucket values.
diff --git a/packages/datadog-api-client-v2/models/RUMCompute.ts b/packages/datadog-api-client-v2/models/RUMCompute.ts
index 3edc93469b63..a4652fb9aa0e 100644
--- a/packages/datadog-api-client-v2/models/RUMCompute.ts
+++ b/packages/datadog-api-client-v2/models/RUMCompute.ts
@@ -10,7 +10,7 @@
 
 import { RUMAggregationFunction } from "./RUMAggregationFunction";
 import { RUMComputeType } from "./RUMComputeType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A compute rule to compute metrics or timeseries.
diff --git a/packages/datadog-api-client-v2/models/RUMEvent.ts b/packages/datadog-api-client-v2/models/RUMEvent.ts
index bbf26356c3a9..fdf93877fae6 100644
--- a/packages/datadog-api-client-v2/models/RUMEvent.ts
+++ b/packages/datadog-api-client-v2/models/RUMEvent.ts
@@ -10,7 +10,7 @@
 
 import { RUMEventAttributes } from "./RUMEventAttributes";
 import { RUMEventType } from "./RUMEventType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object description of a RUM event after being processed and stored by Datadog.
diff --git a/packages/datadog-api-client-v2/models/RUMEventAttributes.ts b/packages/datadog-api-client-v2/models/RUMEventAttributes.ts
index e8714a923709..7a2c8fb543a0 100644
--- a/packages/datadog-api-client-v2/models/RUMEventAttributes.ts
+++ b/packages/datadog-api-client-v2/models/RUMEventAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * JSON object containing all event attributes and their associated values.
diff --git a/packages/datadog-api-client-v2/models/RUMEventsResponse.ts b/packages/datadog-api-client-v2/models/RUMEventsResponse.ts
index 70de1530cc55..91d21a24a4bf 100644
--- a/packages/datadog-api-client-v2/models/RUMEventsResponse.ts
+++ b/packages/datadog-api-client-v2/models/RUMEventsResponse.ts
@@ -11,7 +11,7 @@
 import { RUMEvent } from "./RUMEvent";
 import { RUMResponseLinks } from "./RUMResponseLinks";
 import { RUMResponseMetadata } from "./RUMResponseMetadata";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object with all events matching the request and pagination information.
diff --git a/packages/datadog-api-client-v2/models/RUMGroupBy.ts b/packages/datadog-api-client-v2/models/RUMGroupBy.ts
index 485aeffb485e..e41d7a8a3479 100644
--- a/packages/datadog-api-client-v2/models/RUMGroupBy.ts
+++ b/packages/datadog-api-client-v2/models/RUMGroupBy.ts
@@ -12,7 +12,7 @@ import { RUMAggregateSort } from "./RUMAggregateSort";
 import { RUMGroupByHistogram } from "./RUMGroupByHistogram";
 import { RUMGroupByMissing } from "./RUMGroupByMissing";
 import { RUMGroupByTotal } from "./RUMGroupByTotal";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A group-by rule.
diff --git a/packages/datadog-api-client-v2/models/RUMGroupByHistogram.ts b/packages/datadog-api-client-v2/models/RUMGroupByHistogram.ts
index 099826f286ea..92cb0191b5ed 100644
--- a/packages/datadog-api-client-v2/models/RUMGroupByHistogram.ts
+++ b/packages/datadog-api-client-v2/models/RUMGroupByHistogram.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Used to perform a histogram computation (only for measure facets). Note: At most 100 buckets are allowed, the number of buckets is (max - min)/interval.
diff --git a/packages/datadog-api-client-v2/models/RUMGroupByMissing.ts b/packages/datadog-api-client-v2/models/RUMGroupByMissing.ts
index 58c032a82e4a..789e6ccb0b5e 100644
--- a/packages/datadog-api-client-v2/models/RUMGroupByMissing.ts
+++ b/packages/datadog-api-client-v2/models/RUMGroupByMissing.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * The value to use for logs that don't have the facet used to group by.
diff --git a/packages/datadog-api-client-v2/models/RUMGroupByTotal.ts b/packages/datadog-api-client-v2/models/RUMGroupByTotal.ts
index b00a9ecbdd7a..a6f9c7d51dd6 100644
--- a/packages/datadog-api-client-v2/models/RUMGroupByTotal.ts
+++ b/packages/datadog-api-client-v2/models/RUMGroupByTotal.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * A resulting object to put the given computes in over all the matching records.
diff --git a/packages/datadog-api-client-v2/models/RUMQueryFilter.ts b/packages/datadog-api-client-v2/models/RUMQueryFilter.ts
index 117adb06e49f..218c2ffd7515 100644
--- a/packages/datadog-api-client-v2/models/RUMQueryFilter.ts
+++ b/packages/datadog-api-client-v2/models/RUMQueryFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The search and filter query settings.
diff --git a/packages/datadog-api-client-v2/models/RUMQueryOptions.ts b/packages/datadog-api-client-v2/models/RUMQueryOptions.ts
index 890fcde65aab..c9176db54d8f 100644
--- a/packages/datadog-api-client-v2/models/RUMQueryOptions.ts
+++ b/packages/datadog-api-client-v2/models/RUMQueryOptions.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Global query options that are used during the query. Note: Only supply timezone or time offset, not both. Otherwise, the query fails.
diff --git a/packages/datadog-api-client-v2/models/RUMQueryPageOptions.ts b/packages/datadog-api-client-v2/models/RUMQueryPageOptions.ts
index 2add9db39537..998b72b27004 100644
--- a/packages/datadog-api-client-v2/models/RUMQueryPageOptions.ts
+++ b/packages/datadog-api-client-v2/models/RUMQueryPageOptions.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging attributes for listing events.
diff --git a/packages/datadog-api-client-v2/models/RUMResponseLinks.ts b/packages/datadog-api-client-v2/models/RUMResponseLinks.ts
index 04a50c3a6bd7..9a3ffa52d030 100644
--- a/packages/datadog-api-client-v2/models/RUMResponseLinks.ts
+++ b/packages/datadog-api-client-v2/models/RUMResponseLinks.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Links attributes.
diff --git a/packages/datadog-api-client-v2/models/RUMResponseMetadata.ts b/packages/datadog-api-client-v2/models/RUMResponseMetadata.ts
index c420d8669080..2ae1c840ae75 100644
--- a/packages/datadog-api-client-v2/models/RUMResponseMetadata.ts
+++ b/packages/datadog-api-client-v2/models/RUMResponseMetadata.ts
@@ -11,7 +11,7 @@
 import { RUMResponsePage } from "./RUMResponsePage";
 import { RUMResponseStatus } from "./RUMResponseStatus";
 import { RUMWarning } from "./RUMWarning";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The metadata associated with a request.
diff --git a/packages/datadog-api-client-v2/models/RUMResponsePage.ts b/packages/datadog-api-client-v2/models/RUMResponsePage.ts
index 0ef98f89273b..734e519ca3ac 100644
--- a/packages/datadog-api-client-v2/models/RUMResponsePage.ts
+++ b/packages/datadog-api-client-v2/models/RUMResponsePage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging attributes.
diff --git a/packages/datadog-api-client-v2/models/RUMSearchEventsRequest.ts b/packages/datadog-api-client-v2/models/RUMSearchEventsRequest.ts
index 9c20026a21e9..f506125e4692 100644
--- a/packages/datadog-api-client-v2/models/RUMSearchEventsRequest.ts
+++ b/packages/datadog-api-client-v2/models/RUMSearchEventsRequest.ts
@@ -12,7 +12,7 @@ import { RUMQueryFilter } from "./RUMQueryFilter";
 import { RUMQueryOptions } from "./RUMQueryOptions";
 import { RUMQueryPageOptions } from "./RUMQueryPageOptions";
 import { RUMSort } from "./RUMSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The request for a RUM events list.
diff --git a/packages/datadog-api-client-v2/models/RUMWarning.ts b/packages/datadog-api-client-v2/models/RUMWarning.ts
index dce3ea97759d..4a962d78431c 100644
--- a/packages/datadog-api-client-v2/models/RUMWarning.ts
+++ b/packages/datadog-api-client-v2/models/RUMWarning.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A warning message indicating something that went wrong with the query.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToIncidentIntegrationMetadataData.ts b/packages/datadog-api-client-v2/models/RelationshipToIncidentIntegrationMetadataData.ts
index 6d52f83425ea..37a9997e291f 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToIncidentIntegrationMetadataData.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToIncidentIntegrationMetadataData.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentIntegrationMetadataType } from "./IncidentIntegrationMetadataType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A relationship reference for an integration metadata object.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToIncidentIntegrationMetadatas.ts b/packages/datadog-api-client-v2/models/RelationshipToIncidentIntegrationMetadatas.ts
index f1b1f962c1ad..0cfb63b74f98 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToIncidentIntegrationMetadatas.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToIncidentIntegrationMetadatas.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToIncidentIntegrationMetadataData } from "./RelationshipToIncidentIntegrationMetadataData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A relationship reference for multiple integration metadata objects.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToIncidentPostmortem.ts b/packages/datadog-api-client-v2/models/RelationshipToIncidentPostmortem.ts
index 2a311eb9f51e..0b32309afd3e 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToIncidentPostmortem.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToIncidentPostmortem.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToIncidentPostmortemData } from "./RelationshipToIncidentPostmortemData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A relationship reference for postmortems.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToIncidentPostmortemData.ts b/packages/datadog-api-client-v2/models/RelationshipToIncidentPostmortemData.ts
index d42ec835b05a..c72f67fd99ab 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToIncidentPostmortemData.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToIncidentPostmortemData.ts
@@ -9,7 +9,7 @@
  */
 
 import { IncidentPostmortemType } from "./IncidentPostmortemType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The postmortem relationship data.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToOrganization.ts b/packages/datadog-api-client-v2/models/RelationshipToOrganization.ts
index 98224285e3f5..2c31214fff25 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToOrganization.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToOrganization.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToOrganizationData } from "./RelationshipToOrganizationData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to an organization.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToOrganizationData.ts b/packages/datadog-api-client-v2/models/RelationshipToOrganizationData.ts
index 870f8de51b2d..1e1dbda5521f 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToOrganizationData.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToOrganizationData.ts
@@ -9,7 +9,7 @@
  */
 
 import { OrganizationsType } from "./OrganizationsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to organization object.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToOrganizations.ts b/packages/datadog-api-client-v2/models/RelationshipToOrganizations.ts
index 5f2e9d955175..24c340927b53 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToOrganizations.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToOrganizations.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToOrganizationData } from "./RelationshipToOrganizationData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to organizations.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToPermission.ts b/packages/datadog-api-client-v2/models/RelationshipToPermission.ts
index fc22d5aa5d45..a4865762ca69 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToPermission.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToPermission.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToPermissionData } from "./RelationshipToPermissionData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to a permissions object.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToPermissionData.ts b/packages/datadog-api-client-v2/models/RelationshipToPermissionData.ts
index 012f329cc1ce..5afea3240be3 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToPermissionData.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToPermissionData.ts
@@ -9,7 +9,7 @@
  */
 
 import { PermissionsType } from "./PermissionsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to permission object.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToPermissions.ts b/packages/datadog-api-client-v2/models/RelationshipToPermissions.ts
index 40c6ebe3775f..14742989852b 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToPermissions.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToPermissions.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToPermissionData } from "./RelationshipToPermissionData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to multiple permissions objects.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToRole.ts b/packages/datadog-api-client-v2/models/RelationshipToRole.ts
index 965232f4c1ea..c2e6256a2b9c 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToRole.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToRole.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToRoleData } from "./RelationshipToRoleData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to role.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToRoleData.ts b/packages/datadog-api-client-v2/models/RelationshipToRoleData.ts
index b606a50226a1..098f3b5817f2 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToRoleData.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToRoleData.ts
@@ -9,7 +9,7 @@
  */
 
 import { RolesType } from "./RolesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to role object.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToRoles.ts b/packages/datadog-api-client-v2/models/RelationshipToRoles.ts
index b7f4b1465d8c..f7f9da87bc10 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToRoles.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToRoles.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToRoleData } from "./RelationshipToRoleData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to roles.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToSAMLAssertionAttribute.ts b/packages/datadog-api-client-v2/models/RelationshipToSAMLAssertionAttribute.ts
index 5c204adc102d..e58c389a2f3d 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToSAMLAssertionAttribute.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToSAMLAssertionAttribute.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToSAMLAssertionAttributeData } from "./RelationshipToSAMLAssertionAttributeData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * AuthN Mapping relationship to SAML Assertion Attribute.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToSAMLAssertionAttributeData.ts b/packages/datadog-api-client-v2/models/RelationshipToSAMLAssertionAttributeData.ts
index 1961ec7d7ef2..5d649a49eb9e 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToSAMLAssertionAttributeData.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToSAMLAssertionAttributeData.ts
@@ -9,7 +9,7 @@
  */
 
 import { SAMLAssertionAttributesType } from "./SAMLAssertionAttributesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Data of AuthN Mapping relationship to SAML Assertion Attribute.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToUser.ts b/packages/datadog-api-client-v2/models/RelationshipToUser.ts
index 1bf0ebce2853..317fee7e6d67 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToUser.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToUser.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToUserData } from "./RelationshipToUserData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to user.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToUserData.ts b/packages/datadog-api-client-v2/models/RelationshipToUserData.ts
index f9d543f22029..4245eb3ca80b 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToUserData.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToUserData.ts
@@ -9,7 +9,7 @@
  */
 
 import { UsersType } from "./UsersType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to user object.
diff --git a/packages/datadog-api-client-v2/models/RelationshipToUsers.ts b/packages/datadog-api-client-v2/models/RelationshipToUsers.ts
index 113681d20f45..3539a970749c 100644
--- a/packages/datadog-api-client-v2/models/RelationshipToUsers.ts
+++ b/packages/datadog-api-client-v2/models/RelationshipToUsers.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToUserData } from "./RelationshipToUserData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationship to users.
diff --git a/packages/datadog-api-client-v2/models/ResponseMetaAttributes.ts b/packages/datadog-api-client-v2/models/ResponseMetaAttributes.ts
index 0a98ca570145..0d4de11fef9e 100644
--- a/packages/datadog-api-client-v2/models/ResponseMetaAttributes.ts
+++ b/packages/datadog-api-client-v2/models/ResponseMetaAttributes.ts
@@ -9,7 +9,7 @@
  */
 
 import { Pagination } from "./Pagination";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object describing meta attributes of response.
diff --git a/packages/datadog-api-client-v2/models/Role.ts b/packages/datadog-api-client-v2/models/Role.ts
index 771c6bbd0336..a41c769c0c37 100644
--- a/packages/datadog-api-client-v2/models/Role.ts
+++ b/packages/datadog-api-client-v2/models/Role.ts
@@ -11,7 +11,7 @@
 import { RoleAttributes } from "./RoleAttributes";
 import { RoleResponseRelationships } from "./RoleResponseRelationships";
 import { RolesType } from "./RolesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Role object returned by the API.
diff --git a/packages/datadog-api-client-v2/models/RoleAttributes.ts b/packages/datadog-api-client-v2/models/RoleAttributes.ts
index 896bebca8bd7..7487d3ce4e8c 100644
--- a/packages/datadog-api-client-v2/models/RoleAttributes.ts
+++ b/packages/datadog-api-client-v2/models/RoleAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of the role.
diff --git a/packages/datadog-api-client-v2/models/RoleClone.ts b/packages/datadog-api-client-v2/models/RoleClone.ts
index 1b411bf559b4..e59402825ff1 100644
--- a/packages/datadog-api-client-v2/models/RoleClone.ts
+++ b/packages/datadog-api-client-v2/models/RoleClone.ts
@@ -10,7 +10,7 @@
 
 import { RoleCloneAttributes } from "./RoleCloneAttributes";
 import { RolesType } from "./RolesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Data for the clone role request.
diff --git a/packages/datadog-api-client-v2/models/RoleCloneAttributes.ts b/packages/datadog-api-client-v2/models/RoleCloneAttributes.ts
index 54022e46d36f..2b224a90c2f8 100644
--- a/packages/datadog-api-client-v2/models/RoleCloneAttributes.ts
+++ b/packages/datadog-api-client-v2/models/RoleCloneAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes required to create a new role by cloning an existing one.
diff --git a/packages/datadog-api-client-v2/models/RoleCloneRequest.ts b/packages/datadog-api-client-v2/models/RoleCloneRequest.ts
index 36fb0ee9148f..823eaf6c00ff 100644
--- a/packages/datadog-api-client-v2/models/RoleCloneRequest.ts
+++ b/packages/datadog-api-client-v2/models/RoleCloneRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { RoleClone } from "./RoleClone";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request to create a role by cloning an existing role.
diff --git a/packages/datadog-api-client-v2/models/RoleCreateAttributes.ts b/packages/datadog-api-client-v2/models/RoleCreateAttributes.ts
index bb5e2634cac1..97b769307e1e 100644
--- a/packages/datadog-api-client-v2/models/RoleCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/RoleCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of the created role.
diff --git a/packages/datadog-api-client-v2/models/RoleCreateData.ts b/packages/datadog-api-client-v2/models/RoleCreateData.ts
index 38c77d201213..a2ef1398e03d 100644
--- a/packages/datadog-api-client-v2/models/RoleCreateData.ts
+++ b/packages/datadog-api-client-v2/models/RoleCreateData.ts
@@ -11,7 +11,7 @@
 import { RoleCreateAttributes } from "./RoleCreateAttributes";
 import { RoleRelationships } from "./RoleRelationships";
 import { RolesType } from "./RolesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Data related to the creation of a role.
diff --git a/packages/datadog-api-client-v2/models/RoleCreateRequest.ts b/packages/datadog-api-client-v2/models/RoleCreateRequest.ts
index 662764778aa6..cf21d491a9d5 100644
--- a/packages/datadog-api-client-v2/models/RoleCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/RoleCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { RoleCreateData } from "./RoleCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create a role.
diff --git a/packages/datadog-api-client-v2/models/RoleCreateResponse.ts b/packages/datadog-api-client-v2/models/RoleCreateResponse.ts
index 7881755d96b1..413d1013662e 100644
--- a/packages/datadog-api-client-v2/models/RoleCreateResponse.ts
+++ b/packages/datadog-api-client-v2/models/RoleCreateResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { RoleCreateResponseData } from "./RoleCreateResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing information about a created role.
diff --git a/packages/datadog-api-client-v2/models/RoleCreateResponseData.ts b/packages/datadog-api-client-v2/models/RoleCreateResponseData.ts
index 1a9b3b0c55e3..0237cb29d5b8 100644
--- a/packages/datadog-api-client-v2/models/RoleCreateResponseData.ts
+++ b/packages/datadog-api-client-v2/models/RoleCreateResponseData.ts
@@ -11,7 +11,7 @@
 import { RoleCreateAttributes } from "./RoleCreateAttributes";
 import { RoleResponseRelationships } from "./RoleResponseRelationships";
 import { RolesType } from "./RolesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Role object returned by the API.
diff --git a/packages/datadog-api-client-v2/models/RoleRelationships.ts b/packages/datadog-api-client-v2/models/RoleRelationships.ts
index dbb1e1007122..a6636b0b371b 100644
--- a/packages/datadog-api-client-v2/models/RoleRelationships.ts
+++ b/packages/datadog-api-client-v2/models/RoleRelationships.ts
@@ -10,7 +10,7 @@
 
 import { RelationshipToPermissions } from "./RelationshipToPermissions";
 import { RelationshipToUsers } from "./RelationshipToUsers";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationships of the role object.
diff --git a/packages/datadog-api-client-v2/models/RoleResponse.ts b/packages/datadog-api-client-v2/models/RoleResponse.ts
index e4598c0881f0..a528a489aac8 100644
--- a/packages/datadog-api-client-v2/models/RoleResponse.ts
+++ b/packages/datadog-api-client-v2/models/RoleResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { Role } from "./Role";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing information about a single role.
diff --git a/packages/datadog-api-client-v2/models/RoleResponseRelationships.ts b/packages/datadog-api-client-v2/models/RoleResponseRelationships.ts
index 0ecaa9968818..88066fa95368 100644
--- a/packages/datadog-api-client-v2/models/RoleResponseRelationships.ts
+++ b/packages/datadog-api-client-v2/models/RoleResponseRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToPermissions } from "./RelationshipToPermissions";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationships of the role object returned by the API.
diff --git a/packages/datadog-api-client-v2/models/RoleUpdateAttributes.ts b/packages/datadog-api-client-v2/models/RoleUpdateAttributes.ts
index 993fd0d455ec..e371bf1d5d22 100644
--- a/packages/datadog-api-client-v2/models/RoleUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/RoleUpdateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of the role.
diff --git a/packages/datadog-api-client-v2/models/RoleUpdateData.ts b/packages/datadog-api-client-v2/models/RoleUpdateData.ts
index 582d38805598..742601a500f4 100644
--- a/packages/datadog-api-client-v2/models/RoleUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/RoleUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { RoleUpdateAttributes } from "./RoleUpdateAttributes";
 import { RolesType } from "./RolesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Data related to the update of a role.
diff --git a/packages/datadog-api-client-v2/models/RoleUpdateRequest.ts b/packages/datadog-api-client-v2/models/RoleUpdateRequest.ts
index 855d51053fb3..3dbb20e9d13b 100644
--- a/packages/datadog-api-client-v2/models/RoleUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/RoleUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { RoleUpdateData } from "./RoleUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update a role.
diff --git a/packages/datadog-api-client-v2/models/RoleUpdateResponse.ts b/packages/datadog-api-client-v2/models/RoleUpdateResponse.ts
index 88a8ee2f5ec3..354000f5287c 100644
--- a/packages/datadog-api-client-v2/models/RoleUpdateResponse.ts
+++ b/packages/datadog-api-client-v2/models/RoleUpdateResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { RoleUpdateResponseData } from "./RoleUpdateResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing information about an updated role.
diff --git a/packages/datadog-api-client-v2/models/RoleUpdateResponseData.ts b/packages/datadog-api-client-v2/models/RoleUpdateResponseData.ts
index 2cf615e71210..7f574e67f07b 100644
--- a/packages/datadog-api-client-v2/models/RoleUpdateResponseData.ts
+++ b/packages/datadog-api-client-v2/models/RoleUpdateResponseData.ts
@@ -11,7 +11,7 @@
 import { RoleResponseRelationships } from "./RoleResponseRelationships";
 import { RoleUpdateAttributes } from "./RoleUpdateAttributes";
 import { RolesType } from "./RolesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Role object returned by the API.
diff --git a/packages/datadog-api-client-v2/models/RolesResponse.ts b/packages/datadog-api-client-v2/models/RolesResponse.ts
index 6fc16a7cfcfc..6096cc5f05ee 100644
--- a/packages/datadog-api-client-v2/models/RolesResponse.ts
+++ b/packages/datadog-api-client-v2/models/RolesResponse.ts
@@ -10,7 +10,7 @@
 
 import { ResponseMetaAttributes } from "./ResponseMetaAttributes";
 import { Role } from "./Role";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing information about multiple roles.
diff --git a/packages/datadog-api-client-v2/models/SAMLAssertionAttribute.ts b/packages/datadog-api-client-v2/models/SAMLAssertionAttribute.ts
index 027a608dc08d..b8c0e90fe21f 100644
--- a/packages/datadog-api-client-v2/models/SAMLAssertionAttribute.ts
+++ b/packages/datadog-api-client-v2/models/SAMLAssertionAttribute.ts
@@ -10,7 +10,7 @@
 
 import { SAMLAssertionAttributeAttributes } from "./SAMLAssertionAttributeAttributes";
 import { SAMLAssertionAttributesType } from "./SAMLAssertionAttributesType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * SAML assertion attribute.
diff --git a/packages/datadog-api-client-v2/models/SAMLAssertionAttributeAttributes.ts b/packages/datadog-api-client-v2/models/SAMLAssertionAttributeAttributes.ts
index 7fe039955ae9..9ad59966b111 100644
--- a/packages/datadog-api-client-v2/models/SAMLAssertionAttributeAttributes.ts
+++ b/packages/datadog-api-client-v2/models/SAMLAssertionAttributeAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Key/Value pair of attributes used in SAML assertion attributes.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilter.ts b/packages/datadog-api-client-v2/models/SecurityFilter.ts
index a146d36dc487..d605f4ce8cfc 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilter.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilter.ts
@@ -10,7 +10,7 @@
 
 import { SecurityFilterAttributes } from "./SecurityFilterAttributes";
 import { SecurityFilterType } from "./SecurityFilterType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The security filter's properties.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterAttributes.ts b/packages/datadog-api-client-v2/models/SecurityFilterAttributes.ts
index cb410f73fd53..9e9be1419f7c 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterAttributes.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterAttributes.ts
@@ -10,7 +10,7 @@
 
 import { SecurityFilterExclusionFilterResponse } from "./SecurityFilterExclusionFilterResponse";
 import { SecurityFilterFilteredDataType } from "./SecurityFilterFilteredDataType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object describing a security filter.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterCreateAttributes.ts b/packages/datadog-api-client-v2/models/SecurityFilterCreateAttributes.ts
index ed25b1203612..07cee50bc565 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterCreateAttributes.ts
@@ -10,7 +10,7 @@
 
 import { SecurityFilterExclusionFilter } from "./SecurityFilterExclusionFilter";
 import { SecurityFilterFilteredDataType } from "./SecurityFilterFilteredDataType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object containing the attributes of the security filter to be created.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterCreateData.ts b/packages/datadog-api-client-v2/models/SecurityFilterCreateData.ts
index b7a6f938c31a..99c4febd38d9 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterCreateData.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterCreateData.ts
@@ -10,7 +10,7 @@
 
 import { SecurityFilterCreateAttributes } from "./SecurityFilterCreateAttributes";
 import { SecurityFilterType } from "./SecurityFilterType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object for a single security filter.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterCreateRequest.ts b/packages/datadog-api-client-v2/models/SecurityFilterCreateRequest.ts
index 8ffd47541d97..2cbece8c73af 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { SecurityFilterCreateData } from "./SecurityFilterCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Request object that includes the security filter that you would like to create.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterExclusionFilter.ts b/packages/datadog-api-client-v2/models/SecurityFilterExclusionFilter.ts
index d43f5294619c..40abdf651733 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterExclusionFilter.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterExclusionFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Exclusion filter for the security filter.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterExclusionFilterResponse.ts b/packages/datadog-api-client-v2/models/SecurityFilterExclusionFilterResponse.ts
index d00181e544f3..ce01784cef1d 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterExclusionFilterResponse.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterExclusionFilterResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A single exclusion filter.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterMeta.ts b/packages/datadog-api-client-v2/models/SecurityFilterMeta.ts
index f99d0a511fb1..a62003966194 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterMeta.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterMeta.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Optional metadata associated to the response.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterResponse.ts b/packages/datadog-api-client-v2/models/SecurityFilterResponse.ts
index 3cfac56992fb..0309eac478c2 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterResponse.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterResponse.ts
@@ -10,7 +10,7 @@
 
 import { SecurityFilter } from "./SecurityFilter";
 import { SecurityFilterMeta } from "./SecurityFilterMeta";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response object which includes a single security filter.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterUpdateAttributes.ts b/packages/datadog-api-client-v2/models/SecurityFilterUpdateAttributes.ts
index 4ee059ecc9b1..d8491ae22a67 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterUpdateAttributes.ts
@@ -10,7 +10,7 @@
 
 import { SecurityFilterExclusionFilter } from "./SecurityFilterExclusionFilter";
 import { SecurityFilterFilteredDataType } from "./SecurityFilterFilteredDataType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The security filters properties to be updated.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterUpdateData.ts b/packages/datadog-api-client-v2/models/SecurityFilterUpdateData.ts
index 42f876d542ec..8dff1bbd905b 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { SecurityFilterType } from "./SecurityFilterType";
 import { SecurityFilterUpdateAttributes } from "./SecurityFilterUpdateAttributes";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The new security filter properties.
diff --git a/packages/datadog-api-client-v2/models/SecurityFilterUpdateRequest.ts b/packages/datadog-api-client-v2/models/SecurityFilterUpdateRequest.ts
index 40f58a5e759f..3eb78fd01c24 100644
--- a/packages/datadog-api-client-v2/models/SecurityFilterUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFilterUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { SecurityFilterUpdateData } from "./SecurityFilterUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The new security filter body.
diff --git a/packages/datadog-api-client-v2/models/SecurityFiltersResponse.ts b/packages/datadog-api-client-v2/models/SecurityFiltersResponse.ts
index 66ce4b2d9b94..0b9134046f88 100644
--- a/packages/datadog-api-client-v2/models/SecurityFiltersResponse.ts
+++ b/packages/datadog-api-client-v2/models/SecurityFiltersResponse.ts
@@ -10,7 +10,7 @@
 
 import { SecurityFilter } from "./SecurityFilter";
 import { SecurityFilterMeta } from "./SecurityFilterMeta";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * All the available security filters objects.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringFilter.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringFilter.ts
index 4d6bf9b509a3..fa82f68f2e73 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringFilter.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringFilter.ts
@@ -9,7 +9,7 @@
  */
 
 import { SecurityMonitoringFilterAction } from "./SecurityMonitoringFilterAction";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The rule's suppression filter.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringListRulesResponse.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringListRulesResponse.ts
index 33a893b6b999..5cd7581b83ce 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringListRulesResponse.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringListRulesResponse.ts
@@ -10,7 +10,7 @@
 
 import { ResponseMetaAttributes } from "./ResponseMetaAttributes";
 import { SecurityMonitoringRuleResponse } from "./SecurityMonitoringRuleResponse";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of rules.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCase.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCase.ts
index 28101b70c626..c36d61c1dfb9 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCase.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCase.ts
@@ -9,7 +9,7 @@
  */
 
 import { SecurityMonitoringRuleSeverity } from "./SecurityMonitoringRuleSeverity";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Case when signal is generated.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCaseCreate.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCaseCreate.ts
index d37362b7d836..8e8bf769206a 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCaseCreate.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCaseCreate.ts
@@ -9,7 +9,7 @@
  */
 
 import { SecurityMonitoringRuleSeverity } from "./SecurityMonitoringRuleSeverity";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Case when signal is generated.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCreatePayload.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCreatePayload.ts
index 04a706df3e4d..9d7be846bf8b 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCreatePayload.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleCreatePayload.ts
@@ -13,7 +13,7 @@ import { SecurityMonitoringRuleCaseCreate } from "./SecurityMonitoringRuleCaseCr
 import { SecurityMonitoringRuleOptions } from "./SecurityMonitoringRuleOptions";
 import { SecurityMonitoringRuleQueryCreate } from "./SecurityMonitoringRuleQueryCreate";
 import { SecurityMonitoringRuleTypeCreate } from "./SecurityMonitoringRuleTypeCreate";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create a new rule.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleImpossibleTravelOptions.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleImpossibleTravelOptions.ts
index 0a3769c759d0..2ee566f69916 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleImpossibleTravelOptions.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleImpossibleTravelOptions.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Options on impossible travel rules.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleNewValueOptions.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleNewValueOptions.ts
index 64ef548cf4b1..50dda65f2584 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleNewValueOptions.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleNewValueOptions.ts
@@ -10,7 +10,7 @@
 
 import { SecurityMonitoringRuleNewValueOptionsForgetAfter } from "./SecurityMonitoringRuleNewValueOptionsForgetAfter";
 import { SecurityMonitoringRuleNewValueOptionsLearningDuration } from "./SecurityMonitoringRuleNewValueOptionsLearningDuration";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Options on new value rules.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleOptions.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleOptions.ts
index e1e60d32d525..894d3eeeb1fd 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleOptions.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleOptions.ts
@@ -14,7 +14,7 @@ import { SecurityMonitoringRuleImpossibleTravelOptions } from "./SecurityMonitor
 import { SecurityMonitoringRuleKeepAlive } from "./SecurityMonitoringRuleKeepAlive";
 import { SecurityMonitoringRuleMaxSignalDuration } from "./SecurityMonitoringRuleMaxSignalDuration";
 import { SecurityMonitoringRuleNewValueOptions } from "./SecurityMonitoringRuleNewValueOptions";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Options on rules.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleQuery.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleQuery.ts
index daae49f2506d..ff32b8df853b 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleQuery.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleQuery.ts
@@ -9,7 +9,7 @@
  */
 
 import { SecurityMonitoringRuleQueryAggregation } from "./SecurityMonitoringRuleQueryAggregation";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Query for matching rule.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleQueryCreate.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleQueryCreate.ts
index d714877fe215..0cb9db9928b1 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleQueryCreate.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleQueryCreate.ts
@@ -9,7 +9,7 @@
  */
 
 import { SecurityMonitoringRuleQueryAggregation } from "./SecurityMonitoringRuleQueryAggregation";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Query for matching rule.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleResponse.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleResponse.ts
index 3f8e627fa9eb..08327af62bf6 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleResponse.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleResponse.ts
@@ -13,7 +13,7 @@ import { SecurityMonitoringRuleCase } from "./SecurityMonitoringRuleCase";
 import { SecurityMonitoringRuleOptions } from "./SecurityMonitoringRuleOptions";
 import { SecurityMonitoringRuleQuery } from "./SecurityMonitoringRuleQuery";
 import { SecurityMonitoringRuleTypeRead } from "./SecurityMonitoringRuleTypeRead";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Rule.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleUpdatePayload.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleUpdatePayload.ts
index 5a6b5f90c224..f0ed016d1a9c 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringRuleUpdatePayload.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringRuleUpdatePayload.ts
@@ -12,7 +12,7 @@ import { SecurityMonitoringFilter } from "./SecurityMonitoringFilter";
 import { SecurityMonitoringRuleCase } from "./SecurityMonitoringRuleCase";
 import { SecurityMonitoringRuleOptions } from "./SecurityMonitoringRuleOptions";
 import { SecurityMonitoringRuleQuery } from "./SecurityMonitoringRuleQuery";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update an existing rule.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignal.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignal.ts
index 638199aeec54..41c1f659ce77 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignal.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignal.ts
@@ -10,7 +10,7 @@
 
 import { SecurityMonitoringSignalAttributes } from "./SecurityMonitoringSignalAttributes";
 import { SecurityMonitoringSignalType } from "./SecurityMonitoringSignalType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object description of a security signal.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalAttributes.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalAttributes.ts
index 3b798dd665df..4c63dcb885bc 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalAttributes.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The object containing all signal attributes and their associated values.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequest.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequest.ts
index 57d627f4e33d..209b66ec8e19 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequest.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequest.ts
@@ -11,7 +11,7 @@
 import { SecurityMonitoringSignalListRequestFilter } from "./SecurityMonitoringSignalListRequestFilter";
 import { SecurityMonitoringSignalListRequestPage } from "./SecurityMonitoringSignalListRequestPage";
 import { SecurityMonitoringSignalsSort } from "./SecurityMonitoringSignalsSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The request for a security signal list.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequestFilter.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequestFilter.ts
index d49727e73a9b..cef8c2d5a194 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequestFilter.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequestFilter.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Search filters for listing security signals.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequestPage.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequestPage.ts
index 16bdc3d3229a..8c4774c6c436 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequestPage.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalListRequestPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The paging attributes for listing security signals.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponse.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponse.ts
index 45ad35c45cab..44f3141399b8 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponse.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponse.ts
@@ -11,7 +11,7 @@
 import { SecurityMonitoringSignal } from "./SecurityMonitoringSignal";
 import { SecurityMonitoringSignalsListResponseLinks } from "./SecurityMonitoringSignalsListResponseLinks";
 import { SecurityMonitoringSignalsListResponseMeta } from "./SecurityMonitoringSignalsListResponseMeta";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The response object with all security signals matching the request and pagination information.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseLinks.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseLinks.ts
index 16fb6909b494..8b09e20d45aa 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseLinks.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseLinks.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Links attributes.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseMeta.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseMeta.ts
index 94560af3bdb7..2475c13895e8 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseMeta.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseMeta.ts
@@ -9,7 +9,7 @@
  */
 
 import { SecurityMonitoringSignalsListResponseMetaPage } from "./SecurityMonitoringSignalsListResponseMetaPage";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Meta attributes.
diff --git a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseMetaPage.ts b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseMetaPage.ts
index f80964749aed..5de3168bff56 100644
--- a/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseMetaPage.ts
+++ b/packages/datadog-api-client-v2/models/SecurityMonitoringSignalsListResponseMetaPage.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Paging attributes.
diff --git a/packages/datadog-api-client-v2/models/ServiceAccountCreateAttributes.ts b/packages/datadog-api-client-v2/models/ServiceAccountCreateAttributes.ts
index 877ac189c674..4fcfc93fe040 100644
--- a/packages/datadog-api-client-v2/models/ServiceAccountCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/ServiceAccountCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of the created user.
diff --git a/packages/datadog-api-client-v2/models/ServiceAccountCreateData.ts b/packages/datadog-api-client-v2/models/ServiceAccountCreateData.ts
index fa0950db199d..c7e2c840621a 100644
--- a/packages/datadog-api-client-v2/models/ServiceAccountCreateData.ts
+++ b/packages/datadog-api-client-v2/models/ServiceAccountCreateData.ts
@@ -11,7 +11,7 @@
 import { ServiceAccountCreateAttributes } from "./ServiceAccountCreateAttributes";
 import { UserRelationships } from "./UserRelationships";
 import { UsersType } from "./UsersType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to create a service account User.
diff --git a/packages/datadog-api-client-v2/models/ServiceAccountCreateRequest.ts b/packages/datadog-api-client-v2/models/ServiceAccountCreateRequest.ts
index f343f2e70b96..2b7cbfb32db2 100644
--- a/packages/datadog-api-client-v2/models/ServiceAccountCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/ServiceAccountCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { ServiceAccountCreateData } from "./ServiceAccountCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create a service account.
diff --git a/packages/datadog-api-client-v2/models/User.ts b/packages/datadog-api-client-v2/models/User.ts
index a4b311d02057..9ec49d574afa 100644
--- a/packages/datadog-api-client-v2/models/User.ts
+++ b/packages/datadog-api-client-v2/models/User.ts
@@ -11,7 +11,7 @@
 import { UserAttributes } from "./UserAttributes";
 import { UserResponseRelationships } from "./UserResponseRelationships";
 import { UsersType } from "./UsersType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * User object returned by the API.
diff --git a/packages/datadog-api-client-v2/models/UserAttributes.ts b/packages/datadog-api-client-v2/models/UserAttributes.ts
index 206a37f2ffad..f7b3e6819261 100644
--- a/packages/datadog-api-client-v2/models/UserAttributes.ts
+++ b/packages/datadog-api-client-v2/models/UserAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of user object returned by the API.
diff --git a/packages/datadog-api-client-v2/models/UserCreateAttributes.ts b/packages/datadog-api-client-v2/models/UserCreateAttributes.ts
index 5ddc7680cd2c..88ce49486a98 100644
--- a/packages/datadog-api-client-v2/models/UserCreateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/UserCreateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of the created user.
diff --git a/packages/datadog-api-client-v2/models/UserCreateData.ts b/packages/datadog-api-client-v2/models/UserCreateData.ts
index 11ae78d0e701..ff8b31a5cd3d 100644
--- a/packages/datadog-api-client-v2/models/UserCreateData.ts
+++ b/packages/datadog-api-client-v2/models/UserCreateData.ts
@@ -11,7 +11,7 @@
 import { UserCreateAttributes } from "./UserCreateAttributes";
 import { UserRelationships } from "./UserRelationships";
 import { UsersType } from "./UsersType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to create a user.
diff --git a/packages/datadog-api-client-v2/models/UserCreateRequest.ts b/packages/datadog-api-client-v2/models/UserCreateRequest.ts
index d3198b554239..8353be33c90e 100644
--- a/packages/datadog-api-client-v2/models/UserCreateRequest.ts
+++ b/packages/datadog-api-client-v2/models/UserCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { UserCreateData } from "./UserCreateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Create a user.
diff --git a/packages/datadog-api-client-v2/models/UserInvitationData.ts b/packages/datadog-api-client-v2/models/UserInvitationData.ts
index e68f66d6de59..8d4deec71c7d 100644
--- a/packages/datadog-api-client-v2/models/UserInvitationData.ts
+++ b/packages/datadog-api-client-v2/models/UserInvitationData.ts
@@ -10,7 +10,7 @@
 
 import { UserInvitationRelationships } from "./UserInvitationRelationships";
 import { UserInvitationsType } from "./UserInvitationsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to create a user invitation.
diff --git a/packages/datadog-api-client-v2/models/UserInvitationDataAttributes.ts b/packages/datadog-api-client-v2/models/UserInvitationDataAttributes.ts
index a341d92385de..d4e50df97ef0 100644
--- a/packages/datadog-api-client-v2/models/UserInvitationDataAttributes.ts
+++ b/packages/datadog-api-client-v2/models/UserInvitationDataAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of a user invitation.
diff --git a/packages/datadog-api-client-v2/models/UserInvitationRelationships.ts b/packages/datadog-api-client-v2/models/UserInvitationRelationships.ts
index 7636edbb3160..d219baebf40f 100644
--- a/packages/datadog-api-client-v2/models/UserInvitationRelationships.ts
+++ b/packages/datadog-api-client-v2/models/UserInvitationRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToUser } from "./RelationshipToUser";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationships data for user invitation.
diff --git a/packages/datadog-api-client-v2/models/UserInvitationResponse.ts b/packages/datadog-api-client-v2/models/UserInvitationResponse.ts
index fa16d3d962ad..ae4db5aa1777 100644
--- a/packages/datadog-api-client-v2/models/UserInvitationResponse.ts
+++ b/packages/datadog-api-client-v2/models/UserInvitationResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UserInvitationResponseData } from "./UserInvitationResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * User invitation as returned by the API.
diff --git a/packages/datadog-api-client-v2/models/UserInvitationResponseData.ts b/packages/datadog-api-client-v2/models/UserInvitationResponseData.ts
index 71dd43ccf87b..a31767c1040f 100644
--- a/packages/datadog-api-client-v2/models/UserInvitationResponseData.ts
+++ b/packages/datadog-api-client-v2/models/UserInvitationResponseData.ts
@@ -10,7 +10,7 @@
 
 import { UserInvitationDataAttributes } from "./UserInvitationDataAttributes";
 import { UserInvitationsType } from "./UserInvitationsType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object of a user invitation returned by the API.
diff --git a/packages/datadog-api-client-v2/models/UserInvitationsRequest.ts b/packages/datadog-api-client-v2/models/UserInvitationsRequest.ts
index 528954bd8919..424c274e3e63 100644
--- a/packages/datadog-api-client-v2/models/UserInvitationsRequest.ts
+++ b/packages/datadog-api-client-v2/models/UserInvitationsRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { UserInvitationData } from "./UserInvitationData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to invite users to join the organization.
diff --git a/packages/datadog-api-client-v2/models/UserInvitationsResponse.ts b/packages/datadog-api-client-v2/models/UserInvitationsResponse.ts
index 69e29f3afdd8..db92e2f9ae54 100644
--- a/packages/datadog-api-client-v2/models/UserInvitationsResponse.ts
+++ b/packages/datadog-api-client-v2/models/UserInvitationsResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { UserInvitationResponseData } from "./UserInvitationResponseData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * User invitations as returned by the API.
diff --git a/packages/datadog-api-client-v2/models/UserRelationships.ts b/packages/datadog-api-client-v2/models/UserRelationships.ts
index 8eec480b26d0..6b8a7d79cc2e 100644
--- a/packages/datadog-api-client-v2/models/UserRelationships.ts
+++ b/packages/datadog-api-client-v2/models/UserRelationships.ts
@@ -9,7 +9,7 @@
  */
 
 import { RelationshipToRoles } from "./RelationshipToRoles";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationships of the user object.
diff --git a/packages/datadog-api-client-v2/models/UserResponse.ts b/packages/datadog-api-client-v2/models/UserResponse.ts
index d8d075ed2a2b..1ff7aa8009d8 100644
--- a/packages/datadog-api-client-v2/models/UserResponse.ts
+++ b/packages/datadog-api-client-v2/models/UserResponse.ts
@@ -10,7 +10,7 @@
 
 import { User } from "./User";
 import { UserResponseIncludedItem } from "./UserResponseIncludedItem";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing information about a single user.
diff --git a/packages/datadog-api-client-v2/models/UserResponseIncludedItem.ts b/packages/datadog-api-client-v2/models/UserResponseIncludedItem.ts
index d23429e9c55f..0aabd034b4c3 100644
--- a/packages/datadog-api-client-v2/models/UserResponseIncludedItem.ts
+++ b/packages/datadog-api-client-v2/models/UserResponseIncludedItem.ts
@@ -11,7 +11,7 @@
 import { Organization } from "./Organization";
 import { Permission } from "./Permission";
 import { Role } from "./Role";
-import { UnparsedObject } from "./ObjectSerializer";
+import { UnparsedObject } from "../util";
 
 /**
  * An object related to a user.
diff --git a/packages/datadog-api-client-v2/models/UserResponseRelationships.ts b/packages/datadog-api-client-v2/models/UserResponseRelationships.ts
index b57565178f7f..b4d2ad61f3d1 100644
--- a/packages/datadog-api-client-v2/models/UserResponseRelationships.ts
+++ b/packages/datadog-api-client-v2/models/UserResponseRelationships.ts
@@ -12,7 +12,7 @@ import { RelationshipToOrganization } from "./RelationshipToOrganization";
 import { RelationshipToOrganizations } from "./RelationshipToOrganizations";
 import { RelationshipToRoles } from "./RelationshipToRoles";
 import { RelationshipToUsers } from "./RelationshipToUsers";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Relationships of the user object returned by the API.
diff --git a/packages/datadog-api-client-v2/models/UserUpdateAttributes.ts b/packages/datadog-api-client-v2/models/UserUpdateAttributes.ts
index 1689d3b47bf1..d3cde85ab108 100644
--- a/packages/datadog-api-client-v2/models/UserUpdateAttributes.ts
+++ b/packages/datadog-api-client-v2/models/UserUpdateAttributes.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Attributes of the edited user.
diff --git a/packages/datadog-api-client-v2/models/UserUpdateData.ts b/packages/datadog-api-client-v2/models/UserUpdateData.ts
index 25161b5d1f4a..b3a495c82d3b 100644
--- a/packages/datadog-api-client-v2/models/UserUpdateData.ts
+++ b/packages/datadog-api-client-v2/models/UserUpdateData.ts
@@ -10,7 +10,7 @@
 
 import { UserUpdateAttributes } from "./UserUpdateAttributes";
 import { UsersType } from "./UsersType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Object to update a user.
diff --git a/packages/datadog-api-client-v2/models/UserUpdateRequest.ts b/packages/datadog-api-client-v2/models/UserUpdateRequest.ts
index 3d29b53d5f7a..46d06f539987 100644
--- a/packages/datadog-api-client-v2/models/UserUpdateRequest.ts
+++ b/packages/datadog-api-client-v2/models/UserUpdateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { UserUpdateData } from "./UserUpdateData";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Update a user.
diff --git a/packages/datadog-api-client-v2/models/UsersResponse.ts b/packages/datadog-api-client-v2/models/UsersResponse.ts
index 8a997d9286f9..21d5cced2e7b 100644
--- a/packages/datadog-api-client-v2/models/UsersResponse.ts
+++ b/packages/datadog-api-client-v2/models/UsersResponse.ts
@@ -11,7 +11,7 @@
 import { ResponseMetaAttributes } from "./ResponseMetaAttributes";
 import { User } from "./User";
 import { UserResponseIncludedItem } from "./UserResponseIncludedItem";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Response containing information about multiple users.
diff --git a/packages/datadog-api-client-v2/util.ts b/packages/datadog-api-client-v2/util.ts
index 91172cde2cb2..37479aa2f5a4 100644
--- a/packages/datadog-api-client-v2/util.ts
+++ b/packages/datadog-api-client-v2/util.ts
@@ -29,3 +29,19 @@ export function isCodeInRange(codeRange: string, code: number): boolean {
     return true;
   }
 }
+
+export class UnparsedObject {
+  unparsedObject: any;
+  constructor(data: any) {
+    this.unparsedObject = data;
+  }
+}
+
+export type AttributeTypeMap = {
+  [key: string]: {
+    baseName: string;
+    type: string;
+    required?: boolean;
+    format?: string;
+  };
+};