diff --git a/sdk/batch/batch/src/batchServiceClient.ts b/sdk/batch/batch/src/batchServiceClient.ts
index edf43ad8f5e4..7c056a9ae675 100644
--- a/sdk/batch/batch/src/batchServiceClient.ts
+++ b/sdk/batch/batch/src/batchServiceClient.ts
@@ -34,7 +34,7 @@ class BatchServiceClient extends BatchServiceClientContext {
    * @param batchUrl The base URL for all Azure Batch service requests.
    * @param [options] The parameter options
    */
-  constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, batchUrl: string, options?: coreArm.AzureServiceClientOptions) {
+  constructor(credentials: msRest.ServiceClientCredentials, batchUrl: string, options?: msRest.AzureServiceClientOptions) {
     super(credentials, batchUrl, options);
     this.application = new operations.Application(this);
     this.pool = new operations.Pool(this);
diff --git a/sdk/batch/batch/src/models/index.ts b/sdk/batch/batch/src/models/index.ts
index a5073c895b8f..c4ec9733ade9 100644
--- a/sdk/batch/batch/src/models/index.ts
+++ b/sdk/batch/batch/src/models/index.ts
@@ -8356,7 +8356,7 @@ export interface PoolListNextOptionalParams extends coreHttp.RequestOptionsBase
 /**
  * Optional Parameters.
  */
-export interface AccountListSupportedImagesOptionalParams extends coreHttp.RequestOptionsBase {
+export interface AccountListSupportedImagesOptionalParams extends msRest.RequestOptionsBase {
   /**
    * Additional parameters for the operation
    */
@@ -8376,7 +8376,7 @@ export interface AccountListPoolNodeCountsOptionalParams extends coreHttp.Reques
 /**
  * Optional Parameters.
  */
-export interface AccountListSupportedImagesNextOptionalParams extends coreHttp.RequestOptionsBase {
+export interface AccountListSupportedImagesNextOptionalParams extends msRest.RequestOptionsBase {
   /**
    * Additional parameters for the operation
    */
diff --git a/sdk/batch/batch/src/models/mappers.ts b/sdk/batch/batch/src/models/mappers.ts
index e1361c4d7028..9c5c09597b78 100644
--- a/sdk/batch/batch/src/models/mappers.ts
+++ b/sdk/batch/batch/src/models/mappers.ts
@@ -97,7 +97,7 @@ export const ImageReference: coreHttp.CompositeMapper = {
   }
 };
 
-export const ImageInformation: coreHttp.CompositeMapper = {
+export const ImageInformation: msRest.CompositeMapper = {
   serializedName: "ImageInformation",
   type: {
     name: "Composite",
@@ -2213,6 +2213,211 @@ export const NetworkConfiguration: coreHttp.CompositeMapper = {
   }
 };
 
+export const AzureBlobFileSystemConfiguration: msRest.CompositeMapper = {
+  serializedName: "AzureBlobFileSystemConfiguration",
+  type: {
+    name: "Composite",
+    className: "AzureBlobFileSystemConfiguration",
+    modelProperties: {
+      accountName: {
+        required: true,
+        serializedName: "accountName",
+        type: {
+          name: "String"
+        }
+      },
+      containerName: {
+        required: true,
+        serializedName: "containerName",
+        type: {
+          name: "String"
+        }
+      },
+      accountKey: {
+        serializedName: "accountKey",
+        type: {
+          name: "String"
+        }
+      },
+      sasKey: {
+        serializedName: "sasKey",
+        type: {
+          name: "String"
+        }
+      },
+      blobfuseOptions: {
+        serializedName: "blobfuseOptions",
+        type: {
+          name: "String"
+        }
+      },
+      relativeMountPath: {
+        required: true,
+        serializedName: "relativeMountPath",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const NFSMountConfiguration: msRest.CompositeMapper = {
+  serializedName: "NFSMountConfiguration",
+  type: {
+    name: "Composite",
+    className: "NFSMountConfiguration",
+    modelProperties: {
+      source: {
+        required: true,
+        serializedName: "source",
+        type: {
+          name: "String"
+        }
+      },
+      relativeMountPath: {
+        required: true,
+        serializedName: "relativeMountPath",
+        type: {
+          name: "String"
+        }
+      },
+      mountOptions: {
+        serializedName: "mountOptions",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const CIFSMountConfiguration: msRest.CompositeMapper = {
+  serializedName: "CIFSMountConfiguration",
+  type: {
+    name: "Composite",
+    className: "CIFSMountConfiguration",
+    modelProperties: {
+      username: {
+        required: true,
+        serializedName: "username",
+        type: {
+          name: "String"
+        }
+      },
+      source: {
+        required: true,
+        serializedName: "source",
+        type: {
+          name: "String"
+        }
+      },
+      relativeMountPath: {
+        required: true,
+        serializedName: "relativeMountPath",
+        type: {
+          name: "String"
+        }
+      },
+      mountOptions: {
+        serializedName: "mountOptions",
+        type: {
+          name: "String"
+        }
+      },
+      password: {
+        required: true,
+        serializedName: "password",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const AzureFileShareConfiguration: msRest.CompositeMapper = {
+  serializedName: "AzureFileShareConfiguration",
+  type: {
+    name: "Composite",
+    className: "AzureFileShareConfiguration",
+    modelProperties: {
+      accountName: {
+        required: true,
+        serializedName: "accountName",
+        type: {
+          name: "String"
+        }
+      },
+      azureFileUrl: {
+        required: true,
+        serializedName: "azureFileUrl",
+        type: {
+          name: "String"
+        }
+      },
+      accountKey: {
+        required: true,
+        serializedName: "accountKey",
+        type: {
+          name: "String"
+        }
+      },
+      relativeMountPath: {
+        required: true,
+        serializedName: "relativeMountPath",
+        type: {
+          name: "String"
+        }
+      },
+      mountOptions: {
+        serializedName: "mountOptions",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const MountConfiguration: msRest.CompositeMapper = {
+  serializedName: "MountConfiguration",
+  type: {
+    name: "Composite",
+    className: "MountConfiguration",
+    modelProperties: {
+      azureBlobFileSystemConfiguration: {
+        serializedName: "azureBlobFileSystemConfiguration",
+        type: {
+          name: "Composite",
+          className: "AzureBlobFileSystemConfiguration"
+        }
+      },
+      nfsMountConfiguration: {
+        serializedName: "nfsMountConfiguration",
+        type: {
+          name: "Composite",
+          className: "NFSMountConfiguration"
+        }
+      },
+      cifsMountConfiguration: {
+        serializedName: "cifsMountConfiguration",
+        type: {
+          name: "Composite",
+          className: "CIFSMountConfiguration"
+        }
+      },
+      azureFileShareConfiguration: {
+        serializedName: "azureFileShareConfiguration",
+        type: {
+          name: "Composite",
+          className: "AzureFileShareConfiguration"
+        }
+      }
+    }
+  }
+};
+
 export const AzureBlobFileSystemConfiguration: coreHttp.CompositeMapper = {
   serializedName: "AzureBlobFileSystemConfiguration",
   type: {
@@ -7380,7 +7585,7 @@ export const PoolRemoveNodesOptions: coreHttp.CompositeMapper = {
   }
 };
 
-export const AccountListSupportedImagesOptions: coreHttp.CompositeMapper = {
+export const AccountListSupportedImagesOptions: msRest.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AccountListSupportedImagesOptions",
@@ -9955,7 +10160,7 @@ export const PoolListNextOptions: coreHttp.CompositeMapper = {
   }
 };
 
-export const AccountListSupportedImagesNextOptions: coreHttp.CompositeMapper = {
+export const AccountListSupportedImagesNextOptions: msRest.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AccountListSupportedImagesNextOptions",
@@ -10332,7 +10537,7 @@ export const PoolListUsageMetricsHeaders: coreHttp.CompositeMapper = {
   }
 };
 
-export const AccountListSupportedImagesHeaders: coreHttp.CompositeMapper = {
+export const AccountListSupportedImagesHeaders: msRest.CompositeMapper = {
   serializedName: "account-listsupportedimages-headers",
   type: {
     name: "Composite",
@@ -13114,7 +13319,7 @@ export const CloudPoolListResult: coreHttp.CompositeMapper = {
   }
 };
 
-export const AccountListSupportedImagesResult: coreHttp.CompositeMapper = {
+export const AccountListSupportedImagesResult: msRest.CompositeMapper = {
   serializedName: "AccountListSupportedImagesResult",
   type: {
     name: "Composite",
diff --git a/sdk/batch/batch/src/operations/account.ts b/sdk/batch/batch/src/operations/account.ts
index e675d428037f..289fbc6dabba 100644
--- a/sdk/batch/batch/src/operations/account.ts
+++ b/sdk/batch/batch/src/operations/account.ts
@@ -35,13 +35,13 @@ export class Account {
   /**
    * @param callback The callback
    */
-  listSupportedImages(callback: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
+  listSupportedImages(callback: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  listSupportedImages(options: Models.AccountListSupportedImagesOptionalParams, callback: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
-  listSupportedImages(options?: Models.AccountListSupportedImagesOptionalParams | coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>, callback?: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): Promise<Models.AccountListSupportedImagesResponse> {
+  listSupportedImages(options: Models.AccountListSupportedImagesOptionalParams, callback: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
+  listSupportedImages(options?: Models.AccountListSupportedImagesOptionalParams | msRest.ServiceCallback<Models.AccountListSupportedImagesResult>, callback?: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): Promise<Models.AccountListSupportedImagesResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -85,14 +85,14 @@ export class Account {
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param callback The callback
    */
-  listSupportedImagesNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
+  listSupportedImagesNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
   /**
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param options The optional parameters
    * @param callback The callback
    */
-  listSupportedImagesNext(nextPageLink: string, options: Models.AccountListSupportedImagesNextOptionalParams, callback: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
-  listSupportedImagesNext(nextPageLink: string, options?: Models.AccountListSupportedImagesNextOptionalParams | coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>, callback?: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): Promise<Models.AccountListSupportedImagesResponse> {
+  listSupportedImagesNext(nextPageLink: string, options: Models.AccountListSupportedImagesNextOptionalParams, callback: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
+  listSupportedImagesNext(nextPageLink: string, options?: Models.AccountListSupportedImagesNextOptionalParams | msRest.ServiceCallback<Models.AccountListSupportedImagesResult>, callback?: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): Promise<Models.AccountListSupportedImagesResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -132,8 +132,8 @@ export class Account {
 }
 
 // Operation Specifications
-const serializer = new coreHttp.Serializer(Mappers);
-const listSupportedImagesOperationSpec: coreHttp.OperationSpec = {
+const serializer = new msRest.Serializer(Mappers);
+const listSupportedImagesOperationSpec: msRest.OperationSpec = {
   httpMethod: "GET",
   path: "supportedimages",
   urlParameters: [
@@ -193,7 +193,7 @@ const listPoolNodeCountsOperationSpec: coreHttp.OperationSpec = {
   serializer
 };
 
-const listSupportedImagesNextOperationSpec: coreHttp.OperationSpec = {
+const listSupportedImagesNextOperationSpec: msRest.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "{batchUrl}",
   path: "{nextLink}",