diff --git a/sdk/hanaonazure/arm-hanaonazure/package.json b/sdk/hanaonazure/arm-hanaonazure/package.json
index 317ea53f5a65..1bd156f3fb9d 100644
--- a/sdk/hanaonazure/arm-hanaonazure/package.json
+++ b/sdk/hanaonazure/arm-hanaonazure/package.json
@@ -4,9 +4,9 @@
   "description": "HanaManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "2.2.0",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^1.3.2",
-    "@azure/ms-rest-js": "^1.8.1",
-    "tslib": "^1.9.3"
+    "@azure/ms-rest-azure-js": "^2.0.0",
+    "@azure/ms-rest-js": "^2.0.3",
+    "tslib": "^1.10.0"
   },
   "keywords": [
     "node",
diff --git a/sdk/hanaonazure/arm-hanaonazure/src/models/hanaInstancesMappers.ts b/sdk/hanaonazure/arm-hanaonazure/src/models/hanaInstancesMappers.ts
index f8776c0508d7..665b0c62e27a 100644
--- a/sdk/hanaonazure/arm-hanaonazure/src/models/hanaInstancesMappers.ts
+++ b/sdk/hanaonazure/arm-hanaonazure/src/models/hanaInstancesMappers.ts
@@ -8,14 +8,12 @@
 
 export {
   BaseResource,
-  CloudError,
   Disk,
   ErrorResponse,
   HanaInstance,
   HanaInstancesListResult,
   HardwareProfile,
   IpAddress,
-  MonitoringDetails,
   NetworkProfile,
   OSProfile,
   Resource,
diff --git a/sdk/hanaonazure/arm-hanaonazure/src/models/index.ts b/sdk/hanaonazure/arm-hanaonazure/src/models/index.ts
index 57895bf273d7..b7e22fe72b4a 100644
--- a/sdk/hanaonazure/arm-hanaonazure/src/models/index.ts
+++ b/sdk/hanaonazure/arm-hanaonazure/src/models/index.ts
@@ -334,6 +334,15 @@ export interface SapMonitor extends Resource {
    * Database password of the HANA instance.
    */
   hanaDbPassword?: string;
+  /**
+   * KeyVault URL link to the password for the HANA database.
+   */
+  hanaDbPasswordKeyVaultUrl?: string;
+  /**
+   * MSI ID passed by customer which has access to customer's KeyVault and to be assigned to the
+   * Collector VM.
+   */
+  hanaDbCredentialsMsiId?: string;
   /**
    * State of provisioning of the HanaInstance. Possible values include: 'Accepted', 'Creating',
    * 'Updating', 'Failed', 'Succeeded', 'Deleting', 'Migrating'
diff --git a/sdk/hanaonazure/arm-hanaonazure/src/models/mappers.ts b/sdk/hanaonazure/arm-hanaonazure/src/models/mappers.ts
index d60e194bc69a..c7ccedc13b82 100644
--- a/sdk/hanaonazure/arm-hanaonazure/src/models/mappers.ts
+++ b/sdk/hanaonazure/arm-hanaonazure/src/models/mappers.ts
@@ -505,6 +505,18 @@ export const SapMonitor: msRest.CompositeMapper = {
           name: "String"
         }
       },
+      hanaDbPasswordKeyVaultUrl: {
+        serializedName: "properties.hanaDbPasswordKeyVaultUrl",
+        type: {
+          name: "String"
+        }
+      },
+      hanaDbCredentialsMsiId: {
+        serializedName: "properties.hanaDbCredentialsMsiId",
+        type: {
+          name: "String"
+        }
+      },
       provisioningState: {
         readOnly: true,
         serializedName: "properties.provisioningState",
diff --git a/sdk/hanaonazure/arm-hanaonazure/src/operations/hanaInstances.ts b/sdk/hanaonazure/arm-hanaonazure/src/operations/hanaInstances.ts
index 8c319781d7b1..cfe2e48701a2 100644
--- a/sdk/hanaonazure/arm-hanaonazure/src/operations/hanaInstances.ts
+++ b/sdk/hanaonazure/arm-hanaonazure/src/operations/hanaInstances.ts
@@ -218,19 +218,6 @@ export class HanaInstances {
       .then(lroPoller => lroPoller.pollUntilFinished());
   }
 
-  /**
-   * The operation to add a monitor to an SAP HANA instance.
-   * @param resourceGroupName Name of the resource group.
-   * @param hanaInstanceName Name of the SAP HANA on Azure instance.
-   * @param monitoringParameter Request body that only contains monitoring attributes
-   * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
-   */
-  enableMonitoring(resourceGroupName: string, hanaInstanceName: string, monitoringParameter: Models.MonitoringDetails, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse> {
-    return this.beginEnableMonitoring(resourceGroupName,hanaInstanceName,monitoringParameter,options)
-      .then(lroPoller => lroPoller.pollUntilFinished());
-  }
-
   /**
    * Creates a SAP HANA instance for the specified subscription, resource group, and instance name.
    * @summary Creates a SAP HANA instance.
@@ -325,26 +312,6 @@ export class HanaInstances {
       options);
   }
 
-  /**
-   * The operation to add a monitor to an SAP HANA instance.
-   * @param resourceGroupName Name of the resource group.
-   * @param hanaInstanceName Name of the SAP HANA on Azure instance.
-   * @param monitoringParameter Request body that only contains monitoring attributes
-   * @param [options] The optional parameters
-   * @returns Promise<msRestAzure.LROPoller>
-   */
-  beginEnableMonitoring(resourceGroupName: string, hanaInstanceName: string, monitoringParameter: Models.MonitoringDetails, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
-    return this.client.sendLRORequest(
-      {
-        resourceGroupName,
-        hanaInstanceName,
-        monitoringParameter,
-        options
-      },
-      beginEnableMonitoringOperationSpec,
-      options);
-  }
-
   /**
    * Gets a list of SAP HANA instances in the specified subscription. The operations returns various
    * properties of each SAP HANA on Azure instance.
@@ -644,37 +611,6 @@ const beginShutdownOperationSpec: msRest.OperationSpec = {
   serializer
 };
 
-const beginEnableMonitoringOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/hanaInstances/{hanaInstanceName}/monitoring",
-  urlParameters: [
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.hanaInstanceName
-  ],
-  queryParameters: [
-    Parameters.apiVersion
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  requestBody: {
-    parameterPath: "monitoringParameter",
-    mapper: {
-      ...Mappers.MonitoringDetails,
-      required: true
-    }
-  },
-  responses: {
-    200: {},
-    202: {},
-    default: {
-      bodyMapper: Mappers.CloudError
-    }
-  },
-  serializer
-};
-
 const listNextOperationSpec: msRest.OperationSpec = {
   httpMethod: "GET",
   baseUrl: "https://management.azure.com",
diff --git a/sdk/hanaonazure/arm-hanaonazure/tsconfig.json b/sdk/hanaonazure/arm-hanaonazure/tsconfig.json
index 87bbf5b5fa49..422b584abd5e 100644
--- a/sdk/hanaonazure/arm-hanaonazure/tsconfig.json
+++ b/sdk/hanaonazure/arm-hanaonazure/tsconfig.json
@@ -9,7 +9,7 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
-    "lib": ["es6"],
+    "lib": ["es6", "dom"],
     "declaration": true,
     "outDir": "./esm",
     "importHelpers": true