diff --git a/specification/maps/data-plane/Common/preview/1.0/common.json b/specification/maps/data-plane/Common/preview/1.0/common.json
index a50864ab973e..be11a5a2f621 100644
--- a/specification/maps/data-plane/Common/preview/1.0/common.json
+++ b/specification/maps/data-plane/Common/preview/1.0/common.json
@@ -539,6 +539,13 @@
       "in": "header",
       "x-ms-parameter-location": "client"
     },
+    "Language": {
+      "name": "language",
+      "in": "query",
+      "description": "Language in which search results should be returned. Should be one of supported IETF language tags, case insensitive. When data in specified language is not available for a specific field, default language is used.\n\nPlease refer to [Supported Languages](https://docs.microsoft.com/en-us/azure/azure-maps/supported-languages) for details.",
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
     "ResponseFormat": {
       "name": "format",
       "description": "Desired format of the response. Only `json` format is supported.",
@@ -612,6 +619,33 @@
         ]
       },
       "x-ms-parameter-location": "client"
+    },
+    "View": {
+      "name": "view",
+      "in": "query",
+      "description": "The View parameter specifies which set of geopolitically disputed content is returned via Azure Maps services, including  borders and labels displayed on the map. The View parameter (also referred to as “user region parameter”) will show the  correct maps for that country/region. By default, the View parameter is set to “Unified” even if you haven’t defined it in  the request. It is your responsibility to determine the location of your users, and then set the View parameter correctly  for that location. Alternatively, you have the option to set ‘View=Auto’, which will return the map data based on the IP  address of the request. The View parameter in Azure Maps must be used in compliance with applicable laws, including those  regarding mapping, of the country where maps, images and other data and third party content that you are authorized to  access via Azure Maps is made available. Example: view=IN.\n\nPlease refer to [Supported Views](https://aka.ms/AzureMapsLocalizationViews) for details and to see the available Views.",
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "xTileIndex": {
+      "name": "x",
+      "x-ms-client-name": "xTileIndex",
+      "in": "query",
+      "description": "X coordinate of the tile on zoom grid. Value must be in the range [0, 2<sup>`zoom`</sup> -1].\n\nPlease see [Zoom Levels and Tile Grid](https://docs.microsoft.com/en-us/azure/location-based-services/zoom-levels-and-tile-grid) for details.",
+      "required": true,
+      "type": "integer",
+      "format": "int32",
+      "x-ms-parameter-location": "method"
+    },
+    "yTileIndex": {
+      "name": "y",
+      "x-ms-client-name": "yTileIndex",
+      "in": "query",
+      "description": "Y coordinate of the tile on zoom grid. Value must be in the range [0, 2<sup>`zoom`</sup> -1].\n\nPlease see [Zoom Levels and Tile Grid](https://docs.microsoft.com/en-us/azure/location-based-services/zoom-levels-and-tile-grid) for details.",
+      "required": true,
+      "type": "integer",
+      "format": "int32",
+      "x-ms-parameter-location": "method"
     }
   },
   "responses": {
diff --git a/specification/maps/data-plane/Render/preview/1.0/render.json b/specification/maps/data-plane/Render/preview/1.0/render.json
index b3551dd7c2b8..79099d3ce129 100644
--- a/specification/maps/data-plane/Render/preview/1.0/render.json
+++ b/specification/maps/data-plane/Render/preview/1.0/render.json
@@ -105,26 +105,6 @@
       },
       "x-ms-parameter-location": "method"
     },
-    "xTileIndex": {
-      "name": "x",
-      "x-ms-client-name": "xTileIndex",
-      "in": "query",
-      "description": "X coordinate of the tile on zoom grid. Value must be in the range [0, 2<sup>`zoom`</sup> -1].\n\nPlease see [Zoom Levels and Tile Grid](https://docs.microsoft.com/en-us/azure/location-based-services/zoom-levels-and-tile-grid) for details.",
-      "required": true,
-      "type": "integer",
-      "format": "int32",
-      "x-ms-parameter-location": "method"
-    },
-    "yTileIndex": {
-      "name": "y",
-      "x-ms-client-name": "yTileIndex",
-      "in": "query",
-      "description": "Y coordinate of the tile on zoom grid. Value must be in the range [0, 2<sup>`zoom`</sup> -1].\n\nPlease see [Zoom Levels and Tile Grid](https://docs.microsoft.com/en-us/azure/location-based-services/zoom-levels-and-tile-grid) for details.",
-      "required": true,
-      "type": "integer",
-      "format": "int32",
-      "x-ms-parameter-location": "method"
-    },
     "RasterZoom18": {
       "name": "zoom",
       "in": "query",
@@ -300,10 +280,10 @@
             "maximum": 8192
           },
           {
-            "$ref": "../../../Search/preview/1.0/search.json#/parameters/Language"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/Language"
           },
           {
-            "$ref": "../../../Search/preview/1.0/search.json#/parameters/View"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/View"
           },
           {
             "name": "pins",
@@ -442,10 +422,10 @@
             "$ref": "#/parameters/RasterVectorNaturalEarthZoom"
           },
           {
-            "$ref": "#/parameters/xTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/xTileIndex"
           },
           {
-            "$ref": "#/parameters/yTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/yTileIndex"
           },
           {
             "name": "tileSize",
@@ -472,10 +452,10 @@
             }
           },
           {
-            "$ref": "../../../Search/preview/1.0/search.json#/parameters/Language"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/Language"
           },
           {
-            "$ref": "../../../Search/preview/1.0/search.json#/parameters/View"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/View"
           }
         ],
         "produces": [
@@ -526,10 +506,10 @@
             "$ref": "#/parameters/VectorZoom"
           },
           {
-            "$ref": "#/parameters/xTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/xTileIndex"
           },
           {
-            "$ref": "#/parameters/yTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/yTileIndex"
           },
           {
             "name": "statesetId",
@@ -640,10 +620,10 @@
             "$ref": "#/parameters/ImageryRasterZoom"
           },
           {
-            "$ref": "#/parameters/xTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/xTileIndex"
           },
           {
-            "$ref": "#/parameters/yTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/yTileIndex"
           }
         ],
         "produces": [
@@ -745,10 +725,10 @@
             "$ref": "#/parameters/RasterZoom18"
           },
           {
-            "$ref": "#/parameters/xTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/xTileIndex"
           },
           {
-            "$ref": "#/parameters/yTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/yTileIndex"
           },
           {
             "$ref": "#/parameters/IncludeText"
diff --git a/specification/maps/data-plane/Render/preview/2.0/render.json b/specification/maps/data-plane/Render/preview/2.0/render.json
index 234fba73e523..56f608740f71 100644
--- a/specification/maps/data-plane/Render/preview/2.0/render.json
+++ b/specification/maps/data-plane/Render/preview/2.0/render.json
@@ -76,7 +76,8 @@
         "microsoft.imagery",
         "microsoft.weather.radar.main",
         "microsoft.weather.infrared.main",
-        "microsoft.dem"
+        "microsoft.dem",
+        "microsoft.dem.contours"
       ],
       "x-ms-enum": {
         "name": "TilesetID",
@@ -129,6 +130,10 @@
           {
             "value": "microsoft.dem",
             "description": "Digital Elevation Model tiles. The tiles are in the GeoTIFF format with a single 32-bit floating point band. The tiles cover the whole landmass of Earth. Some small islands (e.g., atolls) might not be represented accurately.<br>\n* The vertical unit for measurement of elevation height is meters. An elevation value of -32767.0 is used for points that have no data value, most often returned where there isn't landmass (i.e. water).<br>\n* The horizontal reference datum is the World Geodetic System 1984 (WGS84-G1150) and the vertical reference datum is the Earth Gravitational Model 2008 (EGM2008).<br>\n* Tiles are 258x258 pixel squares rather than the standard 256 x 256. This is done to allow for accurate interpolation of values at the tile edges. As such adjacent tiles overlap by 1 pixel along all edges.<br>\n* Tile data comes from the [Airbus WorldDEM4Ortho product](https://www.intelligence-airbusds.com/worlddem-streaming/). Urban areas are approximately leveled down to ground level. All other areas are represented by the object surface level (e.g., trees). <br>\n\nSupports zoom level 13 only. Format: raster (tiff)."
+          },
+          {
+            "value": "microsoft.dem.contours",
+            "description": "Digital elevation contour line tiles. Compared to the microsoft.dem option, these tiles are in vector format and intended for visualization purpose. The tiles cover the whole landmass of Earth. Some small islands (e.g., atolls) might not be represented accurately.<br>\n* The vertical unit for measurement of elevation height is meters.<br>\n* The horizontal reference datum is the World Geodetic System 1984 (WGS84-G1150) and the vertical reference datum is the Earth Gravitational Model 2008 (EGM2008).<br>\n* Tile data comes from the [Airbus WorldDEM4Ortho product](https://www.intelligence-airbusds.com/worlddem-streaming/). Urban areas are approximately leveled down to ground level. All other areas are represented by the object surface level (e.g., trees).<br>\n\nSupports zoom levels 9 through 14. Format: vector (pbf)."
           }
         ]
       },
@@ -168,10 +173,10 @@
             "$ref": "#/parameters/MapTileV2Zoom"
           },
           {
-            "$ref": "../1.0/render.json#/parameters/xTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/xTileIndex"
           },
           {
-            "$ref": "../1.0/render.json#/parameters/yTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/yTileIndex"
           },
           {
             "name": "timeStamp",
@@ -204,10 +209,10 @@
             }
           },
           {
-            "$ref": "../../../Search/preview/1.0/search.json#/parameters/Language"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/Language"
           },
           {
-            "$ref": "../../../Search/preview/1.0/search.json#/parameters/View"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/View"
           }
         ],
         "produces": [
diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/GetMapAttributionV2.json b/specification/maps/data-plane/Render/preview/2.1/examples/GetMapAttributionV2.json
new file mode 100644
index 000000000000..47de6f12f5e0
--- /dev/null
+++ b/specification/maps/data-plane/Render/preview/2.1/examples/GetMapAttributionV2.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "api-version": "2.1",
+    "tilesetId": "microsoft.base",
+    "zoom": 6,
+    "bounds": "-122.414162,47.579490,-122.247157,47.668372"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "copyrights": [
+          "<a>&copy; 2021 TomTom</a>"
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/GetMapTileV2.json b/specification/maps/data-plane/Render/preview/2.1/examples/GetMapTileV2.json
new file mode 100644
index 000000000000..704199bbd1e7
--- /dev/null
+++ b/specification/maps/data-plane/Render/preview/2.1/examples/GetMapTileV2.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "api-version": "2.1",
+    "tilesetId": "microsoft.base",
+    "zoom": 6,
+    "x": 10,
+    "y": 22
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Content-Type": "application/vnd.mapbox-vector-tile"
+      },
+      "body": "{file}"
+    }
+  }
+}
diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/GetMapTilesetV2.json b/specification/maps/data-plane/Render/preview/2.1/examples/GetMapTilesetV2.json
new file mode 100644
index 000000000000..cc91082b9526
--- /dev/null
+++ b/specification/maps/data-plane/Render/preview/2.1/examples/GetMapTilesetV2.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "api-version": "2.1",
+    "tilesetId": "microsoft.base"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "tilejson": "2.2.0",
+        "version": "1.0.0",
+        "attribution": "<a>&copy; 2021 TomTom</a>",
+        "scheme": "xyz",
+        "tiles": [
+          "https://atlas.microsoft.com/map/tile?api-version=2.0&tilesetId={tilesetId}&zoom={zoom}&x={x}&y={y}"
+        ],
+        "minzoom": 0,
+        "maxzoom": 22,
+        "bounds": [
+          -180,
+          -90,
+          180,
+          90
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/maps/data-plane/Render/preview/2.1/render.json b/specification/maps/data-plane/Render/preview/2.1/render.json
new file mode 100644
index 000000000000..075aaddc7e3a
--- /dev/null
+++ b/specification/maps/data-plane/Render/preview/2.1/render.json
@@ -0,0 +1,347 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Azure Maps Render Service",
+    "version": "2.1",
+    "description": "Azure Maps Render REST APIs"
+  },
+  "host": "atlas.microsoft.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [],
+  "produces": [
+    "application/json"
+  ],
+  "securityDefinitions": {
+    "AADToken": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "These are the [Azure Active Directory OAuth2](https://docs.microsoft.com/en-us/azure/active-directory/develop/v1-overview)  Flows. When paired with [Azure role-based access](https://docs.microsoft.com/en-us/azure/role-based-access-control/overview)  control it can be used to control access to Azure Maps REST APIs. Azure role-based access controls are used to designate access to one or more Azure Maps resource account or sub-resources. Any user, group, or service principal can be granted access via a  built-in role or a custom role composed of one or more permissions to Azure Maps REST APIs.\n\nTo implement scenarios, we recommend viewing [authentication concepts](https://aka.ms/amauth). In summary, this security definition provides a solution  for modeling application(s) via objects capable of access control on specific APIs and scopes.\n\n#### Notes\n* This security definition **requires** the use of the `x-ms-client-id` header to indicate which Azure Maps resource the application is requesting access to.  This can be acquired from the [Maps management API](https://aka.ms/amauthdetails).\n* \nThe `Authorization URL` is specific to the Azure public cloud instance. Sovereign clouds have unique Authorization URLs and Azure Active directory configurations. \n* \nThe Azure role-based access control is configured from the [Azure management plane](https://aka.ms/amrbac) via Azure portal, PowerShell, CLI, Azure SDKs, or REST APIs.\n* \nUsage of the [Azure Maps Web SDK](https://aka.ms/amaadmc) allows for configuration based setup of an application for multiple use cases.\n* Currently, Azure Active Directory [v1.0](https://docs.microsoft.com/en-us/azure/active-directory/develop/azure-ad-endpoint-comparison) tokens are supported.",
+      "scopes": {
+        "https://atlas.microsoft.com/.default": "https://atlas.microsoft.com/.default"
+      }
+    },
+    "AzureKey": {
+      "type": "apiKey",
+      "description": "This is a shared key that is provisioned when creating an [Azure Maps resource](https://aka.ms/amauth) through the Azure management plane  via Azure portal, PowerShell, CLI, Azure SDKs, or REST APIs.\n\n With this key, any application is authorized to access  all REST APIs. In other words, these can currently be treated as master keys to the account which they are issued for.\n\n For publicly exposed applications, our recommendation is to use server-to-server access of Azure Maps REST APIs where this key can be  securely stored.",
+      "name": "subscription-key",
+      "in": "header"
+    }
+  },
+  "security": [
+    {
+      "AADToken": [
+        "https://atlas.microsoft.com/.default"
+      ]
+    },
+    {
+      "AzureKey": []
+    }
+  ],
+  "responses": {},
+  "parameters": {
+    "RenderApiVersionV2": {
+      "name": "api-version",
+      "description": "Version number of Azure Maps API. Current version is 2.1",
+      "type": "string",
+      "in": "query",
+      "required": true,
+      "default": "2.1",
+      "x-ms-parameter-location": "client"
+    }
+  },
+  "paths": {
+    "/map/tile": {
+      "get": {
+        "description": "**Applies to**: S0 and S1 pricing tiers.\n\nThe Get Map Tiles API allows users to request map tiles in vector or raster formats typically to be integrated  into a map control or SDK. Some example tiles that can be requested are Azure Maps road tiles, real-time  Weather Radar tiles or the map tiles created using [Azure Maps Creator](https://aka.ms/amcreator). By default,  Azure Maps uses vector tiles for its web map control (Web SDK) and Android SDK.",
+        "operationId": "RenderV2_GetMapTilePreview",
+        "x-ms-examples": {
+          "GetMapTile": {
+            "$ref": "./examples/GetMapTileV2.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/ClientId"
+          },
+          {
+            "$ref": "#/parameters/RenderApiVersionV2"
+          },
+          {
+            "$ref": "../2.0/render.json#/parameters/TilesetId_rv2"
+          },
+          {
+            "$ref": "../2.0/render.json#/parameters/MapTileV2Zoom"
+          },
+          {
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/xTileIndex"
+          },
+          {
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/yTileIndex"
+          },
+          {
+            "name": "timeStamp",
+            "in": "query",
+            "format": "date-time",
+            "description": "The desired date and time of the requested tile. This parameter must be specified in the standard date-time format (e.g. 2019-11-14T16:03:00-08:00), as defined by [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601). This parameter is only supported when tilesetId parameter is set to one of the values below.\n  \n* microsoft.weather.infrared.main: We provide tiles up to 3 hours in the past. Tiles are available in 10-minute intervals. We round the timeStamp value to the nearest 10-minute time frame.\n* microsoft.weather.radar.main: We provide tiles up to 1.5 hours in the past and up to 2 hours in the future. Tiles are available in 5-minute intervals. We round the timeStamp value to the nearest 5-minute time frame.",
+            "type": "string"
+          },
+          {
+            "name": "tileSize",
+            "in": "query",
+            "description": "The size of the returned map tile in pixels.",
+            "type": "string",
+            "enum": [
+              "256",
+              "512"
+            ],
+            "x-ms-enum": {
+              "name": "TileSize",
+              "modelAsString": true,
+              "values": [
+                {
+                  "value": "256",
+                  "description": "Return a 256 by 256 pixel tile. Available for all tilesetIds except for\n* microsoft.terra.main"
+                },
+                {
+                  "value": "512",
+                  "description": "Return a 512 by 512 pixel tile.  Available for all tilesetIds except for \n* microsoft.weather.radar.main\n* microsoft.weather.infrared.main\n* microsoft.base.hybrid\n* microsoft.dem\n* microsoft.imagery"
+                }
+              ]
+            }
+          },
+          {
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/Language"
+          },
+          {
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/View"
+          }
+        ],
+        "produces": [
+          "application/json",
+          "image/jpeg",
+          "image/png",
+          "image/pbf",
+          "application/vnd.mapbox-vector-tile"
+        ],
+        "responses": {
+          "200": {
+            "description": "The tile returned from a successful API call.",
+            "schema": {
+              "type": "object",
+              "format": "file",
+              "readOnly": true
+            },
+            "headers": {
+              "Content-Type": {
+                "type": "string",
+                "description": "The content-type for the response."
+              }
+            }
+          },
+          "default": {
+            "$ref": "../../../Common/preview/1.0/common.json#/responses/default"
+          }
+        }
+      }
+    },
+    "/map/tileset": {
+      "get": {
+        "description": "**Applies to**: S0 and S1 pricing tiers.\n\nThe Get Map Tileset API allows users to request metadata for a tileset.",
+        "operationId": "RenderV2_GetMapTileset",
+        "x-ms-examples": {
+          "GetMapTileset": {
+            "$ref": "./examples/GetMapTilesetV2.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/ClientId"
+          },
+          {
+            "$ref": "#/parameters/RenderApiVersionV2"
+          },
+          {
+            "$ref": "../2.0/render.json#/parameters/TilesetId_rv2"
+          }
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/MapTilesetResultV2"
+            }
+          },
+          "default": {
+            "$ref": "../../../Common/preview/1.0/common.json#/responses/default"
+          }
+        }
+      }
+    },
+    "/map/attribution": {
+      "get": {
+        "description": "**Applies to**: S0 and S1 pricing tiers.\n\nThe Get Map Attribution API allows users to request map copyright attribution information for a section of a tileset.",
+        "operationId": "RenderV2_GetMapAttribution",
+        "x-ms-examples": {
+          "GetMapAttribution": {
+            "$ref": "./examples/GetMapAttributionV2.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/ClientId"
+          },
+          {
+            "$ref": "#/parameters/RenderApiVersionV2"
+          },
+          {
+            "$ref": "../2.0/render.json#/parameters/TilesetId_rv2"
+          },
+          {
+            "$ref": "../2.0/render.json#/parameters/MapTileV2Zoom"
+          },
+          {
+            "name": "bounds",
+            "in": "query",
+            "description": "The string that represents the rectangular area of a bounding box. The bounds parameter is defined by the 4 bounding box coordinates, with WGS84 longitude and latitude of the southwest corner followed by  WGS84 longitude and latitude of the northeast corner. The string is presented in the following  format: `[SouthwestCorner_Longitude, SouthwestCorner_Latitude, NortheastCorner_Longitude,  NortheastCorner_Latitude]`.",
+            "required": true,
+            "type": "array",
+            "collectionFormat": "csv",
+            "items": {
+              "type": "string"
+            }
+          }
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/MapAttributionResultV2"
+            }
+          },
+          "default": {
+            "$ref": "../../../Common/preview/1.0/common.json#/responses/default"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "MapTileResultv2": {
+      "description": "The tile returned from a successful API call.",
+      "type": "object",
+      "format": "file",
+      "readOnly": true
+    },
+    "MapTilesetResultV2": {
+      "description": "Metadata for a tileset in the TileJSON format.",
+      "type": "object",
+      "readOnly": true,
+      "properties": {
+        "tilejson": {
+          "type": "string",
+          "pattern": "\\d+\\.\\d+\\.\\d+\\w?[\\w\\d]*",
+          "description": "Version of the TileJSON spec."
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the tileset."
+        },
+        "description": {
+          "type": "string",
+          "description": "Text description of the tileset."
+        },
+        "version": {
+          "type": "string",
+          "pattern": "\\d+\\.\\d+\\.\\d+\\w?[\\w\\d]*",
+          "description": "A semver.org style version number for the tiles contained within the tileset."
+        },
+        "attribution": {
+          "type": "string",
+          "description": "Copyright attribution to be displayed on the map."
+        },
+        "template": {
+          "type": "string",
+          "description": "A mustache template to be used to format data from grids for interaction."
+        },
+        "legend": {
+          "type": "string",
+          "description": "A legend to be displayed with the map."
+        },
+        "scheme": {
+          "type": "string",
+          "description": "Default: \"xyz\". Either \"xyz\" or \"tms\". Influences the y direction of the tile coordinates."
+        },
+        "tiles": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "An array of tile endpoints."
+        },
+        "grids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "An array of interactivity endpoints."
+        },
+        "data": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "An array of data files in GeoJSON format."
+        },
+        "minzoom": {
+          "minimum": 0,
+          "maximum": 30,
+          "type": "integer",
+          "description": "The minimum zoom level."
+        },
+        "maxzoom": {
+          "minimum": 0,
+          "maximum": 30,
+          "type": "integer",
+          "description": "The maximum zoom level."
+        },
+        "bounds": {
+          "type": "array",
+          "items": {
+            "type": "number"
+          },
+          "description": "The WGS84 bounds of the tileset."
+        },
+        "center": {
+          "type": "array",
+          "items": {
+            "type": "number"
+          },
+          "description": "The default location of the tileset in the form [longitude, latitude, zoom]."
+        }
+      }
+    },
+    "MapAttributionResultV2": {
+      "description": "Copyright attribution for the requested section of a tileset.",
+      "type": "object",
+      "readOnly": true,
+      "properties": {
+        "copyrights": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "A list of copyright strings."
+        }
+      }
+    }
+  }
+}
diff --git a/specification/maps/data-plane/Render/readme.go.md b/specification/maps/data-plane/Render/readme.go.md
index d7a8bb1a3b80..309634d3db6f 100644
--- a/specification/maps/data-plane/Render/readme.go.md
+++ b/specification/maps/data-plane/Render/readme.go.md
@@ -14,6 +14,16 @@ export-clients: true
 ``` yaml $(go) && $(multiapi)
 batch:
   - tag: 2.0-preview
+  - tag: 2.1-preview
+```
+
+### Tag: 2.1-preview and go
+
+These settings apply only when `--tag=2.1-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == '2.1-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/maps/2.1/$(namespace)
 ```
 
 ### Tag: 2.0-preview and go
diff --git a/specification/maps/data-plane/Render/readme.md b/specification/maps/data-plane/Render/readme.md
index ef50275bae4f..742c370a1a2b 100644
--- a/specification/maps/data-plane/Render/readme.md
+++ b/specification/maps/data-plane/Render/readme.md
@@ -27,13 +27,22 @@ These are the global settings for Render Client.
 ``` yaml
 title: RenderClient
 openapi-type: data-plane
-tag: 2.0-preview
+tag: 2.1-preview
 # at some point those credentials will move away to Swagger according to [this](https://github.com/Azure/autorest/issues/3718)
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
 credential-scopes: https://atlas.microsoft.com/.default
 ```
 
+### Tag: 2.1-preview
+
+These settings apply only when `--tag=2.1-preview` is specified on the command line.
+
+``` yaml $(tag) == '2.1-preview'
+input-file:
+  - preview/1.0/render.json
+  - preview/2.1/render.json
+```
 
 ### Tag: 2.0-preview
 
diff --git a/specification/maps/data-plane/Render/readme.python.md b/specification/maps/data-plane/Render/readme.python.md
index 7e61eefced21..5ac67a238fe9 100644
--- a/specification/maps/data-plane/Render/readme.python.md
+++ b/specification/maps/data-plane/Render/readme.python.md
@@ -9,7 +9,7 @@ python-mode: create
 license-header: MICROSOFT_MIT_NO_VERSION
 namespace: azure.maps.render
 package-name: azure-maps-render
-package-version: 2.0-preview
+package-version: 2.1-preview
 clear-output-folder: true
 ```
 ``` yaml $(python) && $(python-mode) == 'update'
diff --git a/specification/maps/data-plane/Traffic/preview/1.0/traffic.json b/specification/maps/data-plane/Traffic/preview/1.0/traffic.json
index 55d16316e516..cc860ed0e133 100644
--- a/specification/maps/data-plane/Traffic/preview/1.0/traffic.json
+++ b/specification/maps/data-plane/Traffic/preview/1.0/traffic.json
@@ -162,10 +162,10 @@
             "$ref": "#/parameters/RasterVectorZoom"
           },
           {
-            "$ref": "../../../Render/preview/1.0/render.json#/parameters/xTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/xTileIndex"
           },
           {
-            "$ref": "../../../Render/preview/1.0/render.json#/parameters/yTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/yTileIndex"
           },
           {
             "name": "thickness",
@@ -361,10 +361,10 @@
             "$ref": "#/parameters/RasterVectorZoom"
           },
           {
-            "$ref": "../../../Render/preview/1.0/render.json#/parameters/xTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/xTileIndex"
           },
           {
-            "$ref": "../../../Render/preview/1.0/render.json#/parameters/yTileIndex"
+            "$ref": "../../../Common/preview/1.0/common.json#/parameters/yTileIndex"
           },
           {
             "name": "t",