diff --git a/specification/addons/resource-manager/Microsoft.Addons/preview/2017-05-15/Addons.json b/specification/addons/resource-manager/Microsoft.Addons/preview/2017-05-15/Addons.json
index a4e9517dd2d7..78b509103685 100644
--- a/specification/addons/resource-manager/Microsoft.Addons/preview/2017-05-15/Addons.json
+++ b/specification/addons/resource-manager/Microsoft.Addons/preview/2017-05-15/Addons.json
@@ -48,7 +48,7 @@
           "200": {
             "description": "List all the operations.",
             "schema": {
-              "$ref": "#/definitions/OperationList"
+              "$ref": "#/definitions/OperationListValue"
             }
           },
           "default": {
@@ -327,6 +327,15 @@
         }
       }
     },
+    "OperationListValue": {
+      "type": "object",
+      "description": "List of supported operations.",
+      "properties": {
+        "value": {
+          "$ref": "#/definitions/OperationList"
+        }
+      }
+    },
     "OperationList": {
       "type": "array",
       "description": "List of supported operations.",
@@ -384,10 +393,8 @@
           "description": "Description of the error."
         },
         "code": {
-          "type": "integer",
-          "description": "Service specific error code which serves as the substatus for the HTTP error code.",
-          "minimum": 100,
-          "maximum": 600
+          "type": "string",
+          "description": "Service specific error code which serves as the substatus for the HTTP error code."
         }
       }
     }
diff --git a/specification/addons/resource-manager/Microsoft.Addons/preview/2017-05-15/examples/Operations_List.json b/specification/addons/resource-manager/Microsoft.Addons/preview/2017-05-15/examples/Operations_List.json
index b43f0323a561..42335ff287aa 100644
--- a/specification/addons/resource-manager/Microsoft.Addons/preview/2017-05-15/examples/Operations_List.json
+++ b/specification/addons/resource-manager/Microsoft.Addons/preview/2017-05-15/examples/Operations_List.json
@@ -4,53 +4,55 @@
   },
   "responses": {
     "200": {
-      "body": [
-        {
-          "name": "Microsoft.Addons/supportProviders/supportPlanTypes/read",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "supportPlanTypes",
-            "operation": "Get Canonical support plan state",
-            "description": "Get the specified Canonical support plan state."
+      "body": {
+        "value": [
+          {
+            "name": "Microsoft.Addons/supportProviders/supportPlanTypes/read",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "supportPlanTypes",
+              "operation": "Get Canonical support plan state",
+              "description": "Get the specified Canonical support plan state."
+            }
+          },
+          {
+            "name": "Microsoft.Addons/supportProviders/supportPlanTypes/write",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "supportPlanTypes",
+              "operation": "Adds a Canonical support plan.",
+              "description": "Adds the Canonical support plan type specified."
+            }
+          },
+          {
+            "name": "Microsoft.Addons/supportProviders/supportPlanTypes/delete",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "supportPlanTypes",
+              "operation": "Removes the Canonical support plan",
+              "description": "Removes the specified Canonical support plan"
+            }
+          },
+          {
+            "name": "Microsoft.Addons/supportProviders/canonical/supportPlanTypes/get",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "supportProviders",
+              "operation": "Gets available Canonical support plan types.",
+              "description": "Gets the available Canonical support plan types as well as some extra metadata on their enabled status."
+            }
+          },
+          {
+            "name": "Microsoft.Addons/register/action",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "register",
+              "operation": "Register for Microsoft.Addons",
+              "description": "Register the specified subscription with Microsoft.Addons"
+            }
           }
-        },
-        {
-          "name": "Microsoft.Addons/supportProviders/supportPlanTypes/write",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "supportPlanTypes",
-            "operation": "Adds a Canonical support plan.",
-            "description": "Adds the Canonical support plan type specified."
-          }
-        },
-        {
-          "name": "Microsoft.Addons/supportProviders/supportPlanTypes/delete",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "supportPlanTypes",
-            "operation": "Removes the Canonical support plan",
-            "description": "Removes the specified Canonical support plan"
-          }
-        },
-        {
-          "name": "Microsoft.Addons/supportProviders/canonical/supportPlanTypes/get",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "supportProviders",
-            "operation": "Gets available Canonical support plan types.",
-            "description": "Gets the available Canonical support plan types as well as some extra metadata on their enabled status."
-          }
-        },
-        {
-          "name": "Microsoft.Addons/register/action",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "register",
-            "operation": "Register for Microsoft.Addons",
-            "description": "Register the specified subscription with Microsoft.Addons"
-          }
-        }
-      ]
+        ]
+      }
     }
   }
 }
diff --git a/specification/addons/resource-manager/Microsoft.Addons/preview/2018-03-01/addons-swagger.json b/specification/addons/resource-manager/Microsoft.Addons/preview/2018-03-01/addons-swagger.json
index 62b473bf1191..1927068ae594 100644
--- a/specification/addons/resource-manager/Microsoft.Addons/preview/2018-03-01/addons-swagger.json
+++ b/specification/addons/resource-manager/Microsoft.Addons/preview/2018-03-01/addons-swagger.json
@@ -48,7 +48,7 @@
           "200": {
             "description": "List all the operations.",
             "schema": {
-              "$ref": "#/definitions/OperationList"
+              "$ref": "#/definitions/OperationListValue"
             }
           },
           "default": {
@@ -336,6 +336,15 @@
         }
       }
     },
+    "OperationListValue": {
+      "type": "object",
+      "description": "List of supported operations.",
+      "properties": {
+        "value": {
+          "$ref": "#/definitions/OperationList"
+        }
+      }
+    },
     "OperationList": {
       "type": "array",
       "description": "List of supported operations.",
@@ -393,10 +402,8 @@
           "description": "Description of the error."
         },
         "code": {
-          "type": "integer",
-          "description": "Service specific error code which serves as the substatus for the HTTP error code.",
-          "minimum": 100,
-          "maximum": 600
+          "type": "string",
+          "description": "Service specific error code which serves as the substatus for the HTTP error code."
         }
       }
     }
diff --git a/specification/addons/resource-manager/Microsoft.Addons/preview/2018-03-01/examples/Operations_List.json b/specification/addons/resource-manager/Microsoft.Addons/preview/2018-03-01/examples/Operations_List.json
index b43f0323a561..f8f846235048 100644
--- a/specification/addons/resource-manager/Microsoft.Addons/preview/2018-03-01/examples/Operations_List.json
+++ b/specification/addons/resource-manager/Microsoft.Addons/preview/2018-03-01/examples/Operations_List.json
@@ -1,56 +1,58 @@
 {
   "parameters": {
-    "api-version": "2017-05-15"
+    "api-version": "2018-03-01"
   },
   "responses": {
     "200": {
-      "body": [
-        {
-          "name": "Microsoft.Addons/supportProviders/supportPlanTypes/read",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "supportPlanTypes",
-            "operation": "Get Canonical support plan state",
-            "description": "Get the specified Canonical support plan state."
+      "body": {
+        "value": [
+          {
+            "name": "Microsoft.Addons/supportProviders/supportPlanTypes/read",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "supportPlanTypes",
+              "operation": "Get Canonical support plan state",
+              "description": "Get the specified Canonical support plan state."
+            }
+          },
+          {
+            "name": "Microsoft.Addons/supportProviders/supportPlanTypes/write",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "supportPlanTypes",
+              "operation": "Adds a Canonical support plan.",
+              "description": "Adds the Canonical support plan type specified."
+            }
+          },
+          {
+            "name": "Microsoft.Addons/supportProviders/supportPlanTypes/delete",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "supportPlanTypes",
+              "operation": "Removes the Canonical support plan",
+              "description": "Removes the specified Canonical support plan"
+            }
+          },
+          {
+            "name": "Microsoft.Addons/supportProviders/canonical/supportPlanTypes/get",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "supportProviders",
+              "operation": "Gets available Canonical support plan types.",
+              "description": "Gets the available Canonical support plan types as well as some extra metadata on their enabled status."
+            }
+          },
+          {
+            "name": "Microsoft.Addons/register/action",
+            "display": {
+              "provider": "Microsoft Addons",
+              "resource": "register",
+              "operation": "Register for Microsoft.Addons",
+              "description": "Register the specified subscription with Microsoft.Addons"
+            }
           }
-        },
-        {
-          "name": "Microsoft.Addons/supportProviders/supportPlanTypes/write",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "supportPlanTypes",
-            "operation": "Adds a Canonical support plan.",
-            "description": "Adds the Canonical support plan type specified."
-          }
-        },
-        {
-          "name": "Microsoft.Addons/supportProviders/supportPlanTypes/delete",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "supportPlanTypes",
-            "operation": "Removes the Canonical support plan",
-            "description": "Removes the specified Canonical support plan"
-          }
-        },
-        {
-          "name": "Microsoft.Addons/supportProviders/canonical/supportPlanTypes/get",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "supportProviders",
-            "operation": "Gets available Canonical support plan types.",
-            "description": "Gets the available Canonical support plan types as well as some extra metadata on their enabled status."
-          }
-        },
-        {
-          "name": "Microsoft.Addons/register/action",
-          "display": {
-            "provider": "Microsoft Addons",
-            "resource": "register",
-            "operation": "Register for Microsoft.Addons",
-            "description": "Register the specified subscription with Microsoft.Addons"
-          }
-        }
-      ]
+        ]
+      }
     }
   }
 }