diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/AddAlertFeedback.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/AddAlertFeedback.json
index 782dc7bc69a8..1e25e5f13862 100644
--- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/AddAlertFeedback.json
+++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/AddAlertFeedback.json
@@ -1,17 +1,15 @@
 {
   "parameters": {
     "serviceName": "sampleServiceName",
-    "alertFeedback": [
-      {
-        "level": "Error",
-        "state": "Active",
-        "shortName": "AlertShortName",
-        "feeback": "Like",
-        "comment": "SampleComment",
-        "consentedToShare": false,
-        "serviceMemberId": "SampleServiceMemberId"
-      }
-    ],
+    "alertFeedback": {
+      "level": "Error",
+      "state": "Active",
+      "shortName": "AlertShortName",
+      "feedback": "Like",
+      "comment": "SampleComment",
+      "consentedToShare": false,
+      "serviceMemberId": "SampleServiceMemberId"
+    },
     "api-version": "2014-01-01"
   },
   "responses": {
diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/AddUserPreference.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/AddUserPreference.json
index 1d9a70d84ba8..b15f017c7a0c 100644
--- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/AddUserPreference.json
+++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/AddUserPreference.json
@@ -2,14 +2,12 @@
   "parameters": {
     "serviceName": "sampleServiceName",
     "featureName": "SampleFeatureName",
-    "setting": [
-      {
-        "metricNames": [
-          "UserPreference1",
-          "UserPreference2"
-        ]
-      }
-    ],
+    "setting": {
+      "metricNames": [
+        "UserPreference1",
+        "UserPreference2"
+      ]
+    },
     "api-version": "2014-01-01"
   },
   "responses": {
diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/Alerts.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/Alerts.json
index e535b5304c3e..ca0d4dd0e5df 100644
--- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/Alerts.json
+++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/Alerts.json
@@ -27,21 +27,23 @@
               }
             ],
             "scope": "SampleScope",
-            "additionalInformation": {
-              "titleName": "SampleAdditionalInfo",
-              "titleValue": "SampleTitle",
-              "properties": [
-                {
-                  "key": "Property1",
-                  "value": "Value1"
-                },
-                {
-                  "key": "Property2",
-                  "value": "Value2"
-                }
-              ],
-              "hasProperties": true
-            },
+            "additionalInformation": [
+              {
+                "titleName": "SampleAdditionalInfo",
+                "titleValue": "SampleTitle",
+                "properties": [
+                  {
+                    "key": "Property1",
+                    "value": "Value1"
+                  },
+                  {
+                    "key": "Property2",
+                    "value": "Value2"
+                  }
+                ],
+                "hasProperties": true
+              }
+            ],
             "createdDate": "2018-04-10T03:12:23.4408944Z",
             "resolvedDate": "2018-04-10T03:12:23.4408944Z",
             "lastUpdated": "2018-04-30T19:24:42.1946017Z",
diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/ConnectorMetadata.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/ConnectorMetadata.json
index 673e6f5e5131..b4bae23846d1 100644
--- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/ConnectorMetadata.json
+++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/ConnectorMetadata.json
@@ -2,29 +2,26 @@
   "parameters": {
     "serviceName": "sampleServiceName",
     "serviceMemberId": "SampleServiceMemberId",
+    "metricName": "sampleMetricName",
     "api-version": "2014-01-01"
   },
   "responses": {
     "200": {
       "body": {
-        "value": [
+        "connectors": [
           {
-            "connectors": [
-              {
-                "connectorId": "3efbb72d-5047-4816-a7dd-73fefe16a2f3",
-                "connectorDisplayName": "adhsdfus1runner.adhs.com"
-              },
-              {
-                "connectorId": "b891884f-051e-4a83-95af-2544101c9083",
-                "connectorDisplayName": "dfadhybridhealth.dfdomain.net - AAD"
-              }
-            ],
-            "runProfileNames": [
-              "Export",
-              "ApplyRules",
-              "DeltaImport"
-            ]
+            "connectorId": "3efbb72d-5047-4816-a7dd-73fefe16a2f3",
+            "connectorDisplayName": "adhsdfus1runner.adhs.com"
+          },
+          {
+            "connectorId": "b891884f-051e-4a83-95af-2544101c9083",
+            "connectorDisplayName": "dfadhybridhealth.dfdomain.net - AAD"
           }
+        ],
+        "runProfileNames": [
+          "Export",
+          "ApplyRules",
+          "DeltaImport"
         ]
       }
     }
diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/PatchTenant.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/PatchTenant.json
index 3970f6e3c32a..8f5a01a32008 100644
--- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/PatchTenant.json
+++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/PatchTenant.json
@@ -1,10 +1,8 @@
 {
   "parameters": {
-    "tenant": [
-      {
-        "agentAutoUpdate": false
-      }
-    ],
+    "tenant": {
+      "agentAutoUpdate": false
+    },
     "api-version": "2014-01-01"
   },
   "responses": {
diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/Server_Alerts.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/Server_Alerts.json
index c83967580650..e2f7edad9443 100644
--- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/Server_Alerts.json
+++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/Server_Alerts.json
@@ -28,21 +28,23 @@
               }
             ],
             "scope": "SampleScope",
-            "additionalInformation": {
-              "titleName": "SampleAdditionalInfo",
-              "titleValue": "SampleTitle",
-              "properties": [
-                {
-                  "key": "Property1",
-                  "value": "Value1"
-                },
-                {
-                  "key": "Property2",
-                  "value": "Value2"
-                }
-              ],
-              "hasProperties": true
-            },
+            "additionalInformation": [
+              {
+                "titleName": "SampleAdditionalInfo",
+                "titleValue": "SampleTitle",
+                "properties": [
+                  {
+                    "key": "Property1",
+                    "value": "Value1"
+                  },
+                  {
+                    "key": "Property2",
+                    "value": "Value2"
+                  }
+                ],
+                "hasProperties": true
+              }
+            ],
             "createdDate": "2018-04-10T03:12:23.4408944Z",
             "resolvedDate": "2018-04-10T03:12:23.4408944Z",
             "lastUpdated": "2018-04-30T19:24:42.1945017Z",
diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/UpdateService.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/UpdateService.json
index ccc58f4862d5..384eea9a3444 100644
--- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/UpdateService.json
+++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/UpdateService.json
@@ -1,12 +1,10 @@
 {
   "parameters": {
     "serviceName": "sampleServiceName",
-    "service": [
-      {
-        "notificationEmailEnabled": true,
-        "notificationEmailEnabledForGlobalADmins": true
-      }
-    ],
+    "service": {
+      "notificationEmailEnabled": true,
+      "notificationEmailEnabledForGlobalAdmins": true
+    },
     "api-version": "2014-01-01"
   },
   "responses": {