diff --git a/custom-words.txt b/custom-words.txt
index 78acfcea9cd8..e1ade08e5e4c 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -2064,5 +2064,6 @@ ProviderHub
 checkin
 regionality
 Resource
+metdata
 Metastores
 maintenancewindows
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/baseline_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/baseline_API.json
index 2c92f49d9c2b..1a9d8374b633 100644
--- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/baseline_API.json
+++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/baseline_API.json
@@ -230,6 +230,61 @@
           "readOnly": true,
           "description": "The name and the display name of the metric, i.e. it is localizable string."
         },
+        "timestamps": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The timestamp for the baseline value in ISO 8601 format."
+          },
+          "description": "The array of timestamps of the baselines."
+        },
+        "baseline": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Baseline"
+          },
+          "description": "The baseline values for each sensitivity."
+        },
+        "metdata": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BaselineMetadataValue"
+          },
+          "description": "The baseline metadata values."
+        },
+        "predictionResultType": {
+          "type": "integer",
+          "format": "int32",
+          "enum": [
+            0,
+            1,
+            2
+          ],
+          "x-ms-enum": {
+            "name": "PredictionResultType",
+            "modelAsString": false
+          },
+          "description": "The prediction result type of the baseline."
+        },
+        "errorType": {
+          "type": "integer",
+          "format": "int32",
+          "enum": [
+            0,
+            1,
+            2,
+            3,
+            4,
+            100,
+            200
+          ],
+          "x-ms-enum": {
+            "name": "ErrorType",
+            "modelAsString": false
+          },
+          "description": "The error type of the baseline."
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/BaselineProperties",
@@ -253,28 +308,10 @@
           "type": "string",
           "description": "The aggregation type of the metric."
         },
-        "timestamps": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "format": "date-time",
-            "description": "The timestamp for the baseline value in ISO 8601 format."
-          },
-          "description": "The array of timestamps of the baselines."
-        },
-        "baseline": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Baseline"
-          },
-          "description": "The baseline values for each sensitivity."
-        },
-        "metadata": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/BaselineMetadataValue"
-          },
-          "description": "The baseline metadata values."
+        "internalOperationId": {
+          "type": "string",
+          "readOnly": true,
+          "description": "internal operation id"
         }
       },
       "description": "The baseline properties class."
@@ -321,6 +358,38 @@
             "description": "the timestamp for the baseline value in ISO 8601 format."
           },
           "description": "the array of timestamps of the baselines."
+        },
+        "PredictionResultType": {
+          "type": "integer",
+          "format": "int32",
+          "enum": [
+            0,
+            1,
+            2
+          ],
+          "x-ms-enum": {
+            "name": "PredictionResultType",
+            "modelAsString": false
+          },
+          "description": "The prediction result type of the baseline."
+        },
+        "ErrorType": {
+          "type": "integer",
+          "format": "int32",
+          "enum": [
+            0,
+            1,
+            2,
+            3,
+            4,
+            100,
+            200
+          ],
+          "x-ms-enum": {
+            "name": "ErrorType",
+            "modelAsString": false
+          },
+          "description": "The error type of the baseline."
         }
       },
       "required": [
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/calculateBaseline_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/calculateBaseline_API.json
index 3d593bda62c3..2f1572271866 100644
--- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/calculateBaseline_API.json
+++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/calculateBaseline_API.json
@@ -151,7 +151,7 @@
         "baseline": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Baseline"
+            "$ref": "./baseline_API.json#/definitions/Baseline"
           },
           "description": "The baseline values for each sensitivity."
         },
@@ -188,57 +188,6 @@
         "baseline"
       ],
       "description": "The response to a calculate baseline call."
-    },
-    "Baseline": {
-      "type": "object",
-      "properties": {
-        "sensitivity": {
-          "type": "string",
-          "enum": [
-            "Low",
-            "Medium",
-            "High"
-          ],
-          "x-ms-enum": {
-            "name": "Sensitivity",
-            "modelAsString": false
-          },
-          "description": "The sensitivity of the baseline."
-        },
-        "lowThresholds": {
-          "type": "array",
-          "items": {
-            "type": "number",
-            "format": "double",
-            "description": "A single low threshold value."
-          },
-          "description": "The low thresholds of the baseline."
-        },
-        "highThresholds": {
-          "type": "array",
-          "items": {
-            "type": "number",
-            "format": "double",
-            "description": "A single high threshold value."
-          },
-          "description": "The high thresholds of the baseline."
-        },
-        "timestamps": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "format": "date-time",
-            "description": "the timestamp for the baseline value in ISO 8601 format."
-          },
-          "description": "the array of timestamps of the baselines."
-        }
-      },
-      "required": [
-        "sensitivity",
-        "lowThresholds",
-        "highThresholds"
-      ],
-      "description": "The baseline values for a single sensitivity value."
     }
   },
   "parameters": {
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/examples/GetBaseline.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/examples/GetBaseline.json
index 326d00ba4e6b..24cb0738a22a 100644
--- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/examples/GetBaseline.json
+++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/examples/GetBaseline.json
@@ -11,44 +11,97 @@
   "responses": {
     "200": {
       "body": {
+        "type": "microsoft.insights/baseline",
         "id": "/subscriptions/b368ca2f-e298-46b7-b0ab-012281956afa/resourceGroups/vms/providers/Microsoft.Compute/virtualMachines/vm1/providers/Microsoft.Insights/baseline/PercentageCpu",
-        "type": "Microsoft.Insights/baseline",
         "name": {
-          "value": "PercentageCpu"
+          "value": "PercentageCpu",
+          "localizedValue": null
         },
         "properties": {
-          "timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z",
-          "aggregation": "Average",
           "interval": "PT1H",
-          "timestamps": [
-            "2017-04-14T02:20:00Z",
-            "2017-04-14T03:20:00Z"
-          ],
-          "baseline": [
-            {
-              "sensitivity": "Low",
-              "lowThresholds": [
-                30.0,
-                31.1
-              ],
-              "highThresholds": [
-                90.3453,
-                91.3453
-              ]
-            },
-            {
-              "sensitivity": "Medium",
-              "lowThresholds": [
-                50.0,
-                51.1
-              ],
-              "highThresholds": [
-                70.3453,
-                71.3453
-              ]
-            }
-          ]
-        }
+          "aggregation": "Average",
+          "timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z",
+          "internalOperationId": "ab6700cb-7579-42ea-a032-ec0be8537564"
+        },
+        "timestamps": [
+          "2021-01-08T00:00:00Z",
+          "2021-01-08T00:05:00Z",
+          "2021-01-08T00:10:00Z",
+          "2021-01-08T00:15:00Z",
+          "2021-01-08T00:20:00Z",
+          "2021-01-08T00:25:00Z",
+          "2021-01-08T00:30:00Z",
+          "2021-01-08T00:35:00Z",
+          "2021-01-08T00:40:00Z",
+          "2021-01-08T00:45:00Z",
+          "2021-01-08T00:50:00Z",
+          "2021-01-08T00:55:00Z",
+          "2021-01-08T01:00:00Z"
+        ],
+        "baseline": [
+          {
+            "sensitivity": "Low",
+            "lowThresholds": [
+              6,
+              6,
+              6,
+              6,
+              6,
+              6,
+              6,
+              6,
+              6,
+              6,
+              6,
+              6,
+              6
+            ],
+            "highThresholds": [
+              14,
+              14,
+              14,
+              14,
+              14,
+              14,
+              14,
+              14,
+              14,
+              14,
+              14,
+              14,
+              14
+            ],
+            "timestamps": [
+              "2021-01-08T00:00:00Z",
+              "2021-01-08T00:05:00Z",
+              "2021-01-08T00:10:00Z",
+              "2021-01-08T00:15:00Z",
+              "2021-01-08T00:20:00Z",
+              "2021-01-08T00:25:00Z",
+              "2021-01-08T00:30:00Z",
+              "2021-01-08T00:35:00Z",
+              "2021-01-08T00:40:00Z",
+              "2021-01-08T00:45:00Z",
+              "2021-01-08T00:50:00Z",
+              "2021-01-08T00:55:00Z",
+              "2021-01-08T01:00:00Z"
+            ],
+            "PredictionResultType": 1,
+            "ErrorType": 0
+          }
+        ],
+        "metdata": [
+          {
+            "name": "",
+            "value": "a"
+          },
+          {
+            "name": "",
+            "value": ""
+          }
+        ],
+        "predictionResultType": 1,
+        "errorType": 0
       }
     }
   }
diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/examples/GetBaselineMetadata.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/examples/GetBaselineMetadata.json
index 1af52e4488a8..9bda89e44ccd 100644
--- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/examples/GetBaselineMetadata.json
+++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-09-01/examples/GetBaselineMetadata.json
@@ -19,18 +19,18 @@
         "properties": {
           "timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z",
           "aggregation": "Average",
-          "interval": "PT1H",
-          "metadata": [
-            {
-              "name": "CurrentTrainingState",
-              "value": "Trained"
-            },
-            {
-              "name": "SelectedModel",
-              "value": "AdjustedBoxplot"
-            }
-          ]
-        }
+          "interval": "PT1H"
+        },
+        "metdata": [
+          {
+            "name": "CurrentTrainingState",
+            "value": "Trained"
+          },
+          {
+            "name": "SelectedModel",
+            "value": "AdjustedBoxplot"
+          }
+        ]
       }
     }
   }