diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookDelete.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookDelete.json
index 19d4cd9b5a38..139d9fe0f6b8 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookDelete.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookDelete.json
@@ -6,7 +6,7 @@
     "resourceName": "deadb33f-5e0d-4064-8ebb-1a4ed0313eb2"
   },
   "responses": {
-    "201": {},
+    "200": {},
     "204": {}
   }
 }
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookUpdate.json
index f1d5c52b3916..fafbe94cdfd1 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookUpdate.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookUpdate.json
@@ -23,7 +23,7 @@
     }
   },
   "responses": {
-    "200": {
+    "201": {
       "body": {
         "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722",
         "type": "Microsoft.Insights/myworkbooks",
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList.json
index a59c2857a8eb..65e9571d7073 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList.json
@@ -47,7 +47,8 @@
             "storageUri": null
           }
         }
-      ]
+      ],
+      "nextLink": null
     }
   }
 }
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList2.json
new file mode 100644
index 000000000000..396a769db3d3
--- /dev/null
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList2.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "api-version": "2020-10-20",
+    "subscriptionId": "6b643656-33eb-422f-aee8-3ac145d124af",
+    "resourceGroupName": "my-resource-group",
+    "category": "workbook"
+  },
+  "responses": {
+    "200": {
+      "body": [],
+      "nextLink": null
+    }
+  }
+}
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json
index 19d4cd9b5a38..139d9fe0f6b8 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json
@@ -6,7 +6,7 @@
     "resourceName": "deadb33f-5e0d-4064-8ebb-1a4ed0313eb2"
   },
   "responses": {
-    "201": {},
+    "200": {},
     "204": {}
   }
 }
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedUpdate.json
index 5ca493f45419..19c26211df97 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedUpdate.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedUpdate.json
@@ -30,7 +30,7 @@
     }
   },
   "responses": {
-    "200": {
+    "201": {
       "body": {
         "identity": {
           "type": "UserAssigned",
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookUpdate.json
index d16fecb33284..cd6013e728d7 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookUpdate.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookUpdate.json
@@ -25,7 +25,7 @@
     }
   },
   "responses": {
-    "200": {
+    "201": {
       "body": {
         "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722",
         "type": "",
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbooksList.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbooksList.json
index 81a32353127f..80a2b1b94f95 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbooksList.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbooksList.json
@@ -50,7 +50,8 @@
             "storageUri": null
           }
         }
-      ]
+      ],
+      "nextLink": null
     }
   }
 }
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json
index 336f2a6b00e3..8e0eeb3f9050 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json
@@ -51,6 +51,9 @@
           {
             "$ref": "#/parameters/TagsParameter"
           },
+          {
+            "$ref": "#/parameters/SourceIdParameter"
+          },
           {
             "$ref": "#/parameters/CanFetchWorkbookContentParameter"
           },
@@ -73,11 +76,14 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "nextLink"
         },
         "x-ms-examples": {
           "WorkbooksList": {
             "$ref": "./examples/MyWorkbooksList.json"
+          },
+          "WorkbooksList2": {
+            "$ref": "./examples/MyWorkbooksList2.json"
           }
         }
       }
@@ -118,11 +124,14 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "nextLink"
         },
         "x-ms-examples": {
           "WorkbooksList": {
             "$ref": "./examples/MyWorkbooksList.json"
+          },
+          "WorkbooksList2": {
+            "$ref": "./examples/MyWorkbooksList2.json"
           }
         }
       }
@@ -183,7 +192,7 @@
           }
         ],
         "responses": {
-          "201": {
+          "200": {
             "description": "The private workbook has been successfully deleted."
           },
           "204": {
@@ -215,6 +224,9 @@
           {
             "$ref": "#/parameters/WorkbookResourceNameParameter"
           },
+          {
+            "$ref": "#/parameters/SourceIdParameter"
+          },
           {
             "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           },
@@ -267,6 +279,9 @@
           {
             "$ref": "#/parameters/WorkbookResourceNameParameter"
           },
+          {
+            "$ref": "#/parameters/SourceIdParameter"
+          },
           {
             "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           },
@@ -281,7 +296,7 @@
           }
         ],
         "responses": {
-          "200": {
+          "201": {
             "description": "The private workbook definition updated.",
             "schema": {
               "$ref": "#/definitions/MyWorkbook"
@@ -346,6 +361,12 @@
             "type": "string"
           },
           "description": "Resource tags"
+        },
+        "etag": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource etag"
         }
       },
       "x-ms-azure-resource": true,
@@ -360,6 +381,9 @@
             "$ref": "#/definitions/MyWorkbook"
           },
           "description": "An array of private workbooks."
+        },
+        "nextLink": {
+          "type": "string"
         }
       },
       "description": "Workbook list result."
@@ -380,7 +404,7 @@
             "shared"
           ],
           "x-ms-enum": {
-            "name": "SharedTypeKind",
+            "name": "kind",
             "modelAsString": true
           }
         },
@@ -405,6 +429,7 @@
         },
         "serializedData": {
           "type": "string",
+          "x-nullable": true,
           "description": "Configuration of this particular private workbook. Configuration data is a string containing valid JSON"
         },
         "version": {
@@ -438,46 +463,54 @@
         },
         "storageUri": {
           "type": "string",
+          "x-nullable": true,
           "description": "BYOS Storage Account URI"
         }
       }
     },
-    "ErrorFieldContract": {
+    "MyWorkbookError": {
+      "description": "Error response.",
       "properties": {
-        "code": {
-          "type": "string",
-          "description": "Property level error code."
-        },
-        "message": {
-          "type": "string",
-          "description": "Human-readable representation of property-level error."
-        },
-        "target": {
-          "type": "string",
-          "description": "Property name."
+        "error": {
+          "$ref": "#/definitions/ErrorDefinition",
+          "description": "The error details."
         }
-      },
-      "description": "Error Field contract."
+      }
     },
-    "MyWorkbookError": {
+    "ErrorDefinition": {
+      "description": "Error definition.",
       "properties": {
         "code": {
+          "description": "Service specific error code which serves as the substatus for the HTTP error code.",
           "type": "string",
-          "description": "Service-defined error code. This code serves as a sub-status for the HTTP error code specified in the response."
+          "readOnly": true
         },
         "message": {
+          "description": "Description of the error.",
           "type": "string",
-          "description": "Human-readable representation of the error."
+          "readOnly": true
         },
-        "details": {
+        "innererror": {
+          "description": "Internal error details.",
+          "items": {
+            "$ref": "#/definitions/InnerErrorTrace"
+          },
+          "readOnly": true
+        }
+      }
+    },
+    "InnerErrorTrace": {
+      "description": "Error details",
+      "properties": {
+        "trace": {
+          "description": "detailed error trace",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ErrorFieldContract"
+            "type": "string"
           },
-          "description": "The list of invalid fields send in request, in case of validation error."
+          "readOnly": true
         }
-      },
-      "description": "Error message body that will indicate why the operation failed."
+      }
     },
     "ManagedIdentity": {
       "description": "Customer Managed Identity",
@@ -541,19 +574,11 @@
     "SourceIdParameter": {
       "name": "sourceId",
       "in": "query",
-      "required": true,
+      "required": false,
       "type": "string",
       "description": "Azure Resource Id that will fetch all linked workbooks.",
       "x-ms-parameter-location": "method"
     },
-    "ResourceIdParameter": {
-      "name": "resourceId",
-      "in": "query",
-      "required": true,
-      "type": "string",
-      "description": "Azure Resource Id or any target workbook resource id.",
-      "x-ms-parameter-location": "method"
-    },
     "CanFetchWorkbookContentParameter": {
       "name": "canFetchContent",
       "in": "query",
diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json
index 4a5f1d28cd0e..55a5ae5f5574 100644
--- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json
+++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json
@@ -76,7 +76,7 @@
           }
         },
         "x-ms-pageable": {
-          "nextLinkName": null
+          "nextLinkName": "nextLink"
         },
         "x-ms-examples": {
           "WorkbooksList": {
@@ -147,7 +147,7 @@
           }
         ],
         "responses": {
-          "201": {
+          "200": {
             "description": "The workbook has been successfully deleted."
           },
           "204": {
@@ -254,7 +254,7 @@
           }
         ],
         "responses": {
-          "200": {
+          "201": {
             "description": "The workbook definition updated.",
             "schema": {
               "$ref": "#/definitions/Workbook"
@@ -287,30 +287,27 @@
         },
         "id": {
           "type": "string",
-          "readOnly": true,
-          "description": "Azure resource Id"
+          "description": "Azure resource Id",
+          "x-ms-mutability": [
+            "create",
+            "read"
+          ]
         },
         "name": {
           "type": "string",
-          "readOnly": true,
-          "description": "Azure resource name. This is GUID value. The display name should be assigned within properties field."
+          "description": "Azure resource name",
+          "x-ms-mutability": [
+            "create",
+            "read"
+          ]
         },
         "type": {
           "type": "string",
-          "readOnly": true,
-          "description": "Azure resource type"
-        },
-        "kind": {
-          "type": "string",
-          "description": "The kind of workbook. Choices are user and shared.",
-          "enum": [
-            "user",
-            "shared"
-          ],
-          "x-ms-enum": {
-            "name": "SharedTypeKind",
-            "modelAsString": true
-          }
+          "description": "Azure resource type",
+          "x-ms-mutability": [
+            "create",
+            "read"
+          ]
         },
         "location": {
           "type": "string",
@@ -321,16 +318,18 @@
           ]
         },
         "tags": {
-          "type": "object",
           "additionalProperties": {
             "type": "string"
           },
           "description": "Resource tags"
+        },
+        "etag": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource etag"
         }
       },
-      "required": [
-        "location"
-      ],
       "x-ms-azure-resource": true,
       "description": "An azure resource object"
     },
@@ -338,10 +337,14 @@
       "properties": {
         "value": {
           "type": "array",
+          "readOnly": true,
           "items": {
             "$ref": "#/definitions/Workbook"
           },
           "description": "An array of workbooks."
+        },
+        "nextLink": {
+          "type": "string"
         }
       },
       "description": "Workbook list result."
@@ -354,6 +357,18 @@
         }
       ],
       "properties": {
+        "kind": {
+          "type": "string",
+          "description": "The kind of workbook. Choices are user and shared.",
+          "enum": [
+            "user",
+            "shared"
+          ],
+          "x-ms-enum": {
+            "name": "kind",
+            "modelAsString": true
+          }
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "description": "Metadata describing a workbook for an Azure resource.",
@@ -375,8 +390,13 @@
         },
         "serializedData": {
           "type": "string",
+          "x-nullable": true,
           "description": "Configuration of this particular workbook. Configuration data is a string containing valid JSON"
         },
+        "version": {
+          "type": "string",
+          "description": "Workbook version"
+        },
         "timeModified": {
           "type": "string",
           "description": "Date and time in UTC of the last modification that was made to this workbook definition.",
@@ -386,10 +406,6 @@
           "type": "string",
           "description": "Workbook category, as defined by the user at creation time."
         },
-        "version": {
-          "type": "string",
-          "description": "Workbook version"
-        },
         "tags": {
           "type": "array",
           "items": {
@@ -408,6 +424,7 @@
         },
         "storageUri": {
           "type": "string",
+          "x-nullable": true,
           "description": "BYOS Storage Account URI"
         }
       }
@@ -465,40 +482,47 @@
         }
       }
     },
-    "ErrorFieldContract": {
+    "WorkbookError": {
+      "description": "Error response.",
       "properties": {
-        "code": {
-          "type": "string",
-          "description": "Property level error code."
-        },
-        "message": {
-          "type": "string",
-          "description": "Human-readable representation of property-level error."
-        },
-        "target": {
-          "type": "string",
-          "description": "Property name."
+        "error": {
+          "$ref": "#/definitions/ErrorDefinition",
+          "description": "The error details."
         }
-      },
-      "description": "Error Field contract."
+      }
     },
-    "WorkbookError": {
-      "description": "Error message body that will indicate why the operation failed.",
+    "ErrorDefinition": {
+      "description": "Error definition.",
       "properties": {
         "code": {
+          "description": "Service specific error code which serves as the substatus for the HTTP error code.",
           "type": "string",
-          "description": "Service-defined error code. This code serves as a sub-status for the HTTP error code specified in the response."
+          "readOnly": true
         },
         "message": {
+          "description": "Description of the error.",
           "type": "string",
-          "description": "Human-readable representation of the error."
+          "readOnly": true
         },
-        "details": {
+        "innererror": {
+          "description": "Internal error details.",
+          "items": {
+            "$ref": "#/definitions/InnerErrorTrace"
+          },
+          "readOnly": true
+        }
+      }
+    },
+    "InnerErrorTrace": {
+      "description": "Error details",
+      "properties": {
+        "trace": {
+          "description": "detailed error trace",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ErrorFieldContract"
+            "type": "string"
           },
-          "description": "The list of invalid fields send in request, in case of validation error."
+          "readOnly": true
         }
       }
     },
@@ -564,7 +588,7 @@
     "SourceIdParameter": {
       "name": "sourceId",
       "in": "query",
-      "required": true,
+      "required": false,
       "type": "string",
       "description": "Azure Resource Id that will fetch all linked workbooks.",
       "x-ms-parameter-location": "method"