diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/cassandraResourcesMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/cassandraResourcesMappers.ts
index 5db70e00dcbf..8076d88e0ecd 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/cassandraResourcesMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/cassandraResourcesMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -52,6 +55,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   MongoDBCollectionCreateUpdateParameters,
   MongoDBCollectionGetPropertiesOptions,
@@ -73,7 +77,6 @@ export {
   PrivateEndpointProperty,
   PrivateLinkResource,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   Resource,
   SpatialSpec,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/databaseAccountsMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/databaseAccountsMappers.ts
index 57738ede5857..6e8a41e5a809 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/databaseAccountsMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/databaseAccountsMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -59,6 +62,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   Metric,
   MetricAvailability,
@@ -90,7 +94,6 @@ export {
   PrivateEndpointProperty,
   PrivateLinkResource,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   RegionForOnlineOffline,
   Resource,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/gremlinResourcesMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/gremlinResourcesMappers.ts
index 5e7aa77bb821..dd77c0ca8c2e 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/gremlinResourcesMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/gremlinResourcesMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -52,6 +55,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   MongoDBCollectionCreateUpdateParameters,
   MongoDBCollectionGetPropertiesOptions,
@@ -73,7 +77,6 @@ export {
   PrivateEndpointProperty,
   PrivateLinkResource,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   Resource,
   SpatialSpec,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/index.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/index.ts
index 89557184f6fb..e5d581ad3955 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/index.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/index.ts
@@ -11,6 +11,19 @@ import * as msRest from "@azure/ms-rest-js";
 
 export { BaseResource, CloudError };
 
+/**
+ * IpAddressOrRange object
+ */
+export interface IpAddressOrRange {
+  /**
+   * A single IPv4 address or a single IPv4 address range in CIDR format. Provided IPs must be
+   * well-formatted and cannot be contained in one of the following ranges: 10.0.0.0/8,
+   * 100.64.0.0/10, 172.16.0.0/12, 192.168.0.0/16, since these are not enforceable by the IP
+   * address filter. Example of valid inputs: “23.40.210.245” or “23.40.210.0/8”.
+   */
+  ipAddressOrRange?: string;
+}
+
 /**
  * The consistency policy for the Cosmos DB database account.
  */
@@ -196,6 +209,16 @@ export interface PrivateEndpointConnection extends ProxyResource {
   provisioningState?: string;
 }
 
+/**
+ * An interface representing ApiProperties.
+ */
+export interface ApiProperties {
+  /**
+   * Describes the ServerVersion of an a MongoDB account. Possible values include: '3.2', '3.6'
+   */
+  serverVersion?: ServerVersion;
+}
+
 /**
  * The core properties of ARM resources.
  */
@@ -245,11 +268,9 @@ export interface DatabaseAccountGetResults extends ARMResourceProperties {
    */
   readonly databaseAccountOfferType?: DatabaseAccountOfferType;
   /**
-   * Cosmos DB Firewall Support: This value specifies the set of IP addresses or IP address ranges
-   * in CIDR form to be included as the allowed list of client IPs for a given database account. IP
-   * addresses/ranges must be comma separated and must not contain any spaces.
+   * List of IpRules.
    */
-  ipRangeFilter?: string;
+  ipRules?: IpAddressOrRange[];
   /**
    * Flag to indicate whether to enable/disable Virtual Network ACL rules.
    */
@@ -324,6 +345,18 @@ export interface DatabaseAccountGetResults extends ARMResourceProperties {
    * 'Disabled'
    */
   publicNetworkAccess?: PublicNetworkAccess;
+  /**
+   * Flag to indicate whether Free Tier is enabled.
+   */
+  enableFreeTier?: boolean;
+  /**
+   * API specific properties.
+   */
+  apiProperties?: ApiProperties;
+  /**
+   * Flag to indicate whether to enable storage analytics.
+   */
+  enableAnalyticalStorage?: boolean;
 }
 
 /**
@@ -365,10 +398,14 @@ export interface SqlDatabaseGetPropertiesResource {
  */
 export interface OptionsResource {
   /**
-   * Value of the Cosmos DB resource throughput. Use the ThroughputSetting resource when retrieving
-   * offer details.
+   * Value of the Cosmos DB resource throughput or autoscaleSettings. Use the ThroughputSetting
+   * resource when retrieving offer details.
    */
   throughput?: number;
+  /**
+   * Specifies the Autoscale settings.
+   */
+  autoscaleSettings?: AutoscaleSettings;
 }
 
 /**
@@ -830,6 +867,10 @@ export interface MongoDBCollectionGetPropertiesResource {
    * List of index keys
    */
   indexes?: MongoIndex[];
+  /**
+   * Analytical TTL.
+   */
+  analyticalStorageTtl?: number;
   /**
    * A system generated property. A unique identifier.
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -1014,6 +1055,10 @@ export interface CassandraTableGetPropertiesResource {
    * Schema of the Cosmos DB Cassandra table
    */
   schema?: CassandraSchema;
+  /**
+   * Analytical TTL.
+   */
+  analyticalStorageTtl?: number;
   /**
    * A system generated property. A unique identifier.
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -1256,7 +1301,7 @@ export interface AutoUpgradePolicyResource {
 /**
  * Cosmos DB provisioned throughput settings object
  */
-export interface ProvisionedThroughputSettingsResource {
+export interface AutoscaleSettingsResource {
   /**
    * Represents maximum throughput container can scale up to.
    */
@@ -1278,15 +1323,15 @@ export interface ProvisionedThroughputSettingsResource {
  */
 export interface ThroughputSettingsGetPropertiesResource {
   /**
-   * Value of the Cosmos DB resource throughput. Either throughput is required or
-   * provisionedThroughputSettings is required, but not both.
+   * Value of the Cosmos DB resource throughput. Either throughput is required or autoscaleSettings
+   * is required, but not both.
    */
   throughput?: number;
   /**
-   * Cosmos DB resource for provisioned throughput settings. Either throughput is required or
-   * provisionedThroughputSettings is required, but not both.
+   * Cosmos DB resource for autoscale settings. Either throughput is required or autoscaleSettings
+   * is required, but not both.
    */
-  provisionedThroughputSettings?: ProvisionedThroughputSettingsResource;
+  autoscaleSettings?: AutoscaleSettingsResource;
   /**
    * The minimum throughput of the resource
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -1341,11 +1386,9 @@ export interface DatabaseAccountCreateUpdateParameters extends ARMResourceProper
    */
   locations: Location[];
   /**
-   * Cosmos DB Firewall Support: This value specifies the set of IP addresses or IP address ranges
-   * in CIDR form to be included as the allowed list of client IPs for a given database account. IP
-   * addresses/ranges must be comma separated and must not contain any spaces.
+   * List of IpRules.
    */
-  ipRangeFilter?: string;
+  ipRules?: IpAddressOrRange[];
   /**
    * Flag to indicate whether to enable/disable Virtual Network ACL rules.
    */
@@ -1391,6 +1434,18 @@ export interface DatabaseAccountCreateUpdateParameters extends ARMResourceProper
    * 'Disabled'
    */
   publicNetworkAccess?: PublicNetworkAccess;
+  /**
+   * Flag to indicate whether Free Tier is enabled.
+   */
+  enableFreeTier?: boolean;
+  /**
+   * API specific properties. Currently, supported only for MongoDB API.
+   */
+  apiProperties?: ApiProperties;
+  /**
+   * Flag to indicate whether to enable storage analytics.
+   */
+  enableAnalyticalStorage?: boolean;
 }
 
 /**
@@ -1411,11 +1466,9 @@ export interface DatabaseAccountUpdateParameters {
    */
   locations?: Location[];
   /**
-   * Cosmos DB Firewall Support: This value specifies the set of IP addresses or IP address ranges
-   * in CIDR form to be included as the allowed list of client IPs for a given database account. IP
-   * addresses/ranges must be comma separated and must not contain any spaces.
+   * List of IpRules.
    */
-  ipRangeFilter?: string;
+  ipRules?: IpAddressOrRange[];
   /**
    * Flag to indicate whether to enable/disable Virtual Network ACL rules.
    */
@@ -1461,6 +1514,18 @@ export interface DatabaseAccountUpdateParameters {
    * 'Disabled'
    */
   publicNetworkAccess?: PublicNetworkAccess;
+  /**
+   * Flag to indicate whether Free Tier is enabled.
+   */
+  enableFreeTier?: boolean;
+  /**
+   * API specific properties. Currently, supported only for MongoDB API.
+   */
+  apiProperties?: ApiProperties;
+  /**
+   * Flag to indicate whether to enable storage analytics.
+   */
+  enableAnalyticalStorage?: boolean;
 }
 
 /**
@@ -1533,20 +1598,20 @@ export interface DatabaseAccountRegenerateKeyParameters {
 }
 
 /**
- * Cosmos DB resource throughput object. Either throughput is required or
- * provisionedThroughputSettings is required, but not both.
+ * Cosmos DB resource throughput object. Either throughput is required or autoscaleSettings is
+ * required, but not both.
  */
 export interface ThroughputSettingsResource {
   /**
-   * Value of the Cosmos DB resource throughput. Either throughput is required or
-   * provisionedThroughputSettings is required, but not both.
+   * Value of the Cosmos DB resource throughput. Either throughput is required or autoscaleSettings
+   * is required, but not both.
    */
   throughput?: number;
   /**
-   * Cosmos DB resource for provisioned throughput settings. Either throughput is required or
-   * provisionedThroughputSettings is required, but not both.
+   * Cosmos DB resource for autoscale settings. Either throughput is required or autoscaleSettings
+   * is required, but not both.
    */
-  provisionedThroughputSettings?: ProvisionedThroughputSettingsResource;
+  autoscaleSettings?: AutoscaleSettingsResource;
   /**
    * The minimum throughput of the resource
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -1579,20 +1644,29 @@ export interface SqlDatabaseResource {
   id: string;
 }
 
+/**
+ * An interface representing AutoscaleSettings.
+ */
+export interface AutoscaleSettings {
+  /**
+   * Represents maximum throughput, the resource can scale up to.
+   */
+  maxThroughput?: number;
+}
+
 /**
  * CreateUpdateOptions are a list of key-value pairs that describe the resource. Supported keys are
  * "If-Match", "If-None-Match", "Session-Token" and "Throughput"
  */
 export interface CreateUpdateOptions {
   /**
-   * Request Units per second. For example, "throughput": "10000".
+   * Request Units per second. For example, "throughput": 10000.
    */
-  throughput?: string;
+  throughput?: number;
   /**
-   * Describes unknown properties. The value of an unknown property MUST be of type "string". Due
-   * to valid TS constraints we have modeled this as a union of `string | any`.
+   * Specifies the Autoscale settings.
    */
-  [property: string]: string | any;
+  autoscaleSettings?: AutoscaleSettings;
 }
 
 /**
@@ -1795,6 +1869,10 @@ export interface MongoDBCollectionResource {
    * List of index keys
    */
   indexes?: MongoIndex[];
+  /**
+   * Analytical TTL.
+   */
+  analyticalStorageTtl?: number;
 }
 
 /**
@@ -1878,6 +1956,10 @@ export interface CassandraTableResource {
    * Schema of the Cosmos DB Cassandra table
    */
   schema?: CassandraSchema;
+  /**
+   * Analytical TTL.
+   */
+  analyticalStorageTtl?: number;
 }
 
 /**
@@ -2645,6 +2727,14 @@ export type ConnectorOffer = 'Small';
  */
 export type PublicNetworkAccess = 'Enabled' | 'Disabled';
 
+/**
+ * Defines values for ServerVersion.
+ * Possible values include: '3.2', '3.6'
+ * @readonly
+ * @enum {string}
+ */
+export type ServerVersion = '3.2' | '3.6';
+
 /**
  * Defines values for IndexingMode.
  * Possible values include: 'Consistent', 'Lazy', 'None'
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/mappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/mappers.ts
index 5512b5826d23..8e51cb8aae25 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/mappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/mappers.ts
@@ -12,6 +12,22 @@ import * as msRest from "@azure/ms-rest-js";
 export const CloudError = CloudErrorMapper;
 export const BaseResource = BaseResourceMapper;
 
+export const IpAddressOrRange: msRest.CompositeMapper = {
+  serializedName: "IpAddressOrRange",
+  type: {
+    name: "Composite",
+    className: "IpAddressOrRange",
+    modelProperties: {
+      ipAddressOrRange: {
+        serializedName: "ipAddressOrRange",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ConsistencyPolicy: msRest.CompositeMapper = {
   serializedName: "ConsistencyPolicy",
   type: {
@@ -301,6 +317,22 @@ export const PrivateEndpointConnection: msRest.CompositeMapper = {
   }
 };
 
+export const ApiProperties: msRest.CompositeMapper = {
+  serializedName: "ApiProperties",
+  type: {
+    name: "Composite",
+    className: "ApiProperties",
+    modelProperties: {
+      serverVersion: {
+        serializedName: "serverVersion",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ARMResourceProperties: msRest.CompositeMapper = {
   serializedName: "ARMResourceProperties",
   type: {
@@ -386,10 +418,16 @@ export const DatabaseAccountGetResults: msRest.CompositeMapper = {
           ]
         }
       },
-      ipRangeFilter: {
-        serializedName: "properties.ipRangeFilter",
+      ipRules: {
+        serializedName: "properties.ipRules",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "IpAddressOrRange"
+            }
+          }
         }
       },
       isVirtualNetworkFilterEnabled: {
@@ -535,6 +573,25 @@ export const DatabaseAccountGetResults: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      enableFreeTier: {
+        serializedName: "properties.enableFreeTier",
+        type: {
+          name: "Boolean"
+        }
+      },
+      apiProperties: {
+        serializedName: "properties.apiProperties",
+        type: {
+          name: "Composite",
+          className: "ApiProperties"
+        }
+      },
+      enableAnalyticalStorage: {
+        serializedName: "properties.enableAnalyticalStorage",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -601,6 +658,13 @@ export const OptionsResource: msRest.CompositeMapper = {
         type: {
           name: "Number"
         }
+      },
+      autoscaleSettings: {
+        serializedName: "autoscaleSettings",
+        type: {
+          name: "Composite",
+          className: "AutoscaleSettings"
+        }
       }
     }
   }
@@ -1434,6 +1498,12 @@ export const MongoDBCollectionGetPropertiesResource: msRest.CompositeMapper = {
           }
         }
       },
+      analyticalStorageTtl: {
+        serializedName: "analyticalStorageTtl",
+        type: {
+          name: "Number"
+        }
+      },
       _rid: {
         readOnly: true,
         serializedName: "_rid",
@@ -1775,6 +1845,12 @@ export const CassandraTableGetPropertiesResource: msRest.CompositeMapper = {
           className: "CassandraSchema"
         }
       },
+      analyticalStorageTtl: {
+        serializedName: "analyticalStorageTtl",
+        type: {
+          name: "Number"
+        }
+      },
       _rid: {
         readOnly: true,
         serializedName: "_rid",
@@ -2181,11 +2257,11 @@ export const AutoUpgradePolicyResource: msRest.CompositeMapper = {
   }
 };
 
-export const ProvisionedThroughputSettingsResource: msRest.CompositeMapper = {
-  serializedName: "ProvisionedThroughputSettingsResource",
+export const AutoscaleSettingsResource: msRest.CompositeMapper = {
+  serializedName: "AutoscaleSettingsResource",
   type: {
     name: "Composite",
-    className: "ProvisionedThroughputSettingsResource",
+    className: "AutoscaleSettingsResource",
     modelProperties: {
       maxThroughput: {
         required: true,
@@ -2224,11 +2300,11 @@ export const ThroughputSettingsGetPropertiesResource: msRest.CompositeMapper = {
           name: "Number"
         }
       },
-      provisionedThroughputSettings: {
-        serializedName: "provisionedThroughputSettings",
+      autoscaleSettings: {
+        serializedName: "autoscaleSettings",
         type: {
           name: "Composite",
-          className: "ProvisionedThroughputSettingsResource"
+          className: "AutoscaleSettingsResource"
         }
       },
       minimumThroughput: {
@@ -2331,10 +2407,16 @@ export const DatabaseAccountCreateUpdateParameters: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      ipRangeFilter: {
-        serializedName: "properties.ipRangeFilter",
+      ipRules: {
+        serializedName: "properties.ipRules",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "IpAddressOrRange"
+            }
+          }
         }
       },
       isVirtualNetworkFilterEnabled: {
@@ -2408,6 +2490,25 @@ export const DatabaseAccountCreateUpdateParameters: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      enableFreeTier: {
+        serializedName: "properties.enableFreeTier",
+        type: {
+          name: "Boolean"
+        }
+      },
+      apiProperties: {
+        serializedName: "properties.apiProperties",
+        type: {
+          name: "Composite",
+          className: "ApiProperties"
+        }
+      },
+      enableAnalyticalStorage: {
+        serializedName: "properties.enableAnalyticalStorage",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -2455,10 +2556,16 @@ export const DatabaseAccountUpdateParameters: msRest.CompositeMapper = {
           }
         }
       },
-      ipRangeFilter: {
-        serializedName: "properties.ipRangeFilter",
+      ipRules: {
+        serializedName: "properties.ipRules",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "IpAddressOrRange"
+            }
+          }
         }
       },
       isVirtualNetworkFilterEnabled: {
@@ -2532,6 +2639,25 @@ export const DatabaseAccountUpdateParameters: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      enableFreeTier: {
+        serializedName: "properties.enableFreeTier",
+        type: {
+          name: "Boolean"
+        }
+      },
+      apiProperties: {
+        serializedName: "properties.apiProperties",
+        type: {
+          name: "Composite",
+          className: "ApiProperties"
+        }
+      },
+      enableAnalyticalStorage: {
+        serializedName: "properties.enableAnalyticalStorage",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -2661,11 +2787,11 @@ export const ThroughputSettingsResource: msRest.CompositeMapper = {
           name: "Number"
         }
       },
-      provisionedThroughputSettings: {
-        serializedName: "provisionedThroughputSettings",
+      autoscaleSettings: {
+        serializedName: "autoscaleSettings",
         type: {
           name: "Composite",
-          className: "ProvisionedThroughputSettingsResource"
+          className: "AutoscaleSettingsResource"
         }
       },
       minimumThroughput: {
@@ -2722,6 +2848,22 @@ export const SqlDatabaseResource: msRest.CompositeMapper = {
   }
 };
 
+export const AutoscaleSettings: msRest.CompositeMapper = {
+  serializedName: "AutoscaleSettings",
+  type: {
+    name: "Composite",
+    className: "AutoscaleSettings",
+    modelProperties: {
+      maxThroughput: {
+        serializedName: "maxThroughput",
+        type: {
+          name: "Number"
+        }
+      }
+    }
+  }
+};
+
 export const CreateUpdateOptions: msRest.CompositeMapper = {
   serializedName: "CreateUpdateOptions",
   type: {
@@ -2731,13 +2873,15 @@ export const CreateUpdateOptions: msRest.CompositeMapper = {
       throughput: {
         serializedName: "throughput",
         type: {
-          name: "String"
+          name: "Number"
+        }
+      },
+      autoscaleSettings: {
+        serializedName: "autoscaleSettings",
+        type: {
+          name: "Composite",
+          className: "AutoscaleSettings"
         }
-      }
-    },
-    additionalProperties: {
-      type: {
-        name: "String"
       }
     }
   }
@@ -2763,12 +2907,7 @@ export const SqlDatabaseCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -2846,12 +2985,7 @@ export const SqlContainerCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -2901,12 +3035,7 @@ export const SqlStoredProcedureCreateUpdateParameters: msRest.CompositeMapper =
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -2956,12 +3085,7 @@ export const SqlUserDefinedFunctionCreateUpdateParameters: msRest.CompositeMappe
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -3023,12 +3147,7 @@ export const SqlTriggerCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -3072,12 +3191,7 @@ export const MongoDBDatabaseCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -3119,6 +3233,12 @@ export const MongoDBCollectionResource: msRest.CompositeMapper = {
             }
           }
         }
+      },
+      analyticalStorageTtl: {
+        serializedName: "analyticalStorageTtl",
+        type: {
+          name: "Number"
+        }
       }
     }
   }
@@ -3144,12 +3264,7 @@ export const MongoDBCollectionCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -3193,12 +3308,7 @@ export const TableCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -3242,12 +3352,7 @@ export const CassandraKeyspaceCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -3279,6 +3384,12 @@ export const CassandraTableResource: msRest.CompositeMapper = {
           name: "Composite",
           className: "CassandraSchema"
         }
+      },
+      analyticalStorageTtl: {
+        serializedName: "analyticalStorageTtl",
+        type: {
+          name: "Number"
+        }
       }
     }
   }
@@ -3304,12 +3415,7 @@ export const CassandraTableCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -3353,12 +3459,7 @@ export const GremlinDatabaseCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
@@ -3436,12 +3537,7 @@ export const GremlinGraphCreateUpdateParameters: msRest.CompositeMapper = {
         serializedName: "properties.options",
         type: {
           name: "Composite",
-          className: "CreateUpdateOptions",
-          additionalProperties: {
-            type: {
-              name: "String"
-            }
-          }
+          className: "CreateUpdateOptions"
         }
       }
     }
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/mongoDBResourcesMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/mongoDBResourcesMappers.ts
index bba6e773c163..5a447e578304 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/mongoDBResourcesMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/mongoDBResourcesMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -50,6 +53,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   MongoDBCollectionCreateUpdateParameters,
   MongoDBCollectionGetPropertiesOptions,
@@ -73,7 +77,6 @@ export {
   PrivateEndpointProperty,
   PrivateLinkResource,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   Resource,
   SpatialSpec,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/notebookWorkspacesMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/notebookWorkspacesMappers.ts
index c9f13a97f5ea..67b430bb0b35 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/notebookWorkspacesMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/notebookWorkspacesMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -50,6 +53,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   MongoDBCollectionCreateUpdateParameters,
   MongoDBCollectionGetPropertiesOptions,
@@ -73,7 +77,6 @@ export {
   PrivateEndpointProperty,
   PrivateLinkResource,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   Resource,
   SpatialSpec,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/parameters.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/parameters.ts
index 5b6d7df480fc..cb68a8368400 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/parameters.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/parameters.ts
@@ -41,7 +41,7 @@ export const apiVersion0: msRest.OperationQueryParameter = {
     required: true,
     isConstant: true,
     serializedName: "api-version",
-    defaultValue: '2020-03-01',
+    defaultValue: '2020-04-01',
     constraints: {
       MinLength: 1
     },
@@ -51,21 +51,6 @@ export const apiVersion0: msRest.OperationQueryParameter = {
   }
 };
 export const apiVersion1: msRest.OperationQueryParameter = {
-  parameterPath: "apiVersion",
-  mapper: {
-    required: true,
-    isConstant: true,
-    serializedName: "api-version",
-    defaultValue: '2019-08-01',
-    constraints: {
-      MinLength: 1
-    },
-    type: {
-      name: "String"
-    }
-  }
-};
-export const apiVersion2: msRest.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/privateEndpointConnectionsMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/privateEndpointConnectionsMappers.ts
index a84dacf828bb..75eadc705194 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/privateEndpointConnectionsMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/privateEndpointConnectionsMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -51,6 +54,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   MongoDBCollectionCreateUpdateParameters,
   MongoDBCollectionGetPropertiesOptions,
@@ -73,7 +77,6 @@ export {
   PrivateEndpointProperty,
   PrivateLinkResource,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   Resource,
   SpatialSpec,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/privateLinkResourcesMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/privateLinkResourcesMappers.ts
index 25bda1a8333d..982e3c4539fa 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/privateLinkResourcesMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/privateLinkResourcesMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -50,6 +53,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   MongoDBCollectionCreateUpdateParameters,
   MongoDBCollectionGetPropertiesOptions,
@@ -72,7 +76,6 @@ export {
   PrivateLinkResource,
   PrivateLinkResourceListResult,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   Resource,
   SpatialSpec,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/sqlResourcesMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/sqlResourcesMappers.ts
index d46dd45e455a..c82b56d06e33 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/sqlResourcesMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/sqlResourcesMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -50,6 +53,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   MongoDBCollectionCreateUpdateParameters,
   MongoDBCollectionGetPropertiesOptions,
@@ -71,7 +75,6 @@ export {
   PrivateEndpointProperty,
   PrivateLinkResource,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   Resource,
   SpatialSpec,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/tableResourcesMappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/tableResourcesMappers.ts
index 74304432552f..db653215827a 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/models/tableResourcesMappers.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/models/tableResourcesMappers.ts
@@ -7,8 +7,11 @@
  */
 
 export {
+  ApiProperties,
   ARMProxyResource,
   ARMResourceProperties,
+  AutoscaleSettings,
+  AutoscaleSettingsResource,
   AutoUpgradePolicyResource,
   AzureEntityResource,
   BaseResource,
@@ -50,6 +53,7 @@ export {
   IncludedPath,
   Indexes,
   IndexingPolicy,
+  IpAddressOrRange,
   Location,
   MongoDBCollectionCreateUpdateParameters,
   MongoDBCollectionGetPropertiesOptions,
@@ -71,7 +75,6 @@ export {
   PrivateEndpointProperty,
   PrivateLinkResource,
   PrivateLinkServiceConnectionStateProperty,
-  ProvisionedThroughputSettingsResource,
   ProxyResource,
   Resource,
   SpatialSpec,
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/operations/notebookWorkspaces.ts b/sdk/cosmosdb/arm-cosmosdb/src/operations/notebookWorkspaces.ts
index 62f2643a6bf9..1d22daf2fb67 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/operations/notebookWorkspaces.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/operations/notebookWorkspaces.ts
@@ -255,7 +255,7 @@ const listByDatabaseAccountOperationSpec: msRest.OperationSpec = {
     Parameters.accountName
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -281,7 +281,7 @@ const getOperationSpec: msRest.OperationSpec = {
     Parameters.notebookWorkspaceName
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -307,7 +307,7 @@ const listConnectionInfoOperationSpec: msRest.OperationSpec = {
     Parameters.notebookWorkspaceName
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -333,7 +333,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
     Parameters.notebookWorkspaceName
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -366,7 +366,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
     Parameters.notebookWorkspaceName
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -391,7 +391,7 @@ const beginRegenerateAuthTokenOperationSpec: msRest.OperationSpec = {
     Parameters.notebookWorkspaceName
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -416,7 +416,7 @@ const beginStartOperationSpec: msRest.OperationSpec = {
     Parameters.notebookWorkspaceName
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion0
   ],
   headerParameters: [
     Parameters.acceptLanguage
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/operations/privateEndpointConnections.ts b/sdk/cosmosdb/arm-cosmosdb/src/operations/privateEndpointConnections.ts
index 87bef398c86e..89392e52ce95 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/operations/privateEndpointConnections.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/operations/privateEndpointConnections.ts
@@ -176,7 +176,7 @@ const listByDatabaseAccountOperationSpec: msRest.OperationSpec = {
     Parameters.accountName
   ],
   queryParameters: [
-    Parameters.apiVersion2
+    Parameters.apiVersion1
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -202,7 +202,7 @@ const getOperationSpec: msRest.OperationSpec = {
     Parameters.privateEndpointConnectionName
   ],
   queryParameters: [
-    Parameters.apiVersion2
+    Parameters.apiVersion1
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -228,7 +228,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
     Parameters.privateEndpointConnectionName
   ],
   queryParameters: [
-    Parameters.apiVersion2
+    Parameters.apiVersion1
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -262,7 +262,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
     Parameters.privateEndpointConnectionName
   ],
   queryParameters: [
-    Parameters.apiVersion2
+    Parameters.apiVersion1
   ],
   headerParameters: [
     Parameters.acceptLanguage
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/operations/privateLinkResources.ts b/sdk/cosmosdb/arm-cosmosdb/src/operations/privateLinkResources.ts
index 57ab1aae744b..76a931a235fa 100644
--- a/sdk/cosmosdb/arm-cosmosdb/src/operations/privateLinkResources.ts
+++ b/sdk/cosmosdb/arm-cosmosdb/src/operations/privateLinkResources.ts
@@ -106,7 +106,7 @@ const listByDatabaseAccountOperationSpec: msRest.OperationSpec = {
     Parameters.accountName
   ],
   queryParameters: [
-    Parameters.apiVersion2
+    Parameters.apiVersion1
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -132,7 +132,7 @@ const getOperationSpec: msRest.OperationSpec = {
     Parameters.groupName
   ],
   queryParameters: [
-    Parameters.apiVersion2
+    Parameters.apiVersion1
   ],
   headerParameters: [
     Parameters.acceptLanguage