diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/costmanagement.json
index 33b430e3bce9..afe5f3d7c088 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/costmanagement.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/costmanagement.json
@@ -161,6 +161,9 @@
           },
           "ResourceGroupQuery": {
             "$ref": "./examples/ResourceGroupQuery.json"
+          },
+            "ResourceGroupQueryGrouping": {
+            "$ref": "./examples/ResourceGroupQueryGrouping.json"
           },
           "BillingAccountQuery": {
             "$ref": "./examples/BillingAccountQuery.json"
@@ -252,7 +255,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -300,7 +303,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -352,7 +355,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -419,7 +422,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -470,7 +473,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -521,7 +524,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -1344,7 +1347,16 @@
       "in": "path",
       "required": true,
       "type": "string",
-      "description": "The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope and '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope..",
+      "description": "The scope associated with query operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope and '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope..",
+      "x-ms-parameter-location": "method",
+      "x-ms-skip-url-encoding": true
+    },
+    "scopeExportsParameter": {
+      "name": "scope",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "The scope associated with export operations. This includes '/subscriptions/{subscriptionId}' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope and '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope.",
       "x-ms-parameter-location": "method",
       "x-ms-skip-url-encoding": true
     },
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsList.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsList.json
index b9f5918e4fa3..7b7a36c5b6de 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsList.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsList.json
@@ -1,7 +1,8 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
-    "billingAccountId": "100"
+    "billingAccountId": "100",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListExpandAndTop.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListExpandAndTop.json
index 2758e49d8cd3..67c04cf6a0ff 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListExpandAndTop.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListExpandAndTop.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "billingAccountId": "100",
     "$expand": "properties/data",
-    "$top": 5
+    "$top": 5,
+    "scope": "providers/Microsoft.Billing/billingAccounts/100"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListWithFilter.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListWithFilter.json
index 90bc0b843233..226ca77c6ac7 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListWithFilter.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListWithFilter.json
@@ -4,7 +4,8 @@
     "billingAccountId": "100",
     "$expand": "properties/data",
     "$top": 5,
-    "$filter": "properties/category eq 'resourceId'"
+    "$filter": "properties/category eq 'resourceId'",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQuery.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQuery.json
index 92b50ea0cec7..4a7272d20d16 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQuery.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQuery.json
@@ -2,6 +2,7 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
+    "scope": "providers/Microsoft.Billing/billingAccounts/70664866",
     "parameters":{
       "type": "Usage",
       "timeframe": "MonthToDate",
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQueryGrouping.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQueryGrouping.json
index 0745bf34512f..66ff17b94d83 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQueryGrouping.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQueryGrouping.json
@@ -2,6 +2,7 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
+    "scope": "providers/Microsoft.Billing/billingAccounts/70664866",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsList.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsList.json
index 2bbda0e6a272..ff35b829e14a 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsList.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsList.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "100",
-    "departmentId": "123"
+    "departmentId": "123",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListExpandAndTop.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListExpandAndTop.json
index bfd2ad5a29f3..af4bc2065834 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListExpandAndTop.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListExpandAndTop.json
@@ -4,7 +4,8 @@
     "billingAccountId": "100",
     "departmentId": "123",
     "$expand": "properties/data",
-    "$top": 5
+    "$top": 5,
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListWithFilter.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListWithFilter.json
index 20648e479031..9075deedd69c 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListWithFilter.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListWithFilter.json
@@ -5,7 +5,8 @@
     "departmentId": "123",
     "$expand": "properties/data",
     "$top": 5,
-    "$filter": "properties/category eq 'resourceId'"
+    "$filter": "properties/category eq 'resourceId'",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQuery.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQuery.json
index 8c18343ea77e..71bb29afeda9 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQuery.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQuery.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
     "departmentId": "123",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123",
     "parameters":{
       "type": "Usage",
       "timeframe": "MonthToDate",
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQueryGrouping.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQueryGrouping.json
index 0598d0eb209f..c9f0891e1325 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQueryGrouping.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQueryGrouping.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
     "departmentId": "123",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsList.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsList.json
index f8f029779d6b..b6afccfbd813 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsList.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsList.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "100",
-    "enrollmentAccountId": "456"
+    "enrollmentAccountId": "456",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListExpandAndTop.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListExpandAndTop.json
index 9f05831c65ef..a99204aeef99 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListExpandAndTop.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListExpandAndTop.json
@@ -4,7 +4,8 @@
     "billingAccountId": "100",
     "enrollmentAccountId": "456",
     "$expand": "properties/data",
-    "$top": 5
+    "$top": 5,
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListWithFilter.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListWithFilter.json
index d45b42ec7ab4..f656973802d2 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListWithFilter.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListWithFilter.json
@@ -5,7 +5,8 @@
     "enrollmentAccountId": "456",
     "$expand": "properties/data",
     "$top": 5,
-    "$filter": "properties/category eq 'resourceId'"
+    "$filter": "properties/category eq 'resourceId'",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQuery.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQuery.json
index 0971bf9fe43c..9307d2cc8424 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQuery.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQuery.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
     "enrollmentAccountId": "456",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456",
     "parameters": {
       "type": "Usage",
       "timeframe": "MonthToDate",
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQueryGrouping.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQueryGrouping.json
index 212d475ef1f8..b9c689207a03 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQueryGrouping.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQueryGrouping.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
     "enrollmentAccountId": "456",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/Export.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/Export.json
index f9137eabaf86..ca7e609ac42f 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/Export.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/Export.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "MYDEVTESTRG",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByBillingAccount.json
index 60aeb7f2ad42..81982f13a14f 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByBillingAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByBillingAccount.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "123456",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccount-Id}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByDepartment.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByDepartment.json
index 933958f10d57..5f0b1179cc6c 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByDepartment.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByDepartment.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "departmentId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByEnrollmentAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByEnrollmentAccount.json
index cde78ab1a1c7..a00511951cef 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByEnrollmentAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByEnrollmentAccount.json
@@ -1,8 +1,11 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "enrollmentAccountId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "id": "providers/Microsoft.Billing/billingAccounts/12/enrollmentAccounts/1234/providers/Microsoft.CostManagement/exports/TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdate.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdate.json
index 3fb355728a8a..e0889c255765 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdate.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdate.json
@@ -4,6 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "MYDEVTESTRG",
     "exportName": "TestExport",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000",
     "parameters": {
       "properties": {
         "schedule":{
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByBillingAccount.json
index 4ed4e59be795..a2864274da32 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByBillingAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByBillingAccount.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "123456",
     "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}",
     "parameters": {
       "properties": {
         "schedule":{
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByDepartment.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByDepartment.json
index 7607c3b45024..9f1236fe245d 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByDepartment.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByDepartment.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "departmentId": "1234",
     "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments",
     "parameters": {
       "properties": {
         "schedule":{
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByEnrollmentAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByEnrollmentAccount.json
index cc2743d35598..620863e52a06 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByEnrollmentAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByEnrollmentAccount.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "enrollmentAccountId": "1234",
     "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}",
     "parameters": {
       "properties": {
         "schedule":{
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDelete.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDelete.json
index 5f684882bf31..c6cd33033efe 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDelete.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDelete.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "MYDEVTESTRG",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "subscriptions/{subscriptionId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByBillingAccount.json
index cf6af7b140b6..b24e337b26d3 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByBillingAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByBillingAccount.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "123456",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByDepartment.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByDepartment.json
index 7a5af5221c75..ca837ad3c58b 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByDepartment.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByDepartment.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "123456",
     "departmentId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByEnrollmentAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByEnrollmentAccount.json
index e6eef4d34b5a..2ee7c54fc119 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByEnrollmentAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByEnrollmentAccount.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "enrollmentAccountId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecution.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecution.json
index 916f0ddc6da2..cd52df733b47 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecution.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecution.json
@@ -3,7 +3,8 @@
       "api-version": "2019-01-01",
       "subscriptionId": "00000000-0000-0000-0000-000000000000",
       "resourceGroupName": "MYDEVTESTRG",
-      "exportName": "TestExport"
+      "exportName": "TestExport",
+      "scope": "subscriptions/{subscriptionId}"
     },
     "responses": {
       "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByBillingAccount.json
index b9aff1fd8d4b..41487377c008 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByBillingAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByBillingAccount.json
@@ -2,7 +2,8 @@
     "parameters": {
       "api-version": "2019-01-01",
       "billingAccountId": "123456",
-      "exportName": "TestExport"
+      "exportName": "TestExport",
+      "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}"
     },
     "responses": {
       "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByDepartment.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByDepartment.json
index 249ed27714f1..6e1afcc52382 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByDepartment.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByDepartment.json
@@ -1,8 +1,10 @@
 {
     "parameters": {
       "api-version": "2019-01-01",
+      "billingAccountId": "100",
       "departmentId": "1234",
-      "exportName": "TestExport"
+      "exportName": "TestExport",
+      "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}"
     },
     "responses": {
       "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByEnrollmentAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByEnrollmentAccount.json
index 510971f17922..69a65964f712 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByEnrollmentAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByEnrollmentAccount.json
@@ -1,8 +1,10 @@
 {
     "parameters": {
       "api-version": "2019-01-01",
+      "billingAccountId": "100",
       "enrollmentAccountId": "1234",
-      "exportName": "TestExport"
+      "exportName": "TestExport",
+      "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}"
     },
     "responses": {
       "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionList.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionList.json
index 9d17279a2113..c007354620d6 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionList.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionList.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "MYDEVTESTRG",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "subscriptions/{subscriptionId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByBillingAccount.json
index 4e0ee014c511..5b47ee280df4 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByBillingAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByBillingAccount.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "123456",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByDepartment.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByDepartment.json
index ccc085d712c5..451b9014b922 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByDepartment.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByDepartment.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "departmentId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByEnrollmentAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByEnrollmentAccount.json
index 023a74033716..e640c5d01422 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByEnrollmentAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionListByEnrollmentAccount.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "enrollmentAccountId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportList.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportList.json
index f481a6eb5595..c30789638048 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportList.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportList.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "MYDEVTESTRG"
+    "resourceGroupName": "MYDEVTESTRG",
+    "scope": "subscriptions/{subscription-id}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByBillingAccount.json
index b957cc281abe..3a36e0c73ae1 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByBillingAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByBillingAccount.json
@@ -1,7 +1,8 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
-    "billingAccountId": "123456"
+    "billingAccountId": "123456",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccount-Id}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByDepartment.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByDepartment.json
index 45eee8246431..1eb1def5c377 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByDepartment.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByDepartment.json
@@ -1,7 +1,8 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
-    "departmentId": "1234"
+    "departmentId": "1234",
+    "scope": "providers/Microsoft.Billing/billingAccounts/12/departments/1234"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByEnrollmentAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByEnrollmentAccount.json
index f1f922a1a67a..b5bd1f3e6b60 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByEnrollmentAccount.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportListByEnrollmentAccount.json
@@ -1,7 +1,8 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
-    "departmentId": "1234"
+    "departmentId": "1234",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/1234"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsList.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsList.json
index d9003efbed2b..676dc13d0975 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsList.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsList.json
@@ -1,7 +1,8 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
-    "managementGroupId": "MyMgId"
+    "managementGroupId": "MyMgId",
+    "scope": "providers/Microsoft.Management/managementGroups/MyMgId"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsListExpandAndTop.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsListExpandAndTop.json
index f8c7b72df3ef..13d71998fa75 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsListExpandAndTop.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsListExpandAndTop.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "managementGroupId": "MyMgId",
     "$expand": "properties/data",
-    "$top": 5
+    "$top": 5,
+    "scope": "providers/Microsoft.Management/managementGroups/MyMgId"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsListWithFilter.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsListWithFilter.json
index 86ea49c3e36f..a4e2cac968f6 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsListWithFilter.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupDimensionsListWithFilter.json
@@ -4,7 +4,8 @@
     "managementGroupId": "MyMgId",
     "$expand": "properties/data",
     "$top": 5,
-    "$filter": "properties/category eq 'resourceId'"
+    "$filter": "properties/category eq 'resourceId'",
+    "scope": "providers/Microsoft.Management/managementGroups/MyMgId"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupQuery.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupQuery.json
index a1841f1dac58..75b60311d7da 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupQuery.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupQuery.json
@@ -2,6 +2,7 @@
   "parameters": {
     "api-version": "2019-01-01",
     "managementGroupId": "MyMgId",
+    "scope": "providers/Microsoft.Management/managementGroups/MyMgId",
     "parameters":{
       "type": "Usage",
       "timeframe": "MonthToDate",
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupQueryGrouping.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupQueryGrouping.json
index b0363055b1a3..23a82a6b1f4a 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupQueryGrouping.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ManagementGroupQueryGrouping.json
@@ -2,6 +2,7 @@
   "parameters": {
     "api-version": "2019-01-01",
     "managementGroupId": "MyMgId",
+    "scope": "providers/Microsoft.Management/managementGroups/MyMgId",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",
@@ -22,7 +23,7 @@
           "sorting": [
             {
               "name": "ResourceGroup",
-              "direction": "Descending"
+              "querySortingDirection": "Descending"
             }
           ]         
       }
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupDimensionsList.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupDimensionsList.json
index dc0e9e8cf879..5da6d592c890 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupDimensionsList.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupDimensionsList.json
@@ -4,7 +4,8 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "system.orlando",
     "$expand": "properties/data",
-    "$top": 5
+    "$top": 5,
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/{resourceGroupName}"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupQuery.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupQuery.json
index 28f48b60520e..647c751335b0 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupQuery.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupQuery.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "subscriptionId": "55312978-ba1b-415c-9304-c4b9c43c0481",
     "resourceGroupName": "ScreenSharingTest-peer",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/{resourceGroupName}",
     "parameters":{
       "type": "Usage",
       "timeframe": "MonthToDate",
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupQueryGrouping.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupQueryGrouping.json
index 3f6e8959173b..4c83ec96ff03 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupQueryGrouping.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ResourceGroupQueryGrouping.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "ScreenSharingTest-peer",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/{resourceGroupName}",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",
@@ -23,7 +24,7 @@
           "sorting": [
             {
               "name": "ResourceType",
-              "direction": "Descending"
+              "querySortingDirection": "Descending"
             }
           ]      
       }
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionDimensionsList.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionDimensionsList.json
index d02d49b3c0e6..7a51af63b91d 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionDimensionsList.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionDimensionsList.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "$top": 5,
-    "$expand": "properties/data"
+    "$expand": "properties/data",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000"
   },
   "responses": {
     "200": {
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionQuery.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionQuery.json
index 5486e1b0562a..a002f11dd55e 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionQuery.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionQuery.json
@@ -2,6 +2,7 @@
   "parameters": {
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000",
     "parameters":{
       "type": "Usage",
       "timeframe": "MonthToDate",
@@ -47,7 +48,7 @@
 		"sorting": [
 		{
 		 "name": "UsageDate",
-		 "sortingDirection": "Ascending"
+     "querySortingDirection": "Ascending"
 		}
 		]	
       } 
diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionQueryGrouping.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionQueryGrouping.json
index 944ece81a2cc..6ec072e5e180 100644
--- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionQueryGrouping.json
+++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/SubscriptionQueryGrouping.json
@@ -2,6 +2,7 @@
   "parameters": {
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",