diff --git a/src/command_modules/azure-cli-advisor/HISTORY.rst b/src/command_modules/azure-cli-advisor/HISTORY.rst
index a0da7a4d05d..889e74614de 100644
--- a/src/command_modules/azure-cli-advisor/HISTORY.rst
+++ b/src/command_modules/azure-cli-advisor/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.0
+++++++
+* GA release.
+
 0.6.0
 +++++
 * BREAKING CHANGE: 'show' commands log error message and fail with exit code of 3 upon a missing resource.
diff --git a/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_resource_group.yaml b/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_resource_group.yaml
index 70cdb9ec6bb..93df0e0a39f 100644
--- a/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_resource_group.yaml
+++ b/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_resource_group.yaml
@@ -1,26 +1,27 @@
 interactions:
 - request:
-    body: '{"location": "westus", "tags": {"use": "az-test"}}'
+    body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation",
+      "date": "2018-10-16T16:36:01Z"}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       CommandName: [group create]
       Connection: [keep-alive]
-      Content-Length: ['50']
+      Content-Length: ['110']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 resourcemanagementclient/1.2.1 Azure-SDK-For-Python
-          AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python
+          AZURECLI/2.0.48]
       accept-language: [en-US]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_advisor000001?api-version=2018-05-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001","name":"cli_test_advisor000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001","name":"cli_test_advisor000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-10-16T16:36:01Z"},"properties":{"provisioningState":"Succeeded"}}'}
     headers:
       cache-control: [no-cache]
-      content-length: ['328']
+      content-length: ['384']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:25:54 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:02 GMT']
       expires: ['-1']
       pragma: [no-cache]
       strict-transport-security: [max-age=31536000; includeSubDomains]
@@ -34,9 +35,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration show]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -46,7 +46,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['514']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:25:56 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:03 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -54,7 +54,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-subscription-resource-requests: ['599']
+      x-ms-ratelimit-remaining-subscription-resource-requests: ['598']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -63,9 +63,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration update]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -75,7 +74,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['514']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:25:57 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:04 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -96,8 +95,8 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['509']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -105,7 +104,7 @@ interactions:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
-      date: ['Mon, 26 Feb 2018 21:25:58 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -120,9 +119,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration show]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -132,7 +130,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['513']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:25:59 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -149,9 +147,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration update]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -161,7 +158,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['513']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:26:00 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -182,8 +179,8 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['510']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -191,7 +188,7 @@ interactions:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
-      date: ['Mon, 26 Feb 2018 21:26:01 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:07 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -206,9 +203,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration show]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor000001/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -218,7 +214,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['514']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:26:03 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:07 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -237,9 +233,9 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 resourcemanagementclient/1.2.1 Azure-SDK-For-Python
-          AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 resourcemanagementclient/2.0.0 Azure-SDK-For-Python
+          AZURECLI/2.0.48]
       accept-language: [en-US]
     method: DELETE
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_advisor000001?api-version=2018-05-01
@@ -248,12 +244,12 @@ interactions:
     headers:
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Mon, 26 Feb 2018 21:26:04 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:08 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGQURWSVNPUjZXNlJCTUJUQklYQTZYTDZETkw1RzRXR0dKNnxFMURERDhBMUE3Q0I1N0M1LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTEk6NUZURVNUOjVGQURWSVNPUkUyMkg0NU5WSVJXU05KVFJXVzRWREFHR1pQQXw3RjExMzQxMkZBNTM4MzQwLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
       pragma: [no-cache]
       strict-transport-security: [max-age=31536000; includeSubDomains]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-deletes: ['14999']
     status: {code: 202, message: Accepted}
 version: 1
diff --git a/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_subscription.yaml b/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_subscription.yaml
index 7a4022fcb05..12a23c37ece 100644
--- a/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_subscription.yaml
+++ b/src/command_modules/azure-cli-advisor/azure/cli/command_modules/advisor/tests/latest/recordings/test_configurations_subscription.yaml
@@ -6,19 +6,18 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration show]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
   response:
-    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258","properties":{"low_cpu_threshold":"5","exclude":false}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme","properties":{"exclude":false}}]}'}
+    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258","properties":{"low_cpu_threshold":"5","exclude":false}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr","properties":{"exclude":false}}]}'}
     headers:
       cache-control: [no-cache]
       content-length: ['798']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:26:06 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:09 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -35,19 +34,18 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration update]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
   response:
-    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258","properties":{"low_cpu_threshold":"5","exclude":false}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisor6w6rbmbtbixa6xl6dnl5g4wggj6wxcvuv2h656wujhxqnhottbgusvinhme","properties":{"exclude":false}}]}'}
+    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258","properties":{"low_cpu_threshold":"5","exclude":false}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr/providers/Microsoft.Advisor/configurations/658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr","type":"Microsoft.Advisor/Configurations","name":"658c8950-e79d-4704-a903-1df66ba90258-cli_test_advisore22h45nvirwsnjtrww4vdaggzpayn7klavyd7jceba4e2kqp7roq2yivksr","properties":{"exclude":false}}]}'}
     headers:
       cache-control: [no-cache]
       content-length: ['798']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:26:07 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:10 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -68,8 +66,8 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['293']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -77,7 +75,7 @@ interactions:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
-      date: ['Mon, 26 Feb 2018 21:26:08 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:11 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -92,9 +90,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration show]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -104,7 +101,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['295']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:26:09 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:12 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -112,7 +109,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-subscription-resource-requests: ['599']
+      x-ms-ratelimit-remaining-subscription-resource-requests: ['598']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -121,9 +118,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration update]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -133,7 +129,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['295']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:26:10 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:13 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -154,8 +150,8 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['293']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -163,7 +159,7 @@ interactions:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
-      date: ['Mon, 26 Feb 2018 21:26:10 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:13 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -178,9 +174,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration show]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -190,7 +185,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['295']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:26:12 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:15 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -198,7 +193,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-subscription-resource-requests: ['598']
+      x-ms-ratelimit-remaining-subscription-resource-requests: ['599']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -207,9 +202,8 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       CommandName: [advisor configuration list]
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.3 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.18
-          msrest_azure/0.4.21 azure-mgmt-advisor/1.0.1 Azure-SDK-For-Python AZURECLI/2.0.29]
+      User-Agent: [python/3.6.3 (Windows-10-10.0.17763-SP0) requests/2.18.4 msrest/0.5.1
+          msrest_azure/0.4.34 azure-mgmt-advisor/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.48]
       accept-language: [en-US]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Advisor/configurations?api-version=2017-04-19
@@ -219,7 +213,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['295']
       content-type: [application/json; charset=utf-8]
-      date: ['Mon, 26 Feb 2018 21:26:11 GMT']
+      date: ['Tue, 16 Oct 2018 16:36:15 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0]
@@ -227,6 +221,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-subscription-resource-requests: ['599']
+      x-ms-ratelimit-remaining-subscription-resource-requests: ['598']
     status: {code: 200, message: OK}
 version: 1
diff --git a/src/command_modules/azure-cli-advisor/setup.py b/src/command_modules/azure-cli-advisor/setup.py
index 47d353a70d0..a6f8fd45a7b 100644
--- a/src/command_modules/azure-cli-advisor/setup.py
+++ b/src/command_modules/azure-cli-advisor/setup.py
@@ -14,7 +14,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.6.0"
+VERSION = "2.0.0"
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
@@ -33,7 +33,7 @@
 
 DEPENDENCIES = [
     'azure-cli-core',
-    'azure-mgmt-advisor==1.0.1'
+    'azure-mgmt-advisor==2.0.1'
 ]
 
 with open('README.rst', 'r', encoding='utf-8') as f: