diff --git a/sdk/storage/arm-storage/src/models/blobContainersMappers.ts b/sdk/storage/arm-storage/src/models/blobContainersMappers.ts
index 08b711a15db1..d1f86abea61a 100644
--- a/sdk/storage/arm-storage/src/models/blobContainersMappers.ts
+++ b/sdk/storage/arm-storage/src/models/blobContainersMappers.ts
@@ -36,6 +36,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -67,6 +68,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -96,5 +98,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts b/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts
index ed2d658e0ac9..6664a25fa878 100644
--- a/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts
@@ -30,6 +30,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -60,6 +61,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -89,5 +91,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/blobServicesMappers.ts b/sdk/storage/arm-storage/src/models/blobServicesMappers.ts
index be07a91403b0..3f2123c14c2d 100644
--- a/sdk/storage/arm-storage/src/models/blobServicesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/blobServicesMappers.ts
@@ -32,6 +32,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -59,6 +60,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -88,5 +90,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts b/sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts
index c553a4339e8a..fc0e84e964a4 100644
--- a/sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts
+++ b/sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccountListResult,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -60,6 +61,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -89,5 +91,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts b/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts
index 60573dfa4870..55c91db88eb3 100644
--- a/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionScopeListResult,
@@ -61,6 +62,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -90,5 +92,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/fileServicesMappers.ts b/sdk/storage/arm-storage/src/models/fileServicesMappers.ts
index c183aa65deba..aacc90c637a1 100644
--- a/sdk/storage/arm-storage/src/models/fileServicesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/fileServicesMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -59,6 +60,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -88,5 +90,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/fileSharesMappers.ts b/sdk/storage/arm-storage/src/models/fileSharesMappers.ts
index 3e68926eb854..1644c26e254c 100644
--- a/sdk/storage/arm-storage/src/models/fileSharesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/fileSharesMappers.ts
@@ -32,6 +32,7 @@ export {
   DeletedShare,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -60,6 +61,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -89,5 +91,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/index.ts b/sdk/storage/arm-storage/src/models/index.ts
index 7a5201d4d413..b9bdc54c1db8 100644
--- a/sdk/storage/arm-storage/src/models/index.ts
+++ b/sdk/storage/arm-storage/src/models/index.ts
@@ -328,6 +328,17 @@ export interface KeyVaultProperties {
   readonly lastKeyRotationTimestamp?: Date;
 }
 
+/**
+ * Encryption identity for the storage account.
+ */
+export interface EncryptionIdentity {
+  /**
+   * Resource identifier of the UserAssigned identity to be associated with server-side encryption
+   * on the storage account.
+   */
+  encryptionUserAssignedIdentity?: string;
+}
+
 /**
  * The encryption settings on the storage account.
  */
@@ -351,6 +362,26 @@ export interface Encryption {
    * Properties provided by key vault.
    */
   keyVaultProperties?: KeyVaultProperties;
+  /**
+   * The identity to be used with service-side encryption at rest.
+   */
+  encryptionIdentity?: EncryptionIdentity;
+}
+
+/**
+ * UserAssignedIdentity for the resource.
+ */
+export interface UserAssignedIdentity {
+  /**
+   * The principal ID of the identity.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly principalId?: string;
+  /**
+   * The client ID of the identity.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly clientId?: string;
 }
 
 /**
@@ -412,6 +443,9 @@ export interface NetworkRuleSet {
    * 'AzureServices'. Default value: 'AzureServices'.
    */
   bypass?: Bypass;
+  /**
+   * Sets the resource access rules
+   */
   resourceAccessRules?: ResourceAccessRule[];
   /**
    * Sets the virtual network rules
@@ -506,6 +540,17 @@ export interface Identity {
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
   readonly tenantId?: string;
+  /**
+   * The identity type. Possible values include: 'None', 'SystemAssigned', 'UserAssigned',
+   * 'SystemAssigned,UserAssigned'
+   */
+  type: IdentityType;
+  /**
+   * Gets or sets a list of key value pairs that describe the set of User Assigned identities that
+   * will be used with this storage account. The key is the ARM resource identifier of the
+   * identity. Only 1 User Assigned identity is permitted here.
+   */
+  userAssignedIdentities?: { [propertyName: string]: UserAssignedIdentity };
 }
 
 /**
@@ -625,6 +670,17 @@ export interface StorageAccountCreateParameters {
    * is TLS 1.0 for this property. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2'
    */
   minimumTlsVersion?: MinimumTlsVersion;
+  /**
+   * Indicates whether the storage account permits requests to be authorized with the account
+   * access key via Shared Key. If false, then all requests, including shared access signatures,
+   * must be authorized with Azure Active Directory (Azure AD). The default value is null, which is
+   * equivalent to true.
+   */
+  allowSharedKeyAccess?: boolean;
+  /**
+   * NFS 3.0 protocol support enabled if set to true.
+   */
+  enableNfsV3?: boolean;
 }
 
 /**
@@ -1101,6 +1157,17 @@ export interface StorageAccount extends TrackedResource {
    * is TLS 1.0 for this property. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2'
    */
   minimumTlsVersion?: MinimumTlsVersion;
+  /**
+   * Indicates whether the storage account permits requests to be authorized with the account
+   * access key via Shared Key. If false, then all requests, including shared access signatures,
+   * must be authorized with Azure Active Directory (Azure AD). The default value is null, which is
+   * equivalent to true.
+   */
+  allowSharedKeyAccess?: boolean;
+  /**
+   * NFS 3.0 protocol support enabled if set to true.
+   */
+  enableNfsV3?: boolean;
 }
 
 /**
@@ -1213,6 +1280,13 @@ export interface StorageAccountUpdateParameters {
    * is TLS 1.0 for this property. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2'
    */
   minimumTlsVersion?: MinimumTlsVersion;
+  /**
+   * Indicates whether the storage account permits requests to be authorized with the account
+   * access key via Shared Key. If false, then all requests, including shared access signatures,
+   * must be authorized with Azure Active Directory (Azure AD). The default value is null, which is
+   * equivalent to true.
+   */
+  allowSharedKeyAccess?: boolean;
   /**
    * Optional. Indicates the type of storage account. Currently only StorageV2 value supported by
    * server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage',
@@ -1415,7 +1489,8 @@ export interface ListServiceSasResponse {
 }
 
 /**
- * Object to define the number of days after last modification.
+ * Object to define the number of days after object last modification Or last access. Properties
+ * daysAfterModificationGreaterThan and daysAfterLastAccessTimeGreaterThan are mutually exclusive.
  */
 export interface DateAfterModification {
   /**
@@ -1466,12 +1541,41 @@ export interface DateAfterCreation {
  * Management policy action for snapshot.
  */
 export interface ManagementPolicySnapShot {
+  /**
+   * The function to tier blob snapshot to cool storage. Support blob snapshot currently at Hot
+   * tier
+   */
+  tierToCool?: DateAfterCreation;
+  /**
+   * The function to tier blob snapshot to archive storage. Support blob snapshot currently at Hot
+   * or Cool tier
+   */
+  tierToArchive?: DateAfterCreation;
   /**
    * The function to delete the blob snapshot
    */
   deleteProperty?: DateAfterCreation;
 }
 
+/**
+ * Management policy action for blob version.
+ */
+export interface ManagementPolicyVersion {
+  /**
+   * The function to tier blob version to cool storage. Support blob version currently at Hot tier
+   */
+  tierToCool?: DateAfterCreation;
+  /**
+   * The function to tier blob version to archive storage. Support blob version currently at Hot or
+   * Cool tier
+   */
+  tierToArchive?: DateAfterCreation;
+  /**
+   * The function to delete the blob version
+   */
+  deleteProperty?: DateAfterCreation;
+}
+
 /**
  * Actions are applied to the filtered blobs when the execution condition is met.
  */
@@ -1484,6 +1588,10 @@ export interface ManagementPolicyAction {
    * The management policy action for snapshot
    */
   snapshot?: ManagementPolicySnapShot;
+  /**
+   * The management policy action for version
+   */
+  version?: ManagementPolicyVersion;
 }
 
 /**
@@ -1516,7 +1624,8 @@ export interface ManagementPolicyFilter {
    */
   prefixMatch?: string[];
   /**
-   * An array of predefined enum values. Only blockBlob is supported.
+   * An array of predefined enum values. Currently blockBlob supports all tiering and delete
+   * actions. Only delete actions are supported for appendBlob.
    */
   blobTypes: string[];
   /**
@@ -1598,6 +1707,16 @@ export interface EncryptionScopeKeyVaultProperties {
    * scope.
    */
   keyUri?: string;
+  /**
+   * The object identifier of the current versioned Key Vault Key in use.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly currentVersionedKeyIdentifier?: string;
+  /**
+   * Timestamp of last rotation of the Key Vault Key.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly lastKeyRotationTimestamp?: Date;
 }
 
 /**
@@ -1629,6 +1748,11 @@ export interface EncryptionScope extends Resource {
    * scope 'source' attribute is set to 'Microsoft.KeyVault'.
    */
   keyVaultProperties?: EncryptionScopeKeyVaultProperties;
+  /**
+   * A boolean indicating whether or not the service applies a secondary layer of encryption with
+   * platform managed keys for data at rest.
+   */
+  requireInfrastructureEncryption?: boolean;
 }
 
 /**
@@ -1798,7 +1922,7 @@ export interface SystemData {
    */
   lastModifiedByType?: CreatedByType;
   /**
-   * The type of identity that last modified the resource.
+   * The timestamp of resource last modification (UTC)
    */
   lastModifiedAt?: Date;
 }
@@ -2290,6 +2414,12 @@ export interface ChangeFeed {
    * Indicates whether change feed event logging is enabled for the Blob service.
    */
   enabled?: boolean;
+  /**
+   * Indicates the duration of changeFeed retention in days. Minimum value is 1 day and maximum
+   * value is 146000 days (400 years). A null value indicates an infinite retention of the change
+   * feed.
+   */
+  retentionInDays?: number;
 }
 
 /**
@@ -2455,6 +2585,26 @@ export interface SmbSetting {
    * Multichannel setting. Applies to Premium FileStorage only.
    */
   multichannel?: Multichannel;
+  /**
+   * SMB protocol versions supported by server. Valid values are SMB2.1, SMB3.0, SMB3.1.1. Should
+   * be passed as a string with delimiter ';'.
+   */
+  versions?: string;
+  /**
+   * SMB authentication methods supported by server. Valid values are NTLMv2, Kerberos. Should be
+   * passed as a string with delimiter ';'.
+   */
+  authenticationMethods?: string;
+  /**
+   * Kerberos ticket encryption supported by server. Valid values are RC4-HMAC, AES-256. Should be
+   * passed as a string with delimiter ';'
+   */
+  kerberosTicketEncryption?: string;
+  /**
+   * SMB channel encryption supported by server. Valid values are AES-128-CCM, AES-128-GCM,
+   * AES-256-GCM. Should be passed as a string with delimiter ';'.
+   */
+  channelEncryption?: string;
 }
 
 /**
@@ -3387,6 +3537,14 @@ export type RoutingChoice = 'MicrosoftRouting' | 'InternetRouting';
  */
 export type MinimumTlsVersion = 'TLS1_0' | 'TLS1_1' | 'TLS1_2';
 
+/**
+ * Defines values for IdentityType.
+ * Possible values include: 'None', 'SystemAssigned', 'UserAssigned', 'SystemAssigned,UserAssigned'
+ * @readonly
+ * @enum {string}
+ */
+export type IdentityType = 'None' | 'SystemAssigned' | 'UserAssigned' | 'SystemAssigned,UserAssigned';
+
 /**
  * Defines values for ExtendedLocationTypes.
  * Possible values include: 'EdgeZone'
diff --git a/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts b/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts
index 7f9a841cfa77..5e8f10709e88 100644
--- a/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -58,6 +59,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -87,5 +89,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/mappers.ts b/sdk/storage/arm-storage/src/models/mappers.ts
index adbc5ce36d2c..211798a62138 100644
--- a/sdk/storage/arm-storage/src/models/mappers.ts
+++ b/sdk/storage/arm-storage/src/models/mappers.ts
@@ -526,6 +526,22 @@ export const KeyVaultProperties: msRest.CompositeMapper = {
   }
 };
 
+export const EncryptionIdentity: msRest.CompositeMapper = {
+  serializedName: "EncryptionIdentity",
+  type: {
+    name: "Composite",
+    className: "EncryptionIdentity",
+    modelProperties: {
+      encryptionUserAssignedIdentity: {
+        serializedName: "userAssignedIdentity",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const Encryption: msRest.CompositeMapper = {
   serializedName: "Encryption",
   type: {
@@ -559,6 +575,37 @@ export const Encryption: msRest.CompositeMapper = {
           name: "Composite",
           className: "KeyVaultProperties"
         }
+      },
+      encryptionIdentity: {
+        serializedName: "identity",
+        type: {
+          name: "Composite",
+          className: "EncryptionIdentity"
+        }
+      }
+    }
+  }
+};
+
+export const UserAssignedIdentity: msRest.CompositeMapper = {
+  serializedName: "UserAssignedIdentity",
+  type: {
+    name: "Composite",
+    className: "UserAssignedIdentity",
+    modelProperties: {
+      principalId: {
+        readOnly: true,
+        serializedName: "principalId",
+        type: {
+          name: "String"
+        }
+      },
+      clientId: {
+        readOnly: true,
+        serializedName: "clientId",
+        type: {
+          name: "String"
+        }
       }
     }
   }
@@ -612,14 +659,7 @@ export const VirtualNetworkRule: msRest.CompositeMapper = {
       state: {
         serializedName: "state",
         type: {
-          name: "Enum",
-          allowedValues: [
-            "provisioning",
-            "deprovisioning",
-            "succeeded",
-            "failed",
-            "networkSourceDeleted"
-          ]
+          name: "String"
         }
       }
     }
@@ -844,12 +884,22 @@ export const Identity: msRest.CompositeMapper = {
       },
       type: {
         required: true,
-        isConstant: true,
         serializedName: "type",
-        defaultValue: 'SystemAssigned',
         type: {
           name: "String"
         }
+      },
+      userAssignedIdentities: {
+        serializedName: "userAssignedIdentities",
+        type: {
+          name: "Dictionary",
+          value: {
+            type: {
+              name: "Composite",
+              className: "UserAssignedIdentity"
+            }
+          }
+        }
       }
     }
   }
@@ -1031,6 +1081,18 @@ export const StorageAccountCreateParameters: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      allowSharedKeyAccess: {
+        serializedName: "properties.allowSharedKeyAccess",
+        type: {
+          name: "Boolean"
+        }
+      },
+      enableNfsV3: {
+        serializedName: "properties.isNfsV3Enabled",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -1738,6 +1800,18 @@ export const StorageAccount: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      allowSharedKeyAccess: {
+        serializedName: "properties.allowSharedKeyAccess",
+        type: {
+          name: "Boolean"
+        }
+      },
+      enableNfsV3: {
+        serializedName: "properties.isNfsV3Enabled",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -1918,6 +1992,12 @@ export const StorageAccountUpdateParameters: msRest.CompositeMapper = {
           name: "String"
         }
       },
+      allowSharedKeyAccess: {
+        serializedName: "properties.allowSharedKeyAccess",
+        type: {
+          name: "Boolean"
+        }
+      },
       kind: {
         serializedName: "kind",
         type: {
@@ -2319,6 +2399,51 @@ export const ManagementPolicySnapShot: msRest.CompositeMapper = {
     name: "Composite",
     className: "ManagementPolicySnapShot",
     modelProperties: {
+      tierToCool: {
+        serializedName: "tierToCool",
+        type: {
+          name: "Composite",
+          className: "DateAfterCreation"
+        }
+      },
+      tierToArchive: {
+        serializedName: "tierToArchive",
+        type: {
+          name: "Composite",
+          className: "DateAfterCreation"
+        }
+      },
+      deleteProperty: {
+        serializedName: "delete",
+        type: {
+          name: "Composite",
+          className: "DateAfterCreation"
+        }
+      }
+    }
+  }
+};
+
+export const ManagementPolicyVersion: msRest.CompositeMapper = {
+  serializedName: "ManagementPolicyVersion",
+  type: {
+    name: "Composite",
+    className: "ManagementPolicyVersion",
+    modelProperties: {
+      tierToCool: {
+        serializedName: "tierToCool",
+        type: {
+          name: "Composite",
+          className: "DateAfterCreation"
+        }
+      },
+      tierToArchive: {
+        serializedName: "tierToArchive",
+        type: {
+          name: "Composite",
+          className: "DateAfterCreation"
+        }
+      },
       deleteProperty: {
         serializedName: "delete",
         type: {
@@ -2349,6 +2474,13 @@ export const ManagementPolicyAction: msRest.CompositeMapper = {
           name: "Composite",
           className: "ManagementPolicySnapShot"
         }
+      },
+      version: {
+        serializedName: "version",
+        type: {
+          name: "Composite",
+          className: "ManagementPolicyVersion"
+        }
       }
     }
   }
@@ -2563,6 +2695,20 @@ export const EncryptionScopeKeyVaultProperties: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      currentVersionedKeyIdentifier: {
+        readOnly: true,
+        serializedName: "currentVersionedKeyIdentifier",
+        type: {
+          name: "String"
+        }
+      },
+      lastKeyRotationTimestamp: {
+        readOnly: true,
+        serializedName: "lastKeyRotationTimestamp",
+        type: {
+          name: "DateTime"
+        }
       }
     }
   }
@@ -2607,6 +2753,12 @@ export const EncryptionScope: msRest.CompositeMapper = {
           name: "Composite",
           className: "EncryptionScopeKeyVaultProperties"
         }
+      },
+      requireInfrastructureEncryption: {
+        serializedName: "properties.requireInfrastructureEncryption",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -3688,6 +3840,16 @@ export const ChangeFeed: msRest.CompositeMapper = {
         type: {
           name: "Boolean"
         }
+      },
+      retentionInDays: {
+        serializedName: "retentionInDays",
+        constraints: {
+          InclusiveMaximum: 146000,
+          InclusiveMinimum: 1
+        },
+        type: {
+          name: "Number"
+        }
       }
     }
   }
@@ -3944,6 +4106,30 @@ export const SmbSetting: msRest.CompositeMapper = {
           name: "Composite",
           className: "Multichannel"
         }
+      },
+      versions: {
+        serializedName: "versions",
+        type: {
+          name: "String"
+        }
+      },
+      authenticationMethods: {
+        serializedName: "authenticationMethods",
+        type: {
+          name: "String"
+        }
+      },
+      kerberosTicketEncryption: {
+        serializedName: "kerberosTicketEncryption",
+        type: {
+          name: "String"
+        }
+      },
+      channelEncryption: {
+        serializedName: "channelEncryption",
+        type: {
+          name: "String"
+        }
       }
     }
   }
diff --git a/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts b/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts
index 1eb0feab8616..a0f19e4ceb4a 100644
--- a/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts
+++ b/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts
@@ -30,6 +30,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -59,6 +60,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicies,
@@ -89,5 +91,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts b/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts
index 324962a3b15e..b8411bdd6b8e 100644
--- a/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts
+++ b/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -60,6 +61,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -90,5 +92,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts b/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts
index 2e06299b9e40..3f84ea52d8b8 100644
--- a/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -58,6 +59,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -88,5 +90,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/queueMappers.ts b/sdk/storage/arm-storage/src/models/queueMappers.ts
index 92f1856cf5e2..eef9bd41f116 100644
--- a/sdk/storage/arm-storage/src/models/queueMappers.ts
+++ b/sdk/storage/arm-storage/src/models/queueMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -59,6 +60,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -88,5 +90,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/queueServicesMappers.ts b/sdk/storage/arm-storage/src/models/queueServicesMappers.ts
index 5c2e50448417..afdefe3bdb42 100644
--- a/sdk/storage/arm-storage/src/models/queueServicesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/queueServicesMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -59,6 +60,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -88,5 +90,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts b/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts
index fe4578e8b20e..3a860478cd3a 100644
--- a/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts
+++ b/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts
@@ -33,6 +33,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -62,6 +63,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -99,5 +101,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts b/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts
index ef76967c4ccc..4d420da49972 100644
--- a/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts
+++ b/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -59,6 +60,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -88,5 +90,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/models/tableServicesMappers.ts b/sdk/storage/arm-storage/src/models/tableServicesMappers.ts
index ebbb07423ad7..d795e3086195 100644
--- a/sdk/storage/arm-storage/src/models/tableServicesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/tableServicesMappers.ts
@@ -31,6 +31,7 @@ export {
   DeletedAccount,
   DeleteRetentionPolicy,
   Encryption,
+  EncryptionIdentity,
   EncryptionScope,
   EncryptionScopeKeyVaultProperties,
   EncryptionService,
@@ -59,6 +60,7 @@ export {
   ManagementPolicyRule,
   ManagementPolicySchema,
   ManagementPolicySnapShot,
+  ManagementPolicyVersion,
   Multichannel,
   NetworkRuleSet,
   ObjectReplicationPolicy,
@@ -88,5 +90,6 @@ export {
   TagProperty,
   TrackedResource,
   UpdateHistoryProperty,
+  UserAssignedIdentity,
   VirtualNetworkRule
 } from "../models/mappers";
diff --git a/sdk/storage/arm-storage/src/storageManagementClientContext.ts b/sdk/storage/arm-storage/src/storageManagementClientContext.ts
index 6ad950defd43..ec778b7aec62 100644
--- a/sdk/storage/arm-storage/src/storageManagementClientContext.ts
+++ b/sdk/storage/arm-storage/src/storageManagementClientContext.ts
@@ -36,14 +36,14 @@ export class StorageManagementClientContext extends msRestAzure.AzureServiceClie
     if (!options) {
       options = {};
     }
-    if (!options.userAgent) {
+    if(!options.userAgent) {
       const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
 
     super(credentials, options);
 
-    this.apiVersion = '2020-08-01-preview';
+    this.apiVersion = '2021-01-01';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
@@ -51,10 +51,10 @@ export class StorageManagementClientContext extends msRestAzure.AzureServiceClie
     this.credentials = credentials;
     this.subscriptionId = subscriptionId;
 
-    if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
+    if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
       this.acceptLanguage = options.acceptLanguage;
     }
-    if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
+    if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
       this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
     }
   }