diff --git a/arm-sql/2014-04-01/swagger/databaseSecurityAlertPolicies.json b/arm-sql/2014-04-01/swagger/databaseSecurityAlertPolicies.json
index 5d9ab4bfd755..5ce321e4afff 100644
--- a/arm-sql/2014-04-01/swagger/databaseSecurityAlertPolicies.json
+++ b/arm-sql/2014-04-01/swagger/databaseSecurityAlertPolicies.json
@@ -120,6 +120,68 @@
     }
   },
   "definitions": {
+    "Resource":{
+      "description":"ARM resource.",
+      "properties":{  
+        "id":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource ID."
+        },
+        "name":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource name."
+        },
+        "type":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource type."
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "TrackedResource":{  
+      "description":"ARM tracked top level resource.",
+      "properties":{  
+        "tags":{  
+          "type":"object",
+          "additionalProperties":{  
+            "type":"string"
+          },
+          "x-ms-mutability":[  
+            "read",
+            "create",
+            "update"
+          ],
+          "description":"Resource tags."
+        },
+        "location":{  
+          "type":"string",
+          "x-ms-mutability":[  
+            "read",
+            "create"
+          ],
+          "description":"Resource location."
+        }
+      },
+      "required":[  
+        "location"
+      ],
+      "allOf":[  
+        {  
+          "$ref":"#/definitions/Resource"
+        }
+      ]
+    },
+    "ProxyResource":{  
+      "description":"ARM proxy resource.",
+      "allOf":[  
+        {  
+          "$ref":"#/definitions/Resource"
+        }
+      ]
+    },
     "DatabaseSecurityAlertPolicy": {
       "description": "Contains information about a database Threat Detection policy.",
       "type": "object",
@@ -144,7 +206,7 @@
       },
       "allOf": [
         {
-          "$ref": "./sql.core.json#/definitions/ProxyResource"
+          "$ref": "#/definitions/ProxyResource"
         }
       ]
     },
diff --git a/arm-sql/2014-04-01/swagger/firewallRules.json b/arm-sql/2014-04-01/swagger/firewallRules.json
index 68de877f4469..6493cdf11a74 100644
--- a/arm-sql/2014-04-01/swagger/firewallRules.json
+++ b/arm-sql/2014-04-01/swagger/firewallRules.json
@@ -190,6 +190,21 @@
     }
   },
   "definitions": {
+    "SubResource": {
+      "description": "Subresource properties",
+      "properties": {
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name"
+        },
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The resource ID."
+        }
+      }
+    },
     "FirewallRuleProperties": {
       "properties": {
         "startIpAddress": {
@@ -229,7 +244,7 @@
       },
       "allOf": [
         {
-          "$ref": "./sql.core.json#/definitions/SubResource"
+          "$ref": "#/definitions/SubResource"
         }
       ],
       "description": "Represents a server firewall rule."
diff --git a/arm-sql/2014-04-01/swagger/importExport.json b/arm-sql/2014-04-01/swagger/importExport.json
index 8b0fba0eeefb..07456324dbd8 100644
--- a/arm-sql/2014-04-01/swagger/importExport.json
+++ b/arm-sql/2014-04-01/swagger/importExport.json
@@ -175,6 +175,68 @@
         }
     },
     "definitions": {
+    "Resource":{
+      "description":"ARM resource.",
+      "properties":{  
+        "id":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource ID."
+        },
+        "name":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource name."
+        },
+        "type":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource type."
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "TrackedResource":{  
+      "description":"ARM tracked top level resource.",
+      "properties":{  
+        "tags":{  
+          "type":"object",
+          "additionalProperties":{  
+            "type":"string"
+          },
+          "x-ms-mutability":[  
+            "read",
+            "create",
+            "update"
+          ],
+          "description":"Resource tags."
+        },
+        "location":{  
+          "type":"string",
+          "x-ms-mutability":[  
+            "read",
+            "create"
+          ],
+          "description":"Resource location."
+        }
+      },
+      "required":[  
+        "location"
+      ],
+      "allOf":[  
+        {  
+          "$ref":"#/definitions/Resource"
+        }
+      ]
+    },
+    "ProxyResource":{  
+      "description":"ARM proxy resource.",
+      "allOf":[  
+        {  
+          "$ref":"#/definitions/Resource"
+        }
+      ]
+    },
         "ImportExtensionProperties": {
             "properties": {
                 "operationMode": {
@@ -221,7 +283,7 @@
                 }
             },
             "allOf": [{
-                "$ref": "./sql.core.json#/definitions/ProxyResource"
+                "$ref": "#/definitions/ProxyResource"
             }],
             "description": "Response for Import/Export Get operation."
         },
diff --git a/arm-sql/2014-04-01/swagger/replicationLinks.json b/arm-sql/2014-04-01/swagger/replicationLinks.json
index 9b859f1d6e18..6b2b36eceb0a 100644
--- a/arm-sql/2014-04-01/swagger/replicationLinks.json
+++ b/arm-sql/2014-04-01/swagger/replicationLinks.json
@@ -251,6 +251,21 @@
     }
   },
   "definitions": {
+    "SubResource": {
+      "description": "Subresource properties",
+      "properties": {
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name"
+        },
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The resource ID."
+        }
+      }
+    },
     "ReplicationLinkProperties": {
       "properties": {
         "isTerminationAllowed": {
@@ -358,7 +373,7 @@
       },
       "allOf": [
         {
-          "$ref": "./sql.core.json#/definitions/SubResource"
+          "$ref": "#/definitions/SubResource"
         }
       ],
       "description": "Represents a database replication link."
diff --git a/arm-sql/2015-05-01-preview/swagger/blobAuditingPolicies.json b/arm-sql/2015-05-01-preview/swagger/blobAuditingPolicies.json
index c7b73f877a91..01d17b611291 100644
--- a/arm-sql/2015-05-01-preview/swagger/blobAuditingPolicies.json
+++ b/arm-sql/2015-05-01-preview/swagger/blobAuditingPolicies.json
@@ -120,6 +120,68 @@
     }
   },
   "definitions": {
+"Resource":{
+      "description":"ARM resource.",
+      "properties":{  
+        "id":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource ID."
+        },
+        "name":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource name."
+        },
+        "type":{  
+          "readOnly":true,
+          "type":"string",
+          "description":"Resource type."
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "TrackedResource":{  
+      "description":"ARM tracked top level resource.",
+      "properties":{  
+        "tags":{  
+          "type":"object",
+          "additionalProperties":{  
+            "type":"string"
+          },
+          "x-ms-mutability":[  
+            "read",
+            "create",
+            "update"
+          ],
+          "description":"Resource tags."
+        },
+        "location":{  
+          "type":"string",
+          "x-ms-mutability":[  
+            "read",
+            "create"
+          ],
+          "description":"Resource location."
+        }
+      },
+      "required":[  
+        "location"
+      ],
+      "allOf":[  
+        {  
+          "$ref":"#/definitions/Resource"
+        }
+      ]
+    },
+    "ProxyResource":{  
+      "description":"ARM proxy resource.",
+      "allOf":[  
+        {  
+          "$ref":"#/definitions/Resource"
+        }
+      ]
+    },
     "DatabaseBlobAuditingPolicy": {
       "description": "Contains information about a database Blob Auditing policy.",
       "type": "object",
@@ -143,7 +205,7 @@
         }
       },
       "allOf": [
-        { "$ref": "../../2014-04-01/swagger/sql.core.json#/definitions/ProxyResource" }
+        { "$ref": "#/definitions/ProxyResource" }
       ]
     },
     "DatabaseBlobAuditingPolicyProperties": {