diff --git a/specification/vmware/resource-manager/Microsoft.AVS/preview/2020-07-17-preview/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/preview/2020-07-17-preview/vmware.json
index b9e382738ec6..fbdc18e0f097 100644
--- a/specification/vmware/resource-manager/Microsoft.AVS/preview/2020-07-17-preview/vmware.json
+++ b/specification/vmware/resource-manager/Microsoft.AVS/preview/2020-07-17-preview/vmware.json
@@ -3694,6 +3694,14 @@
         "displayName": {
           "description": "Localized friendly display name of the dimension",
           "type": "string"
+        },
+        "internalName": {
+          "description": "Name of the dimension as it appears in MDM",
+          "type": "string"
+        },
+        "toBeExportedForShoebox": {
+          "description": "A boolean flag indicating whether this dimension should be included for the shoebox export scenario",
+          "type": "boolean"
         }
       }
     },
diff --git a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json
index 891e2eb1a39a..cec614376448 100644
--- a/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json
+++ b/specification/vmware/resource-manager/Microsoft.AVS/stable/2020-03-20/vmware.json
@@ -1501,6 +1501,14 @@
         "displayName": {
           "description": "Localized friendly display name of the dimension",
           "type": "string"
+        },
+        "internalName": {
+          "description": "Name of the dimension as it appears in MDM",
+          "type": "string"
+        },
+        "toBeExportedForShoebox": {
+          "description": "A boolean flag indicating whether this dimension should be included for the shoebox export scenario",
+          "type": "boolean"
         }
       }
     },
diff --git a/specification/vmware/resource-manager/readme.md b/specification/vmware/resource-manager/readme.md
index 90e2880519a8..6f5b6d74c0d9 100644
--- a/specification/vmware/resource-manager/readme.md
+++ b/specification/vmware/resource-manager/readme.md
@@ -56,6 +56,10 @@ directive:
   - suppress: R4009
     from: Microsoft.AVS/preview/2020-07-17-preview/vmware.json
     reason: systemData will be in the next API version
+  - suppress: R3018
+    from: Microsoft.AVS/preview/2020-07-17-preview/vmware.json
+    where: $.definitions.MetricDimension.properties.toBeExportedForShoebox
+    reason: standard property defined by Geneva Metrics
 ```
 
 ### Tag: package-2020-03-20
@@ -87,6 +91,10 @@ directive:
     from: Microsoft.AVS/stable/2020-03-20/vmware.json
     where: $.definitions.Operation.properties.properties
     reason: x-ms-client-flatten not needed for Operation
+  - suppress: R3018
+    from: Microsoft.AVS/stable/2020-03-20/vmware.json
+    where: $.definitions.MetricDimension.properties.toBeExportedForShoebox
+    reason: standard property defined by Geneva Metrics
 ```
 
 ---