diff --git a/README.md b/README.md
index 5baa9e250818..7bd0339d0788 100644
--- a/README.md
+++ b/README.md
@@ -2,18 +2,18 @@
 
 [![Build Status](https://dev.azure.com/azure-public/adx/_apis/build/status/public.Azure.azure-sdk-for-js)](https://dev.azure.com/azure-public/adx/_build/latest?definitionId=2)
 
-This project provides a Javascript package that makes it easy to consume and manage
+This project provides an isomorphic Javascript package with TypeScript definitions that makes it easy to consume and manage
 Microsoft Azure Services.
 It supports SDKs for:
-- ARM services (packages with the naming convention of `azure-arm-<servicename>`)
-- data plane of some Azure services (packages with the naming convention of `azure-<servicename>`).
+- ARM services (control plane) (packages with the naming convention of `@azure/arm-<servicename>`)
+- data plane of some Azure services (packages with the naming convention of `@azure/<servicename>`).
 
 ## Documentation
 
 Documentation of the supported SDKs can be found here:
 - https://docs.microsoft.com/en-us/javascript/azure - This website primarily provides SDK documentation for
-  - ARM based services (`azure-arm-<serviceName>`)
-  - data plane SDKs like `azure-batch`, `azure-graph`, etc.
+  - ARM based services (`@azure/arm-<serviceName>`)
+  - data plane SDKs like `@azure/batch`, `@azure/graph`, etc.
   
 ## Authentication
 - For Node.js-based authentication, look at [ms-rest-nodeauth](https://npmjs.com/package/ms-rest-nodeauth).
@@ -28,9 +28,8 @@ Documentation of the supported SDKs can be found here:
 
 ## License
 
-This project is licensed under MIT and Apache-2.0.
-- "MIT" license is usually used for the client libraries generated using [Autorest](https://github.com/Azure/Autorest) that are targeting ARM (V2 version of Azure REST API). The license can be found in "LICENSE.MIT.txt" file in this repository.
-- "Apache-2.0" license is usually used for the client libraries generated using an internal code generator that are targeting ASM (V1 version of Azure REST API). The license can be found in "LICENSE.Apache.txt" file in this repository.
+This project is licensed under MIT.
+- "MIT" license is usually used for the client libraries generated using [Autorest.TypeScript](https://github.com/azure/autorest.typescript) that are targeting ARM (V2 version of Azure REST API). The license can be found in "LICENSE.MIT.txt" file in this repository.
 
 ## Contribute
 
diff --git a/packages/@azure/arm-cognitiveservices/LICENSE.txt b/packages/@azure/arm-cognitiveservices/LICENSE.txt
index 5431ba98b936..a70e8cf66038 100644
--- a/packages/@azure/arm-cognitiveservices/LICENSE.txt
+++ b/packages/@azure/arm-cognitiveservices/LICENSE.txt
@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/@azure/arm-cognitiveservices/README.md b/packages/@azure/arm-cognitiveservices/README.md
index b6df42c0c189..673041a38710 100644
--- a/packages/@azure/arm-cognitiveservices/README.md
+++ b/packages/@azure/arm-cognitiveservices/README.md
@@ -1,81 +1,81 @@
-# Azure CognitiveServicesManagementClient SDK for JavaScript
-This package contains an isomorphic SDK for CognitiveServicesManagementClient.
-
-## Currently supported environments
-- Node.js version 6.x.x or higher
-- Browser JavaScript
-
-## How to Install
-```
-npm install @azure/arm-cognitiveservices
-```
-
-
-## How to use
-
-### nodejs - Authentication, client creation and getProperties accounts as an example written in TypeScript.
-
-```ts
-import * as msRest from "ms-rest-js";
-import * as msRestAzure from "ms-rest-azure-js";
-import * as msRestNodeAuth from "ms-rest-nodeauth";
-import { CognitiveServicesManagementClient, CognitiveServicesManagementModels, CognitiveServicesManagementMappers } from "@azure/arm-cognitiveservices";
-const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
-
-msRestNodeAuth.interactiveLogin().then((creds) => {
-  const client = new CognitiveServicesManagementClient(creds, subscriptionId);
-  const resourceGroupName = "testresourceGroupName";
-  const accountName = "testaccountName";
-  client.accounts.getProperties(resourceGroupName, accountName).then((result) => {
-    console.log("The result is:");
-    console.log(result);
-  });
-}).catch((err) => {
-  console.error(err);
-});
-```
-
-### browser - Authentication, client creation and getProperties accounts as an example written in JavaScript.
-See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.
-
-- index.html
-```html
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>@azure/arm-cognitiveservices sample</title>
-    <script src="node_modules/ms-rest-js/dist/msRest.browser.js"></script>
-    <script src="node_modules/ms-rest-azure-js/dist/msRestAzure.js"></script>
-    <script src="node_modules/ms-rest-browserauth/dist/msAuth.js"></script>
-    <script src="node_modules/@azure/arm-cognitiveservices/dist/arm-cognitiveservices.js"></script>
-    <script>
-      const subscriptionId = "<Subscription_Id>";
-      const authManager = new msAuth.AuthManager({
-        clientId: "<client id for your Azure AD app>",
-        tenant: "<optional tenant for your organization>"
-      });
-      authManager.finalizeLogin().then((res) => {
-        if (!res.isLoggedIn) {
-          // may cause redirects
-          authManager.login();
-        }
-        const client = new Azure.ArmCognitiveservices.CognitiveServicesManagementClient(res.creds, subscriptionId);
-        const resourceGroupName = "testresourceGroupName";
-        const accountName = "testaccountName";
-        client.accounts.getProperties(resourceGroupName, accountName).then((result) => {
-          console.log("The result is:");
-          console.log(result);
-        }).catch((err) => {
-          console.log("An error occurred:");
-          console.error(err);
-        });
-      });
-    </script>
-  </head>
-  <body>
-  </body>
-</html>
-```
-
-# Related projects
- - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
+# Azure CognitiveServicesManagementClient SDK for JavaScript
+This package contains an isomorphic SDK for CognitiveServicesManagementClient.
+
+## Currently supported environments
+- Node.js version 6.x.x or higher
+- Browser JavaScript
+
+## How to Install
+```
+npm install @azure/arm-cognitiveservices
+```
+
+
+## How to use
+
+### nodejs - Authentication, client creation and getProperties accounts as an example written in TypeScript.
+
+```ts
+import * as msRest from "ms-rest-js";
+import * as msRestAzure from "ms-rest-azure-js";
+import * as msRestNodeAuth from "ms-rest-nodeauth";
+import { CognitiveServicesManagementClient, CognitiveServicesManagementModels, CognitiveServicesManagementMappers } from "@azure/arm-cognitiveservices";
+const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
+
+msRestNodeAuth.interactiveLogin().then((creds) => {
+  const client = new CognitiveServicesManagementClient(creds, subscriptionId);
+  const resourceGroupName = "testresourceGroupName";
+  const accountName = "testaccountName";
+  client.accounts.getProperties(resourceGroupName, accountName).then((result) => {
+    console.log("The result is:");
+    console.log(result);
+  });
+}).catch((err) => {
+  console.error(err);
+});
+```
+
+### browser - Authentication, client creation and getProperties accounts as an example written in JavaScript.
+See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.
+
+- index.html
+```html
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>@azure/arm-cognitiveservices sample</title>
+    <script src="node_modules/ms-rest-js/dist/msRest.browser.js"></script>
+    <script src="node_modules/ms-rest-azure-js/dist/msRestAzure.js"></script>
+    <script src="node_modules/ms-rest-browserauth/dist/msAuth.js"></script>
+    <script src="node_modules/@azure/arm-cognitiveservices/dist/arm-cognitiveservices.js"></script>
+    <script>
+      const subscriptionId = "<Subscription_Id>";
+      const authManager = new msAuth.AuthManager({
+        clientId: "<client id for your Azure AD app>",
+        tenant: "<optional tenant for your organization>"
+      });
+      authManager.finalizeLogin().then((res) => {
+        if (!res.isLoggedIn) {
+          // may cause redirects
+          authManager.login();
+        }
+        const client = new Azure.ArmCognitiveservices.CognitiveServicesManagementClient(res.creds, subscriptionId);
+        const resourceGroupName = "testresourceGroupName";
+        const accountName = "testaccountName";
+        client.accounts.getProperties(resourceGroupName, accountName).then((result) => {
+          console.log("The result is:");
+          console.log(result);
+        }).catch((err) => {
+          console.log("An error occurred:");
+          console.error(err);
+        });
+      });
+    </script>
+  </head>
+  <body>
+  </body>
+</html>
+```
+
+# Related projects
+ - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
diff --git a/packages/@azure/cognitiveservices-face/README.md b/packages/@azure/cognitiveservices-face/README.md
index d6c866babab6..e3044e1dd5ae 100644
--- a/packages/@azure/cognitiveservices-face/README.md
+++ b/packages/@azure/cognitiveservices-face/README.md
@@ -20,18 +20,19 @@ npm install @azure/cognitiveservices-face
 
 ```ts
 import * as msRest from "ms-rest-js";
+import * as msRestNodeAuth from "ms-rest-nodeauth";
 import { FaceClient, FaceModels, FaceMappers } from "@azure/cognitiveservices-face";
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
 
-const token = "<access_token>";
-const creds = new msRest.TokenCredentials(token);
-const client = new FaceClient(creds, subscriptionId);
-const personGroupId = "testpersonGroupId";
-const start = "teststart";
-const top = 1;
-client.personGroupPerson.list(personGroupId, start, top).then((result) => {
-  console.log("The result is:");
-  console.log(result);
+msRestNodeAuth.interactiveLogin().then((creds) => {
+  const client = new FaceClient(creds, subscriptionId);
+  const personGroupId = "testpersonGroupId";
+  const start = "teststart";
+  const top = 1;
+  client.personGroupPerson.list(personGroupId, start, top).then((result) => {
+    console.log("The result is:");
+    console.log(result);
+  });
 }).catch((err) => {
   console.error(err);
 });
@@ -45,21 +46,31 @@ client.personGroupPerson.list(personGroupId, start, top).then((result) => {
 <html lang="en">
   <head>
     <title>@azure/cognitiveservices-face sample</title>
-    <script type="text/javascript" src="./node_modules/ms-rest-js/dist/msRest.browser.js"></script>
-    <script type="text/javascript" src="./dist/cognitiveservices-face.js"></script>
+    <script src="node_modules/ms-rest-js/dist/msRest.browser.js"></script>
+    <script src="node_modules/ms-rest-browserauth/dist/msAuth.js"></script>
+    <script src="node_modules/@azure/cognitiveservices-face/dist/cognitiveservices-face.js"></script>
     <script type="text/javascript">
       const subscriptionId = "<Subscription_Id>";
-      const token = "<access_token>";
-      const creds = new msRest.TokenCredentials(token);
-      const client = new Azure.CognitiveservicesFace.FaceClient(creds, subscriptionId);
-      const personGroupId = "testpersonGroupId";
-      const start = "teststart";
-      const top = 1;
-      client.personGroupPerson.list(personGroupId, start, top).then((result) => {
-        console.log("The result is:");
-        console.log(result);
-      }).catch((err) => {
-        console.error(err);
+      const authManager = new msAuth.AuthManager({
+        clientId: "<client id for your Azure AD app>",
+        tenant: "<optional tenant for your organization>"
+      });
+      authManager.finalizeLogin().then((res) => {
+        if (!res.isLoggedIn) {
+          // may cause redirects
+          authManager.login();
+        }
+        const client = new Azure.CognitiveservicesFace.FaceClient(res.creds, subscriptionId);
+        const personGroupId = "testpersonGroupId";
+        const start = "teststart";
+        const top = 1;
+        client.personGroupPerson.list(personGroupId, start, top).then((result) => {
+          console.log("The result is:");
+          console.log(result);
+        }).catch((err) => {
+          console.log("An error occurred:");
+          console.error(err);
+        });
       });
     </script>
   </head>
diff --git a/packages/@azure/cognitiveservices-face/lib/faceClientContext.ts b/packages/@azure/cognitiveservices-face/lib/faceClientContext.ts
index 5a0f7221da02..d1a69d729ebd 100644
--- a/packages/@azure/cognitiveservices-face/lib/faceClientContext.ts
+++ b/packages/@azure/cognitiveservices-face/lib/faceClientContext.ts
@@ -11,7 +11,7 @@
 import * as msRest from "ms-rest-js";
 
 const packageName = "@azure/cognitiveservices-face";
-const packageVersion = "1.0.0";
+const packageVersion = "0.1.0";
 
 export class FaceClientContext extends msRest.ServiceClient {
   endpoint: string;
@@ -35,6 +35,10 @@ export class FaceClientContext extends msRest.ServiceClient {
     if (!options) {
       options = {};
     }
+    if(!options.userAgent) {
+      const defaultUserAgent = msRest.getDefaultUserAgentValue();
+      options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
+    }
 
     super(credentials, options);
 
@@ -43,6 +47,5 @@ export class FaceClientContext extends msRest.ServiceClient {
     this.endpoint = endpoint;
     this.credentials = credentials;
 
-    this.addUserAgentInfo(`${packageName}/${packageVersion}`);
   }
 }
diff --git a/packages/@azure/cognitiveservices-face/lib/models/index.ts b/packages/@azure/cognitiveservices-face/lib/models/index.ts
index edb81419a647..2152fe73a11c 100644
--- a/packages/@azure/cognitiveservices-face/lib/models/index.ts
+++ b/packages/@azure/cognitiveservices-face/lib/models/index.ts
@@ -1740,43 +1740,23 @@ export interface LargeFaceListAddFaceFromStreamOptionalParams extends msRest.Req
  * @readonly
  * @enum {string}
  */
-export enum Gender {
-  Male = 'male',
-  Female = 'female',
-  Genderless = 'genderless',
-}
+export type Gender = 'male' | 'female' | 'genderless';
 
 /**
  * Defines values for GlassesType.
- * Possible values include: 'noGlasses', 'readingGlasses', 'sunglasses',
- * 'swimmingGoggles'
+ * Possible values include: 'noGlasses', 'readingGlasses', 'sunglasses', 'swimmingGoggles'
  * @readonly
  * @enum {string}
  */
-export enum GlassesType {
-  NoGlasses = 'noGlasses',
-  ReadingGlasses = 'readingGlasses',
-  Sunglasses = 'sunglasses',
-  SwimmingGoggles = 'swimmingGoggles',
-}
+export type GlassesType = 'noGlasses' | 'readingGlasses' | 'sunglasses' | 'swimmingGoggles';
 
 /**
  * Defines values for HairColorType.
- * Possible values include: 'unknown', 'white', 'gray', 'blond', 'brown',
- * 'red', 'black', 'other'
+ * Possible values include: 'unknown', 'white', 'gray', 'blond', 'brown', 'red', 'black', 'other'
  * @readonly
  * @enum {string}
  */
-export enum HairColorType {
-  Unknown = 'unknown',
-  White = 'white',
-  Gray = 'gray',
-  Blond = 'blond',
-  Brown = 'brown',
-  Red = 'red',
-  Black = 'black',
-  Other = 'other',
-}
+export type HairColorType = 'unknown' | 'white' | 'gray' | 'blond' | 'brown' | 'red' | 'black' | 'other';
 
 /**
  * Defines values for AccessoryType.
@@ -1784,11 +1764,7 @@ export enum HairColorType {
  * @readonly
  * @enum {string}
  */
-export enum AccessoryType {
-  HeadWear = 'headWear',
-  Glasses = 'glasses',
-  Mask = 'mask',
-}
+export type AccessoryType = 'headWear' | 'glasses' | 'mask';
 
 /**
  * Defines values for BlurLevel.
@@ -1796,11 +1772,7 @@ export enum AccessoryType {
  * @readonly
  * @enum {string}
  */
-export enum BlurLevel {
-  Low = 'Low',
-  Medium = 'Medium',
-  High = 'High',
-}
+export type BlurLevel = 'Low' | 'Medium' | 'High';
 
 /**
  * Defines values for ExposureLevel.
@@ -1808,11 +1780,7 @@ export enum BlurLevel {
  * @readonly
  * @enum {string}
  */
-export enum ExposureLevel {
-  UnderExposure = 'UnderExposure',
-  GoodExposure = 'GoodExposure',
-  OverExposure = 'OverExposure',
-}
+export type ExposureLevel = 'UnderExposure' | 'GoodExposure' | 'OverExposure';
 
 /**
  * Defines values for NoiseLevel.
@@ -1820,11 +1788,7 @@ export enum ExposureLevel {
  * @readonly
  * @enum {string}
  */
-export enum NoiseLevel {
-  Low = 'Low',
-  Medium = 'Medium',
-  High = 'High',
-}
+export type NoiseLevel = 'Low' | 'Medium' | 'High';
 
 /**
  * Defines values for FindSimilarMatchMode.
@@ -1832,10 +1796,7 @@ export enum NoiseLevel {
  * @readonly
  * @enum {string}
  */
-export enum FindSimilarMatchMode {
-  MatchPerson = 'matchPerson',
-  MatchFace = 'matchFace',
-}
+export type FindSimilarMatchMode = 'matchPerson' | 'matchFace';
 
 /**
  * Defines values for TrainingStatusType.
@@ -1843,37 +1804,16 @@ export enum FindSimilarMatchMode {
  * @readonly
  * @enum {string}
  */
-export enum TrainingStatusType {
-  Nonstarted = 'nonstarted',
-  Running = 'running',
-  Succeeded = 'succeeded',
-  Failed = 'failed',
-}
+export type TrainingStatusType = 'nonstarted' | 'running' | 'succeeded' | 'failed';
 
 /**
  * Defines values for FaceAttributeType.
- * Possible values include: 'age', 'gender', 'headPose', 'smile', 'facialHair',
- * 'glasses', 'emotion', 'hair', 'makeup', 'occlusion', 'accessories', 'blur',
- * 'exposure', 'noise'
+ * Possible values include: 'age', 'gender', 'headPose', 'smile', 'facialHair', 'glasses',
+ * 'emotion', 'hair', 'makeup', 'occlusion', 'accessories', 'blur', 'exposure', 'noise'
  * @readonly
  * @enum {string}
  */
-export enum FaceAttributeType {
-  Age = 'age',
-  Gender = 'gender',
-  HeadPose = 'headPose',
-  Smile = 'smile',
-  FacialHair = 'facialHair',
-  Glasses = 'glasses',
-  Emotion = 'emotion',
-  Hair = 'hair',
-  Makeup = 'makeup',
-  Occlusion = 'occlusion',
-  Accessories = 'accessories',
-  Blur = 'blur',
-  Exposure = 'exposure',
-  Noise = 'noise',
-}
+export type FaceAttributeType = 'age' | 'gender' | 'headPose' | 'smile' | 'facialHair' | 'glasses' | 'emotion' | 'hair' | 'makeup' | 'occlusion' | 'accessories' | 'blur' | 'exposure' | 'noise';
 
 /**
  * Contains response data for the findSimilar operation.
diff --git a/packages/@azure/cognitiveservices-face/lib/operations/face.ts b/packages/@azure/cognitiveservices-face/lib/operations/face.ts
index f1e0dad0a848..dc711e459624 100644
--- a/packages/@azure/cognitiveservices-face/lib/operations/face.ts
+++ b/packages/@azure/cognitiveservices-face/lib/operations/face.ts
@@ -48,7 +48,7 @@ export class Face {
    * @param callback The callback
    */
   findSimilar(faceId: string, options: Models.FaceFindSimilarOptionalParams, callback: msRest.ServiceCallback<Models.SimilarFace[]>): void;
-  findSimilar(faceId: string, options?: Models.FaceFindSimilarOptionalParams, callback?: msRest.ServiceCallback<Models.SimilarFace[]>): Promise<Models.FaceFindSimilarResponse> {
+  findSimilar(faceId: string, options?: Models.FaceFindSimilarOptionalParams | msRest.ServiceCallback<Models.SimilarFace[]>, callback?: msRest.ServiceCallback<Models.SimilarFace[]>): Promise<Models.FaceFindSimilarResponse> {
     return this.client.sendOperationRequest(
       {
         faceId,
@@ -76,7 +76,7 @@ export class Face {
    * @param callback The callback
    */
   group(faceIds: string[], options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupResult>): void;
-  group(faceIds: string[], options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.GroupResult>): Promise<Models.FaceGroupResponse> {
+  group(faceIds: string[], options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupResult>, callback?: msRest.ServiceCallback<Models.GroupResult>): Promise<Models.FaceGroupResponse> {
     return this.client.sendOperationRequest(
       {
         faceIds,
@@ -108,7 +108,7 @@ export class Face {
    * @param callback The callback
    */
   identify(faceIds: string[], options: Models.FaceIdentifyOptionalParams, callback: msRest.ServiceCallback<Models.IdentifyResult[]>): void;
-  identify(faceIds: string[], options?: Models.FaceIdentifyOptionalParams, callback?: msRest.ServiceCallback<Models.IdentifyResult[]>): Promise<Models.FaceIdentifyResponse> {
+  identify(faceIds: string[], options?: Models.FaceIdentifyOptionalParams | msRest.ServiceCallback<Models.IdentifyResult[]>, callback?: msRest.ServiceCallback<Models.IdentifyResult[]>): Promise<Models.FaceIdentifyResponse> {
     return this.client.sendOperationRequest(
       {
         faceIds,
@@ -139,7 +139,7 @@ export class Face {
    * @param callback The callback
    */
   verifyFaceToFace(faceId1: string, faceId2: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.VerifyResult>): void;
-  verifyFaceToFace(faceId1: string, faceId2: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.VerifyResult>): Promise<Models.FaceVerifyFaceToFaceResponse> {
+  verifyFaceToFace(faceId1: string, faceId2: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.VerifyResult>, callback?: msRest.ServiceCallback<Models.VerifyResult>): Promise<Models.FaceVerifyFaceToFaceResponse> {
     return this.client.sendOperationRequest(
       {
         faceId1,
@@ -169,7 +169,7 @@ export class Face {
    * @param callback The callback
    */
   detectWithUrl(url: string, options: Models.FaceDetectWithUrlOptionalParams, callback: msRest.ServiceCallback<Models.DetectedFace[]>): void;
-  detectWithUrl(url: string, options?: Models.FaceDetectWithUrlOptionalParams, callback?: msRest.ServiceCallback<Models.DetectedFace[]>): Promise<Models.FaceDetectWithUrlResponse> {
+  detectWithUrl(url: string, options?: Models.FaceDetectWithUrlOptionalParams | msRest.ServiceCallback<Models.DetectedFace[]>, callback?: msRest.ServiceCallback<Models.DetectedFace[]>): Promise<Models.FaceDetectWithUrlResponse> {
     return this.client.sendOperationRequest(
       {
         url,
@@ -203,7 +203,7 @@ export class Face {
    * @param callback The callback
    */
   verifyFaceToPerson(faceId: string, personId: string, options: Models.FaceVerifyFaceToPersonOptionalParams, callback: msRest.ServiceCallback<Models.VerifyResult>): void;
-  verifyFaceToPerson(faceId: string, personId: string, options?: Models.FaceVerifyFaceToPersonOptionalParams, callback?: msRest.ServiceCallback<Models.VerifyResult>): Promise<Models.FaceVerifyFaceToPersonResponse> {
+  verifyFaceToPerson(faceId: string, personId: string, options?: Models.FaceVerifyFaceToPersonOptionalParams | msRest.ServiceCallback<Models.VerifyResult>, callback?: msRest.ServiceCallback<Models.VerifyResult>): Promise<Models.FaceVerifyFaceToPersonResponse> {
     return this.client.sendOperationRequest(
       {
         faceId,
@@ -233,7 +233,7 @@ export class Face {
    * @param callback The callback
    */
   detectWithStream(image: msRest.HttpRequestBody, options: Models.FaceDetectWithStreamOptionalParams, callback: msRest.ServiceCallback<Models.DetectedFace[]>): void;
-  detectWithStream(image: msRest.HttpRequestBody, options?: Models.FaceDetectWithStreamOptionalParams, callback?: msRest.ServiceCallback<Models.DetectedFace[]>): Promise<Models.FaceDetectWithStreamResponse> {
+  detectWithStream(image: msRest.HttpRequestBody, options?: Models.FaceDetectWithStreamOptionalParams | msRest.ServiceCallback<Models.DetectedFace[]>, callback?: msRest.ServiceCallback<Models.DetectedFace[]>): Promise<Models.FaceDetectWithStreamResponse> {
     return this.client.sendOperationRequest(
       {
         image,
diff --git a/packages/@azure/cognitiveservices-face/lib/operations/faceListOperations.ts b/packages/@azure/cognitiveservices-face/lib/operations/faceListOperations.ts
index f38f11cfd5ba..0033fad7e938 100644
--- a/packages/@azure/cognitiveservices-face/lib/operations/faceListOperations.ts
+++ b/packages/@azure/cognitiveservices-face/lib/operations/faceListOperations.ts
@@ -44,7 +44,7 @@ export class FaceListOperations {
    * @param callback The callback
    */
   create(faceListId: string, options: Models.FaceListCreateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  create(faceListId: string, options?: Models.FaceListCreateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  create(faceListId: string, options?: Models.FaceListCreateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         faceListId,
@@ -72,7 +72,7 @@ export class FaceListOperations {
    * @param callback The callback
    */
   get(faceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.FaceList>): void;
-  get(faceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.FaceList>): Promise<Models.FaceListGetResponse> {
+  get(faceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.FaceList>, callback?: msRest.ServiceCallback<Models.FaceList>): Promise<Models.FaceListGetResponse> {
     return this.client.sendOperationRequest(
       {
         faceListId,
@@ -100,7 +100,7 @@ export class FaceListOperations {
    * @param callback The callback
    */
   update(faceListId: string, options: Models.FaceListUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(faceListId: string, options?: Models.FaceListUpdateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(faceListId: string, options?: Models.FaceListUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         faceListId,
@@ -129,7 +129,7 @@ export class FaceListOperations {
    * @param callback The callback
    */
   deleteMethod(faceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(faceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(faceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         faceListId,
@@ -155,7 +155,7 @@ export class FaceListOperations {
    * @param callback The callback
    */
   list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.FaceList[]>): void;
-  list(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.FaceList[]>): Promise<Models.FaceListListResponse> {
+  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.FaceList[]>, callback?: msRest.ServiceCallback<Models.FaceList[]>): Promise<Models.FaceListListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -186,7 +186,7 @@ export class FaceListOperations {
    * @param callback The callback
    */
   deleteFace(faceListId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteFace(faceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteFace(faceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         faceListId,
@@ -219,7 +219,7 @@ export class FaceListOperations {
    * @param callback The callback
    */
   addFaceFromUrl(faceListId: string, url: string, options: Models.FaceListAddFaceFromUrlOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  addFaceFromUrl(faceListId: string, url: string, options?: Models.FaceListAddFaceFromUrlOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.FaceListAddFaceFromUrlResponse> {
+  addFaceFromUrl(faceListId: string, url: string, options?: Models.FaceListAddFaceFromUrlOptionalParams | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.FaceListAddFaceFromUrlResponse> {
     return this.client.sendOperationRequest(
       {
         faceListId,
@@ -252,7 +252,7 @@ export class FaceListOperations {
    * @param callback The callback
    */
   addFaceFromStream(faceListId: string, image: msRest.HttpRequestBody, options: Models.FaceListAddFaceFromStreamOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  addFaceFromStream(faceListId: string, image: msRest.HttpRequestBody, options?: Models.FaceListAddFaceFromStreamOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.FaceListAddFaceFromStreamResponse> {
+  addFaceFromStream(faceListId: string, image: msRest.HttpRequestBody, options?: Models.FaceListAddFaceFromStreamOptionalParams | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.FaceListAddFaceFromStreamResponse> {
     return this.client.sendOperationRequest(
       {
         faceListId,
diff --git a/packages/@azure/cognitiveservices-face/lib/operations/largeFaceListOperations.ts b/packages/@azure/cognitiveservices-face/lib/operations/largeFaceListOperations.ts
index 6971b752285d..9988d40df3aa 100644
--- a/packages/@azure/cognitiveservices-face/lib/operations/largeFaceListOperations.ts
+++ b/packages/@azure/cognitiveservices-face/lib/operations/largeFaceListOperations.ts
@@ -45,7 +45,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   create(largeFaceListId: string, options: Models.LargeFaceListCreateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  create(largeFaceListId: string, options?: Models.LargeFaceListCreateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  create(largeFaceListId: string, options?: Models.LargeFaceListCreateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -73,7 +73,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   get(largeFaceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LargeFaceList>): void;
-  get(largeFaceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LargeFaceList>): Promise<Models.LargeFaceListGetResponse> {
+  get(largeFaceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LargeFaceList>, callback?: msRest.ServiceCallback<Models.LargeFaceList>): Promise<Models.LargeFaceListGetResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -101,7 +101,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   update(largeFaceListId: string, options: Models.LargeFaceListUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(largeFaceListId: string, options?: Models.LargeFaceListUpdateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(largeFaceListId: string, options?: Models.LargeFaceListUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -130,7 +130,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   deleteMethod(largeFaceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(largeFaceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(largeFaceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -158,7 +158,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   getTrainingStatus(largeFaceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TrainingStatus>): void;
-  getTrainingStatus(largeFaceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TrainingStatus>): Promise<Models.LargeFaceListGetTrainingStatusResponse> {
+  getTrainingStatus(largeFaceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TrainingStatus>, callback?: msRest.ServiceCallback<Models.TrainingStatus>): Promise<Models.LargeFaceListGetTrainingStatusResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -184,7 +184,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LargeFaceList[]>): void;
-  list(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LargeFaceList[]>): Promise<Models.LargeFaceListListResponse> {
+  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LargeFaceList[]>, callback?: msRest.ServiceCallback<Models.LargeFaceList[]>): Promise<Models.LargeFaceListListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -211,7 +211,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   train(largeFaceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  train(largeFaceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  train(largeFaceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -243,7 +243,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   deleteFace(largeFaceListId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteFace(largeFaceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteFace(largeFaceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -276,7 +276,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   getFace(largeFaceListId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  getFace(largeFaceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargeFaceListGetFaceResponse> {
+  getFace(largeFaceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargeFaceListGetFaceResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -308,7 +308,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   updateFace(largeFaceListId: string, persistedFaceId: string, options: Models.LargeFaceListUpdateFaceOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  updateFace(largeFaceListId: string, persistedFaceId: string, options?: Models.LargeFaceListUpdateFaceOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  updateFace(largeFaceListId: string, persistedFaceId: string, options?: Models.LargeFaceListUpdateFaceOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -342,7 +342,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   addFaceFromUrl(largeFaceListId: string, url: string, options: Models.LargeFaceListAddFaceFromUrlOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  addFaceFromUrl(largeFaceListId: string, url: string, options?: Models.LargeFaceListAddFaceFromUrlOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargeFaceListAddFaceFromUrlResponse> {
+  addFaceFromUrl(largeFaceListId: string, url: string, options?: Models.LargeFaceListAddFaceFromUrlOptionalParams | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargeFaceListAddFaceFromUrlResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -372,7 +372,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   listFaces(largeFaceListId: string, options: Models.LargeFaceListListFacesOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace[]>): void;
-  listFaces(largeFaceListId: string, options?: Models.LargeFaceListListFacesOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace[]>): Promise<Models.LargeFaceListListFacesResponse> {
+  listFaces(largeFaceListId: string, options?: Models.LargeFaceListListFacesOptionalParams | msRest.ServiceCallback<Models.PersistedFace[]>, callback?: msRest.ServiceCallback<Models.PersistedFace[]>): Promise<Models.LargeFaceListListFacesResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
@@ -405,7 +405,7 @@ export class LargeFaceListOperations {
    * @param callback The callback
    */
   addFaceFromStream(largeFaceListId: string, image: msRest.HttpRequestBody, options: Models.LargeFaceListAddFaceFromStreamOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  addFaceFromStream(largeFaceListId: string, image: msRest.HttpRequestBody, options?: Models.LargeFaceListAddFaceFromStreamOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargeFaceListAddFaceFromStreamResponse> {
+  addFaceFromStream(largeFaceListId: string, image: msRest.HttpRequestBody, options?: Models.LargeFaceListAddFaceFromStreamOptionalParams | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargeFaceListAddFaceFromStreamResponse> {
     return this.client.sendOperationRequest(
       {
         largeFaceListId,
diff --git a/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupOperations.ts b/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupOperations.ts
index bfedff478382..59e6a9c5137a 100644
--- a/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupOperations.ts
+++ b/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupOperations.ts
@@ -45,7 +45,7 @@ export class LargePersonGroupOperations {
    * @param callback The callback
    */
   create(largePersonGroupId: string, options: Models.LargePersonGroupCreateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  create(largePersonGroupId: string, options?: Models.LargePersonGroupCreateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  create(largePersonGroupId: string, options?: Models.LargePersonGroupCreateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -74,7 +74,7 @@ export class LargePersonGroupOperations {
    * @param callback The callback
    */
   deleteMethod(largePersonGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(largePersonGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(largePersonGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -102,7 +102,7 @@ export class LargePersonGroupOperations {
    * @param callback The callback
    */
   get(largePersonGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LargePersonGroup>): void;
-  get(largePersonGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LargePersonGroup>): Promise<Models.LargePersonGroupGetResponse> {
+  get(largePersonGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LargePersonGroup>, callback?: msRest.ServiceCallback<Models.LargePersonGroup>): Promise<Models.LargePersonGroupGetResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -131,7 +131,7 @@ export class LargePersonGroupOperations {
    * @param callback The callback
    */
   update(largePersonGroupId: string, options: Models.LargePersonGroupUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(largePersonGroupId: string, options?: Models.LargePersonGroupUpdateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(largePersonGroupId: string, options?: Models.LargePersonGroupUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -159,7 +159,7 @@ export class LargePersonGroupOperations {
    * @param callback The callback
    */
   getTrainingStatus(largePersonGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TrainingStatus>): void;
-  getTrainingStatus(largePersonGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TrainingStatus>): Promise<Models.LargePersonGroupGetTrainingStatusResponse> {
+  getTrainingStatus(largePersonGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TrainingStatus>, callback?: msRest.ServiceCallback<Models.TrainingStatus>): Promise<Models.LargePersonGroupGetTrainingStatusResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -184,7 +184,7 @@ export class LargePersonGroupOperations {
    * @param callback The callback
    */
   list(options: Models.LargePersonGroupListOptionalParams, callback: msRest.ServiceCallback<Models.LargePersonGroup[]>): void;
-  list(options?: Models.LargePersonGroupListOptionalParams, callback?: msRest.ServiceCallback<Models.LargePersonGroup[]>): Promise<Models.LargePersonGroupListResponse> {
+  list(options?: Models.LargePersonGroupListOptionalParams | msRest.ServiceCallback<Models.LargePersonGroup[]>, callback?: msRest.ServiceCallback<Models.LargePersonGroup[]>): Promise<Models.LargePersonGroupListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -211,7 +211,7 @@ export class LargePersonGroupOperations {
    * @param callback The callback
    */
   train(largePersonGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  train(largePersonGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  train(largePersonGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
diff --git a/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupPerson.ts b/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupPerson.ts
index e0c94641a31f..990dd5098401 100644
--- a/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupPerson.ts
+++ b/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupPerson.ts
@@ -44,7 +44,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   create(largePersonGroupId: string, options: Models.LargePersonGroupPersonCreateOptionalParams, callback: msRest.ServiceCallback<Models.Person>): void;
-  create(largePersonGroupId: string, options?: Models.LargePersonGroupPersonCreateOptionalParams, callback?: msRest.ServiceCallback<Models.Person>): Promise<Models.LargePersonGroupPersonCreateResponse> {
+  create(largePersonGroupId: string, options?: Models.LargePersonGroupPersonCreateOptionalParams | msRest.ServiceCallback<Models.Person>, callback?: msRest.ServiceCallback<Models.Person>): Promise<Models.LargePersonGroupPersonCreateResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -73,7 +73,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   list(largePersonGroupId: string, options: Models.LargePersonGroupPersonListOptionalParams, callback: msRest.ServiceCallback<Models.Person[]>): void;
-  list(largePersonGroupId: string, options?: Models.LargePersonGroupPersonListOptionalParams, callback?: msRest.ServiceCallback<Models.Person[]>): Promise<Models.LargePersonGroupPersonListResponse> {
+  list(largePersonGroupId: string, options?: Models.LargePersonGroupPersonListOptionalParams | msRest.ServiceCallback<Models.Person[]>, callback?: msRest.ServiceCallback<Models.Person[]>): Promise<Models.LargePersonGroupPersonListResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -105,7 +105,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   deleteMethod(largePersonGroupId: string, personId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(largePersonGroupId: string, personId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(largePersonGroupId: string, personId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -137,7 +137,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   get(largePersonGroupId: string, personId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Person>): void;
-  get(largePersonGroupId: string, personId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.Person>): Promise<Models.LargePersonGroupPersonGetResponse> {
+  get(largePersonGroupId: string, personId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Person>, callback?: msRest.ServiceCallback<Models.Person>): Promise<Models.LargePersonGroupPersonGetResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -169,7 +169,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   update(largePersonGroupId: string, personId: string, options: Models.LargePersonGroupPersonUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(largePersonGroupId: string, personId: string, options?: Models.LargePersonGroupPersonUpdateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(largePersonGroupId: string, personId: string, options?: Models.LargePersonGroupPersonUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -204,7 +204,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   deleteFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -241,7 +241,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   getFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  getFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargePersonGroupPersonGetFaceResponse> {
+  getFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargePersonGroupPersonGetFaceResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -277,7 +277,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   updateFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options: Models.LargePersonGroupPersonUpdateFaceOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  updateFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: Models.LargePersonGroupPersonUpdateFaceOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  updateFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: Models.LargePersonGroupPersonUpdateFaceOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -314,7 +314,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   addFaceFromUrl(largePersonGroupId: string, personId: string, url: string, options: Models.LargePersonGroupPersonAddFaceFromUrlOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  addFaceFromUrl(largePersonGroupId: string, personId: string, url: string, options?: Models.LargePersonGroupPersonAddFaceFromUrlOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargePersonGroupPersonAddFaceFromUrlResponse> {
+  addFaceFromUrl(largePersonGroupId: string, personId: string, url: string, options?: Models.LargePersonGroupPersonAddFaceFromUrlOptionalParams | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargePersonGroupPersonAddFaceFromUrlResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
@@ -351,7 +351,7 @@ export class LargePersonGroupPerson {
    * @param callback The callback
    */
   addFaceFromStream(largePersonGroupId: string, personId: string, image: msRest.HttpRequestBody, options: Models.LargePersonGroupPersonAddFaceFromStreamOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  addFaceFromStream(largePersonGroupId: string, personId: string, image: msRest.HttpRequestBody, options?: Models.LargePersonGroupPersonAddFaceFromStreamOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargePersonGroupPersonAddFaceFromStreamResponse> {
+  addFaceFromStream(largePersonGroupId: string, personId: string, image: msRest.HttpRequestBody, options?: Models.LargePersonGroupPersonAddFaceFromStreamOptionalParams | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.LargePersonGroupPersonAddFaceFromStreamResponse> {
     return this.client.sendOperationRequest(
       {
         largePersonGroupId,
diff --git a/packages/@azure/cognitiveservices-face/lib/operations/personGroupOperations.ts b/packages/@azure/cognitiveservices-face/lib/operations/personGroupOperations.ts
index 58b547ce5353..df2778f5b356 100644
--- a/packages/@azure/cognitiveservices-face/lib/operations/personGroupOperations.ts
+++ b/packages/@azure/cognitiveservices-face/lib/operations/personGroupOperations.ts
@@ -44,7 +44,7 @@ export class PersonGroupOperations {
    * @param callback The callback
    */
   create(personGroupId: string, options: Models.PersonGroupCreateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  create(personGroupId: string, options?: Models.PersonGroupCreateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  create(personGroupId: string, options?: Models.PersonGroupCreateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -73,7 +73,7 @@ export class PersonGroupOperations {
    * @param callback The callback
    */
   deleteMethod(personGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(personGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(personGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -101,7 +101,7 @@ export class PersonGroupOperations {
    * @param callback The callback
    */
   get(personGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PersonGroup>): void;
-  get(personGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PersonGroup>): Promise<Models.PersonGroupGetResponse> {
+  get(personGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PersonGroup>, callback?: msRest.ServiceCallback<Models.PersonGroup>): Promise<Models.PersonGroupGetResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -130,7 +130,7 @@ export class PersonGroupOperations {
    * @param callback The callback
    */
   update(personGroupId: string, options: Models.PersonGroupUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(personGroupId: string, options?: Models.PersonGroupUpdateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(personGroupId: string, options?: Models.PersonGroupUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -158,7 +158,7 @@ export class PersonGroupOperations {
    * @param callback The callback
    */
   getTrainingStatus(personGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TrainingStatus>): void;
-  getTrainingStatus(personGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TrainingStatus>): Promise<Models.PersonGroupGetTrainingStatusResponse> {
+  getTrainingStatus(personGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TrainingStatus>, callback?: msRest.ServiceCallback<Models.TrainingStatus>): Promise<Models.PersonGroupGetTrainingStatusResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -183,7 +183,7 @@ export class PersonGroupOperations {
    * @param callback The callback
    */
   list(options: Models.PersonGroupListOptionalParams, callback: msRest.ServiceCallback<Models.PersonGroup[]>): void;
-  list(options?: Models.PersonGroupListOptionalParams, callback?: msRest.ServiceCallback<Models.PersonGroup[]>): Promise<Models.PersonGroupListResponse> {
+  list(options?: Models.PersonGroupListOptionalParams | msRest.ServiceCallback<Models.PersonGroup[]>, callback?: msRest.ServiceCallback<Models.PersonGroup[]>): Promise<Models.PersonGroupListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -210,7 +210,7 @@ export class PersonGroupOperations {
    * @param callback The callback
    */
   train(personGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  train(personGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  train(personGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
diff --git a/packages/@azure/cognitiveservices-face/lib/operations/personGroupPerson.ts b/packages/@azure/cognitiveservices-face/lib/operations/personGroupPerson.ts
index bc61ac26e3a1..05b49c116372 100644
--- a/packages/@azure/cognitiveservices-face/lib/operations/personGroupPerson.ts
+++ b/packages/@azure/cognitiveservices-face/lib/operations/personGroupPerson.ts
@@ -44,7 +44,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   create(personGroupId: string, options: Models.PersonGroupPersonCreateOptionalParams, callback: msRest.ServiceCallback<Models.Person>): void;
-  create(personGroupId: string, options?: Models.PersonGroupPersonCreateOptionalParams, callback?: msRest.ServiceCallback<Models.Person>): Promise<Models.PersonGroupPersonCreateResponse> {
+  create(personGroupId: string, options?: Models.PersonGroupPersonCreateOptionalParams | msRest.ServiceCallback<Models.Person>, callback?: msRest.ServiceCallback<Models.Person>): Promise<Models.PersonGroupPersonCreateResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -73,7 +73,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   list(personGroupId: string, options: Models.PersonGroupPersonListOptionalParams, callback: msRest.ServiceCallback<Models.Person[]>): void;
-  list(personGroupId: string, options?: Models.PersonGroupPersonListOptionalParams, callback?: msRest.ServiceCallback<Models.Person[]>): Promise<Models.PersonGroupPersonListResponse> {
+  list(personGroupId: string, options?: Models.PersonGroupPersonListOptionalParams | msRest.ServiceCallback<Models.Person[]>, callback?: msRest.ServiceCallback<Models.Person[]>): Promise<Models.PersonGroupPersonListResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -105,7 +105,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   deleteMethod(personGroupId: string, personId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(personGroupId: string, personId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(personGroupId: string, personId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -137,7 +137,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   get(personGroupId: string, personId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Person>): void;
-  get(personGroupId: string, personId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.Person>): Promise<Models.PersonGroupPersonGetResponse> {
+  get(personGroupId: string, personId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Person>, callback?: msRest.ServiceCallback<Models.Person>): Promise<Models.PersonGroupPersonGetResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -169,7 +169,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   update(personGroupId: string, personId: string, options: Models.PersonGroupPersonUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(personGroupId: string, personId: string, options?: Models.PersonGroupPersonUpdateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(personGroupId: string, personId: string, options?: Models.PersonGroupPersonUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -204,7 +204,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   deleteFace(personGroupId: string, personId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteFace(personGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteFace(personGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -241,7 +241,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   getFace(personGroupId: string, personId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  getFace(personGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.PersonGroupPersonGetFaceResponse> {
+  getFace(personGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.PersonGroupPersonGetFaceResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -277,7 +277,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   updateFace(personGroupId: string, personId: string, persistedFaceId: string, options: Models.PersonGroupPersonUpdateFaceOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  updateFace(personGroupId: string, personId: string, persistedFaceId: string, options?: Models.PersonGroupPersonUpdateFaceOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  updateFace(personGroupId: string, personId: string, persistedFaceId: string, options?: Models.PersonGroupPersonUpdateFaceOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -314,7 +314,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   addFaceFromUrl(personGroupId: string, personId: string, url: string, options: Models.PersonGroupPersonAddFaceFromUrlOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  addFaceFromUrl(personGroupId: string, personId: string, url: string, options?: Models.PersonGroupPersonAddFaceFromUrlOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.PersonGroupPersonAddFaceFromUrlResponse> {
+  addFaceFromUrl(personGroupId: string, personId: string, url: string, options?: Models.PersonGroupPersonAddFaceFromUrlOptionalParams | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.PersonGroupPersonAddFaceFromUrlResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
@@ -351,7 +351,7 @@ export class PersonGroupPerson {
    * @param callback The callback
    */
   addFaceFromStream(personGroupId: string, personId: string, image: msRest.HttpRequestBody, options: Models.PersonGroupPersonAddFaceFromStreamOptionalParams, callback: msRest.ServiceCallback<Models.PersistedFace>): void;
-  addFaceFromStream(personGroupId: string, personId: string, image: msRest.HttpRequestBody, options?: Models.PersonGroupPersonAddFaceFromStreamOptionalParams, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.PersonGroupPersonAddFaceFromStreamResponse> {
+  addFaceFromStream(personGroupId: string, personId: string, image: msRest.HttpRequestBody, options?: Models.PersonGroupPersonAddFaceFromStreamOptionalParams | msRest.ServiceCallback<Models.PersistedFace>, callback?: msRest.ServiceCallback<Models.PersistedFace>): Promise<Models.PersonGroupPersonAddFaceFromStreamResponse> {
     return this.client.sendOperationRequest(
       {
         personGroupId,
diff --git a/packages/@azure/cognitiveservices-face/package.json b/packages/@azure/cognitiveservices-face/package.json
index ed86978ad025..d8f0ea3d5669 100644
--- a/packages/@azure/cognitiveservices-face/package.json
+++ b/packages/@azure/cognitiveservices-face/package.json
@@ -4,7 +4,7 @@
   "description": "FaceClient Library with typescript type definitions for node.js and browser.",
   "version": "0.1.0",
   "dependencies": {
-    "ms-rest-js": "^1.0.455",
+    "ms-rest-js": "^1.0.461",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -32,10 +32,23 @@
   "bugs": {
     "url": "https://github.com/azure/azure-sdk-for-js/issues"
   },
+  "files": [
+    "dist/**/*.js",
+    "dist/**/*.js.map",
+    "dist/**/*.d.ts",
+    "dist/**/*.d.ts.map",
+    "esm/**/*.js",
+    "esm/**/*.js.map",
+    "esm/**/*.d.ts",
+    "esm/**/*.d.ts.map",
+    "lib/**/*.ts",
+    "rollup.config.js",
+    "tsconfig.json"
+  ],
   "scripts": {
     "build": "tsc && rollup -c rollup.config.js && npm run minify",
     "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/cognitiveservices-face.js.map'\" -o ./dist/cognitiveservices-face.min.js ./dist/cognitiveservices-face.js",
-    "prepare": "npm run build"
+    "prepack": "npm install && npm run build"
   },
   "sideEffects": false
 }
\ No newline at end of file
diff --git a/packages/@azure/graph/README.md b/packages/@azure/graph/README.md
index 960e011a3112..a6b5947ec87e 100644
--- a/packages/@azure/graph/README.md
+++ b/packages/@azure/graph/README.md
@@ -20,10 +20,10 @@ import * as msRest from "ms-rest-js";
 import * as msRestAzure from "ms-rest-azure-js";
 import * as msRestNodeAuth from "ms-rest-nodeauth";
 import { GraphRbacManagementClient, GraphRbacManagementModels, GraphRbacManagementMappers } from "@azure/graph";
-const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
+const tenantId = process.env["AZURE_TENANT_ID"];
 
 msRestNodeAuth.interactiveLogin().then((creds) => {
-  const client = new GraphRbacManagementClient(creds, subscriptionId);
+  const client = new GraphRbacManagementClient(creds, tenantId);
   client.signedInUser.get().then((result) => {
     console.log("The result is:");
     console.log(result);
@@ -47,7 +47,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
     <script src="node_modules/ms-rest-browserauth/dist/msAuth.js"></script>
     <script src="node_modules/@azure/graph/dist/graph.js"></script>
     <script>
-      const subscriptionId = "<Subscription_Id>";
+      const tenantId = "<Tenant_Id>";
       const authManager = new msAuth.AuthManager({
         clientId: "<client id for your Azure AD app>",
         tenant: "<optional tenant for your organization>"
@@ -57,7 +57,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
           // may cause redirects
           authManager.login();
         }
-        const client = new Azure.Graph.GraphRbacManagementClient(res.creds, subscriptionId);
+        const client = new Azure.Graph.GraphRbacManagementClient(res.creds, tenantId);
         client.signedInUser.get().then((result) => {
           console.log("The result is:");
           console.log(result);