diff --git a/sdk/resourcegraph/arm-resourcegraph/package.json b/sdk/resourcegraph/arm-resourcegraph/package.json
index a64bfd50b57f..79d18cbbcf3a 100644
--- a/sdk/resourcegraph/arm-resourcegraph/package.json
+++ b/sdk/resourcegraph/arm-resourcegraph/package.json
@@ -5,7 +5,7 @@
   "version": "1.0.0",
   "dependencies": {
     "@azure/ms-rest-azure-js": "^1.3.2",
-    "@azure/ms-rest-js": "^1.6.0",
+    "@azure/ms-rest-js": "^1.8.1",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -26,7 +26,7 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "uglify-js": "^3.4.9"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/sdk/resourcegraph/arm-resourcegraph",
+  "homepage": "https://github.com/azure/azure-sdk-for-js",
   "repository": {
     "type": "git",
     "url": "https://github.com/azure/azure-sdk-for-js.git"
diff --git a/sdk/resourcegraph/arm-resourcegraph/src/models/index.ts b/sdk/resourcegraph/arm-resourcegraph/src/models/index.ts
index 06256014072f..a14379f6e8f6 100644
--- a/sdk/resourcegraph/arm-resourcegraph/src/models/index.ts
+++ b/sdk/resourcegraph/arm-resourcegraph/src/models/index.ts
@@ -30,6 +30,10 @@ export interface QueryRequestOptions {
    * when ```$skipToken``` property is present.
    */
   skip?: number;
+  /**
+   * Defines in which format query result returned. Possible values include: 'table', 'objectArray'
+   */
+  resultFormat?: ResultFormat;
 }
 
 /**
@@ -92,34 +96,6 @@ export interface QueryRequest {
   facets?: FacetRequest[];
 }
 
-/**
- * Query result column descriptor.
- */
-export interface Column {
-  /**
-   * Column name.
-   */
-  name: string;
-  /**
-   * Column data type. Possible values include: 'string', 'integer', 'number', 'boolean', 'object'
-   */
-  type: ColumnDataType;
-}
-
-/**
- * Query output in tabular format.
- */
-export interface Table {
-  /**
-   * Query result column descriptors.
-   */
-  columns: Column[];
-  /**
-   * Query result rows.
-   */
-  rows: any[][];
-}
-
 /**
  * Contains the possible cases for Facet.
  */
@@ -165,13 +141,41 @@ export interface QueryResponse {
   /**
    * Query output in tabular format.
    */
-  data: Table;
+  data: any;
   /**
    * Query facets.
    */
   facets?: FacetUnion[];
 }
 
+/**
+ * Query result column descriptor.
+ */
+export interface Column {
+  /**
+   * Column name.
+   */
+  name: string;
+  /**
+   * Column data type. Possible values include: 'string', 'integer', 'number', 'boolean', 'object'
+   */
+  type: ColumnDataType;
+}
+
+/**
+ * Query output in tabular format.
+ */
+export interface Table {
+  /**
+   * Query result column descriptors.
+   */
+  columns: Column[];
+  /**
+   * Query result rows.
+   */
+  rows: any[][];
+}
+
 /**
  * Successfully executed facet containing additional statistics on the response of a query.
  */
@@ -195,7 +199,7 @@ export interface FacetResult {
   /**
    * A table containing the desired facets. Only present if the facet is valid.
    */
-  data: Table;
+  data: any;
 }
 
 /**
@@ -321,6 +325,14 @@ export interface ResourceGraphClientOptions extends AzureServiceClientOptions {
 export interface OperationListResult extends Array<Operation> {
 }
 
+/**
+ * Defines values for ResultFormat.
+ * Possible values include: 'table', 'objectArray'
+ * @readonly
+ * @enum {string}
+ */
+export type ResultFormat = 'table' | 'objectArray';
+
 /**
  * Defines values for FacetSortOrder.
  * Possible values include: 'asc', 'desc'
diff --git a/sdk/resourcegraph/arm-resourcegraph/src/models/mappers.ts b/sdk/resourcegraph/arm-resourcegraph/src/models/mappers.ts
index 89eca895611a..13a1ca9222d6 100644
--- a/sdk/resourcegraph/arm-resourcegraph/src/models/mappers.ts
+++ b/sdk/resourcegraph/arm-resourcegraph/src/models/mappers.ts
@@ -42,6 +42,16 @@ export const QueryRequestOptions: msRest.CompositeMapper = {
         type: {
           name: "Number"
         }
+      },
+      resultFormat: {
+        serializedName: "resultFormat",
+        type: {
+          name: "Enum",
+          allowedValues: [
+            "table",
+            "objectArray"
+          ]
+        }
       }
     }
   }
@@ -162,77 +172,6 @@ export const QueryRequest: msRest.CompositeMapper = {
   }
 };
 
-export const Column: msRest.CompositeMapper = {
-  serializedName: "Column",
-  type: {
-    name: "Composite",
-    className: "Column",
-    modelProperties: {
-      name: {
-        required: true,
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      },
-      type: {
-        required: true,
-        serializedName: "type",
-        type: {
-          name: "Enum",
-          allowedValues: [
-            "string",
-            "integer",
-            "number",
-            "boolean",
-            "object"
-          ]
-        }
-      }
-    }
-  }
-};
-
-export const Table: msRest.CompositeMapper = {
-  serializedName: "Table",
-  type: {
-    name: "Composite",
-    className: "Table",
-    modelProperties: {
-      columns: {
-        required: true,
-        serializedName: "columns",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "Column"
-            }
-          }
-        }
-      },
-      rows: {
-        required: true,
-        serializedName: "rows",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Sequence",
-              element: {
-                type: {
-                  name: "Object"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
 export const Facet: msRest.CompositeMapper = {
   serializedName: "Facet",
   type: {
@@ -303,8 +242,7 @@ export const QueryResponse: msRest.CompositeMapper = {
         required: true,
         serializedName: "data",
         type: {
-          name: "Composite",
-          className: "Table"
+          name: "Object"
         }
       },
       facets: {
@@ -323,6 +261,77 @@ export const QueryResponse: msRest.CompositeMapper = {
   }
 };
 
+export const Column: msRest.CompositeMapper = {
+  serializedName: "Column",
+  type: {
+    name: "Composite",
+    className: "Column",
+    modelProperties: {
+      name: {
+        required: true,
+        serializedName: "name",
+        type: {
+          name: "String"
+        }
+      },
+      type: {
+        required: true,
+        serializedName: "type",
+        type: {
+          name: "Enum",
+          allowedValues: [
+            "string",
+            "integer",
+            "number",
+            "boolean",
+            "object"
+          ]
+        }
+      }
+    }
+  }
+};
+
+export const Table: msRest.CompositeMapper = {
+  serializedName: "Table",
+  type: {
+    name: "Composite",
+    className: "Table",
+    modelProperties: {
+      columns: {
+        required: true,
+        serializedName: "columns",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "Column"
+            }
+          }
+        }
+      },
+      rows: {
+        required: true,
+        serializedName: "rows",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Sequence",
+              element: {
+                type: {
+                  name: "Object"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
 export const FacetResult: msRest.CompositeMapper = {
   serializedName: "FacetResult",
   type: {
@@ -350,8 +359,7 @@ export const FacetResult: msRest.CompositeMapper = {
         required: true,
         serializedName: "data",
         type: {
-          name: "Composite",
-          className: "Table"
+          name: "Object"
         }
       }
     }