diff --git a/schemas/2018-08-20-preview/Microsoft.HealthcareApis.json b/schemas/2018-08-20-preview/Microsoft.HealthcareApis.json
index d7390ae2b5..6b18d193b1 100644
--- a/schemas/2018-08-20-preview/Microsoft.HealthcareApis.json
+++ b/schemas/2018-08-20-preview/Microsoft.HealthcareApis.json
@@ -7,24 +7,16 @@
     "services": {
       "type": "object",
       "properties": {
-        "name": {
-          "type": "string",
-          "minLength": 3,
-          "maxLength": 24,
-          "description": "The name of the service instance."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.HealthcareApis/services"
-          ]
-        },
         "apiVersion": {
           "type": "string",
           "enum": [
             "2018-08-20-preview"
           ]
         },
+        "etag": {
+          "type": "string",
+          "description": "An etag associated with the resource, used for optimistic concurrency when editing it."
+        },
         "kind": {
           "oneOf": [
             {
@@ -39,49 +31,58 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The kind of the service. Valid values are: fhir."
+          "description": "The kind of the service. Valid values are: fhir, fhir-Stu3 and fhir-R4."
         },
         "location": {
           "type": "string",
           "description": "The resource location."
         },
-        "tags": {
+        "name": {
+          "type": "string",
+          "minLength": 3,
+          "maxLength": 24,
+          "description": "The name of the service instance."
+        },
+        "properties": {
           "oneOf": [
             {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              }
+              "$ref": "#/definitions/ServicesProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The resource tags."
-        },
-        "etag": {
-          "type": "string",
-          "description": "An etag associated with the resource, used for optimistic concurrency when editing it."
+          "description": "The properties of a service instance."
         },
-        "properties": {
+        "tags": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ServicesProperties"
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The common properties of a service."
+          "description": "The resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.HealthcareApis/services"
+          ]
         }
       },
       "required": [
-        "name",
-        "type",
         "apiVersion",
         "kind",
         "location",
-        "properties"
+        "name",
+        "properties",
+        "type"
       ],
       "description": "Microsoft.HealthcareApis/services"
     }
@@ -100,7 +101,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An Azure AD object ID (User or Apps) that is allowed access to the FHIR service."
+          "description": "An object ID that is allowed access to the FHIR service."
         }
       },
       "required": [
@@ -108,169 +109,121 @@
       ],
       "description": "An access policy entry."
     },
-    "ServiceCosmosDbConfigurationInfo": {
+    "ServiceAuthenticationConfigurationInfo": {
       "type": "object",
       "properties": {
-        "offerThroughput": {
+        "audience": {
+          "type": "string",
+          "description": "The audience url for the service"
+        },
+        "authority": {
+          "type": "string",
+          "description": "The authority url for the service"
+        },
+        "smartProxyEnabled": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "boolean"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The provisioned throughput for the backing database."
+          "description": "If the SMART on FHIR proxy is enabled"
         }
       },
-      "description": "The settings for the Cosmos DB database backing the service."
+      "description": "Authentication configuration information"
     },
-    "ServiceAuthenticationConfigurationInfo": {
+    "ServiceCorsConfigurationInfo": {
       "type": "object",
       "properties": {
-        "authority": {
+        "allowCredentials": {
           "oneOf": [
             {
-              "type": "string",
-              "description": "The authority url for the service"
+              "type": "boolean"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "readOnly": false
+          "description": "If credentials are allowed via CORS."
         },
-        "audience": {
+        "headers": {
           "oneOf": [
             {
-              "type": "string",
-              "description": "The audience url for the service"
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "readOnly": false
+          "description": "The headers to be allowed via CORS."
         },
-        "smartProxyEnabled": {
+        "maxAge": {
           "oneOf": [
             {
-              "type": "boolean",
-              "description": "If the SMART on FHIR proxy is enabled"
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 99999
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "readOnly": false
-        }
-      },
-      "description": "Authentication configuration information"
-    },
-    "ServiceCorsConfigurationInfo": {
-      "type": "object",
-      "properties": {
-        "origins": {
-          "readOnly": false,
-          "oneOf": [
-            {
-              "type": "array",
-              "description": "The origins to be allowed via CORS.",
-              "items": {
-                "anyOf": [
-                  {
-                    "type": "string",
-                    "description": "An origin for CORS.",
-                    "pattern": "^(?:(?:(?:[hH][tT][tT][pP](?:[sS]|))\\:\\/\\/(?:[a-zA-Z0-9-]+[.]?)+(?:\\:[0-9]{1,5})?|[*]))$"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                  }
-                ]
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
+          "description": "The max age to be allowed via CORS."
         },
-        "headers": {
-          "readOnly": false,
+        "methods": {
           "oneOf": [
             {
               "type": "array",
-              "description": "The headers to be allowed via CORS.",
               "items": {
-                "anyOf": [
-                  {
-                    "type": "string",
-                    "description": "A header for CORS."
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                  }
-                ]
+                "type": "string"
               }
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ]
+          ],
+          "description": "The methods to be allowed via CORS."
         },
-        "methods": {
-          "readOnly": false,
+        "origins": {
           "oneOf": [
             {
               "type": "array",
-              "description": "The methods to be allowed via CORS.",
               "items": {
-                "anyOf": [
-                  {
-                    "type": "string",
-                    "description": "A method for CORS.",
-                    "enum": [
-                      "DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT"
-                    ]
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                  }
-                ]
+                "type": "string"
               }
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ]
-        },
-        "maxAge": {
-          "readOnly": false,
+          ],
+          "description": "The origins to be allowed via CORS."
+        }
+      },
+      "description": "The settings for the CORS configuration of the service instance."
+    },
+    "ServiceCosmosDbConfigurationInfo": {
+      "type": "object",
+      "properties": {
+        "offerThroughput": {
           "oneOf": [
             {
               "type": "integer",
-              "description": "The max age to be allowed via CORS.",
-              "minimum": 0,
-              "maximum": 99999
+              "minimum": 400,
+              "maximum": 10000
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ]
-        },
-        "allowCredentials": {
-          "readOnly": false,
-          "oneOf": [
-            {
-              "type": "boolean",
-              "description": "If credentials are allowed via CORS."
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
+          ],
+          "description": "The provisioned throughput for the backing database."
         }
       },
-      "description": "The settings for the CORS configuration of the service instance."
+      "description": "The settings for the Cosmos DB database backing the service."
     },
     "ServicesProperties": {
       "type": "object",
@@ -289,38 +242,38 @@
           ],
           "description": "The access policies of the service instance."
         },
-        "cosmosDbConfiguration": {
+        "authenticationConfiguration": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ServiceCosmosDbConfigurationInfo"
+              "$ref": "#/definitions/ServiceAuthenticationConfigurationInfo"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The settings for the Cosmos DB database backing the service."
+          "description": "Authentication configuration information"
         },
-        "authenticationConfiguration": {
+        "corsConfiguration": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ServiceAuthenticationConfigurationInfo"
+              "$ref": "#/definitions/ServiceCorsConfigurationInfo"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The authentication configuration for the service instance."
+          "description": "The settings for the CORS configuration of the service instance."
         },
-        "corsConfiguration": {
-            "oneOf": [
-                {
-                    "$ref": "#/definitions/ServiceCorsConfigurationInfo"
-                },
-                {
-                    "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-            ],
-            "description": "The settings for the CORS configuration of the service instance."
+        "cosmosDbConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ServiceCosmosDbConfigurationInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The settings for the Cosmos DB database backing the service."
         }
       },
       "description": "The properties of a service instance."
diff --git a/schemas/2019-09-16/Microsoft.HealthcareApis.json b/schemas/2019-09-16/Microsoft.HealthcareApis.json
index 70142a0e3e..c08c78aa5c 100644
--- a/schemas/2019-09-16/Microsoft.HealthcareApis.json
+++ b/schemas/2019-09-16/Microsoft.HealthcareApis.json
@@ -7,24 +7,27 @@
     "services": {
       "type": "object",
       "properties": {
-        "name": {
-          "type": "string",
-          "minLength": 3,
-          "maxLength": 24,
-          "description": "The name of the service instance."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.HealthcareApis/services"
-          ]
-        },
         "apiVersion": {
           "type": "string",
           "enum": [
             "2019-09-16"
           ]
         },
+        "etag": {
+          "type": "string",
+          "description": "An etag associated with the resource, used for optimistic concurrency when editing it."
+        },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Setting indicating whether the service has a managed identity associated with it."
+        },
         "kind": {
           "oneOf": [
             {
@@ -39,144 +42,126 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The kind of the service. Valid values are: fhir, fhir-Stu3 and fhir-R4."
+          "description": "The kind of the service."
         },
         "location": {
           "type": "string",
           "description": "The resource location."
         },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The resource tags."
-        },
-        "etag": {
+        "name": {
           "type": "string",
-          "description": "An etag associated with the resource, used for optimistic concurrency when editing it."
+          "minLength": 3,
+          "maxLength": 24,
+          "description": "The name of the service instance."
         },
-        "identity": {
+        "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/Identity"
+              "$ref": "#/definitions/ServicesProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Setting indicating whether the service has a managed identity associated with it."
+          "description": "The properties of a service instance."
         },
-        "properties": {
+        "tags": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ServicesProperties"
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The common properties of a service."
+          "description": "The resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.HealthcareApis/services"
+          ]
         }
       },
       "required": [
-        "name",
-        "type",
         "apiVersion",
         "kind",
         "location",
+        "name",
         "properties",
-        "identity"
+        "type"
       ],
       "description": "Microsoft.HealthcareApis/services"
     }
   },
   "definitions": {
-    "ServiceAccessPolicyEntry": {
+    "ResourceIdentity": {
       "type": "object",
       "properties": {
-        "objectId": {
+        "type": {
           "oneOf": [
             {
               "type": "string",
-              "pattern": "^(([0-9A-Fa-f]{8}[-]?(?:[0-9A-Fa-f]{4}[-]?){3}[0-9A-Fa-f]{12}){1})+$"
+              "enum": [
+                "SystemAssigned",
+                "None"
+              ]
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An Azure AD object ID (User or Apps) that is allowed access to the FHIR service."
+          "description": "Type of identity being specified, currently SystemAssigned and None are allowed."
         }
       },
-      "required": [
-        "objectId"
-      ],
-      "description": "An access policy entry."
+      "description": "Setting indicating whether the service has a managed identity associated with it."
     },
-    "ServiceCosmosDbConfigurationInfo": {
+    "ServiceAccessPolicyEntry": {
       "type": "object",
       "properties": {
-        "offerThroughput": {
+        "objectId": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "string",
+              "pattern": "^(([0-9A-Fa-f]{8}[-]?(?:[0-9A-Fa-f]{4}[-]?){3}[0-9A-Fa-f]{12}){1})+$"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "minimum": 400,
-          "maximum": 10000,
-          "description": "The provisioned throughput for the backing database."
+          "description": "An Azure AD object ID (User or Apps) that is allowed access to the FHIR service."
         }
       },
-      "description": "The settings for the Cosmos DB database backing the service."
+      "required": [
+        "objectId"
+      ],
+      "description": "An access policy entry."
     },
     "ServiceAuthenticationConfigurationInfo": {
       "type": "object",
       "properties": {
-        "authority": {
-          "oneOf": [
-            {
-              "type": "string",
-              "description": "The authority url for the service"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "readOnly": false
-        },
         "audience": {
-          "oneOf": [
-            {
-              "type": "string",
-              "description": "The audience url for the service"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "readOnly": false
+          "type": "string",
+          "description": "The audience url for the service"
+        },
+        "authority": {
+          "type": "string",
+          "description": "The authority url for the service"
         },
         "smartProxyEnabled": {
           "oneOf": [
             {
-              "type": "boolean",
-              "description": "If the SMART on FHIR proxy is enabled"
+              "type": "boolean"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "readOnly": false
+          "description": "If the SMART on FHIR proxy is enabled"
         }
       },
       "description": "Authentication configuration information"
@@ -184,127 +169,100 @@
     "ServiceCorsConfigurationInfo": {
       "type": "object",
       "properties": {
-        "origins": {
-          "readOnly": false,
+        "allowCredentials": {
           "oneOf": [
             {
-              "type": "array",
-              "description": "The origins to be allowed via CORS.",
-              "items": {
-                "anyOf": [
-                  {
-                    "type": "string",
-                    "description": "An origin for CORS.",
-                    "pattern": "^(?:(?:(?:[hH][tT][tT][pP](?:[sS]|))\\:\\/\\/(?:[a-zA-Z0-9-]+[.]?)+(?:\\:[0-9]{1,5})?|[*]))$"
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                  }
-                ]
-              }
+              "type": "boolean"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ]
+          ],
+          "description": "If credentials are allowed via CORS."
         },
         "headers": {
-          "readOnly": false,
           "oneOf": [
             {
               "type": "array",
-              "description": "The headers to be allowed via CORS.",
               "items": {
-                "anyOf": [
-                  {
-                    "type": "string",
-                    "description": "A header for CORS."
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                  }
-                ]
+                "type": "string"
               }
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ]
+          ],
+          "description": "The headers to be allowed via CORS."
         },
-        "methods": {
-          "readOnly": false,
+        "maxAge": {
           "oneOf": [
             {
-              "type": "array",
-              "description": "The methods to be allowed via CORS.",
-              "items": {
-                "anyOf": [
-                  {
-                    "type": "string",
-                    "description": "A method for CORS.",
-                    "enum": [
-                      "DELETE",
-                      "GET",
-                      "OPTIONS",
-                      "PATCH",
-                      "POST",
-                      "PUT"
-                    ]
-                  },
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                  }
-                ]
-              }
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 99999
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ]
+          ],
+          "description": "The max age to be allowed via CORS."
         },
-        "maxAge": {
-          "readOnly": false,
+        "methods": {
           "oneOf": [
             {
-              "type": "integer",
-              "description": "The max age to be allowed via CORS.",
-              "minimum": 0,
-              "maximum": 99999
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ]
+          ],
+          "description": "The methods to be allowed via CORS."
         },
-        "allowCredentials": {
-          "readOnly": false,
+        "origins": {
           "oneOf": [
             {
-              "type": "boolean",
-              "description": "If credentials are allowed via CORS."
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ]
+          ],
+          "description": "The origins to be allowed via CORS."
         }
       },
       "description": "The settings for the CORS configuration of the service instance."
     },
-    "ServiceExportConfigurationInfo": {
+    "ServiceCosmosDbConfigurationInfo": {
       "type": "object",
       "properties": {
-        "storageAccountName": {
+        "offerThroughput": {
           "oneOf": [
             {
-              "type": "string",
-              "description": "The name of the default export storage account."
+              "type": "integer",
+              "minimum": 400,
+              "maximum": 10000
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "readOnly": false
+          "description": "The provisioned throughput for the backing database."
+        }
+      },
+      "description": "The settings for the Cosmos DB database backing the service."
+    },
+    "ServiceExportConfigurationInfo": {
+      "type": "object",
+      "properties": {
+        "storageAccountName": {
+          "type": "string",
+          "description": "The name of the default export storage account."
         }
       },
       "description": "Export operation configuration information"
@@ -326,17 +284,6 @@
           ],
           "description": "The access policies of the service instance."
         },
-        "cosmosDbConfiguration": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ServiceCosmosDbConfigurationInfo"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The settings for the Cosmos DB database backing the service."
-        },
         "authenticationConfiguration": {
           "oneOf": [
             {
@@ -346,7 +293,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The authentication configuration for the service instance."
+          "description": "Authentication configuration information"
         },
         "corsConfiguration": {
           "oneOf": [
@@ -359,43 +306,30 @@
           ],
           "description": "The settings for the CORS configuration of the service instance."
         },
-        "exportConfiguration": {
+        "cosmosDbConfiguration": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ServiceExportConfigurationInfo"
+              "$ref": "#/definitions/ServiceCosmosDbConfigurationInfo"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The settings for the export operation of the service instance."
-        }
-      },
-      "description": "The properties of a service instance."
-    },
-    "Identity": {
-      "type": "object",
-      "properties": {
-        "type": {
+          "description": "The settings for the Cosmos DB database backing the service."
+        },
+        "exportConfiguration": {
           "oneOf": [
             {
-              "type": "string",
-              "enum": [
-                "SystemAssigned",
-                "None"
-              ]
+              "$ref": "#/definitions/ServiceExportConfigurationInfo"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The identity type."
+          "description": "Export operation configuration information"
         }
       },
-      "required": [
-        "type"
-      ],
-      "description": "Identity for the resource."
+      "description": "The properties of a service instance."
     }
   }
 }