Tweaks

Tweak
2026-01-19 17:54:07 +00:00 · 2020-07-23 21:53:46 -05:00 · 2020-07-23 21:52:05 -05:00 · 2020-07-23 19:03:43 -05:00 · 2020-07-23 19:02:09 -05:00 · 2020-07-23 18:40:55 -05:00
260 changed files with 14422 additions and 8718 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -298,9 +298,11 @@ src/Utils/DatabaseAccountUtils.ts
 src/Utils/JunoUtils.ts
 src/Utils/MessageValidation.ts
 src/Utils/NotebookConfigurationUtils.ts
+src/Utils/NotificationConsoleUtils.ts
 src/Utils/OfferUtils.test.ts
 src/Utils/OfferUtils.ts
 src/Utils/PricingUtils.test.ts
+src/Utils/PricingUtils.ts
 src/Utils/QueryUtils.test.ts
 src/Utils/QueryUtils.ts
 src/Utils/StringUtils.test.ts
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,7 +3,7 @@ module.exports = {
    browser: true,
    es6: true
  },
-  plugins: ["@typescript-eslint", "no-null", "prefer-arrow"],
+  plugins: ["@typescript-eslint", "no-null"],
  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
  globals: {
    Atomics: "readonly",
@@ -40,8 +40,6 @@ module.exports = {
    "@typescript-eslint/no-unused-vars": "error",
    "@typescript-eslint/no-extraneous-class": "error",
    "no-null/no-null": "error",
-    "@typescript-eslint/no-explicit-any": "error",
-    "prefer-arrow/prefer-arrow-functions": ["error", { allowStandaloneDeclarations: true }],
-    eqeqeq: "error"
+    "@typescript-eslint/no-explicit-any": "error"
  }
 };
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @Azure/cosmos-explorer-owners @Azure/azure-cosmos-explorer-developers
+* @Azure/cosmos-explorer-owners
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,13 +1,9 @@
 name: CI
 on:
  push:
-    branches:
-      - master
-      - hotfix/*
-      - release/*
+    branches: [master]
  pull_request:
-    branches:
-      - master
+    branches: [master]
 jobs:
  compile:
    runs-on: ubuntu-latest
@@ -56,7 +52,6 @@ jobs:
      - run: npm run test
  build:
    runs-on: ubuntu-latest
-    needs: [lint, format, compile, unittest]
    name: "Build"
    steps:
      - uses: actions/checkout@v2
@@ -80,7 +75,6 @@ jobs:
          path: dist/
  endtoendemulator:
    name: "End To End Tests | Emulator | SQL"
-    needs: [lint, format, compile, unittest]
    runs-on: windows-latest
    steps:
      - uses: actions/checkout@v2
@@ -107,7 +101,6 @@ jobs:
          CYPRESS_CACHE_FOLDER: ~/.cache/Cypress
  endtoendsql:
    name: "End To End Tests | SQL"
-    needs: [lint, format, compile, unittest]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
@@ -134,14 +127,8 @@ jobs:
          NODE_TLS_REJECT_UNAUTHORIZED: 0
          CYPRESS_CACHE_FOLDER: ~/.cache/Cypress
          CYPRESS_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_SQL }}
-      - uses: actions/upload-artifact@v2
-        name: videos
-        if: ${{ failure() }}
-        with:
-          path: "**/*.mp4"
  endtoendmongo:
    name: "End To End Tests | Mongo"
-    needs: [lint, format, compile, unittest]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
@@ -168,14 +155,8 @@ jobs:
          NODE_TLS_REJECT_UNAUTHORIZED: 0
          CYPRESS_CACHE_FOLDER: ~/.cache/Cypress
          CYPRESS_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_MONGO }}
-      - uses: actions/upload-artifact@v2
-        if: ${{ failure() }}
-        name: videos
-        with:
-          path: "**/*.mp4"
  accessibility:
    name: "Accessibility | Hosted"
-    needs: [lint, format, compile, unittest]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
@@ -198,7 +179,7 @@ jobs:
          NODE_TLS_REJECT_UNAUTHORIZED: 0
  nuget:
    name: Publish Nuget
-    if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/')
+    if: github.ref == 'refs/heads/master'
    needs: [lint, format, compile, build, unittest, endtoendemulator, endtoendsql, endtoendmongo]
    runs-on: ubuntu-latest
    env:
@@ -222,7 +203,7 @@ jobs:
          path: "*.nupkg"
  nugetmpac:
    name: Publish Nuget MPAC
-    if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/')
+    if: github.ref == 'refs/heads/master'
    needs: [lint, format, compile, build, unittest, endtoendemulator, endtoendsql, endtoendmongo]
    runs-on: ubuntu-latest
    env:
--- a/cypress/cypress.json
+++ b/cypress/cypress.json
@@ -3,7 +3,7 @@
  "pluginsFile": false,
  "fixturesFolder": false,
  "supportFile": "./support/index.js",
-  "defaultCommandTimeout": 90000,
+  "defaultCommandTimeout": 60000,
  "chromeWebSecurity": false,
  "reporter": "mochawesome",
  "reporterOptions": {
--- a/cypress/package.json
+++ b/cypress/package.json
@@ -6,7 +6,7 @@
  "scripts": {
    "test": "cypress run",
    "wait-for-server": "wait-on -t 240000 -i 5000 -v https-get://0.0.0.0:1234/",
-    "test:sql": "cypress run --browser chrome --spec \"./integration/dataexplorer/SQL/*\"",
+    "test:sql": "cypress run --browser chrome --headless --spec \"./integration/dataexplorer/SQL/*\"",
    "test:ci": "wait-on -t 240000 -i 5000 -v https-get://0.0.0.0:1234/ https-get://0.0.0.0:8081/_explorer/index.html && cypress run --browser chrome --headless",
    "test:debug": "cypress open"
  },
--- a/jest.config.js
+++ b/jest.config.js
@@ -39,10 +39,10 @@ module.exports = {
  // An object that configures minimum threshold enforcement for coverage results
  coverageThreshold: {
    global: {
-      branches: 20,
-      functions: 24,
-      lines: 30,
-      statements: 29.0
+      branches: 18,
+      functions: 22,
+      lines: 28,
+      statements: 27
    }
  },

--- a/package-lock.json
+++ b/package-lock.json
@@ -5,14 +5,13 @@
  "requires": true,
  "dependencies": {
    "@azure/cosmos": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.9.0.tgz",
-      "integrity": "sha512-SA+QB54I8Dvg/ZolHpsEDLK/sbSB9sFmSU1ElnMTFw88TVik+LYHq4o/srU2TY6Gr1BketjPmgLVEqrmnRvjkw==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.7.4.tgz",
+      "integrity": "sha512-IbSEadapQDajSCXj7gUc8OklkOd/oAY4w7XBLHouWc4iKQTtntb2DmGjhrbh2W5Ku+pmBSr1GTApCjQ55iIjlQ==",
      "requires": {
        "@types/debug": "^4.1.4",
        "debug": "^4.1.1",
        "fast-json-stable-stringify": "^2.0.0",
-        "jsbi": "^3.1.3",
        "node-abort-controller": "^1.0.4",
        "node-fetch": "^2.6.0",
        "os-name": "^3.1.0",
@@ -23,14 +22,14 @@
      },
      "dependencies": {
        "tslib": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-          "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
+          "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g=="
        },
        "uuid": {
-          "version": "8.3.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
-          "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.2.0.tgz",
+          "integrity": "sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q=="
        }
      }
    },
@@ -7721,11 +7720,6 @@
        "@types/react": "*"
      }
    },
-    "@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
-    },
    "@types/shallowequal": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/@types/shallowequal/-/shallowequal-1.1.1.tgz",
@@ -9572,11 +9566,6 @@
      "resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz",
      "integrity": "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA="
    },
-    "base64-arraybuffer": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
-      "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
-    },
    "base64-js": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
@@ -10133,9 +10122,9 @@
      "dev": true
    },
    "canvas": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.6.1.tgz",
-      "integrity": "sha512-S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.6.0.tgz",
+      "integrity": "sha512-bEO9f1ThmbknLPxCa8Es7obPlN9W3stB1bo7njlhOFKIdUTldeTqXCh9YclCPAi2pSQs84XA0jq/QEZXSzgyMw==",
      "requires": {
        "nan": "^2.14.0",
        "node-pre-gyp": "^0.11.0",
@@ -10940,14 +10929,6 @@
      "resolved": "https://registry.npmjs.org/css-element-queries/-/css-element-queries-1.1.1.tgz",
      "integrity": "sha512-/PX6Bkk77ShgbOx/mpawHdEvS3PGgy1mmMktcztDPndWdMJxcorcQiivrs+nEljqtBpvNEhAmQky9tQR6FSm8Q=="
    },
-    "css-line-break": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz",
-      "integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==",
-      "requires": {
-        "base64-arraybuffer": "^0.2.0"
-      }
-    },
    "css-loader": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.0.tgz",
@@ -12818,12 +12799,6 @@
      "integrity": "sha1-EjaoEjkTkKGHetQAfCbnRTQclR8=",
      "dev": true
    },
-    "eslint-plugin-prefer-arrow": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.2.tgz",
-      "integrity": "sha512-C8YMhL+r8RMeMdYAw/rQtE6xNdMulj+zGWud/qIGnlmomiPRaLDGLMeskZ3alN6uMBojmooRimtdrXebLN4svQ==",
-      "dev": true
-    },
    "eslint-plugin-react": {
      "version": "7.20.0",
      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz",
@@ -15637,14 +15612,6 @@
        }
      }
    },
-    "html2canvas": {
-      "version": "1.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.5.tgz",
-      "integrity": "sha512-DtNqPxJNXPoTajs+lVQzGS1SULRI4GQaROeU5R41xH8acffHukxRh/NBVcTBsfCkJSkLq91rih5TpbEwUP9yWA==",
-      "requires": {
-        "css-line-break": "1.1.1"
-      }
-    },
    "htmlparser2": {
      "version": "3.10.1",
      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
@@ -20205,11 +20172,6 @@
        "esprima": "^4.0.0"
      }
    },
-    "jsbi": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-3.1.3.tgz",
-      "integrity": "sha512-nBJqA0C6Qns+ZxurbEoIR56wyjiUszpNy70FHvxO5ervMoCbZVE3z3kxr5nKGhlxr/9MhKTSUBs7cAwwuf3g9w=="
-    },
    "jsbn": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@@ -21540,9 +21502,9 @@
      }
    },
    "needle": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.0.tgz",
-      "integrity": "sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz",
+      "integrity": "sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==",
      "requires": {
        "debug": "^3.2.6",
        "iconv-lite": "^0.4.4",
@@ -22297,11 +22259,11 @@
      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo="
    },
    "p-retry": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz",
-      "integrity": "sha512-jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "dev": true,
      "requires": {
-        "@types/retry": "^0.12.0",
        "retry": "^0.12.0"
      }
    },
@@ -24079,7 +24041,8 @@
    "retry": {
      "version": "0.12.0",
      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "dev": true
    },
    "reusify": {
      "version": "1.0.4",
@@ -24636,9 +24599,9 @@
      "integrity": "sha1-ZfDBWZNSs1Ny7KrlolDmEHN27Wk="
    },
    "simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
+      "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY="
    },
    "simple-get": {
      "version": "3.1.0",
@@ -27482,15 +27445,6 @@
          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
          "dev": true
        },
-        "p-retry": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-          "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
-          "dev": true,
-          "requires": {
-            "retry": "^0.12.0"
-          }
-        },
        "schema-utils": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "description": "Cosmos Explorer",
  "main": "index.js",
  "dependencies": {
-    "@azure/cosmos": "3.9.0",
+    "@azure/cosmos": "3.7.4",
    "@azure/cosmos-language-service": "0.0.4",
    "@jupyterlab/services": "4.2.0",
    "@jupyterlab/terminal": "1.2.1",
@@ -42,7 +42,7 @@
    "applicationinsights": "1.8.0",
    "babel-polyfill": "6.26.0",
    "bootstrap": "3.4.1",
-    "canvas": "2.6.1",
+    "canvas": "2.6.0",
    "clean-webpack-plugin": "0.1.19",
    "copy-webpack-plugin": "6.0.2",
    "crossroads": "0.12.2",
@@ -56,7 +56,6 @@
    "es6-symbol": "3.1.3",
    "eslint-plugin-jest": "23.13.2",
    "hasher": "1.2.0",
-    "html2canvas": "1.0.0-rc.5",
    "immutable": "4.0.0-rc.12",
    "is-ci": "2.0.0",
    "jquery": "3.5.1",
@@ -67,7 +66,6 @@
    "monaco-editor": "0.15.6",
    "object.entries": "1.1.0",
    "office-ui-fabric-react": "7.121.10",
-    "p-retry": "4.2.0",
    "plotly.js-cartesian-dist-min": "1.52.3",
    "promise-polyfill": "8.1.0",
    "promise.prototype.finally": "3.1.0",
@@ -135,7 +133,6 @@
    "eslint": "7.3.1",
    "eslint-cli": "1.1.1",
    "eslint-plugin-no-null": "1.0.2",
-    "eslint-plugin-prefer-arrow": "1.2.2",
    "eslint-plugin-react": "7.20.0",
    "expose-loader": "0.7.5",
    "file-loader": "2.0.0",
--- a/src/Api/Apis.ts
+++ b/src/Api/Apis.ts
@@ -0,0 +1,13 @@
+import * as ViewModels from "../Contracts/ViewModels";
+
+export class DefaultApi implements ViewModels.CosmosDbApi {
+  public isSystemDatabasePredicate = (database: ViewModels.Database): boolean => {
+    return false;
+  };
+}
+
+export class CassandraApi implements ViewModels.CosmosDbApi {
+  public isSystemDatabasePredicate = (database: ViewModels.Database): boolean => {
+    return database.id() === "system";
+  };
+}
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -1,5 +1,5 @@
 import { AutopilotTier } from "../Contracts/DataModels";
-import { configContext } from "../ConfigContext";
+import { config } from "../Config";
 import { HashMap } from "./HashMap";

 export class AuthorizationEndpoints {
@@ -7,23 +7,14 @@ export class AuthorizationEndpoints {
  public static common: string = "https://login.windows.net/";
 }

-export class CodeOfConductEndpoints {
-  public static privacyStatement: string = "https://aka.ms/ms-privacy-policy";
-  public static codeOfConduct: string = "https://aka.ms/cosmos-code-of-conduct";
-  public static termsOfUse: string = "https://aka.ms/ms-terms-of-use";
-}
-
 export class BackendEndpoints {
  public static localhost: string = "https://localhost:12900";
  public static dev: string = "https://ext.documents-dev.windows-int.net";
-  public static productionPortal: string = configContext.BACKEND_ENDPOINT || "https://main.documentdb.ext.azure.com";
+  public static productionPortal: string = config.BACKEND_ENDPOINT || "https://main.documentdb.ext.azure.com";
 }

 export class EndpointsRegex {
-  public static readonly cassandra = [
-    "AccountEndpoint=(.*).cassandra.cosmosdb.azure.com",
-    "HostName=(.*).cassandra.cosmos.azure.com"
-  ];
+  public static readonly cassandra = "AccountEndpoint=(.*).cassandra.cosmosdb.azure.com";
  public static readonly mongo = "mongodb://.*:(.*)@(.*).documents.azure.com";
  public static readonly mongoCompute = "mongodb://.*:(.*)@(.*).mongo.cosmos.azure.com";
  public static readonly sql = "AccountEndpoint=https://(.*).documents.azure.com";
@@ -110,7 +101,6 @@ export class CapabilityNames {
  public static readonly EnableNotebooks: string = "EnableNotebooks";
  public static readonly EnableStorageAnalytics: string = "EnableStorageAnalytics";
  public static readonly EnableMongo: string = "EnableMongo";
-  public static readonly EnableServerless: string = "EnableServerless";
 }

 export class Features {
@@ -122,8 +112,6 @@ export class Features {
  public static readonly enableTtl = "enablettl";
  public static readonly enableNotebooks = "enablenotebooks";
  public static readonly enableGalleryPublish = "enablegallerypublish";
-  public static readonly enableCodeOfConduct = "enablecodeofconduct";
-  public static readonly enableLinkInjection = "enablelinkinjection";
  public static readonly enableSpark = "enablespark";
  public static readonly livyEndpoint = "livyendpoint";
  public static readonly notebookServerUrl = "notebookserverurl";
@@ -134,7 +122,6 @@ export class Features {
  public static readonly enableAutoPilotV2 = "enableautopilotv2";
  public static readonly ttl90Days = "ttl90days";
  public static readonly enableRightPanelV2 = "enablerightpanelv2";
-  public static readonly enableSDKoperations = "enablesdkoperations";
 }

 export class AfecFeatures {
--- a/src/Common/CosmosClient.test.ts
+++ b/src/Common/CosmosClient.test.ts
@@ -1,7 +1,6 @@
+import { CosmosClient, tokenProvider, endpoint, requestPlugin, getTokenFromAuthService } from "./CosmosClient";
 import { ResourceType } from "@azure/cosmos/dist-esm/common/constants";
-import { configContext, Platform, updateConfigContext, resetConfigContext } from "../ConfigContext";
-import { updateUserContext } from "../UserContext";
-import { endpoint, getTokenFromAuthService, requestPlugin, tokenProvider } from "./CosmosClient";
+import { config, Platform } from "../Config";

 describe("tokenProvider", () => {
  const options = {
@@ -33,9 +32,7 @@ describe("tokenProvider", () => {
  });

  it("does not call the auth service if a master key is set", async () => {
-    updateUserContext({
-      masterKey: "foo"
-    });
+    CosmosClient.masterKey("foo");
    await tokenProvider(options);
    expect((window.fetch as any).mock.calls.length).toBe(0);
  });
@@ -44,7 +41,7 @@ describe("tokenProvider", () => {
 describe("getTokenFromAuthService", () => {
  beforeEach(() => {
    delete window.dataExplorer;
-    resetConfigContext();
+    delete config.BACKEND_ENDPOINT;
    window.fetch = jest.fn().mockImplementation(() => {
      return {
        json: () => "{}",
@@ -67,9 +64,7 @@ describe("getTokenFromAuthService", () => {
  });

  it("builds the correct URL in dev", () => {
-    updateConfigContext({
-      BACKEND_ENDPOINT: "https://localhost:1234"
-    });
+    config.BACKEND_ENDPOINT = "https://localhost:1234";
    getTokenFromAuthService("GET", "dbs", "foo");
    expect(window.fetch).toHaveBeenCalledWith(
      "https://localhost:1234/api/guest/runtimeproxy/authorizationTokens",
@@ -80,28 +75,24 @@ describe("getTokenFromAuthService", () => {

 describe("endpoint", () => {
  it("falls back to _databaseAccount", () => {
-    updateUserContext({
-      databaseAccount: {
-        id: "foo",
-        name: "foo",
-        location: "foo",
-        type: "foo",
-        kind: "foo",
-        tags: [],
-        properties: {
-          documentEndpoint: "bar",
-          gremlinEndpoint: "foo",
-          tableEndpoint: "foo",
-          cassandraEndpoint: "foo"
-        }
+    CosmosClient.databaseAccount({
+      id: "foo",
+      name: "foo",
+      location: "foo",
+      type: "foo",
+      kind: "foo",
+      tags: [],
+      properties: {
+        documentEndpoint: "bar",
+        gremlinEndpoint: "foo",
+        tableEndpoint: "foo",
+        cassandraEndpoint: "foo"
      }
    });
    expect(endpoint()).toEqual("bar");
  });
  it("uses _endpoint if set", () => {
-    updateUserContext({
-      endpoint: "baz"
-    });
+    CosmosClient.endpoint("baz");
    expect(endpoint()).toEqual("baz");
  });
 });
@@ -109,17 +100,17 @@ describe("endpoint", () => {
 describe("requestPlugin", () => {
  beforeEach(() => {
    delete window.dataExplorerPlatform;
-    resetConfigContext();
+    delete config.PROXY_PATH;
+    delete config.BACKEND_ENDPOINT;
+    delete config.PROXY_PATH;
  });

  describe("Hosted", () => {
    it("builds a proxy URL in development", () => {
      const next = jest.fn();
-      updateConfigContext({
-        platform: Platform.Hosted,
-        BACKEND_ENDPOINT: "https://localhost:1234",
-        PROXY_PATH: "/proxy"
-      });
+      config.platform = Platform.Hosted;
+      config.BACKEND_ENDPOINT = "https://localhost:1234";
+      config.PROXY_PATH = "/proxy";
      const headers = {};
      const endpoint = "https://docs.azure.com";
      const path = "/dbs/foo";
@@ -131,7 +122,8 @@ describe("requestPlugin", () => {
  describe("Emulator", () => {
    it("builds a url for emulator proxy via webpack", () => {
      const next = jest.fn();
-      updateConfigContext({ platform: Platform.Emulator, PROXY_PATH: "/proxy" });
+      config.platform = Platform.Emulator;
+      config.PROXY_PATH = "/proxy";
      const headers = {};
      const endpoint = "";
      const path = "/dbs/foo";
--- a/src/Common/CosmosClient.ts
+++ b/src/Common/CosmosClient.ts
@@ -1,28 +1,39 @@
 import * as Cosmos from "@azure/cosmos";
 import { RequestInfo, setAuthorizationTokenHeaderUsingMasterKey } from "@azure/cosmos";
-import { configContext, Platform } from "../ConfigContext";
-import { logConsoleError } from "../Utils/NotificationConsoleUtils";
-import { EmulatorMasterKey, HttpHeaders } from "./Constants";
-import { userContext } from "../UserContext";
+import { DatabaseAccount } from "../Contracts/DataModels";
+import { HttpHeaders, EmulatorMasterKey } from "./Constants";
+import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
+import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
+import { config, Platform } from "../Config";
+
+let _client: Cosmos.CosmosClient;
+let _masterKey: string;
+let _endpoint: string;
+let _authorizationToken: string;
+let _accessToken: string;
+let _databaseAccount: DatabaseAccount;
+let _subscriptionId: string;
+let _resourceGroup: string;
+let _resourceToken: string;

 const _global = typeof self === "undefined" ? window : self;

 export const tokenProvider = async (requestInfo: RequestInfo) => {
  const { verb, resourceId, resourceType, headers } = requestInfo;
-  if (configContext.platform === Platform.Emulator) {
+  if (config.platform === Platform.Emulator) {
    // TODO This SDK method mutates the headers object. Find a better one or fix the SDK.
    await setAuthorizationTokenHeaderUsingMasterKey(verb, resourceId, resourceType, headers, EmulatorMasterKey);
    return decodeURIComponent(headers.authorization);
  }

-  if (userContext.masterKey) {
+  if (_masterKey) {
    // TODO This SDK method mutates the headers object. Find a better one or fix the SDK.
    await setAuthorizationTokenHeaderUsingMasterKey(verb, resourceId, resourceType, headers, EmulatorMasterKey);
    return decodeURIComponent(headers.authorization);
  }

-  if (userContext.resourceToken) {
-    return userContext.resourceToken;
+  if (_resourceToken) {
+    return _resourceToken;
  }

  const result = await getTokenFromAuthService(verb, resourceType, resourceId);
@@ -31,33 +42,28 @@ export const tokenProvider = async (requestInfo: RequestInfo) => {
 };

 export const requestPlugin: Cosmos.Plugin<any> = async (requestContext, next) => {
-  requestContext.endpoint = configContext.PROXY_PATH;
+  requestContext.endpoint = config.PROXY_PATH;
  requestContext.headers["x-ms-proxy-target"] = endpoint();
  return next(requestContext);
 };

 export const endpoint = () => {
-  if (configContext.platform === Platform.Emulator) {
+  if (config.platform === Platform.Emulator) {
    // In worker scope, _global(self).parent does not exist
    const location = _global.parent ? _global.parent.location : _global.location;
-    return configContext.EMULATOR_ENDPOINT || location.origin;
+    return config.EMULATOR_ENDPOINT || location.origin;
  }
-  return (
-    userContext.endpoint ||
-    (userContext.databaseAccount &&
-      userContext.databaseAccount.properties &&
-      userContext.databaseAccount.properties.documentEndpoint)
-  );
+  return _endpoint || (_databaseAccount && _databaseAccount.properties && _databaseAccount.properties.documentEndpoint);
 };

 export async function getTokenFromAuthService(verb: string, resourceType: string, resourceId?: string): Promise<any> {
  try {
-    const host = configContext.BACKEND_ENDPOINT || _global.dataExplorer.extensionEndpoint();
+    const host = config.BACKEND_ENDPOINT || _global.dataExplorer.extensionEndpoint();
    const response = await _global.fetch(host + "/api/guest/runtimeproxy/authorizationTokens", {
      method: "POST",
      headers: {
        "content-type": "application/json",
-        "x-ms-encrypted-auth-token": userContext.accessToken
+        "x-ms-encrypted-auth-token": _accessToken
      },
      body: JSON.stringify({
        verb,
@@ -69,25 +75,106 @@ export async function getTokenFromAuthService(verb: string, resourceType: string
    const result = JSON.parse(await response.json());
    return result;
  } catch (error) {
-    logConsoleError(`Failed to get authorization headers for ${resourceType}: ${JSON.stringify(error)}`);
+    NotificationConsoleUtils.logConsoleMessage(
+      ConsoleDataType.Error,
+      `Failed to get authorization headers for ${resourceType}: ${JSON.stringify(error)}`
+    );
    return Promise.reject(error);
  }
 }

-export function client(): Cosmos.CosmosClient {
-  const options: Cosmos.CosmosClientOptions = {
-    endpoint: endpoint() || " ", // CosmosClient gets upset if we pass a falsy value here
-    key: userContext.masterKey,
-    tokenProvider,
-    connectionPolicy: {
-      enableEndpointDiscovery: false
-    },
-    userAgentSuffix: "Azure Portal"
-  };
+export const CosmosClient = {
+  client(): Cosmos.CosmosClient {
+    if (_client) {
+      return _client;
+    }
+    const options: Cosmos.CosmosClientOptions = {
+      endpoint: endpoint() || " ", // CosmosClient gets upset if we pass a falsy value here
+      key: _masterKey,
+      tokenProvider,
+      connectionPolicy: {
+        enableEndpointDiscovery: false
+      },
+      userAgentSuffix: "Azure Portal"
+    };

-  // In development we proxy requests to the backend via webpack. This is removed in production bundles.
-  if (process.env.NODE_ENV === "development") {
-    (options as any).plugins = [{ on: "request", plugin: requestPlugin }];
+    // In development we proxy requests to the backend via webpack. This is removed in production bundles.
+    if (process.env.NODE_ENV === "development") {
+      (options as any).plugins = [{ on: "request", plugin: requestPlugin }];
+    }
+    _client = new Cosmos.CosmosClient(options);
+    return _client;
+  },
+
+  authorizationToken(value?: string): string {
+    if (typeof value === "undefined") {
+      return _authorizationToken;
+    }
+    _authorizationToken = value;
+    _client = null;
+    return value;
+  },
+
+  accessToken(value?: string): string {
+    if (typeof value === "undefined") {
+      return _accessToken;
+    }
+    _accessToken = value;
+    _client = null;
+    return value;
+  },
+
+  masterKey(value?: string): string {
+    if (typeof value === "undefined") {
+      return _masterKey;
+    }
+    _client = null;
+    _masterKey = value;
+    return value;
+  },
+
+  endpoint(value?: string): string {
+    if (typeof value === "undefined") {
+      return _endpoint;
+    }
+    _client = null;
+    _endpoint = value;
+    return value;
+  },
+
+  databaseAccount(value?: DatabaseAccount): DatabaseAccount {
+    if (typeof value === "undefined") {
+      return _databaseAccount || ({} as any);
+    }
+    _client = null;
+    _databaseAccount = value;
+    return value;
+  },
+
+  subscriptionId(value?: string): string {
+    if (typeof value === "undefined") {
+      return _subscriptionId;
+    }
+    _client = null;
+    _subscriptionId = value;
+    return value;
+  },
+
+  resourceGroup(value?: string): string {
+    if (typeof value === "undefined") {
+      return _resourceGroup;
+    }
+    _client = null;
+    _resourceGroup = value;
+    return value;
+  },
+
+  resourceToken(value?: string): string {
+    if (typeof value === "undefined") {
+      return _resourceToken;
+    }
+    _client = null;
+    _resourceToken = value;
+    return value;
  }
-  return new Cosmos.CosmosClient(options);
-}
+};
--- a/src/Common/DataAccessUtilityBase.ts
+++ b/src/Common/DataAccessUtilityBase.ts
--- a/src/Common/DocumentClientUtilityBase.ts
+++ b/src/Common/DocumentClientUtilityBase.ts
--- a/src/Common/ErrorParserUtility.ts
+++ b/src/Common/ErrorParserUtility.ts
@@ -1,4 +1,4 @@
-import * as DataModels from "../Contracts/DataModels";
+import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";

 export function replaceKnownError(err: string): string {
@@ -7,8 +7,6 @@ export function replaceKnownError(err: string): string {
    err.indexOf("SharedOffer is Disabled for your account") >= 0
  ) {
    return "Database throughput is not supported for internal subscriptions.";
-  } else if (err.indexOf("Partition key paths must contain only valid") >= 0) {
-    return "Partition key paths must contain only valid characters and not contain a trailing slash or wildcard character.";
  }

  return err;
--- a/src/Common/Logger.test.ts
+++ b/src/Common/Logger.test.ts
@@ -1,26 +1,46 @@
-jest.mock("./MessageHandler");
 import { LogEntryLevel } from "../Contracts/Diagnostics";
 import * as Logger from "./Logger";
+import { MessageHandler } from "./MessageHandler";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
-import { sendMessage } from "./MessageHandler";

 describe("Logger", () => {
+  let sendMessageSpy: jasmine.Spy;
+
  beforeEach(() => {
-    jest.resetAllMocks();
+    sendMessageSpy = spyOn(MessageHandler, "sendMessage");
+  });
+
+  afterEach(() => {
+    sendMessageSpy = null;
  });

  it("should log info messages", () => {
    Logger.logInfo("Test info", "DocDB");
-    expect(sendMessage).toBeCalled();
+    const spyArgs = sendMessageSpy.calls.mostRecent().args[0];
+
+    expect(spyArgs.type).toBe(MessageTypes.LogInfo);
+    expect(spyArgs.data).toContain(LogEntryLevel.Verbose);
+    expect(spyArgs.data).toContain("DocDB");
+    expect(spyArgs.data).toContain("Test info");
  });

  it("should log error messages", () => {
    Logger.logError("Test error", "DocDB");
-    expect(sendMessage).toBeCalled();
+    const spyArgs = sendMessageSpy.calls.mostRecent().args[0];
+
+    expect(spyArgs.type).toBe(MessageTypes.LogInfo);
+    expect(spyArgs.data).toContain(LogEntryLevel.Error);
+    expect(spyArgs.data).toContain("DocDB");
+    expect(spyArgs.data).toContain("Test error");
  });

  it("should log warnings", () => {
    Logger.logWarning("Test warning", "DocDB");
-    expect(sendMessage).toBeCalled();
+    const spyArgs = sendMessageSpy.calls.mostRecent().args[0];
+
+    expect(spyArgs.type).toBe(MessageTypes.LogInfo);
+    expect(spyArgs.data).toContain(LogEntryLevel.Warning);
+    expect(spyArgs.data).toContain("DocDB");
+    expect(spyArgs.data).toContain("Test warning");
  });
 });
--- a/src/Common/Logger.ts
+++ b/src/Common/Logger.ts
@@ -1,4 +1,4 @@
-import { sendMessage } from "./MessageHandler";
+import { MessageHandler } from "./MessageHandler";
 import { Diagnostics, MessageTypes } from "../Contracts/ExplorerContracts";
 import { appInsights } from "../Shared/appInsights";
 import { SeverityLevel } from "@microsoft/applicationinsights-web";
@@ -33,7 +33,7 @@ export function logError(message: string | Error, area: string, code?: number):
 }

 function _logEntry(entry: Diagnostics.LogEntry): void {
-  sendMessage({
+  MessageHandler.sendMessage({
    type: MessageTypes.LogInfo,
    data: JSON.stringify(entry)
  });
--- a/src/Common/MessageHandler.test.ts
+++ b/src/Common/MessageHandler.test.ts
@@ -1,29 +1,65 @@
 import Q from "q";
-import * as MessageHandler from "./MessageHandler";
+import { CachedDataPromise, MessageHandler } from "./MessageHandler";
 import { MessageTypes } from "../Contracts/ExplorerContracts";

+class MockMessageHandler extends MessageHandler {
+  public static addToMap(key: string, value: CachedDataPromise<any>): void {
+    MessageHandler.RequestMap[key] = value;
+  }
+
+  public static mapContainsKey(key: string): boolean {
+    return MessageHandler.RequestMap[key] != null;
+  }
+
+  public static clearAllEntries(): void {
+    MessageHandler.RequestMap = {};
+  }
+
+  public static runGarbageCollector(): void {
+    MessageHandler.runGarbageCollector();
+  }
+}
+
 describe("Message Handler", () => {
-  it("should handle cached message", async () => {
-    let mockPromise = {
+  beforeEach(() => {
+    MockMessageHandler.clearAllEntries();
+  });
+
+  xit("should send cached data message", (done: any) => {
+    const testValidationCallback = (e: MessageEvent) => {
+      expect(e.data.data).toEqual(
+        jasmine.objectContaining({ type: MessageTypes.AllDatabases, params: ["some param"] })
+      );
+      e.currentTarget.removeEventListener(e.type, testValidationCallback);
+      done();
+    };
+    window.parent.addEventListener("message", testValidationCallback);
+    MockMessageHandler.sendCachedDataMessage(MessageTypes.AllDatabases, ["some param"]);
+  });
+
+  it("should handle cached message", () => {
+    let mockPromise: CachedDataPromise<any> = {
      id: "123",
      startTime: new Date(),
      deferred: Q.defer<any>()
    };
    let mockMessage = { message: { id: "123", data: "{}" } };
-    MessageHandler.RequestMap[mockPromise.id] = mockPromise;
-    MessageHandler.handleCachedDataMessage(mockMessage);
+
+    MockMessageHandler.addToMap(mockPromise.id, mockPromise);
+    MockMessageHandler.handleCachedDataMessage(mockMessage);
    expect(mockPromise.deferred.promise.isFulfilled()).toBe(true);
  });

-  it("should delete fulfilled promises on running the garbage collector", async () => {
-    let message = {
+  it("should delete fulfilled promises on running the garbage collector", () => {
+    let mockPromise: CachedDataPromise<any> = {
      id: "123",
      startTime: new Date(),
      deferred: Q.defer<any>()
    };

-    MessageHandler.handleCachedDataMessage(message);
-    MessageHandler.runGarbageCollector();
-    expect(MessageHandler.RequestMap["123"]).toBeUndefined();
+    MockMessageHandler.addToMap(mockPromise.id, mockPromise);
+    mockPromise.deferred.reject("some error");
+    MockMessageHandler.runGarbageCollector();
+    expect(MockMessageHandler.mapContainsKey(mockPromise.id)).toBe(false);
  });
 });
--- a/src/Common/MessageHandler.ts
+++ b/src/Common/MessageHandler.ts
@@ -1,73 +1,85 @@
-import { MessageTypes } from "../Contracts/ExplorerContracts";
-import Q from "q";
-import * as _ from "underscore";
-import * as Constants from "./Constants";
-
-export interface CachedDataPromise<T> {
-  deferred: Q.Deferred<T>;
-  startTime: Date;
-  id: string;
-}
-
-export const RequestMap: Record<string, CachedDataPromise<any>> = {};
-
-export function handleCachedDataMessage(message: any): void {
-  const messageContent = message && message.message;
-  if (message == null || messageContent == null || messageContent.id == null || !RequestMap[messageContent.id]) {
-    return;
-  }
-
-  const cachedDataPromise = RequestMap[messageContent.id];
-  if (messageContent.error != null) {
-    cachedDataPromise.deferred.reject(messageContent.error);
-  } else {
-    cachedDataPromise.deferred.resolve(JSON.parse(messageContent.data));
-  }
-  runGarbageCollector();
-}
-
-export function sendCachedDataMessage<TResponseDataModel>(
-  messageType: MessageTypes,
-  params: Object[],
-  timeoutInMs?: number
-): Q.Promise<TResponseDataModel> {
-  let cachedDataPromise: CachedDataPromise<TResponseDataModel> = {
-    deferred: Q.defer<TResponseDataModel>(),
-    startTime: new Date(),
-    id: _.uniqueId()
-  };
-  RequestMap[cachedDataPromise.id] = cachedDataPromise;
-  sendMessage({ type: messageType, params: params, id: cachedDataPromise.id });
-
-  //TODO: Use telemetry to measure optimal time to resolve/reject promises
-  return cachedDataPromise.deferred.promise.timeout(
-    timeoutInMs || Constants.ClientDefaults.requestTimeoutMs,
-    "Timed out while waiting for response from portal"
-  );
-}
-
-export function sendMessage(data: any): void {
-  if (canSendMessage()) {
-    window.parent.postMessage(
-      {
-        signature: "pcIframe",
-        data: data
-      },
-      window.document.referrer
-    );
-  }
-}
-
-export function canSendMessage(): boolean {
-  return window.parent !== window;
-}
-
-// TODO: This is exported just for testing. It should not be.
-export function runGarbageCollector() {
-  Object.keys(RequestMap).forEach((key: string) => {
-    const promise: Q.Promise<any> = RequestMap[key].deferred.promise;
-    if (promise.isFulfilled() || promise.isRejected()) {
-      delete RequestMap[key];
-    }
-  });
-}
+import { MessageTypes } from "../Contracts/ExplorerContracts";
+import Q from "q";
+import * as _ from "underscore";
+import * as Constants from "./Constants";
+
+export interface CachedDataPromise<T> {
+  deferred: Q.Deferred<T>;
+  startTime: Date;
+  id: string;
+}
+
+/**
+ * For some reason, typescript emits a Map() in the compiled js output(despite the target being set to ES5) forcing us to define our own polyfill,
+ * so we define our own custom implementation of the ES6 Map to work around it.
+ */
+type Map = { [key: string]: CachedDataPromise<any> };
+
+export class MessageHandler {
+  protected static RequestMap: Map = {};
+
+  public static handleCachedDataMessage(message: any): void {
+    const messageContent = message && message.message;
+    if (
+      message == null ||
+      messageContent == null ||
+      messageContent.id == null ||
+      !MessageHandler.RequestMap[messageContent.id]
+    ) {
+      return;
+    }
+
+    const cachedDataPromise = MessageHandler.RequestMap[messageContent.id];
+    if (messageContent.error != null) {
+      cachedDataPromise.deferred.reject(messageContent.error);
+    } else {
+      cachedDataPromise.deferred.resolve(JSON.parse(messageContent.data));
+    }
+    MessageHandler.runGarbageCollector();
+  }
+
+  public static sendCachedDataMessage<TResponseDataModel>(
+    messageType: MessageTypes,
+    params: Object[],
+    timeoutInMs?: number
+  ): Q.Promise<TResponseDataModel> {
+    let cachedDataPromise: CachedDataPromise<TResponseDataModel> = {
+      deferred: Q.defer<TResponseDataModel>(),
+      startTime: new Date(),
+      id: _.uniqueId()
+    };
+    MessageHandler.RequestMap[cachedDataPromise.id] = cachedDataPromise;
+    MessageHandler.sendMessage({ type: messageType, params: params, id: cachedDataPromise.id });
+
+    //TODO: Use telemetry to measure optimal time to resolve/reject promises
+    return cachedDataPromise.deferred.promise.timeout(
+      timeoutInMs || Constants.ClientDefaults.requestTimeoutMs,
+      "Timed out while waiting for response from portal"
+    );
+  }
+
+  public static sendMessage(data: any): void {
+    if (MessageHandler.canSendMessage()) {
+      window.parent.postMessage(
+        {
+          signature: "pcIframe",
+          data: data
+        },
+        window.document.referrer
+      );
+    }
+  }
+
+  public static canSendMessage(): boolean {
+    return window.parent !== window;
+  }
+
+  protected static runGarbageCollector() {
+    Object.keys(MessageHandler.RequestMap).forEach((key: string) => {
+      const promise: Q.Promise<any> = MessageHandler.RequestMap[key].deferred.promise;
+      if (promise.isFulfilled() || promise.isRejected()) {
+        delete MessageHandler.RequestMap[key];
+      }
+    });
+  }
+}
--- a/src/Common/MongoProxyClient.test.ts
+++ b/src/Common/MongoProxyClient.test.ts
@@ -1,18 +1,16 @@
-import { AuthType } from "../AuthType";
-import { configContext, resetConfigContext, updateConfigContext } from "../ConfigContext";
-import { DatabaseAccount } from "../Contracts/DataModels";
-import { Collection } from "../Contracts/ViewModels";
-import DocumentId from "../Explorer/Tree/DocumentId";
-import { ResourceProviderClient } from "../ResourceProvider/ResourceProviderClient";
-import { updateUserContext } from "../UserContext";
 import {
+  _createMongoCollectionWithARM,
  deleteDocument,
  getEndpoint,
  queryDocuments,
  readDocument,
-  updateDocument,
-  _createMongoCollectionWithARM
+  updateDocument
 } from "./MongoProxyClient";
+import { AuthType } from "../AuthType";
+import { Collection, DatabaseAccount, DocumentId } from "../Contracts/ViewModels";
+import { config } from "../Config";
+import { CosmosClient } from "./CosmosClient";
+import { ResourceProviderClient } from "../ResourceProvider/ResourceProviderClient";
 jest.mock("../ResourceProvider/ResourceProviderClient.ts");

 const databaseId = "testDB";
@@ -62,15 +60,13 @@ const databaseAccount = {
    tableEndpoint: "foo",
    cassandraEndpoint: "foo"
  }
-} as DatabaseAccount;
+};

 describe("MongoProxyClient", () => {
  describe("queryDocuments", () => {
    beforeEach(() => {
-      resetConfigContext();
-      updateUserContext({
-        databaseAccount
-      });
+      delete config.BACKEND_ENDPOINT;
+      CosmosClient.databaseAccount(databaseAccount as any);
      window.dataExplorer = {
        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
        serverId: () => ""
@@ -90,7 +86,7 @@ describe("MongoProxyClient", () => {
    });

    it("builds the correct proxy URL in development", () => {
-      updateConfigContext({ MONGO_BACKEND_ENDPOINT: "https://localhost:1234" });
+      config.MONGO_BACKEND_ENDPOINT = "https://localhost:1234";
      queryDocuments(databaseId, collection, true, "{}");
      expect(window.fetch).toHaveBeenCalledWith(
        "https://localhost:1234/api/mongo/explorer/resourcelist?db=testDB&coll=testCollection&resourceUrl=bardbs%2FtestDB%2Fcolls%2FtestCollection%2Fdocs%2F&rid=testCollectionrid&rtype=docs&sid=&rg=&dba=foo&pk=pk",
@@ -100,10 +96,8 @@ describe("MongoProxyClient", () => {
  });
  describe("readDocument", () => {
    beforeEach(() => {
-      resetConfigContext();
-      updateUserContext({
-        databaseAccount
-      });
+      delete config.MONGO_BACKEND_ENDPOINT;
+      CosmosClient.databaseAccount(databaseAccount as any);
      window.dataExplorer = {
        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
        serverId: () => ""
@@ -123,7 +117,7 @@ describe("MongoProxyClient", () => {
    });

    it("builds the correct proxy URL in development", () => {
-      updateConfigContext({ MONGO_BACKEND_ENDPOINT: "https://localhost:1234" });
+      config.MONGO_BACKEND_ENDPOINT = "https://localhost:1234";
      readDocument(databaseId, collection, documentId);
      expect(window.fetch).toHaveBeenCalledWith(
        "https://localhost:1234/api/mongo/explorer?db=testDB&coll=testCollection&resourceUrl=bardb%2FtestDB%2Fdb%2FtestCollection%2FtestId&rid=testId&rtype=docs&sid=&rg=&dba=foo&pk=pk",
@@ -133,10 +127,8 @@ describe("MongoProxyClient", () => {
  });
  describe("createDocument", () => {
    beforeEach(() => {
-      resetConfigContext();
-      updateUserContext({
-        databaseAccount
-      });
+      delete config.MONGO_BACKEND_ENDPOINT;
+      CosmosClient.databaseAccount(databaseAccount as any);
      window.dataExplorer = {
        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
        serverId: () => ""
@@ -156,7 +148,7 @@ describe("MongoProxyClient", () => {
    });

    it("builds the correct proxy URL in development", () => {
-      updateConfigContext({ MONGO_BACKEND_ENDPOINT: "https://localhost:1234" });
+      config.MONGO_BACKEND_ENDPOINT = "https://localhost:1234";
      readDocument(databaseId, collection, documentId);
      expect(window.fetch).toHaveBeenCalledWith(
        "https://localhost:1234/api/mongo/explorer?db=testDB&coll=testCollection&resourceUrl=bardb%2FtestDB%2Fdb%2FtestCollection%2FtestId&rid=testId&rtype=docs&sid=&rg=&dba=foo&pk=pk",
@@ -166,10 +158,8 @@ describe("MongoProxyClient", () => {
  });
  describe("updateDocument", () => {
    beforeEach(() => {
-      resetConfigContext();
-      updateUserContext({
-        databaseAccount
-      });
+      delete config.MONGO_BACKEND_ENDPOINT;
+      CosmosClient.databaseAccount(databaseAccount as any);
      window.dataExplorer = {
        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
        serverId: () => ""
@@ -181,7 +171,7 @@ describe("MongoProxyClient", () => {
    });

    it("builds the correct URL", () => {
-      updateDocument(databaseId, collection, documentId, "{}");
+      updateDocument(databaseId, collection, documentId, {});
      expect(window.fetch).toHaveBeenCalledWith(
        "https://main.documentdb.ext.azure.com/api/mongo/explorer?db=testDB&coll=testCollection&resourceUrl=bardb%2FtestDB%2Fdb%2FtestCollection%2Fdocs%2FtestId&rid=testId&rtype=docs&sid=&rg=&dba=foo&pk=pk",
        expect.any(Object)
@@ -189,8 +179,8 @@ describe("MongoProxyClient", () => {
    });

    it("builds the correct proxy URL in development", () => {
-      updateConfigContext({ MONGO_BACKEND_ENDPOINT: "https://localhost:1234" });
-      updateDocument(databaseId, collection, documentId, "{}");
+      config.MONGO_BACKEND_ENDPOINT = "https://localhost:1234";
+      updateDocument(databaseId, collection, documentId, {});
      expect(window.fetch).toHaveBeenCalledWith(
        "https://localhost:1234/api/mongo/explorer?db=testDB&coll=testCollection&resourceUrl=bardb%2FtestDB%2Fdb%2FtestCollection%2Fdocs%2FtestId&rid=testId&rtype=docs&sid=&rg=&dba=foo&pk=pk",
        expect.any(Object)
@@ -199,10 +189,8 @@ describe("MongoProxyClient", () => {
  });
  describe("deleteDocument", () => {
    beforeEach(() => {
-      resetConfigContext();
-      updateUserContext({
-        databaseAccount
-      });
+      delete config.MONGO_BACKEND_ENDPOINT;
+      CosmosClient.databaseAccount(databaseAccount as any);
      window.dataExplorer = {
        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
        serverId: () => ""
@@ -222,7 +210,7 @@ describe("MongoProxyClient", () => {
    });

    it("builds the correct proxy URL in development", () => {
-      updateConfigContext({ MONGO_BACKEND_ENDPOINT: "https://localhost:1234" });
+      config.MONGO_BACKEND_ENDPOINT = "https://localhost:1234";
      deleteDocument(databaseId, collection, documentId);
      expect(window.fetch).toHaveBeenCalledWith(
        "https://localhost:1234/api/mongo/explorer?db=testDB&coll=testCollection&resourceUrl=bardb%2FtestDB%2Fdb%2FtestCollection%2Fdocs%2FtestId&rid=testId&rtype=docs&sid=&rg=&dba=foo&pk=pk",
@@ -232,11 +220,9 @@ describe("MongoProxyClient", () => {
  });
  describe("getEndpoint", () => {
    beforeEach(() => {
-      resetConfigContext();
+      delete config.MONGO_BACKEND_ENDPOINT;
      delete window.authType;
-      updateUserContext({
-        databaseAccount
-      });
+      CosmosClient.databaseAccount(databaseAccount as any);
      window.dataExplorer = {
        extensionEndpoint: () => "https://main.documentdb.ext.azure.com",
        serverId: () => ""
@@ -249,7 +235,7 @@ describe("MongoProxyClient", () => {
    });

    it("returns a development endpoint", () => {
-      updateConfigContext({ MONGO_BACKEND_ENDPOINT: "https://localhost:1234" });
+      config.MONGO_BACKEND_ENDPOINT = "https://localhost:1234";
      const endpoint = getEndpoint(databaseAccount as DatabaseAccount);
      expect(endpoint).toEqual("https://localhost:1234/api/mongo/explorer");
    });
--- a/src/Common/MongoProxyClient.ts
+++ b/src/Common/MongoProxyClient.ts
@@ -1,22 +1,22 @@
-import { Constants as CosmosSDKConstants } from "@azure/cosmos";
-import queryString from "querystring";
-import { AuthType } from "../AuthType";
 import * as Constants from "../Common/Constants";
 import * as DataExplorerConstants from "../Common/Constants";
-import { configContext } from "../ConfigContext";
 import * as DataModels from "../Contracts/DataModels";
-import { MessageTypes } from "../Contracts/ExplorerContracts";
-import { Collection } from "../Contracts/ViewModels";
-import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
-import DocumentId from "../Explorer/Tree/DocumentId";
-import { ResourceProviderClient } from "../ResourceProvider/ResourceProviderClient";
-import { AddDbUtilities } from "../Shared/AddDatabaseUtility";
-import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
-import { ApiType, HttpHeaders, HttpStatusCodes } from "./Constants";
-import { userContext } from "../UserContext";
+import * as ViewModels from "../Contracts/ViewModels";
 import EnvironmentUtility from "./EnvironmentUtility";
+import queryString from "querystring";
+import { AddDbUtilities } from "../Shared/AddDatabaseUtility";
+import { ApiType, HttpHeaders, HttpStatusCodes } from "./Constants";
+import { AuthType } from "../AuthType";
+import { Collection } from "../Contracts/ViewModels";
+import { config } from "../Config";
+import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
+import { Constants as CosmosSDKConstants } from "@azure/cosmos";
+import { CosmosClient } from "./CosmosClient";
+import { MessageHandler } from "./MessageHandler";
+import { MessageTypes } from "../Contracts/ExplorerContracts";
+import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
+import { ResourceProviderClient } from "../ResourceProvider/ResourceProviderClient";
 import { MinimalQueryIterator } from "./IteratorUtilities";
-import { sendMessage } from "./MessageHandler";

 const defaultHeaders = {
  [HttpHeaders.apiType]: ApiType.MongoDB.toString(),
@@ -26,9 +26,9 @@ const defaultHeaders = {

 function authHeaders() {
  if (window.authType === AuthType.EncryptedToken) {
-    return { [HttpHeaders.guestAccessToken]: userContext.accessToken };
+    return { [HttpHeaders.guestAccessToken]: CosmosClient.accessToken() };
  } else {
-    return { [HttpHeaders.authorization]: userContext.authorizationToken };
+    return { [HttpHeaders.authorization]: CosmosClient.authorizationToken() };
  }
 }

@@ -67,7 +67,7 @@ export function queryDocuments(
  query: string,
  continuationToken?: string
 ): Promise<QueryResponse> {
-  const databaseAccount = userContext.databaseAccount;
+  const databaseAccount = CosmosClient.databaseAccount();
  const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
  const params = {
    db: databaseId,
@@ -75,8 +75,8 @@ export function queryDocuments(
    resourceUrl: `${resourceEndpoint}dbs/${databaseId}/colls/${collection.id()}/docs/`,
    rid: collection.rid,
    rtype: "docs",
-    sid: userContext.subscriptionId,
-    rg: userContext.resourceGroup,
+    sid: CosmosClient.subscriptionId(),
+    rg: CosmosClient.resourceGroup(),
    dba: databaseAccount.name,
    pk:
      collection && collection.partitionKey && !collection.partitionKey.systemKey ? collection.partitionKeyProperty : ""
@@ -123,9 +123,9 @@ export function queryDocuments(
 export function readDocument(
  databaseId: string,
  collection: Collection,
-  documentId: DocumentId
+  documentId: ViewModels.DocumentId
 ): Promise<DataModels.DocumentId> {
-  const databaseAccount = userContext.databaseAccount;
+  const databaseAccount = CosmosClient.databaseAccount();
  const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
  const idComponents = documentId.self.split("/");
  const path = idComponents.slice(0, 4).join("/");
@@ -136,8 +136,8 @@ export function readDocument(
    resourceUrl: `${resourceEndpoint}${path}/${rid}`,
    rid,
    rtype: "docs",
-    sid: userContext.subscriptionId,
-    rg: userContext.resourceGroup,
+    sid: CosmosClient.subscriptionId(),
+    rg: CosmosClient.resourceGroup(),
    dba: databaseAccount.name,
    pk:
      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey ? documentId.partitionKeyProperty : ""
@@ -169,7 +169,7 @@ export function createDocument(
  partitionKeyProperty: string,
  documentContent: unknown
 ): Promise<DataModels.DocumentId> {
-  const databaseAccount = userContext.databaseAccount;
+  const databaseAccount = CosmosClient.databaseAccount();
  const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
  const params = {
    db: databaseId,
@@ -177,8 +177,8 @@ export function createDocument(
    resourceUrl: `${resourceEndpoint}dbs/${databaseId}/colls/${collection.id()}/docs/`,
    rid: collection.rid,
    rtype: "docs",
-    sid: userContext.subscriptionId,
-    rg: userContext.resourceGroup,
+    sid: CosmosClient.subscriptionId(),
+    rg: CosmosClient.resourceGroup(),
    dba: databaseAccount.name,
    pk: collection && collection.partitionKey && !collection.partitionKey.systemKey ? partitionKeyProperty : ""
  };
@@ -205,10 +205,10 @@ export function createDocument(
 export function updateDocument(
  databaseId: string,
  collection: Collection,
-  documentId: DocumentId,
-  documentContent: string
+  documentId: ViewModels.DocumentId,
+  documentContent: unknown
 ): Promise<DataModels.DocumentId> {
-  const databaseAccount = userContext.databaseAccount;
+  const databaseAccount = CosmosClient.databaseAccount();
  const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
  const idComponents = documentId.self.split("/");
  const path = idComponents.slice(0, 5).join("/");
@@ -219,8 +219,8 @@ export function updateDocument(
    resourceUrl: `${resourceEndpoint}${path}/${rid}`,
    rid,
    rtype: "docs",
-    sid: userContext.subscriptionId,
-    rg: userContext.resourceGroup,
+    sid: CosmosClient.subscriptionId(),
+    rg: CosmosClient.resourceGroup(),
    dba: databaseAccount.name,
    pk:
      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey ? documentId.partitionKeyProperty : ""
@@ -230,7 +230,7 @@ export function updateDocument(
  return window
    .fetch(`${endpoint}?${queryString.stringify(params)}`, {
      method: "PUT",
-      body: documentContent,
+      body: JSON.stringify(documentContent),
      headers: {
        ...defaultHeaders,
        ...authHeaders(),
@@ -246,8 +246,12 @@ export function updateDocument(
    });
 }

-export function deleteDocument(databaseId: string, collection: Collection, documentId: DocumentId): Promise<void> {
-  const databaseAccount = userContext.databaseAccount;
+export function deleteDocument(
+  databaseId: string,
+  collection: Collection,
+  documentId: ViewModels.DocumentId
+): Promise<void> {
+  const databaseAccount = CosmosClient.databaseAccount();
  const resourceEndpoint = databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint;
  const idComponents = documentId.self.split("/");
  const path = idComponents.slice(0, 5).join("/");
@@ -258,8 +262,8 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
    resourceUrl: `${resourceEndpoint}${path}/${rid}`,
    rid,
    rtype: "docs",
-    sid: userContext.subscriptionId,
-    rg: userContext.resourceGroup,
+    sid: CosmosClient.subscriptionId(),
+    rg: CosmosClient.resourceGroup(),
    dba: databaseAccount.name,
    pk:
      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey ? documentId.partitionKeyProperty : ""
@@ -294,7 +298,7 @@ export function createMongoCollectionWithProxy(
  isSharded: boolean,
  autopilotOptions?: DataModels.RpOptions
 ): Promise<DataModels.Collection> {
-  const databaseAccount = userContext.databaseAccount;
+  const databaseAccount = CosmosClient.databaseAccount();
  const params: DataModels.MongoParameters = {
    resourceUrl: databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint,
    db: databaseId,
@@ -306,8 +310,8 @@ export function createMongoCollectionWithProxy(
    is: isSharded,
    rid: "",
    rtype: "colls",
-    sid: userContext.subscriptionId,
-    rg: userContext.resourceGroup,
+    sid: CosmosClient.subscriptionId(),
+    rg: CosmosClient.resourceGroup(),
    dba: databaseAccount.name,
    isAutoPilot: false
  };
@@ -351,7 +355,7 @@ export function createMongoCollectionWithARM(
  isSharded: boolean,
  additionalOptions?: DataModels.RpOptions
 ): Promise<DataModels.CreateCollectionWithRpResponse> {
-  const databaseAccount = userContext.databaseAccount;
+  const databaseAccount = CosmosClient.databaseAccount();
  const params: DataModels.MongoParameters = {
    resourceUrl: databaseAccount.properties.mongoEndpoint || databaseAccount.properties.documentEndpoint,
    db: databaseId,
@@ -363,8 +367,8 @@ export function createMongoCollectionWithARM(
    is: isSharded,
    rid: "",
    rtype: "colls",
-    sid: userContext.subscriptionId,
-    rg: userContext.resourceGroup,
+    sid: CosmosClient.subscriptionId(),
+    rg: CosmosClient.resourceGroup(),
    dba: databaseAccount.name,
    analyticalStorageTtl
  };
@@ -381,11 +385,11 @@ export function createMongoCollectionWithARM(
  return _createMongoCollectionWithARM(armEndpoint, params, additionalOptions);
 }

-export function getEndpoint(databaseAccount: DataModels.DatabaseAccount): string {
+export function getEndpoint(databaseAccount: ViewModels.DatabaseAccount): string {
  const serverId = window.dataExplorer.serverId();
  const extensionEndpoint = window.dataExplorer.extensionEndpoint();
-  let url = configContext.MONGO_BACKEND_ENDPOINT
-    ? configContext.MONGO_BACKEND_ENDPOINT + "/api/mongo/explorer"
+  let url = config.MONGO_BACKEND_ENDPOINT
+    ? config.MONGO_BACKEND_ENDPOINT + "/api/mongo/explorer"
    : EnvironmentUtility.getMongoBackendEndpoint(serverId, databaseAccount.location, extensionEndpoint);

  if (window.authType === AuthType.EncryptedToken) {
@@ -404,14 +408,16 @@ async function errorHandling(response: Response, action: string, params: unknown
    `Error ${action}: ${errorMessage}, Payload: ${JSON.stringify(params)}`
  );
  if (response.status === HttpStatusCodes.Forbidden) {
-    sendMessage({ type: MessageTypes.ForbiddenError, reason: errorMessage });
+    MessageHandler.sendMessage({ type: MessageTypes.ForbiddenError, reason: errorMessage });
    return;
  }
  throw new Error(errorMessage);
 }

 export function getARMCreateCollectionEndpoint(params: DataModels.MongoParameters): string {
-  return `subscriptions/${params.sid}/resourceGroups/${params.rg}/providers/Microsoft.DocumentDB/databaseAccounts/${userContext.databaseAccount.name}/mongodbDatabases/${params.db}/collections/${params.coll}`;
+  return `subscriptions/${params.sid}/resourceGroups/${params.rg}/providers/Microsoft.DocumentDB/databaseAccounts/${
+    CosmosClient.databaseAccount().name
+  }/mongodbDatabases/${params.db}/collections/${params.coll}`;
 }

 export async function _createMongoCollectionWithARM(
--- a/src/Common/NotificationsClientBase.ts
+++ b/src/Common/NotificationsClientBase.ts
@@ -2,10 +2,11 @@ import "jquery";
 import * as Q from "q";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
-import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
-import { userContext } from "../UserContext";

-export class NotificationsClientBase {
+import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
+import { CosmosClient } from "./CosmosClient";
+
+export class NotificationsClientBase implements ViewModels.NotificationsClient {
  private _extensionEndpoint: string;
  private _notificationsApiSuffix: string;

@@ -15,10 +16,10 @@ export class NotificationsClientBase {

  public fetchNotifications(): Q.Promise<DataModels.Notification[]> {
    const deferred: Q.Deferred<DataModels.Notification[]> = Q.defer<DataModels.Notification[]>();
-    const databaseAccount = userContext.databaseAccount;
-    const subscriptionId = userContext.subscriptionId;
-    const resourceGroup = userContext.resourceGroup;
-    const url = `${this._extensionEndpoint}${this._notificationsApiSuffix}?accountName=${databaseAccount.name}&subscriptionId=${subscriptionId}&resourceGroup=${resourceGroup}`;
+    const databaseAccount: ViewModels.DatabaseAccount = CosmosClient.databaseAccount();
+    const subscriptionId: string = CosmosClient.subscriptionId();
+    const resourceGroup: string = CosmosClient.resourceGroup();
+    const url: string = `${this._extensionEndpoint}${this._notificationsApiSuffix}?accountName=${databaseAccount.name}&subscriptionId=${subscriptionId}&resourceGroup=${resourceGroup}`;
    const authorizationHeader: ViewModels.AuthorizationTokenHeaderMetadata = getAuthorizationHeader();
    const headers: any = {};
    headers[authorizationHeader.header] = authorizationHeader.token;
--- a/src/Common/QueriesClient.ts
+++ b/src/Common/QueriesClient.ts
@@ -1,26 +1,18 @@
-import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as _ from "underscore";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
-import Explorer from "../Explorer/Explorer";
-import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
-import DocumentsTab from "../Explorer/Tabs/DocumentsTab";
 import DocumentId from "../Explorer/Tree/DocumentId";
-import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
-import { QueryUtils } from "../Utils/QueryUtils";
-import { BackendDefaults, HttpStatusCodes, SavedQueries } from "./Constants";
-import { userContext } from "../UserContext";
-import {
-  createDocument,
-  deleteDocument,
-  getOrCreateDatabaseAndCollection,
-  queryDocuments,
-  queryDocumentsPage
-} from "./DocumentClientUtilityBase";
 import * as ErrorParserUtility from "./ErrorParserUtility";
+import { BackendDefaults, HttpStatusCodes, SavedQueries } from "./Constants";
+import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
+import { CosmosClient } from "./CosmosClient";
+import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as Logger from "./Logger";
+import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
+import { QueryUtils } from "../Utils/QueryUtils";
+import Explorer from "../Explorer/Explorer";

-export class QueriesClient {
+export class QueriesClient implements ViewModels.QueriesClient {
  private static readonly PartitionKey: DataModels.PartitionKey = {
    paths: [`/${SavedQueries.PartitionKeyProperty}`],
    kind: BackendDefaults.partitionKeyKind,
@@ -41,13 +33,14 @@ export class QueriesClient {
      ConsoleDataType.InProgress,
      "Setting up account for saving queries"
    );
-    return getOrCreateDatabaseAndCollection({
-      collectionId: SavedQueries.CollectionName,
-      databaseId: SavedQueries.DatabaseName,
-      partitionKey: QueriesClient.PartitionKey,
-      offerThroughput: SavedQueries.OfferThroughput,
-      databaseLevelThroughput: undefined
-    })
+    return this.container.documentClientUtility
+      .getOrCreateDatabaseAndCollection({
+        collectionId: SavedQueries.CollectionName,
+        databaseId: SavedQueries.DatabaseName,
+        partitionKey: QueriesClient.PartitionKey,
+        offerThroughput: SavedQueries.OfferThroughput,
+        databaseLevelThroughput: undefined
+      })
      .then(
        (collection: DataModels.Collection) => {
          NotificationConsoleUtils.logConsoleMessage(
@@ -96,7 +89,8 @@ export class QueriesClient {
      `Saving query ${query.queryName}`
    );
    query.id = query.queryName;
-    return createDocument(queriesCollection, query)
+    return this.container.documentClientUtility
+      .createDocument(queriesCollection, query)
      .then(
        (savedQuery: DataModels.Query) => {
          NotificationConsoleUtils.logConsoleMessage(
@@ -137,11 +131,17 @@ export class QueriesClient {

    const options: any = { enableCrossPartitionQuery: true };
    const id = NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.InProgress, "Fetching saved queries");
-    return queryDocuments(SavedQueries.DatabaseName, SavedQueries.CollectionName, this.fetchQueriesQuery(), options)
+    return this.container.documentClientUtility
+      .queryDocuments(SavedQueries.DatabaseName, SavedQueries.CollectionName, this.fetchQueriesQuery(), options)
      .then(
        (queryIterator: QueryIterator<ItemDefinition & Resource>) => {
          const fetchQueries = (firstItemIndex: number): Q.Promise<ViewModels.QueryResults> =>
-            queryDocumentsPage(queriesCollection.id(), queryIterator, firstItemIndex, options);
+            this.container.documentClientUtility.queryDocumentsPage(
+              queriesCollection.id(),
+              queryIterator,
+              firstItemIndex,
+              options
+            );
          return QueryUtils.queryAllPages(fetchQueries).then(
            (results: ViewModels.QueryResults) => {
              let queries: DataModels.Query[] = _.map(results.documents, (document: DataModels.Query) => {
@@ -217,16 +217,17 @@ export class QueriesClient {
      `Deleting query ${query.queryName}`
    );
    query.id = query.queryName;
-    const documentId = new DocumentId(
+    const documentId: ViewModels.DocumentId = new DocumentId(
      {
        partitionKey: QueriesClient.PartitionKey,
        partitionKeyProperty: "id"
-      } as DocumentsTab,
+      } as ViewModels.DocumentsTab,
      query,
      query.queryName
    ); // TODO: Remove DocumentId's dependency on DocumentsTab
    const options: any = { partitionKey: query.resourceId };
-    return deleteDocument(queriesCollection, documentId)
+    return this.container.documentClientUtility
+      .deleteDocument(queriesCollection, documentId)
      .then(
        () => {
          NotificationConsoleUtils.logConsoleMessage(
@@ -249,10 +250,10 @@ export class QueriesClient {
  }

  public getResourceId(): string {
-    const databaseAccount = userContext.databaseAccount;
-    const databaseAccountName = (databaseAccount && databaseAccount.name) || "";
-    const subscriptionId = userContext.subscriptionId || "";
-    const resourceGroup = userContext.resourceGroup || "";
+    const databaseAccount: ViewModels.DatabaseAccount = CosmosClient.databaseAccount();
+    const databaseAccountName: string = (databaseAccount && databaseAccount.name) || "";
+    const subscriptionId: string = CosmosClient.subscriptionId() || "";
+    const resourceGroup: string = CosmosClient.resourceGroup() || "";

    return `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDb/databaseAccounts/${databaseAccountName}`;
  }
--- a/src/Common/dataAccess/createDatabase.ts
+++ b/src/Common/dataAccess/createDatabase.ts
@@ -1,250 +0,0 @@
-import * as DataModels from "../../Contracts/DataModels";
-import { AuthType } from "../../AuthType";
-import { DatabaseResponse } from "@azure/cosmos";
-import { DatabaseRequest } from "@azure/cosmos/dist-esm/client/Database/DatabaseRequest";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import { RequestOptions } from "@azure/cosmos/dist-esm";
-import {
-  SqlDatabaseCreateUpdateParameters,
-  CreateUpdateOptions
-} from "../../Utils/arm/generatedClients/2020-04-01/types";
-import { client } from "../CosmosClient";
-import { createUpdateSqlDatabase, getSqlDatabase } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import {
-  createUpdateCassandraKeyspace,
-  getCassandraKeyspace
-} from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
-import {
-  createUpdateMongoDBDatabase,
-  getMongoDBDatabase
-} from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
-import {
-  createUpdateGremlinDatabase,
-  getGremlinDatabase
-} from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { logConsoleProgress, logConsoleError, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
-import { logError } from "../Logger";
-import { refreshCachedOffers, refreshCachedResources } from "../DataAccessUtilityBase";
-import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
-
-export async function createDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  let database: DataModels.Database;
-  const clearMessage = logConsoleProgress(`Creating a new database ${params.databaseId}`);
-  try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.Table
-    ) {
-      database = await createDatabaseWithARM(params);
-    } else {
-      database = await createDatabaseWithSDK(params);
-    }
-  } catch (error) {
-    logConsoleError(`Error while creating database ${params.databaseId}:\n ${error.message}`);
-    logError(JSON.stringify(error), "CreateDatabase", error.code);
-    sendNotificationForError(error);
-    clearMessage();
-    throw error;
-  }
-  logConsoleInfo(`Successfully created database ${params.databaseId}`);
-  await refreshCachedResources();
-  await refreshCachedOffers();
-  clearMessage();
-  return database;
-}
-
-async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  const defaultExperience = userContext.defaultExperience;
-  switch (defaultExperience) {
-    case DefaultAccountExperienceType.DocumentDB:
-      return createSqlDatabase(params);
-    case DefaultAccountExperienceType.MongoDB:
-      return createMongoDatabase(params);
-    case DefaultAccountExperienceType.Cassandra:
-      return createCassandraKeyspace(params);
-    case DefaultAccountExperienceType.Graph:
-      return createGremlineDatabase(params);
-    default:
-      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
-  }
-}
-
-async function createSqlDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  try {
-    const getResponse = await getSqlDatabase(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId
-    );
-    if (getResponse && getResponse.properties && getResponse.properties.resource) {
-      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
-  const options: CreateUpdateOptions = constructRpOptions(params);
-  const rpPayload: SqlDatabaseCreateUpdateParameters = {
-    properties: {
-      resource: {
-        id: params.databaseId
-      },
-      options
-    }
-  };
-  const createResponse = await createUpdateSqlDatabase(
-    userContext.subscriptionId,
-    userContext.resourceGroup,
-    userContext.databaseAccount.name,
-    params.databaseId,
-    rpPayload
-  );
-  return createResponse && (createResponse.properties.resource as DataModels.Database);
-}
-
-async function createMongoDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  try {
-    const getResponse = await getMongoDBDatabase(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId
-    );
-    if (getResponse && getResponse.properties && getResponse.properties.resource) {
-      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
-  const options: CreateUpdateOptions = constructRpOptions(params);
-  const rpPayload: SqlDatabaseCreateUpdateParameters = {
-    properties: {
-      resource: {
-        id: params.databaseId
-      },
-      options
-    }
-  };
-  const createResponse = await createUpdateMongoDBDatabase(
-    userContext.subscriptionId,
-    userContext.resourceGroup,
-    userContext.databaseAccount.name,
-    params.databaseId,
-    rpPayload
-  );
-  return createResponse && (createResponse.properties.resource as DataModels.Database);
-}
-
-async function createCassandraKeyspace(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  try {
-    const getResponse = await getCassandraKeyspace(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId
-    );
-    if (getResponse?.properties?.resource) {
-      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
-  const options: CreateUpdateOptions = constructRpOptions(params);
-  const rpPayload: SqlDatabaseCreateUpdateParameters = {
-    properties: {
-      resource: {
-        id: params.databaseId
-      },
-      options
-    }
-  };
-  const createResponse = await createUpdateCassandraKeyspace(
-    userContext.subscriptionId,
-    userContext.resourceGroup,
-    userContext.databaseAccount.name,
-    params.databaseId,
-    rpPayload
-  );
-  return createResponse && (createResponse.properties.resource as DataModels.Database);
-}
-
-async function createGremlineDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  try {
-    const getResponse = await getGremlinDatabase(
-      userContext.subscriptionId,
-      userContext.resourceGroup,
-      userContext.databaseAccount.name,
-      params.databaseId
-    );
-    if (getResponse && getResponse.properties && getResponse.properties.resource) {
-      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
-    }
-  } catch (error) {
-    if (error.code !== "NotFound") {
-      throw error;
-    }
-  }
-
-  const options: CreateUpdateOptions = constructRpOptions(params);
-  const rpPayload: SqlDatabaseCreateUpdateParameters = {
-    properties: {
-      resource: {
-        id: params.databaseId
-      },
-      options
-    }
-  };
-  const createResponse = await createUpdateGremlinDatabase(
-    userContext.subscriptionId,
-    userContext.resourceGroup,
-    userContext.databaseAccount.name,
-    params.databaseId,
-    rpPayload
-  );
-  return createResponse && (createResponse.properties.resource as DataModels.Database);
-}
-
-async function createDatabaseWithSDK(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  const createBody: DatabaseRequest = { id: params.databaseId };
-  const databaseOptions: RequestOptions = {};
-  // TODO: replace when SDK support autopilot
-  if (params.databaseLevelThroughput) {
-    if (params.autoPilotMaxThroughput) {
-      createBody.maxThroughput = params.autoPilotMaxThroughput;
-    } else {
-      createBody.throughput = params.offerThroughput;
-    }
-  }
-
-  const response: DatabaseResponse = await client().databases.create(createBody, databaseOptions);
-  return response.resource;
-}
-
-function constructRpOptions(params: DataModels.CreateDatabaseParams): CreateUpdateOptions {
-  if (!params.databaseLevelThroughput) {
-    return {};
-  }
-
-  if (params.autoPilotMaxThroughput) {
-    return {
-      autoscaleSettings: {
-        maxThroughput: params.autoPilotMaxThroughput
-      }
-    };
-  }
-
-  return {
-    throughput: params.offerThroughput
-  };
-}
--- a/src/Common/dataAccess/deleteCollection.test.ts
+++ b/src/Common/dataAccess/deleteCollection.test.ts
@@ -1,46 +0,0 @@
-jest.mock("../../Utils/arm/request");
-jest.mock("../MessageHandler");
-jest.mock("../CosmosClient");
-import { deleteCollection } from "./deleteCollection";
-import { armRequest } from "../../Utils/arm/request";
-import { AuthType } from "../../AuthType";
-import { client } from "../CosmosClient";
-import { updateUserContext } from "../../UserContext";
-import { DatabaseAccount } from "../../Contracts/DataModels";
-import { sendCachedDataMessage } from "../MessageHandler";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-
-describe("deleteCollection", () => {
-  beforeAll(() => {
-    updateUserContext({
-      databaseAccount: {
-        name: "test"
-      } as DatabaseAccount,
-      defaultExperience: DefaultAccountExperienceType.DocumentDB
-    });
-    (sendCachedDataMessage as jest.Mock).mockResolvedValue(undefined);
-  });
-
-  it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
-    await deleteCollection("database", "collection");
-    expect(armRequest).toHaveBeenCalled();
-  });
-
-  it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
-    (client as jest.Mock).mockReturnValue({
-      database: () => {
-        return {
-          container: () => {
-            return {
-              delete: (): unknown => undefined
-            };
-          }
-        };
-      }
-    });
-    await deleteCollection("database", "collection");
-    expect(client).toHaveBeenCalled();
-  });
-});
--- a/src/Common/dataAccess/deleteCollection.ts
+++ b/src/Common/dataAccess/deleteCollection.ts
@@ -1,57 +0,0 @@
-import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import { deleteSqlContainer } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { deleteCassandraTable } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
-import { deleteMongoDBCollection } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
-import { deleteGremlinGraph } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { deleteTable } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
-import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import { logError } from "../Logger";
-import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
-import { client } from "../CosmosClient";
-import { refreshCachedResources } from "../DataAccessUtilityBase";
-
-export async function deleteCollection(databaseId: string, collectionId: string): Promise<void> {
-  const clearMessage = logConsoleProgress(`Deleting container ${collectionId}`);
-  try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      await deleteCollectionWithARM(databaseId, collectionId);
-    } else {
-      await client()
-        .database(databaseId)
-        .container(collectionId)
-        .delete();
-    }
-  } catch (error) {
-    logConsoleError(`Error while deleting container ${collectionId}:\n ${JSON.stringify(error)}`);
-    logError(JSON.stringify(error), "DeleteCollection", error.code);
-    sendNotificationForError(error);
-    throw error;
-  }
-  logConsoleInfo(`Successfully deleted container ${collectionId}`);
-  clearMessage();
-  await refreshCachedResources();
-}
-
-function deleteCollectionWithARM(databaseId: string, collectionId: string): Promise<void> {
-  const subscriptionId = userContext.subscriptionId;
-  const resourceGroup = userContext.resourceGroup;
-  const accountName = userContext.databaseAccount.name;
-  const defaultExperience = userContext.defaultExperience;
-
-  switch (defaultExperience) {
-    case DefaultAccountExperienceType.DocumentDB:
-      return deleteSqlContainer(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-    case DefaultAccountExperienceType.MongoDB:
-      return deleteMongoDBCollection(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-    case DefaultAccountExperienceType.Cassandra:
-      return deleteCassandraTable(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-    case DefaultAccountExperienceType.Graph:
-      return deleteGremlinGraph(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-    case DefaultAccountExperienceType.Table:
-      return deleteTable(subscriptionId, resourceGroup, accountName, collectionId);
-    default:
-      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
-  }
-}
--- a/src/Common/dataAccess/deleteDatabase.test.ts
+++ b/src/Common/dataAccess/deleteDatabase.test.ts
@@ -1,42 +0,0 @@
-jest.mock("../../Utils/arm/request");
-jest.mock("../MessageHandler");
-jest.mock("../CosmosClient");
-import { deleteDatabase } from "./deleteDatabase";
-import { armRequest } from "../../Utils/arm/request";
-import { AuthType } from "../../AuthType";
-import { client } from "../CosmosClient";
-import { updateUserContext } from "../../UserContext";
-import { DatabaseAccount } from "../../Contracts/DataModels";
-import { sendCachedDataMessage } from "../MessageHandler";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-
-describe("deleteDatabase", () => {
-  beforeAll(() => {
-    updateUserContext({
-      databaseAccount: {
-        name: "test"
-      } as DatabaseAccount,
-      defaultExperience: DefaultAccountExperienceType.DocumentDB
-    });
-    (sendCachedDataMessage as jest.Mock).mockResolvedValue(undefined);
-  });
-
-  it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
-    await deleteDatabase("database");
-    expect(armRequest).toHaveBeenCalled();
-  });
-
-  it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
-    (client as jest.Mock).mockReturnValue({
-      database: () => {
-        return {
-          delete: (): unknown => undefined
-        };
-      }
-    });
-    await deleteDatabase("database");
-    expect(client).toHaveBeenCalled();
-  });
-});
--- a/src/Common/dataAccess/deleteDatabase.ts
+++ b/src/Common/dataAccess/deleteDatabase.ts
@@ -1,58 +0,0 @@
-import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import { deleteSqlDatabase } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { deleteCassandraKeyspace } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
-import { deleteMongoDBDatabase } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
-import { deleteGremlinDatabase } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import { userContext } from "../../UserContext";
-import { client } from "../CosmosClient";
-import { refreshCachedResources } from "../DataAccessUtilityBase";
-import { logError } from "../Logger";
-import { sendNotificationForError } from "./sendNotificationForError";
-
-export async function deleteDatabase(databaseId: string): Promise<void> {
-  const clearMessage = logConsoleProgress(`Deleting database ${databaseId}`);
-
-  try {
-    if (
-      window.authType === AuthType.AAD &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.Table &&
-      !userContext.useSDKOperations
-    ) {
-      await deleteDatabaseWithARM(databaseId);
-    } else {
-      await client()
-        .database(databaseId)
-        .delete();
-    }
-  } catch (error) {
-    logConsoleError(`Error while deleting database ${databaseId}:\n ${JSON.stringify(error)}`);
-    logError(JSON.stringify(error), "DeleteDatabase", error.code);
-    sendNotificationForError(error);
-    throw error;
-  }
-  logConsoleInfo(`Successfully deleted database ${databaseId}`);
-  clearMessage();
-  await refreshCachedResources();
-}
-
-function deleteDatabaseWithARM(databaseId: string): Promise<void> {
-  const subscriptionId = userContext.subscriptionId;
-  const resourceGroup = userContext.resourceGroup;
-  const accountName = userContext.databaseAccount.name;
-  const defaultExperience = userContext.defaultExperience;
-
-  switch (defaultExperience) {
-    case DefaultAccountExperienceType.DocumentDB:
-      return deleteSqlDatabase(subscriptionId, resourceGroup, accountName, databaseId);
-    case DefaultAccountExperienceType.MongoDB:
-      return deleteMongoDBDatabase(subscriptionId, resourceGroup, accountName, databaseId);
-    case DefaultAccountExperienceType.Cassandra:
-      return deleteCassandraKeyspace(subscriptionId, resourceGroup, accountName, databaseId);
-    case DefaultAccountExperienceType.Graph:
-      return deleteGremlinDatabase(subscriptionId, resourceGroup, accountName, databaseId);
-    default:
-      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
-  }
-}
--- a/src/Common/dataAccess/readCollection.test.ts
+++ b/src/Common/dataAccess/readCollection.test.ts
@@ -1,35 +0,0 @@
-jest.mock("../CosmosClient");
-import { AuthType } from "../../AuthType";
-import { DatabaseAccount } from "../../Contracts/DataModels";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import { client } from "../CosmosClient";
-import { readCollection } from "./readCollection";
-import { updateUserContext } from "../../UserContext";
-
-describe("readCollection", () => {
-  beforeAll(() => {
-    updateUserContext({
-      databaseAccount: {
-        name: "test"
-      } as DatabaseAccount,
-      defaultExperience: DefaultAccountExperienceType.DocumentDB
-    });
-  });
-
-  it("should call SDK if logged in with resource token", async () => {
-    window.authType = AuthType.ResourceToken;
-    (client as jest.Mock).mockReturnValue({
-      database: () => {
-        return {
-          container: () => {
-            return {
-              read: (): unknown => ({})
-            };
-          }
-        };
-      }
-    });
-    await readCollection("database", "collection");
-    expect(client).toHaveBeenCalled();
-  });
-});
--- a/src/Common/dataAccess/readCollection.ts
+++ b/src/Common/dataAccess/readCollection.ts
@@ -1,24 +0,0 @@
-import * as DataModels from "../../Contracts/DataModels";
-import { client } from "../CosmosClient";
-import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
-import { logError } from "../Logger";
-import { sendNotificationForError } from "./sendNotificationForError";
-
-export async function readCollection(databaseId: string, collectionId: string): Promise<DataModels.Collection> {
-  let collection: DataModels.Collection;
-  const clearMessage = logConsoleProgress(`Querying container ${collectionId}`);
-  try {
-    const response = await client()
-      .database(databaseId)
-      .container(collectionId)
-      .read();
-    collection = response.resource as DataModels.Collection;
-  } catch (error) {
-    logConsoleError(`Error while querying container ${collectionId}:\n ${JSON.stringify(error)}`);
-    logError(JSON.stringify(error), "ReadCollection", error.code);
-    sendNotificationForError(error);
-    throw error;
-  }
-  clearMessage();
-  return collection;
-}
--- a/src/Common/dataAccess/readCollections.test.ts
+++ b/src/Common/dataAccess/readCollections.test.ts
@@ -1,45 +0,0 @@
-jest.mock("../../Utils/arm/request");
-jest.mock("../CosmosClient");
-import { AuthType } from "../../AuthType";
-import { DatabaseAccount } from "../../Contracts/DataModels";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import { armRequest } from "../../Utils/arm/request";
-import { client } from "../CosmosClient";
-import { readCollections } from "./readCollections";
-import { updateUserContext } from "../../UserContext";
-
-describe("readCollections", () => {
-  beforeAll(() => {
-    updateUserContext({
-      databaseAccount: {
-        name: "test"
-      } as DatabaseAccount,
-      defaultExperience: DefaultAccountExperienceType.DocumentDB
-    });
-  });
-
-  it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
-    await readCollections("database");
-    expect(armRequest).toHaveBeenCalled();
-  });
-
-  it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
-    (client as jest.Mock).mockReturnValue({
-      database: () => {
-        return {
-          containers: {
-            readAll: () => {
-              return {
-                fetchAll: (): unknown => []
-              };
-            }
-          }
-        };
-      }
-    });
-    await readCollections("database");
-    expect(client).toHaveBeenCalled();
-  });
-});
--- a/src/Common/dataAccess/readCollections.ts
+++ b/src/Common/dataAccess/readCollections.ts
@@ -1,71 +0,0 @@
-import * as DataModels from "../../Contracts/DataModels";
-import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import { client } from "../CosmosClient";
-import { listSqlContainers } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { listCassandraTables } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
-import { listMongoDBCollections } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
-import { listGremlinGraphs } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { listTables } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
-import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
-import { logError } from "../Logger";
-import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
-
-export async function readCollections(databaseId: string): Promise<DataModels.Collection[]> {
-  let collections: DataModels.Collection[];
-  const clearMessage = logConsoleProgress(`Querying containers for database ${databaseId}`);
-  try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.MongoDB &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.Table
-    ) {
-      collections = await readCollectionsWithARM(databaseId);
-    } else {
-      const sdkResponse = await client()
-        .database(databaseId)
-        .containers.readAll()
-        .fetchAll();
-      collections = sdkResponse.resources as DataModels.Collection[];
-    }
-  } catch (error) {
-    logConsoleError(`Error while querying containers for database ${databaseId}:\n ${JSON.stringify(error)}`);
-    logError(JSON.stringify(error), "ReadCollections", error.code);
-    sendNotificationForError(error);
-    throw error;
-  }
-  clearMessage();
-  return collections;
-}
-
-async function readCollectionsWithARM(databaseId: string): Promise<DataModels.Collection[]> {
-  let rpResponse;
-  const subscriptionId = userContext.subscriptionId;
-  const resourceGroup = userContext.resourceGroup;
-  const accountName = userContext.databaseAccount.name;
-  const defaultExperience = userContext.defaultExperience;
-
-  switch (defaultExperience) {
-    case DefaultAccountExperienceType.DocumentDB:
-      rpResponse = await listSqlContainers(subscriptionId, resourceGroup, accountName, databaseId);
-      break;
-    case DefaultAccountExperienceType.MongoDB:
-      rpResponse = await listMongoDBCollections(subscriptionId, resourceGroup, accountName, databaseId);
-      break;
-    case DefaultAccountExperienceType.Cassandra:
-      rpResponse = await listCassandraTables(subscriptionId, resourceGroup, accountName, databaseId);
-      break;
-    case DefaultAccountExperienceType.Graph:
-      rpResponse = await listGremlinGraphs(subscriptionId, resourceGroup, accountName, databaseId);
-      break;
-    case DefaultAccountExperienceType.Table:
-      rpResponse = await listTables(subscriptionId, resourceGroup, accountName);
-      break;
-    default:
-      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
-  }
-
-  return rpResponse?.value?.map(collection => collection.properties?.resource as DataModels.Collection);
-}
--- a/src/Common/dataAccess/readDatabases.test.ts
+++ b/src/Common/dataAccess/readDatabases.test.ts
@@ -1,41 +0,0 @@
-jest.mock("../../Utils/arm/request");
-jest.mock("../CosmosClient");
-import { AuthType } from "../../AuthType";
-import { DatabaseAccount } from "../../Contracts/DataModels";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import { armRequest } from "../../Utils/arm/request";
-import { client } from "../CosmosClient";
-import { readDatabases } from "./readDatabases";
-import { updateUserContext } from "../../UserContext";
-
-describe("readDatabases", () => {
-  beforeAll(() => {
-    updateUserContext({
-      databaseAccount: {
-        name: "test"
-      } as DatabaseAccount,
-      defaultExperience: DefaultAccountExperienceType.DocumentDB
-    });
-  });
-
-  it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
-    await readDatabases();
-    expect(armRequest).toHaveBeenCalled();
-  });
-
-  it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
-    (client as jest.Mock).mockReturnValue({
-      databases: {
-        readAll: () => {
-          return {
-            fetchAll: (): unknown => []
-          };
-        }
-      }
-    });
-    await readDatabases();
-    expect(client).toHaveBeenCalled();
-  });
-});
--- a/src/Common/dataAccess/readDatabases.ts
+++ b/src/Common/dataAccess/readDatabases.ts
@@ -1,67 +0,0 @@
-import * as DataModels from "../../Contracts/DataModels";
-import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import { client } from "../CosmosClient";
-import { listSqlDatabases } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { listCassandraKeyspaces } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
-import { listMongoDBDatabases } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
-import { listGremlinDatabases } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
-import { logError } from "../Logger";
-import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
-
-export async function readDatabases(): Promise<DataModels.Database[]> {
-  let databases: DataModels.Database[];
-  const clearMessage = logConsoleProgress(`Querying databases`);
-  try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.MongoDB &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.Table &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.Cassandra
-    ) {
-      databases = await readDatabasesWithARM();
-    } else {
-      const sdkResponse = await client()
-        .databases.readAll()
-        .fetchAll();
-      databases = sdkResponse.resources as DataModels.Database[];
-    }
-  } catch (error) {
-    logConsoleError(`Error while querying databases:\n ${JSON.stringify(error)}`);
-    logError(JSON.stringify(error), "ReadDatabases", error.code);
-    sendNotificationForError(error);
-    throw error;
-  }
-  clearMessage();
-  return databases;
-}
-
-async function readDatabasesWithARM(): Promise<DataModels.Database[]> {
-  let rpResponse;
-  const subscriptionId = userContext.subscriptionId;
-  const resourceGroup = userContext.resourceGroup;
-  const accountName = userContext.databaseAccount.name;
-  const defaultExperience = userContext.defaultExperience;
-
-  switch (defaultExperience) {
-    case DefaultAccountExperienceType.DocumentDB:
-      rpResponse = await listSqlDatabases(subscriptionId, resourceGroup, accountName);
-      break;
-    case DefaultAccountExperienceType.MongoDB:
-      rpResponse = await listMongoDBDatabases(subscriptionId, resourceGroup, accountName);
-      break;
-    case DefaultAccountExperienceType.Cassandra:
-      rpResponse = await listCassandraKeyspaces(subscriptionId, resourceGroup, accountName);
-      break;
-    case DefaultAccountExperienceType.Graph:
-      rpResponse = await listGremlinDatabases(subscriptionId, resourceGroup, accountName);
-      break;
-    default:
-      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
-  }
-
-  return rpResponse?.value?.map(database => database.properties?.resource as DataModels.Database);
-}
--- a/src/Common/dataAccess/sendNotificationForError.ts
+++ b/src/Common/dataAccess/sendNotificationForError.ts
@@ -1,20 +0,0 @@
-import * as Constants from "../Constants";
-import { sendMessage } from "../MessageHandler";
-import { MessageTypes } from "../../Contracts/ExplorerContracts";
-
-interface CosmosError {
-  code: number;
-  message?: string;
-}
-
-export function sendNotificationForError(error: CosmosError): void {
-  if (error && error.code === Constants.HttpStatusCodes.Forbidden) {
-    if (error.message && error.message.toLowerCase().indexOf("sharedoffer is disabled for your account") > 0) {
-      return;
-    }
-    sendMessage({
-      type: MessageTypes.ForbiddenError,
-      reason: error && error.message ? error.message : error
-    });
-  }
-}
--- a/src/Common/dataAccess/updateCollection.ts
+++ b/src/Common/dataAccess/updateCollection.ts
@@ -1,225 +0,0 @@
-import { AuthType } from "../../AuthType";
-import { Collection } from "../../Contracts/DataModels";
-import { ContainerDefinition } from "@azure/cosmos";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
-import {
-  ExtendedResourceProperties,
-  SqlContainerCreateUpdateParameters,
-  SqlContainerResource
-} from "../../Utils/arm/generatedClients/2020-04-01/types";
-import { RequestOptions } from "@azure/cosmos/dist-esm";
-import { client } from "../CosmosClient";
-import { createUpdateSqlContainer, getSqlContainer } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import {
-  createUpdateCassandraTable,
-  getCassandraTable
-} from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
-import {
-  createUpdateMongoDBCollection,
-  getMongoDBCollection
-} from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
-import {
-  createUpdateGremlinGraph,
-  getGremlinGraph
-} from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { createUpdateTable, getTable } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
-import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import { logError } from "../Logger";
-import { refreshCachedResources } from "../DataAccessUtilityBase";
-import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
-
-export async function updateCollection(
-  databaseId: string,
-  collectionId: string,
-  newCollection: Collection,
-  options: RequestOptions = {}
-): Promise<Collection> {
-  let collection: Collection;
-  const clearMessage = logConsoleProgress(`Updating container ${collectionId}`);
-
-  try {
-    if (
-      window.authType === AuthType.AAD &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.MongoDB &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.Table
-    ) {
-      collection = await updateCollectionWithARM(databaseId, collectionId, newCollection);
-    } else {
-      const sdkResponse = await client()
-        .database(databaseId)
-        .container(collectionId)
-        .replace(newCollection as ContainerDefinition, options);
-      collection = sdkResponse.resource as Collection;
-    }
-  } catch (error) {
-    logConsoleError(`Failed to update container ${collectionId}: ${JSON.stringify(error)}`);
-    logError(JSON.stringify(error), "UpdateCollection", error.code);
-    sendNotificationForError(error);
-    throw error;
-  }
-  logConsoleInfo(`Successfully updated container ${collectionId}`);
-  clearMessage();
-  await refreshCachedResources();
-  return collection;
-}
-
-async function updateCollectionWithARM(
-  databaseId: string,
-  collectionId: string,
-  newCollection: Collection
-): Promise<Collection> {
-  const subscriptionId = userContext.subscriptionId;
-  const resourceGroup = userContext.resourceGroup;
-  const accountName = userContext.databaseAccount.name;
-  const defaultExperience = userContext.defaultExperience;
-
-  switch (defaultExperience) {
-    case DefaultAccountExperienceType.DocumentDB:
-      return updateSqlContainer(databaseId, collectionId, subscriptionId, resourceGroup, accountName, newCollection);
-    case DefaultAccountExperienceType.MongoDB:
-      return updateMongoDBCollection(
-        databaseId,
-        collectionId,
-        subscriptionId,
-        resourceGroup,
-        accountName,
-        newCollection
-      );
-    case DefaultAccountExperienceType.Cassandra:
-      return updateCassandraTable(databaseId, collectionId, subscriptionId, resourceGroup, accountName, newCollection);
-    case DefaultAccountExperienceType.Graph:
-      return updateGremlinGraph(databaseId, collectionId, subscriptionId, resourceGroup, accountName, newCollection);
-    case DefaultAccountExperienceType.Table:
-      return updateTable(collectionId, subscriptionId, resourceGroup, accountName, newCollection);
-    default:
-      throw new Error(`Unsupported default experience type: ${defaultExperience}`);
-  }
-}
-
-async function updateSqlContainer(
-  databaseId: string,
-  collectionId: string,
-  subscriptionId: string,
-  resourceGroup: string,
-  accountName: string,
-  newCollection: Collection
-): Promise<Collection> {
-  const getResponse = await getSqlContainer(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-  if (getResponse && getResponse.properties && getResponse.properties.resource) {
-    getResponse.properties.resource = newCollection as SqlContainerResource & ExtendedResourceProperties;
-    const updateResponse = await createUpdateSqlContainer(
-      subscriptionId,
-      resourceGroup,
-      accountName,
-      databaseId,
-      collectionId,
-      getResponse as SqlContainerCreateUpdateParameters
-    );
-    return updateResponse && (updateResponse.properties.resource as Collection);
-  }
-
-  throw new Error(`Sql container to update does not exist. Database id: ${databaseId} Collection id: ${collectionId}`);
-}
-
-async function updateMongoDBCollection(
-  databaseId: string,
-  collectionId: string,
-  subscriptionId: string,
-  resourceGroup: string,
-  accountName: string,
-  newCollection: Collection
-): Promise<Collection> {
-  const getResponse = await getMongoDBCollection(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-  if (getResponse && getResponse.properties && getResponse.properties.resource) {
-    getResponse.properties.resource = newCollection as SqlContainerResource & ExtendedResourceProperties;
-    const updateResponse = await createUpdateMongoDBCollection(
-      subscriptionId,
-      resourceGroup,
-      accountName,
-      databaseId,
-      collectionId,
-      getResponse as SqlContainerCreateUpdateParameters
-    );
-    return updateResponse && (updateResponse.properties.resource as Collection);
-  }
-
-  throw new Error(
-    `MongoDB collection to update does not exist. Database id: ${databaseId} Collection id: ${collectionId}`
-  );
-}
-
-async function updateCassandraTable(
-  databaseId: string,
-  collectionId: string,
-  subscriptionId: string,
-  resourceGroup: string,
-  accountName: string,
-  newCollection: Collection
-): Promise<Collection> {
-  const getResponse = await getCassandraTable(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-  if (getResponse && getResponse.properties && getResponse.properties.resource) {
-    getResponse.properties.resource = newCollection as SqlContainerResource & ExtendedResourceProperties;
-    const updateResponse = await createUpdateCassandraTable(
-      subscriptionId,
-      resourceGroup,
-      accountName,
-      databaseId,
-      collectionId,
-      getResponse as SqlContainerCreateUpdateParameters
-    );
-    return updateResponse && (updateResponse.properties.resource as Collection);
-  }
-
-  throw new Error(
-    `Cassandra table to update does not exist. Database id: ${databaseId} Collection id: ${collectionId}`
-  );
-}
-
-async function updateGremlinGraph(
-  databaseId: string,
-  collectionId: string,
-  subscriptionId: string,
-  resourceGroup: string,
-  accountName: string,
-  newCollection: Collection
-): Promise<Collection> {
-  const getResponse = await getGremlinGraph(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-  if (getResponse && getResponse.properties && getResponse.properties.resource) {
-    getResponse.properties.resource = newCollection as SqlContainerResource & ExtendedResourceProperties;
-    const updateResponse = await createUpdateGremlinGraph(
-      subscriptionId,
-      resourceGroup,
-      accountName,
-      databaseId,
-      collectionId,
-      getResponse as SqlContainerCreateUpdateParameters
-    );
-    return updateResponse && (updateResponse.properties.resource as Collection);
-  }
-
-  throw new Error(`Gremlin graph to update does not exist. Database id: ${databaseId} Collection id: ${collectionId}`);
-}
-
-async function updateTable(
-  collectionId: string,
-  subscriptionId: string,
-  resourceGroup: string,
-  accountName: string,
-  newCollection: Collection
-): Promise<Collection> {
-  const getResponse = await getTable(subscriptionId, resourceGroup, accountName, collectionId);
-  if (getResponse && getResponse.properties && getResponse.properties.resource) {
-    getResponse.properties.resource = newCollection as SqlContainerResource & ExtendedResourceProperties;
-    const updateResponse = await createUpdateTable(
-      subscriptionId,
-      resourceGroup,
-      accountName,
-      collectionId,
-      getResponse as SqlContainerCreateUpdateParameters
-    );
-    return updateResponse && (updateResponse.properties.resource as Collection);
-  }
-
-  throw new Error(`Table to update does not exist. Table id: ${collectionId}`);
-}
--- a/src/Common/dataAccess/updateOfferThroughputBeyondLimit.test.ts
+++ b/src/Common/dataAccess/updateOfferThroughputBeyondLimit.test.ts
@@ -1,26 +0,0 @@
-import { updateOfferThroughputBeyondLimit } from "./updateOfferThroughputBeyondLimit";
-
-describe("updateOfferThroughputBeyondLimit", () => {
-  it("should call fetch", async () => {
-    window.fetch = jest.fn(() => {
-      return {
-        ok: true
-      };
-    });
-    window.dataExplorer = {
-      logConsoleData: jest.fn(),
-      deleteInProgressConsoleDataWithId: jest.fn(),
-      extensionEndpoint: jest.fn()
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } as any;
-    await updateOfferThroughputBeyondLimit({
-      subscriptionId: "foo",
-      resourceGroup: "foo",
-      databaseAccountName: "foo",
-      databaseName: "foo",
-      throughput: 1000000000,
-      offerIsRUPerMinuteThroughputEnabled: false
-    });
-    expect(window.fetch).toHaveBeenCalled();
-  });
-});
--- a/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts
+++ b/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts
@@ -1,52 +0,0 @@
-import { Platform, configContext } from "../../ConfigContext";
-import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
-import { AutoPilotOfferSettings } from "../../Contracts/DataModels";
-import { logConsoleProgress, logConsoleInfo, logConsoleError } from "../../Utils/NotificationConsoleUtils";
-import { HttpHeaders } from "../Constants";
-
-interface UpdateOfferThroughputRequest {
-  subscriptionId: string;
-  resourceGroup: string;
-  databaseAccountName: string;
-  databaseName: string;
-  collectionName?: string;
-  throughput: number;
-  offerIsRUPerMinuteThroughputEnabled: boolean;
-  offerAutopilotSettings?: AutoPilotOfferSettings;
-}
-
-export async function updateOfferThroughputBeyondLimit(request: UpdateOfferThroughputRequest): Promise<void> {
-  if (configContext.platform !== Platform.Portal) {
-    throw new Error("Updating throughput beyond specified limit is not supported on this platform");
-  }
-
-  const resourceDescriptionInfo = request.collectionName
-    ? `database ${request.databaseName} and container ${request.collectionName}`
-    : `database ${request.databaseName}`;
-
-  const clearMessage = logConsoleProgress(
-    `Requesting increase in throughput to ${request.throughput} for ${resourceDescriptionInfo}`
-  );
-
-  const explorer = window.dataExplorer;
-  const url = `${explorer.extensionEndpoint()}/api/offerthroughputrequest/updatebeyondspecifiedlimit`;
-  const authorizationHeader = getAuthorizationHeader();
-
-  const response = await fetch(url, {
-    method: "POST",
-    body: JSON.stringify(request),
-    headers: { [authorizationHeader.header]: authorizationHeader.token, [HttpHeaders.contentType]: "application/json" }
-  });
-
-  if (response.ok) {
-    logConsoleInfo(
-      `Successfully requested an increase in throughput to ${request.throughput} for ${resourceDescriptionInfo}`
-    );
-    clearMessage();
-    return undefined;
-  }
-  const error = await response.json();
-  logConsoleError(`Failed to request an increase in throughput for ${request.throughput}: ${error.message}`);
-  clearMessage();
-  throw new Error(error.message);
-}
--- a/src/ConfigContext.ts
+++ b/src/ConfigContext.ts
@@ -4,7 +4,7 @@ export enum Platform {
  Emulator = "Emulator"
 }

-interface ConfigContext {
+interface Config {
  platform: Platform;
  allowedParentFrameOrigins: RegExp;
  gitSha?: string;
@@ -28,7 +28,7 @@ interface ConfigContext {
 }

 // Default configuration
-let configContext: Readonly<ConfigContext> = {
+let config: Config = {
  platform: Platform.Portal,
  allowedParentFrameOrigins: /^https:\/\/portal\.azure\.com$|^https:\/\/portal\.azure\.us$|^https:\/\/portal\.azure\.cn$|^https:\/\/portal\.microsoftazure\.de$|^https:\/\/.+\.portal\.azure\.com$|^https:\/\/.+\.portal\.azure\.us$|^https:\/\/.+\.portal\.azure\.cn$|^https:\/\/.+\.portal\.microsoftazure\.de$|^https:\/\/main\.documentdb\.ext\.azure\.com$|^https:\/\/main\.documentdb\.ext\.microsoftazure\.de$|^https:\/\/main\.documentdb\.ext\.azure\.cn$|^https:\/\/main\.documentdb\.ext\.azure\.us$/,
  // Webpack injects this at build time
@@ -46,58 +46,36 @@ let configContext: Readonly<ConfigContext> = {
  JUNO_ENDPOINT: "https://tools.cosmos.azure.com"
 };

-export function resetConfigContext(): void {
-  if (process.env.NODE_ENV !== "test") {
-    throw new Error("resetConfigContext can only becalled in a test environment");
-  }
-  configContext = {} as ConfigContext;
-}
-
-export function updateConfigContext(newContext: Partial<ConfigContext>): void {
-  Object.assign(configContext, newContext);
-}
-
 // Injected for local develpment. These will be removed in the production bundle by webpack
 if (process.env.NODE_ENV === "development") {
  const port: string = process.env.PORT || "1234";
-  updateConfigContext({
-    BACKEND_ENDPOINT: "https://localhost:" + port,
-    MONGO_BACKEND_ENDPOINT: "https://localhost:" + port,
-    PROXY_PATH: "/proxy",
-    EMULATOR_ENDPOINT: "https://localhost:8081"
-  });
+  config.BACKEND_ENDPOINT = "https://localhost:" + port;
+  config.MONGO_BACKEND_ENDPOINT = "https://localhost:" + port;
+  config.PROXY_PATH = "/proxy";
+  config.EMULATOR_ENDPOINT = "https://localhost:8081";
 }

-export async function initializeConfiguration(): Promise<ConfigContext> {
+export async function initializeConfiguration(): Promise<Config> {
  try {
    const response = await fetch("./config.json");
    if (response.status === 200) {
      try {
        const externalConfig = await response.json();
-        Object.assign(configContext, externalConfig);
+        config = Object.assign({}, config, externalConfig);
      } catch (error) {
        console.error("Unable to parse json in config file");
        console.error(error);
      }
    }
-    // Allow override of platform value with URL query parameter
+    // Allow override of any config value with URL query parameters
    const params = new URLSearchParams(window.location.search);
-    if (params.has("platform")) {
-      const platform = params.get("platform");
-      switch (platform) {
-        default:
-          console.log("Invalid platform query parameter given, ignoring");
-          break;
-        case Platform.Portal:
-        case Platform.Hosted:
-        case Platform.Emulator:
-          updateConfigContext({ platform });
-      }
-    }
+    params.forEach((value, key) => {
+      (config as any)[key] = value;
+    });
  } catch (error) {
    console.log("No configuration file found using defaults");
  }
-  return configContext;
+  return config;
 }

-export { configContext };
+export { config };
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -153,14 +153,7 @@ export interface KeyResource {
  Token: string;
 }

-export interface IndexingPolicy {
-  automatic: boolean;
-  indexingMode: string;
-  includedPaths: any;
-  excludedPaths: any;
-  compositeIndexes?: any;
-  spatialIndexes?: any;
-}
+export interface IndexingPolicy {}

 export interface PartitionKey {
  paths: string[];
@@ -319,6 +312,17 @@ export interface Query {
  query: string;
 }

+export interface UpdateOfferThroughputRequest {
+  subscriptionId: string;
+  resourceGroup: string;
+  databaseAccountName: string;
+  databaseName: string;
+  collectionName: string;
+  throughput: number;
+  offerIsRUPerMinuteThroughputEnabled: boolean;
+  offerAutopilotSettings?: AutoPilotOfferSettings;
+}
+
 export interface AutoPilotOfferSettings {
  tier?: AutopilotTier;
  maximumTierThroughput?: number;
@@ -327,11 +331,12 @@ export interface AutoPilotOfferSettings {
  targetMaxThroughput?: number;
 }

-export interface CreateDatabaseParams {
-  autoPilotMaxThroughput?: number;
+export interface CreateDatabaseRequest {
  databaseId: string;
  databaseLevelThroughput?: boolean;
  offerThroughput?: number;
+  autoPilot?: AutoPilotCreationSettings;
+  hasAutoPilotV2FeatureFlag?: boolean;
 }

 export interface SharedThroughputRange {
--- a/src/Contracts/ViewModels.ts
+++ b/src/Contracts/ViewModels.ts
@@ -1,16 +1,41 @@
 import * as DataModels from "./DataModels";
+import * as monaco from "monaco-editor";
+import DocumentClientUtilityBase from "../Common/DocumentClientUtilityBase";
 import Q from "q";
+import { AccessibleVerticalList } from "../Explorer/Tree/AccessibleVerticalList";
 import { CassandraTableKey, CassandraTableKeys } from "../Explorer/Tables/TableDataClient";
 import { CommandButtonComponentProps } from "../Explorer/Controls/CommandButton/CommandButtonComponent";
 import { ConsoleData } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
+import { GitHubClient } from "../GitHub/GitHubClient";
+import { JunoClient, IGalleryItem } from "../Juno/JunoClient";
+import { NotebookContentItem } from "../Explorer/Notebook/NotebookContentItem";
 import { QueryMetrics } from "@azure/cosmos";
 import { UploadDetails } from "../workers/upload/definitions";
 import Explorer from "../Explorer/Explorer";
 import UserDefinedFunction from "../Explorer/Tree/UserDefinedFunction";
 import StoredProcedure from "../Explorer/Tree/StoredProcedure";
+import ConflictsTab from "../Explorer/Tabs/ConflictsTab";
 import Trigger from "../Explorer/Tree/Trigger";
-import DocumentId from "../Explorer/Tree/DocumentId";
-import ConflictId from "../Explorer/Tree/ConflictId";
+
+export interface ExplorerOptions {
+  documentClientUtility: DocumentClientUtilityBase;
+  notificationsClient: NotificationsClient;
+  isEmulator: boolean;
+}
+
+export interface Capability extends DataModels.Capability {}
+
+export interface ConfigurationOverrides extends DataModels.ConfigurationOverrides {}
+
+export interface NavbarButtonConfig extends CommandButtonComponentProps {}
+
+export interface DatabaseAccount extends DataModels.DatabaseAccount {}
+
+export interface KernelConnectionMetadata {
+  name: string;
+  configurationEndpoints: DataModels.NotebookConfigurationEndpoints;
+  notebookConnectionInfo: DataModels.NotebookWorkspaceConnectionInfo;
+}

 export interface TokenProvider {
  getAuthHeader(): Promise<Headers>;
@@ -50,6 +75,11 @@ export interface WaitsForTemplate {
  isTemplateReady: ko.Observable<boolean>;
 }

+export interface AdHocAccessData {
+  readWriteUrl: string;
+  readUrl: string;
+}
+
 export interface TreeNode {
  nodeKind: string;
  rid: string;
@@ -171,15 +201,118 @@ export interface Collection extends CollectionBase {
  getLabel(): string;
 }

+export interface DocumentId {
+  container: DocumentsTab;
+  rid: string;
+  self: string;
+  ts: string;
+  partitionKeyValue: any;
+  partitionKeyProperty: string;
+  partitionKey: DataModels.PartitionKey;
+  stringPartitionKeyValue: string;
+  id: ko.Observable<string>;
+
+  isDirty: ko.Observable<boolean>;
+  click(): void;
+  getPartitionKeyValueAsString(): string;
+  loadDocument(): Q.Promise<any>;
+  partitionKeyHeader(): Object;
+}
+
+export interface ConflictId {
+  container: ConflictsTab;
+  rid: string;
+  self: string;
+  ts: string;
+  partitionKeyValue: any;
+  partitionKeyProperty: string;
+  partitionKey: DataModels.PartitionKey;
+  stringPartitionKeyValue: string;
+  id: ko.Observable<string>;
+  operationType: string;
+  resourceId: string;
+  resourceType: string;
+
+  isDirty: ko.Observable<boolean>;
+  click(): void;
+  buildDocumentIdFromConflict(partitionKeyValue: any): DocumentId;
+  getPartitionKeyValueAsString(): string;
+  loadConflict(): Q.Promise<any>;
+}
+
 /**
 * Options used to initialize pane
 */
 export interface PaneOptions {
  id: string;
+  documentClientUtility: DocumentClientUtilityBase;
  visible: ko.Observable<boolean>;
  container?: Explorer;
 }

+export interface ContextualPane {
+  documentClientUtility: DocumentClientUtilityBase;
+  formErrors: ko.Observable<string>;
+  formErrorsDetails: ko.Observable<string>;
+  id: string;
+  title: ko.Observable<string>;
+  visible: ko.Observable<boolean>;
+  firstFieldHasFocus: ko.Observable<boolean>;
+  isExecuting: ko.Observable<boolean>;
+
+  submit: () => void;
+  cancel: () => void;
+  open: () => void;
+  close: () => void;
+  resetData: () => void;
+  showErrorDetails: () => void;
+  onCloseKeyPress(source: any, event: KeyboardEvent): void;
+  onPaneKeyDown(source: any, event: KeyboardEvent): boolean;
+}
+
+export interface GitHubReposPaneOptions extends PaneOptions {
+  gitHubClient: GitHubClient;
+  junoClient: JunoClient;
+}
+
+export interface PublishNotebookPaneOptions extends PaneOptions {
+  junoClient: JunoClient;
+}
+
+export interface PublishNotebookPaneOpenOptions {
+  name: string;
+  author: string;
+  content: string;
+}
+
+export interface AddCollectionPaneOptions extends PaneOptions {
+  isPreferredApiTable: ko.Computed<boolean>;
+  databaseId?: string;
+  databaseSelfLink?: string;
+}
+
+export interface UploadFilePaneOpenOptions {
+  paneTitle: string;
+  selectFileInputLabel: string;
+  errorMessage: string; // Could not upload notebook
+  inProgressMessage: string; // Uploading notebook
+  successMessage: string; // Successfully uploaded notebook
+  onSubmit: (file: File) => Promise<any>;
+  extensions?: string; // input accept field. E.g: .ipynb
+  submitButtonLabel?: string;
+}
+
+export interface StringInputPaneOpenOptions {
+  paneTitle: string;
+  inputLabel: string;
+  errorMessage: string;
+  inProgressMessage: string;
+  successMessage: string;
+  onSubmit: (input: string) => Promise<any>;
+  submitButtonLabel: string;
+  defaultInput?: string;
+}
+
 /**
 * Graph configuration
 */
@@ -249,6 +382,19 @@ export interface DocumentRequestContainer {
  resourceName?: string;
 }

+export interface NotificationsClient {
+  fetchNotifications(): Q.Promise<DataModels.Notification[]>;
+  setExtensionEndpoint(extensionEndpoint: string): void;
+}
+
+export interface QueriesClient {
+  setupQueriesCollection(): Promise<DataModels.Collection>;
+  saveQuery(query: DataModels.Query): Promise<void>;
+  getQueries(): Promise<DataModels.Query[]>;
+  deleteQuery(query: DataModels.Query): Promise<void>;
+  getResourceId(): string;
+}
+
 export interface DocumentClientOption {
  endpoint?: string;
  masterKey?: string;
@@ -260,10 +406,11 @@ export interface TabOptions {
  tabKind: CollectionTabKind;
  title: string;
  tabPath: string;
+  documentClientUtility: DocumentClientUtilityBase;
  selfLink: string;
  isActive: ko.Observable<boolean>;
  hashLocation: string;
-  onUpdateTabsButtons: (buttons: CommandButtonComponentProps[]) => void;
+  onUpdateTabsButtons: (buttons: NavbarButtonConfig[]) => void;
  isTabsContentExpanded?: ko.Observable<boolean>;
  onLoadStartKey?: number;

@@ -276,6 +423,47 @@ export interface TabOptions {
  theme?: string;
 }

+export interface SparkMasterTabOptions extends TabOptions {
+  clusterConnectionInfo: DataModels.SparkClusterConnectionInfo;
+  container: Explorer;
+}
+
+export interface GraphTabOptions extends TabOptions {
+  account: DatabaseAccount;
+  masterKey: string;
+  collectionId: string;
+  databaseId: string;
+  collectionPartitionKeyProperty: string;
+}
+
+export interface NotebookTabOptions extends TabOptions {
+  account: DatabaseAccount;
+  masterKey: string;
+  container: Explorer;
+  notebookContentItem: NotebookContentItem;
+}
+
+export interface TerminalTabOptions extends TabOptions {
+  account: DatabaseAccount;
+  container: Explorer;
+  kind: TerminalKind;
+}
+
+export interface GalleryTabOptions extends TabOptions {
+  account: DatabaseAccount;
+  container: Explorer;
+  junoClient: JunoClient;
+  notebookUrl?: string;
+  galleryItem?: IGalleryItem;
+  isFavorite?: boolean;
+}
+
+export interface NotebookViewerTabOptions extends TabOptions {
+  account: DatabaseAccount;
+  container: Explorer;
+  notebookUrl: string;
+}
+
 export interface DocumentsTabOptions extends TabOptions {
  partitionKey: DataModels.PartitionKey;
  documentIds: ko.ObservableArray<DocumentId>;
@@ -303,15 +491,157 @@ export interface ScriptTabOption extends TabOptions {
  partitionKey?: DataModels.PartitionKey;
 }

+// Tabs
+export interface Tab {
+  documentClientUtility: DocumentClientUtilityBase;
+  node: TreeNode; // Can be null
+  collection: CollectionBase;
+  rid: string;
+
+  tabKind: CollectionTabKind;
+  tabId: string;
+  isActive: ko.Observable<boolean>;
+  isMouseOver: ko.Observable<boolean>;
+  tabPath: ko.Observable<string>;
+  tabTitle: ko.Observable<string>;
+  hashLocation: ko.Observable<string>;
+  closeTabButton: Button;
+  onCloseTabButtonClick(): void;
+  onTabClick(): Q.Promise<any>;
+  onKeyPressActivate(source: any, event: KeyboardEvent): void;
+  onKeyPressClose(source: any, event: KeyboardEvent): void;
+  onActivate(): Q.Promise<any>;
+  refresh(): void;
+  closeButtonTabIndex: ko.Computed<number>;
+  isExecutionError: ko.Observable<boolean>;
+  isExecuting: ko.Observable<boolean>;
+}
+
+export interface DocumentsTab extends Tab {
+  /* Documents Grid  */
+  selectDocument(documentId: DocumentId): Q.Promise<any>;
+  selectedDocumentId: ko.Observable<DocumentId>;
+  selectedDocumentContent: Editable<any>;
+  onDocumentIdClick(documentId: DocumentId): Q.Promise<any>;
+  dataContentsGridScrollHeight: ko.Observable<string>;
+  accessibleDocumentList: AccessibleVerticalList;
+  documentContentsGridId: string;
+
+  partitionKey: DataModels.PartitionKey;
+  idHeader: string;
+  partitionKeyPropertyHeader: string;
+  partitionKeyProperty: string;
+  documentIds: ko.ObservableArray<DocumentId>;
+
+  /* Documents Filter */
+  filterContent: ko.Observable<string>;
+  appliedFilter: ko.Observable<string>;
+  lastFilterContents: ko.ObservableArray<string>;
+  isFilterExpanded: ko.Observable<boolean>;
+  applyFilterButton: Button;
+  onShowFilterClick(): Q.Promise<any>;
+  onHideFilterClick(): Q.Promise<any>;
+  onApplyFilterClick(): Q.Promise<any>;
+
+  /* Document Editor */
+  isEditorDirty: ko.Computed<boolean>;
+  editorState: ko.Observable<DocumentExplorerState>;
+  onValidDocumentEdit(content: any): Q.Promise<any>;
+  onInvalidDocumentEdit(content: any): Q.Promise<any>;
+
+  onNewDocumentClick(): Q.Promise<any>;
+  onSaveNewDocumentClick(): Q.Promise<any>;
+  onRevertNewDocumentClick(): Q.Promise<any>;
+  onSaveExisitingDocumentClick(): Q.Promise<any>;
+  onRevertExisitingDocumentClick(): Q.Promise<any>;
+  onDeleteExisitingDocumentClick(): Q.Promise<any>;
+
+  /* Errors */
+  displayedError: ko.Observable<string>;
+
+  initDocumentEditor(documentId: DocumentId, content: any): Q.Promise<any>;
+  loadNextPage(): Q.Promise<any>;
+}
+
 export interface WaitsForTemplate {
  isTemplateReady: ko.Observable<boolean>;
 }

+export interface QueryTab extends Tab {
+  queryEditorId: string;
+  isQueryMetricsEnabled: ko.Computed<boolean>;
+  activityId: ko.Observable<string>;
+
+  /* Command Bar */
+  executeQueryButton: Button;
+  fetchNextPageButton: Button;
+  saveQueryButton: Button;
+  onExecuteQueryClick(): Q.Promise<any>;
+  onFetchNextPageClick(): Q.Promise<any>;
+
+  /*Query Editor*/
+  initialEditorContent: ko.Observable<string>;
+  sqlQueryEditorContent: ko.Observable<string>;
+  sqlStatementToExecute: ko.Observable<string>;
+
+  /* Results */
+  allResultsMetadata: ko.ObservableArray<QueryResultsMetadata>;
+
+  /* Errors */
+  errors: ko.ObservableArray<QueryError>;
+
+  /* Status  */
+  statusMessge: ko.Observable<string>;
+  statusIcon: ko.Observable<string>;
+}
+
+export interface ScriptTab extends Tab {
+  id: Editable<string>;
+  editorId: string;
+
+  saveButton: Button;
+  updateButton: Button;
+  discardButton: Button;
+  deleteButton: Button;
+
+  editorState: ko.Observable<ScriptEditorState>;
+  editorContent: ko.Observable<string>;
+  editor: ko.Observable<monaco.editor.IStandaloneCodeEditor>;
+
+  errors: ko.ObservableArray<QueryError>;
+  statusMessge: ko.Observable<string>;
+  statusIcon: ko.Observable<string>;
+
+  formFields: ko.ObservableArray<Editable<any>>;
+  formIsValid: ko.Computed<boolean>;
+  formIsDirty: ko.Computed<boolean>;
+
+  isNew: ko.Observable<boolean>;
+  resource: ko.Observable<DataModels.Resource>;
+
+  setBaselines(): void;
+}
+
+export interface StoredProcedureTab extends ScriptTab {
+  onExecuteSprocsResult(result: any, logsData: any): void;
+  onExecuteSprocsError(error: string): void;
+}
+
+export interface UserDefinedFunctionTab extends ScriptTab {}
+
+export interface TriggerTab extends ScriptTab {
+  triggerType: Editable<string>;
+  triggerOperation: Editable<string>;
+}
+
+export interface GraphTab extends Tab {}
 export interface EditorPosition {
  line: number;
  column: number;
 }

+export interface MongoShellTab extends Tab {}
+
 export enum DocumentExplorerState {
  noDocumentSelected,
  newDocumentValid,
@@ -429,8 +759,40 @@ export interface AuthorizationTokenHeaderMetadata {
  token: string;
 }

+export interface TelemetryActions {
+  sendEvent(name: string, telemetryProperties?: { [propertyName: string]: string }): Q.Promise<any>;
+  sendError(errorInfo: DataModels.ITelemetryError): Q.Promise<any>;
+  sendMetric(
+    name: string,
+    metricNumber: number,
+    telemetryProperties?: { [propertyName: string]: string }
+  ): Q.Promise<any>;
+}
+
+export interface ConfigurationOverrides {
+  EnableBsonSchema: string;
+}
+
+export interface CosmosDbApi {
+  isSystemDatabasePredicate: (database: Database) => boolean;
+}
+
 export interface DropdownOption<T> {
  text: string;
  value: T;
  disable?: boolean;
 }
+
+export interface INotebookContainerClient {
+  resetWorkspace: () => Promise<void>;
+}
+
+export interface INotebookContentClient {
+  updateItemChildren: (item: NotebookContentItem) => Promise<void>;
+  createNewNotebookFile: (parent: NotebookContentItem) => Promise<NotebookContentItem>;
+  deleteContentItem: (item: NotebookContentItem) => Promise<void>;
+  uploadFileAsync: (name: string, content: string, parent: NotebookContentItem) => Promise<NotebookContentItem>;
+  renameNotebook: (item: NotebookContentItem, targetName: string) => Promise<NotebookContentItem>;
+  createDirectory: (parent: NotebookContentItem, newDirectoryName: string) => Promise<NotebookContentItem>;
+  readFileContent: (filePath: string) => Promise<string>;
+}
--- a/src/Controls/Heatmap/Heatmap.ts
+++ b/src/Controls/Heatmap/Heatmap.ts
@@ -12,7 +12,7 @@ import {
  PortalTheme
 } from "./HeatmapDatatypes";
 import { isInvalidParentFrameOrigin } from "../../Utils/MessageValidation";
-import { sendCachedDataMessage, sendMessage } from "../../Common/MessageHandler";
+import { MessageHandler } from "../../Common/MessageHandler";
 import { MessageTypes } from "../../Contracts/ExplorerContracts";
 import { StyleConstants } from "../../Common/Constants";
 import "./Heatmap.less";
@@ -209,7 +209,7 @@ export class Heatmap {
      for (let i = 0; i < this._chartData.dataPoints.length; i++) {
        output.push(this._chartData.dataPoints[i][xAxisIndex]);
      }
-      sendCachedDataMessage(MessageTypes.LogInfo, output);
+      MessageHandler.sendCachedDataMessage(MessageTypes.LogInfo, output);
    });
  }
 }
@@ -266,4 +266,4 @@ export function handleMessage(event: MessageEvent) {
 }

 window.addEventListener("message", handleMessage, false);
-sendMessage("ready");
+MessageHandler.sendMessage("ready");
--- a/src/DefaultAccountExperienceType.ts
+++ b/src/DefaultAccountExperienceType.ts
@@ -1,8 +0,0 @@
-export enum DefaultAccountExperienceType {
-  DocumentDB = "DocumentDB",
-  Graph = "Graph",
-  MongoDB = "MongoDB",
-  Table = "Table",
-  Cassandra = "Cassandra",
-  ApiForMongoDB = "Azure Cosmos DB for MongoDB API"
-}
--- a/src/Explorer/ComponentRegisterer.ts
+++ b/src/Explorer/ComponentRegisterer.ts
@@ -13,7 +13,9 @@ import { NewVertexComponent } from "./Graph/NewVertexComponent/NewVertexComponen
 import { TabsManagerKOComponent } from "./Tabs/TabsManager";
 import { ThroughputInputComponent } from "./Controls/ThroughputInput/ThroughputInputComponent";
 import { ThroughputInputComponentAutoPilotV3 } from "./Controls/ThroughputInput/ThroughputInputComponentAutoPilotV3";
+import { ToolbarComponent } from "./Controls/Toolbar/Toolbar";

+ko.components.register("toolbar", new ToolbarComponent());
 ko.components.register("input-typeahead", new InputTypeaheadComponent());
 ko.components.register("new-vertex-form", NewVertexComponent);
 ko.components.register("error-display", new ErrorDisplayComponent());
--- a/src/Explorer/Controls/FeaturePanel/FeaturePanelComponent.tsx
+++ b/src/Explorer/Controls/FeaturePanel/FeaturePanelComponent.tsx
@@ -49,12 +49,6 @@ export const FeaturePanelComponent: React.FunctionComponent = () => {
    { key: "feature.hosteddataexplorerenabled", label: "Hosted Data Explorer (deprecated?)", value: "true" },
    { key: "feature.enablettl", label: "Enable TTL", value: "true" },
    { key: "feature.enablegallerypublish", label: "Enable Notebook Gallery Publishing", value: "true" },
-    { key: "feature.enablecodeofconduct", label: "Enable Code Of Conduct Acknowledgement", value: "true" },
-    {
-      key: "feature.enableLinkInjection",
-      label: "Enable Injecting Notebook Viewer Link into the first cell",
-      value: "true"
-    },
    { key: "feature.canexceedmaximumvalue", label: "Can exceed max value", value: "true" },
    {
      key: "feature.enablefixedcollectionwithsharedthroughput",
--- a/src/Explorer/Controls/FeaturePanel/snapshots/FeaturePanelComponent.test.tsx.snap
+++ b/src/Explorer/Controls/FeaturePanel/snapshots/FeaturePanelComponent.test.tsx.snap
@@ -163,14 +163,8 @@ exports[`Feature panel renders all flags 1`] = `
        />
        <StyledCheckboxBase
          checked={false}
-          key="feature.enablecodeofconduct"
-          label="Enable Code Of Conduct Acknowledgement"
-          onChange={[Function]}
-        />
-        <StyledCheckboxBase
-          checked={false}
-          key="feature.enableLinkInjection"
-          label="Enable Injecting Notebook Viewer Link into the first cell"
+          key="feature.canexceedmaximumvalue"
+          label="Can exceed max value"
          onChange={[Function]}
        />
      </Stack>
@@ -178,12 +172,6 @@ exports[`Feature panel renders all flags 1`] = `
        className="checkboxRow"
        horizontalAlign="space-between"
      >
-        <StyledCheckboxBase
-          checked={false}
-          key="feature.canexceedmaximumvalue"
-          label="Can exceed max value"
-          onChange={[Function]}
-        />
        <StyledCheckboxBase
          checked={false}
          key="feature.enablefixedcollectionwithsharedthroughput"
--- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
+++ b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
@@ -5,7 +5,7 @@
 import * as React from "react";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as Logger from "../../../Common/Logger";
-import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../../Utils/NotificationConsoleUtils";
 import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import { StringUtils } from "../../../Utils/StringUtils";

--- a/src/Explorer/Controls/NotebookGallery/Cards/GalleryCardComponent.test.tsx
+++ b/src/Explorer/Controls/NotebookGallery/Cards/GalleryCardComponent.test.tsx
@@ -17,8 +17,7 @@ describe("GalleryCardComponent", () => {
        isSample: false,
        downloads: 0,
        favorites: 0,
-        views: 0,
-        newCellId: undefined
+        views: 0
      },
      isFavorite: false,
      showDownload: true,
--- a/src/Explorer/Controls/NotebookGallery/Cards/GalleryCardComponent.tsx
+++ b/src/Explorer/Controls/NotebookGallery/Cards/GalleryCardComponent.tsx
@@ -36,8 +36,6 @@ export interface GalleryCardComponentProps {
 export class GalleryCardComponent extends React.Component<GalleryCardComponentProps> {
  public static readonly CARD_WIDTH = 256;
  private static readonly cardImageHeight = 144;
-  public static readonly cardHeightToWidthRatio =
-    GalleryCardComponent.cardImageHeight / GalleryCardComponent.CARD_WIDTH;
  private static readonly cardDescriptionMaxChars = 88;
  private static readonly cardItemGapBig = 10;
  private static readonly cardItemGapSmall = 8;
--- a/src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.test.tsx
+++ b/src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.test.tsx
@@ -1,43 +0,0 @@
-import { shallow } from "enzyme";
-import * as sinon from "sinon";
-import React from "react";
-import { CodeOfConductComponent, CodeOfConductComponentProps } from "./CodeOfConductComponent";
-import { IJunoResponse, JunoClient } from "../../../Juno/JunoClient";
-import { HttpStatusCodes } from "../../../Common/Constants";
-
-describe("CodeOfConductComponent", () => {
-  let sandbox: sinon.SinonSandbox;
-  let codeOfConductProps: CodeOfConductComponentProps;
-
-  beforeEach(() => {
-    sandbox = sinon.sandbox.create();
-    sandbox.stub(JunoClient.prototype, "acceptCodeOfConduct").returns({
-      status: HttpStatusCodes.OK,
-      data: true
-    } as IJunoResponse<boolean>);
-    const junoClient = new JunoClient(undefined);
-    codeOfConductProps = {
-      junoClient: junoClient,
-      onAcceptCodeOfConduct: jest.fn()
-    };
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  it("renders", () => {
-    const wrapper = shallow(<CodeOfConductComponent {...codeOfConductProps} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("onAcceptedCodeOfConductCalled", async () => {
-    const wrapper = shallow(<CodeOfConductComponent {...codeOfConductProps} />);
-    wrapper
-      .find(".genericPaneSubmitBtn")
-      .first()
-      .simulate("click");
-    await Promise.resolve();
-    expect(codeOfConductProps.onAcceptCodeOfConduct).toBeCalled();
-  });
-});
--- a/src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.tsx
+++ b/src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.tsx
@@ -1,112 +0,0 @@
-import * as React from "react";
-import { JunoClient } from "../../../Juno/JunoClient";
-import { HttpStatusCodes, CodeOfConductEndpoints } from "../../../Common/Constants";
-import * as Logger from "../../../Common/Logger";
-import { logConsoleError } from "../../../Utils/NotificationConsoleUtils";
-import { Stack, Text, Checkbox, PrimaryButton, Link } from "office-ui-fabric-react";
-
-export interface CodeOfConductComponentProps {
-  junoClient: JunoClient;
-  onAcceptCodeOfConduct: (result: boolean) => void;
-}
-
-interface CodeOfConductComponentState {
-  readCodeOfConduct: boolean;
-}
-
-export class CodeOfConductComponent extends React.Component<CodeOfConductComponentProps, CodeOfConductComponentState> {
-  private descriptionPara1: string;
-  private descriptionPara2: string;
-  private descriptionPara3: string;
-  private link1: { label: string; url: string };
-  private link2: { label: string; url: string };
-
-  constructor(props: CodeOfConductComponentProps) {
-    super(props);
-
-    this.state = {
-      readCodeOfConduct: false
-    };
-
-    this.descriptionPara1 = "Azure CosmosDB Notebook Gallery - Code of Conduct and Privacy Statement";
-    this.descriptionPara2 =
-      "Azure Cosmos DB Notebook Public Gallery contains notebook samples shared by users of Cosmos DB.";
-    this.descriptionPara3 = "In order to access Azure Cosmos DB Notebook Gallery resources, you must accept the ";
-    this.link1 = { label: "code of conduct", url: CodeOfConductEndpoints.codeOfConduct };
-    this.link2 = { label: "privacy statement", url: CodeOfConductEndpoints.privacyStatement };
-  }
-
-  private async acceptCodeOfConduct(): Promise<void> {
-    try {
-      const response = await this.props.junoClient.acceptCodeOfConduct();
-      if (response.status !== HttpStatusCodes.OK && response.status !== HttpStatusCodes.NoContent) {
-        throw new Error(`Received HTTP ${response.status} when accepting code of conduct`);
-      }
-
-      this.props.onAcceptCodeOfConduct(response.data);
-    } catch (error) {
-      const message = `Failed to accept code of conduct: ${error}`;
-      Logger.logError(message, "CodeOfConductComponent/acceptCodeOfConduct");
-      logConsoleError(message);
-    }
-  }
-
-  private onChangeCheckbox = (): void => {
-    this.setState({ readCodeOfConduct: !this.state.readCodeOfConduct });
-  };
-
-  public render(): JSX.Element {
-    return (
-      <Stack tokens={{ childrenGap: 20 }}>
-        <Stack.Item>
-          <Text style={{ fontWeight: 500, fontSize: "20px" }}>{this.descriptionPara1}</Text>
-        </Stack.Item>
-
-        <Stack.Item>
-          <Text>{this.descriptionPara2}</Text>
-        </Stack.Item>
-
-        <Stack.Item>
-          <Text>
-            {this.descriptionPara3}
-            <Link href={this.link1.url} target="_blank">
-              {this.link1.label}
-            </Link>
-            {" and "}
-            <Link href={this.link2.url} target="_blank">
-              {this.link2.label}
-            </Link>
-          </Text>
-        </Stack.Item>
-
-        <Stack.Item>
-          <Checkbox
-            styles={{
-              label: {
-                margin: 0,
-                padding: "2 0 2 0"
-              },
-              text: {
-                fontSize: 12
-              }
-            }}
-            label="I have read and accepted the code of conduct and privacy statement"
-            onChange={this.onChangeCheckbox}
-          />
-        </Stack.Item>
-
-        <Stack.Item>
-          <PrimaryButton
-            ariaLabel="Continue"
-            title="Continue"
-            onClick={async () => await this.acceptCodeOfConduct()}
-            tabIndex={0}
-            className="genericPaneSubmitBtn"
-            text="Continue"
-            disabled={!this.state.readCodeOfConduct}
-          />
-        </Stack.Item>
-      </Stack>
-    );
-  }
-}
--- a/src/Explorer/Controls/NotebookGallery/GalleryViewerComponent.tsx
+++ b/src/Explorer/Controls/NotebookGallery/GalleryViewerComponent.tsx
@@ -15,17 +15,15 @@ import {
 } from "office-ui-fabric-react";
 import * as React from "react";
 import * as Logger from "../../../Common/Logger";
-import { IGalleryItem, JunoClient, IJunoResponse, IPublicGalleryData } from "../../../Juno/JunoClient";
+import { IGalleryItem, JunoClient } from "../../../Juno/JunoClient";
 import * as GalleryUtils from "../../../Utils/GalleryUtils";
-import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../../Utils/NotificationConsoleUtils";
 import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import { DialogComponent, DialogProps } from "../DialogReactComponent/DialogComponent";
 import { GalleryCardComponent, GalleryCardComponentProps } from "./Cards/GalleryCardComponent";
 import "./GalleryViewerComponent.less";
 import { HttpStatusCodes } from "../../../Common/Constants";
 import Explorer from "../../Explorer";
-import { CodeOfConductComponent } from "./CodeOfConductComponent";
-import { InfoComponent } from "./InfoComponent/InfoComponent";

 export interface GalleryViewerComponentProps {
  container?: Explorer;
@@ -62,7 +60,6 @@ interface GalleryViewerComponentState {
  sortBy: SortBy;
  searchText: string;
  dialogProps: DialogProps;
-  isCodeOfConductAccepted: boolean;
 }

 interface GalleryTabInfo {
@@ -89,7 +86,6 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
  private publicNotebooks: IGalleryItem[];
  private favoriteNotebooks: IGalleryItem[];
  private publishedNotebooks: IGalleryItem[];
-  private isCodeOfConductAccepted: boolean;
  private columnCount: number;
  private rowCount: number;

@@ -104,8 +100,7 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
      selectedTab: props.selectedTab,
      sortBy: props.sortBy,
      searchText: props.searchText,
-      dialogProps: undefined,
-      isCodeOfConductAccepted: undefined
+      dialogProps: undefined
    };

    this.sortingOptions = [
@@ -139,20 +134,9 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
    const tabs: GalleryTabInfo[] = [this.createTab(GalleryTab.OfficialSamples, this.state.sampleNotebooks)];

    if (this.props.container?.isGalleryPublishEnabled()) {
-      tabs.push(
-        this.createPublicGalleryTab(
-          GalleryTab.PublicGallery,
-          this.state.publicNotebooks,
-          this.state.isCodeOfConductAccepted
-        )
-      );
+      tabs.push(this.createTab(GalleryTab.PublicGallery, this.state.publicNotebooks));
      tabs.push(this.createTab(GalleryTab.Favorites, this.state.favoriteNotebooks));
-
-      // explicitly checking if isCodeOfConductAccepted is not false, as it is initially undefined.
-      // Displaying code of conduct component on gallery load should not be the default behavior.
-      if (this.state.isCodeOfConductAccepted !== false) {
-        tabs.push(this.createTab(GalleryTab.Published, this.state.publishedNotebooks));
-      }
+      tabs.push(this.createTab(GalleryTab.Published, this.state.publishedNotebooks));
    }

    const pivotProps: IPivotProps = {
@@ -183,17 +167,6 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
    );
  }

-  private createPublicGalleryTab(
-    tab: GalleryTab,
-    data: IGalleryItem[],
-    acceptedCodeOfConduct: boolean
-  ): GalleryTabInfo {
-    return {
-      tab,
-      content: this.createPublicGalleryTabContent(data, acceptedCodeOfConduct)
-    };
-  }
-
  private createTab(tab: GalleryTab, data: IGalleryItem[]): GalleryTabInfo {
    return {
      tab,
@@ -201,19 +174,6 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
    };
  }

-  private createPublicGalleryTabContent(data: IGalleryItem[], acceptedCodeOfConduct: boolean): JSX.Element {
-    return acceptedCodeOfConduct === false ? (
-      <CodeOfConductComponent
-        junoClient={this.props.junoClient}
-        onAcceptCodeOfConduct={(result: boolean) => {
-          this.setState({ isCodeOfConductAccepted: result });
-        }}
-      />
-    ) : (
-      this.createTabContent(data)
-    );
-  }
-
  private createTabContent(data: IGalleryItem[]): JSX.Element {
    return (
      <Stack tokens={{ childrenGap: 10 }}>
@@ -227,12 +187,8 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
          <Stack.Item styles={{ root: { minWidth: 200 } }}>
            <Dropdown options={this.sortingOptions} selectedKey={this.state.sortBy} onChange={this.onDropdownChange} />
          </Stack.Item>
-          {this.props.container?.isGalleryPublishEnabled() && (
-            <Stack.Item>
-              <InfoComponent />
-            </Stack.Item>
-          )}
        </Stack>
+
        {data && this.createCardsTabContent(data)}
      </Stack>
    );
@@ -298,19 +254,12 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
  private async loadPublicNotebooks(searchText: string, sortBy: SortBy, offline: boolean): Promise<void> {
    if (!offline) {
      try {
-        let response: IJunoResponse<IPublicGalleryData> | IJunoResponse<IGalleryItem[]>;
-        if (this.props.container.isCodeOfConductEnabled()) {
-          response = await this.props.junoClient.fetchPublicNotebooks();
-          this.isCodeOfConductAccepted = response.data?.metadata.acceptedCodeOfConduct;
-          this.publicNotebooks = response.data?.notebooksData;
-        } else {
-          response = await this.props.junoClient.getPublicNotebooks();
-          this.publicNotebooks = response.data;
-        }
-
+        const response = await this.props.junoClient.getPublicNotebooks();
        if (response.status !== HttpStatusCodes.OK && response.status !== HttpStatusCodes.NoContent) {
          throw new Error(`Received HTTP ${response.status} when loading public notebooks`);
        }
+
+        this.publicNotebooks = response.data;
      } catch (error) {
        const message = `Failed to load public notebooks: ${error}`;
        Logger.logError(message, "GalleryViewerComponent/loadPublicNotebooks");
@@ -319,8 +268,7 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
    }

    this.setState({
-      publicNotebooks: this.publicNotebooks && [...this.sort(sortBy, this.search(searchText, this.publicNotebooks))],
-      isCodeOfConductAccepted: this.isCodeOfConductAccepted
+      publicNotebooks: this.publicNotebooks && [...this.sort(sortBy, this.search(searchText, this.publicNotebooks))]
    });
  }

@@ -385,11 +333,12 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone

  private isGalleryItemPresent(searchText: string, item: IGalleryItem): boolean {
    const toSearch = searchText.trim().toUpperCase();
-    const searchData: string[] = [item.author.toUpperCase(), item.description.toUpperCase(), item.name.toUpperCase()];
-
-    if (item.tags) {
-      searchData.push(...item.tags.map(tag => tag.toUpperCase()));
-    }
+    const searchData: string[] = [
+      item.author.toUpperCase(),
+      item.description.toUpperCase(),
+      item.name.toUpperCase(),
+      ...item.tags?.map(tag => tag.toUpperCase())
+    ];

    for (const data of searchData) {
      if (data?.indexOf(toSearch) !== -1) {
--- a/src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.less
+++ b/src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.less
@@ -1,26 +0,0 @@
-@import "../../../../../less/Common/Constants.less";
-.infoPanel, .infoPanelMain {
-    display: flex;
-    align-items: center;
-}
-
-.infoPanel {
-    padding-left: 5px;
-    padding-right: 5px;
-}
-
-.infoLabel, .infoLabelMain {
-    padding-left: 5px  
-}
-
-.infoLabel {
-    font-weight: 400
-}
-
-.infoIconMain {
-    color: @AccentMedium
-}
-
-.infoIconMain:hover {
-    color: @BaseMedium
-}
--- a/src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.test.tsx
+++ b/src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.test.tsx
@@ -1,10 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-import { InfoComponent } from "./InfoComponent";
-
-describe("InfoComponent", () => {
-  it("renders", () => {
-    const wrapper = shallow(<InfoComponent />);
-    expect(wrapper).toMatchSnapshot();
-  });
-});
--- a/src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.tsx
+++ b/src/Explorer/Controls/NotebookGallery/InfoComponent/InfoComponent.tsx
@@ -1,42 +0,0 @@
-import * as React from "react";
-import { Icon, Label, Stack, HoverCard, HoverCardType, Link } from "office-ui-fabric-react";
-import { CodeOfConductEndpoints } from "../../../../Common/Constants";
-import "./InfoComponent.less";
-
-export class InfoComponent extends React.Component {
-  private getInfoPanel = (iconName: string, labelText: string, url: string): JSX.Element => {
-    return (
-      <Link href={url} target="_blank">
-        <div className="infoPanel">
-          <Icon iconName={iconName} styles={{ root: { verticalAlign: "middle" } }} />
-          <Label className="infoLabel">{labelText}</Label>
-        </div>
-      </Link>
-    );
-  };
-
-  private onHover = (): JSX.Element => {
-    return (
-      <Stack tokens={{ childrenGap: 5, padding: 5 }}>
-        <Stack.Item>{this.getInfoPanel("Script", "Code of Conduct", CodeOfConductEndpoints.codeOfConduct)}</Stack.Item>
-        <Stack.Item>
-          {this.getInfoPanel("RedEye", "Privacy Statement", CodeOfConductEndpoints.privacyStatement)}
-        </Stack.Item>
-        <Stack.Item>
-          {this.getInfoPanel("KnowledgeArticle", "Microsoft Terms of Use", CodeOfConductEndpoints.termsOfUse)}
-        </Stack.Item>
-      </Stack>
-    );
-  };
-
-  public render(): JSX.Element {
-    return (
-      <HoverCard plainCardProps={{ onRenderPlainCard: this.onHover }} instantOpenOnClick type={HoverCardType.plain}>
-        <div className="infoPanelMain">
-          <Icon className="infoIconMain" iconName="Help" styles={{ root: { verticalAlign: "middle" } }} />
-          <Label className="infoLabelMain">Help</Label>
-        </div>
-      </HoverCard>
-    );
-  }
-}
--- a/src/Explorer/Controls/NotebookGallery/InfoComponent/snapshots/InfoComponent.test.tsx.snap
+++ b/src/Explorer/Controls/NotebookGallery/InfoComponent/snapshots/InfoComponent.test.tsx.snap
@@ -1,34 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`InfoComponent renders 1`] = `
-<StyledHoverCardBase
-  instantOpenOnClick={true}
-  plainCardProps={
-    Object {
-      "onRenderPlainCard": [Function],
-    }
-  }
-  type="PlainCard"
->
-  <div
-    className="infoPanelMain"
-  >
-    <Memo(StyledIconBase)
-      className="infoIconMain"
-      iconName="Help"
-      styles={
-        Object {
-          "root": Object {
-            "verticalAlign": "middle",
-          },
-        }
-      }
-    />
-    <StyledLabelBase
-      className="infoLabelMain"
-    >
-      Help
-    </StyledLabelBase>
-  </div>
-</StyledHoverCardBase>
-`;
--- a/src/Explorer/Controls/NotebookGallery/snapshots/CodeOfConductComponent.test.tsx.snap
+++ b/src/Explorer/Controls/NotebookGallery/snapshots/CodeOfConductComponent.test.tsx.snap
@@ -1,75 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`CodeOfConductComponent renders 1`] = `
-<Stack
-  tokens={
-    Object {
-      "childrenGap": 20,
-    }
-  }
->
-  <StackItem>
-    <Text
-      style={
-        Object {
-          "fontSize": "20px",
-          "fontWeight": 500,
-        }
-      }
-    >
-      Azure CosmosDB Notebook Gallery - Code of Conduct and Privacy Statement
-    </Text>
-  </StackItem>
-  <StackItem>
-    <Text>
-      Azure Cosmos DB Notebook Public Gallery contains notebook samples shared by users of Cosmos DB.
-    </Text>
-  </StackItem>
-  <StackItem>
-    <Text>
-      In order to access Azure Cosmos DB Notebook Gallery resources, you must accept the 
-      <StyledLinkBase
-        href="https://aka.ms/cosmos-code-of-conduct"
-        target="_blank"
-      >
-        code of conduct
-      </StyledLinkBase>
-       and 
-      <StyledLinkBase
-        href="https://aka.ms/ms-privacy-policy"
-        target="_blank"
-      >
-        privacy statement
-      </StyledLinkBase>
-    </Text>
-  </StackItem>
-  <StackItem>
-    <StyledCheckboxBase
-      label="I have read and accepted the code of conduct and privacy statement"
-      onChange={[Function]}
-      styles={
-        Object {
-          "label": Object {
-            "margin": 0,
-            "padding": "2 0 2 0",
-          },
-          "text": Object {
-            "fontSize": 12,
-          },
-        }
-      }
-    />
-  </StackItem>
-  <StackItem>
-    <CustomizedPrimaryButton
-      ariaLabel="Continue"
-      className="genericPaneSubmitBtn"
-      disabled={true}
-      onClick={[Function]}
-      tabIndex={0}
-      text="Continue"
-      title="Continue"
-    />
-  </StackItem>
-</Stack>
-`;
--- a/src/Explorer/Controls/NotebookViewer/NotebookMetadataComponent.test.tsx
+++ b/src/Explorer/Controls/NotebookViewer/NotebookMetadataComponent.test.tsx
@@ -17,8 +17,7 @@ describe("NotebookMetadataComponent", () => {
        isSample: false,
        downloads: 0,
        favorites: 0,
-        views: 0,
-        newCellId: undefined
+        views: 0
      },
      isFavorite: false,
      downloadButtonText: "Download",
@@ -46,8 +45,7 @@ describe("NotebookMetadataComponent", () => {
        isSample: false,
        downloads: 0,
        favorites: 0,
-        views: 0,
-        newCellId: undefined
+        views: 0
      },
      isFavorite: true,
      downloadButtonText: "Download",
--- a/src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
+++ b/src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
@@ -10,7 +10,7 @@ import * as Logger from "../../../Common/Logger";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { IGalleryItem, JunoClient } from "../../../Juno/JunoClient";
 import * as GalleryUtils from "../../../Utils/GalleryUtils";
-import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../../Utils/NotificationConsoleUtils";
 import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import { NotebookClientV2 } from "../../Notebook/NotebookClientV2";
 import { NotebookComponentBootstrapper } from "../../Notebook/NotebookComponent/NotebookComponentBootstrapper";
@@ -19,8 +19,6 @@ import { DialogComponent, DialogProps } from "../DialogReactComponent/DialogComp
 import { NotebookMetadataComponent } from "./NotebookMetadataComponent";
 import "./NotebookViewerComponent.less";
 import Explorer from "../../Explorer";
-import { NotebookV4 } from "@nteract/commutable/lib/v4";
-import { SessionStorageUtility } from "../../../Shared/StorageUtility";

 export interface NotebookViewerComponentProps {
  container?: Explorer;
@@ -87,17 +85,16 @@ export class NotebookViewerComponent extends React.Component<
      }

      const notebook: Notebook = await response.json();
-      this.removeNotebookViewerLink(notebook, this.props.galleryItem?.newCellId);
      this.notebookComponentBootstrapper.setContent("json", notebook);
      this.setState({ content: notebook, showProgressBar: false });

-      if (this.props.galleryItem && !SessionStorageUtility.getEntry(this.props.galleryItem.id)) {
+      if (this.props.galleryItem) {
        const response = await this.props.junoClient.increaseNotebookViews(this.props.galleryItem.id);
        if (!response.data) {
          throw new Error(`Received HTTP ${response.status} while increasing notebook views`);
        }
+
        this.setState({ galleryItem: response.data });
-        SessionStorageUtility.setEntry(this.props.galleryItem?.id, "true");
      }
    } catch (error) {
      this.setState({ showProgressBar: false });
@@ -107,21 +104,10 @@ export class NotebookViewerComponent extends React.Component<
    }
  }

-  private removeNotebookViewerLink = (notebook: Notebook, newCellId: string): void => {
-    if (!newCellId) {
-      return;
-    }
-    const notebookV4 = notebook as NotebookV4;
-    if (notebookV4 && notebookV4.cells[0].source[0].search(newCellId)) {
-      delete notebookV4.cells[0];
-      notebook = notebookV4;
-    }
-  };
-
  public render(): JSX.Element {
    return (
      <div className="notebookViewerContainer">
-        {this.props.backNavigationText !== undefined ? (
+        {this.props.backNavigationText ? (
          <Link onClick={this.props.onBackClick}>
            <Icon iconName="Back" /> {this.props.backNavigationText}
          </Link>
--- a/src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx
+++ b/src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx
@@ -27,10 +27,9 @@ import { TextField, ITextFieldProps, ITextField } from "office-ui-fabric-react/l
 import TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";

 import SaveQueryBannerIcon from "../../../../images/save_query_banner.png";
-import { QueriesClient } from "../../../Common/QueriesClient";

 export interface QueriesGridComponentProps {
-  queriesClient: QueriesClient;
+  queriesClient: ViewModels.QueriesClient;
  onQuerySelect: (query: DataModels.Query) => void;
  containerVisible: boolean;
  saveQueryEnabled: boolean;
--- a/src/Explorer/Controls/Toolbar/IToolbarAction.ts
+++ b/src/Explorer/Controls/Toolbar/IToolbarAction.ts
@@ -0,0 +1,12 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+import IToolbarDisplayable from "./IToolbarDisplayable";
+
+interface IToolbarAction extends IToolbarDisplayable {
+  type: "action";
+  action: () => void;
+}
+
+export default IToolbarAction;
--- a/src/Explorer/Controls/Toolbar/IToolbarDisplayable.ts
+++ b/src/Explorer/Controls/Toolbar/IToolbarDisplayable.ts
@@ -0,0 +1,18 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+interface IToolbarDisplayable {
+  id: string;
+  title: ko.Subscribable<string>;
+  displayName: ko.Subscribable<string>;
+  enabled: ko.Subscribable<boolean>;
+  visible: ko.Observable<boolean>;
+  focused: ko.Observable<boolean>;
+  icon: string;
+  mouseDown: (data: any, event: MouseEvent) => any;
+  keyUp: (data: any, event: KeyboardEvent) => any;
+  keyDown: (data: any, event: KeyboardEvent) => any;
+}
+
+export default IToolbarDisplayable;
--- a/src/Explorer/Controls/Toolbar/IToolbarDropDown.ts
+++ b/src/Explorer/Controls/Toolbar/IToolbarDropDown.ts
@@ -0,0 +1,56 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+import IToolbarDisplayable from "./IToolbarDisplayable";
+
+interface IToolbarDropDown extends IToolbarDisplayable {
+  type: "dropdown";
+  subgroup: IActionConfigItem[];
+  expanded: ko.Observable<boolean>;
+  open: () => void;
+}
+
+export interface IDropdown {
+  type: "dropdown";
+  title: string;
+  displayName: string;
+  id: string;
+  enabled: ko.Observable<boolean>;
+  visible?: ko.Observable<boolean>;
+  icon?: string;
+  subgroup?: IActionConfigItem[];
+}
+
+export interface ISeperator {
+  type: "separator";
+  visible?: ko.Observable<boolean>;
+}
+
+export interface IToggle {
+  type: "toggle";
+  title: string;
+  displayName: string;
+  checkedTitle: string;
+  checkedDisplayName: string;
+  id: string;
+  checked: ko.Observable<boolean>;
+  enabled: ko.Observable<boolean>;
+  visible?: ko.Observable<boolean>;
+  icon?: string;
+}
+
+export interface IAction {
+  type: "action";
+  title: string;
+  displayName: string;
+  id: string;
+  action: () => any;
+  enabled: ko.Subscribable<boolean>;
+  visible?: ko.Observable<boolean>;
+  icon?: string;
+}
+
+export type IActionConfigItem = ISeperator | IAction | IToggle | IDropdown;
+
+export default IToolbarDropDown;
--- a/src/Explorer/Controls/Toolbar/IToolbarItem.ts
+++ b/src/Explorer/Controls/Toolbar/IToolbarItem.ts
@@ -0,0 +1,12 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+import IToolbarAction from "./IToolbarAction";
+import IToolbarToggle from "./IToolbarToggle";
+import IToolbarSeperator from "./IToolbarSeperator";
+import IToolbarDropDown from "./IToolbarDropDown";
+
+type IToolbarItem = IToolbarAction | IToolbarToggle | IToolbarSeperator | IToolbarDropDown;
+
+export default IToolbarItem;
--- a/src/Explorer/Controls/Toolbar/IToolbarSeperator.ts
+++ b/src/Explorer/Controls/Toolbar/IToolbarSeperator.ts
@@ -0,0 +1,10 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+interface IToolbarSeperator {
+  type: "separator";
+  visible: ko.Observable<boolean>;
+}
+
+export default IToolbarSeperator;
--- a/src/Explorer/Controls/Toolbar/IToolbarToggle.ts
+++ b/src/Explorer/Controls/Toolbar/IToolbarToggle.ts
@@ -0,0 +1,12 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+import IToolbarDisplayable from "./IToolbarDisplayable";
+
+interface IToolbarToggle extends IToolbarDisplayable {
+  type: "toggle";
+  checked: ko.Observable<boolean>;
+  toggle: () => void;
+}
+export default IToolbarToggle;
--- a/src/Explorer/Controls/Toolbar/KeyCodes.ts
+++ b/src/Explorer/Controls/Toolbar/KeyCodes.ts
@@ -0,0 +1,58 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+var keyCodes = {
+  RightClick: 3,
+  Enter: 13,
+  Esc: 27,
+  Tab: 9,
+  LeftArrow: 37,
+  UpArrow: 38,
+  RightArrow: 39,
+  DownArrow: 40,
+  Delete: 46,
+  A: 65,
+  B: 66,
+  C: 67,
+  D: 68,
+  E: 69,
+  F: 70,
+  G: 71,
+  H: 72,
+  I: 73,
+  J: 74,
+  K: 75,
+  L: 76,
+  M: 77,
+  N: 78,
+  O: 79,
+  P: 80,
+  Q: 81,
+  R: 82,
+  S: 83,
+  T: 84,
+  U: 85,
+  V: 86,
+  W: 87,
+  X: 88,
+  Y: 89,
+  Z: 90,
+  Period: 190,
+  DecimalPoint: 110,
+  F1: 112,
+  F2: 113,
+  F3: 114,
+  F4: 115,
+  F5: 116,
+  F6: 117,
+  F7: 118,
+  F8: 119,
+  F9: 120,
+  F10: 121,
+  F11: 122,
+  F12: 123,
+  Dash: 189
+};
+
+export default keyCodes;
--- a/src/Explorer/Controls/Toolbar/Toolbar.ts
+++ b/src/Explorer/Controls/Toolbar/Toolbar.ts
@@ -0,0 +1,145 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+import { IDropdown } from "./IToolbarDropDown";
+import { IActionConfigItem } from "./IToolbarDropDown";
+import IToolbarItem from "./IToolbarItem";
+
+import * as ko from "knockout";
+import ToolbarDropDown from "./ToolbarDropDown";
+import ToolbarAction from "./ToolbarAction";
+import ToolbarToggle from "./ToolbarToggle";
+import template from "./toolbar.html";
+
+export default class Toolbar {
+  private _toolbarWidth = ko.observable<number>();
+  private _actionConfigs: IActionConfigItem[];
+  private _afterExecute: (id: string) => void;
+
+  private _hasFocus: boolean = false;
+  private _focusedSubscription: ko.Subscription;
+
+  constructor(actionItems: IActionConfigItem[], afterExecute?: (id: string) => void) {
+    this._actionConfigs = actionItems;
+    this._afterExecute = afterExecute;
+    this.toolbarItems.subscribe(this._focusFirstEnabledItem);
+
+    $(window).resize(() => {
+      this._toolbarWidth($(".toolbar").width());
+    });
+    setTimeout(() => {
+      this._toolbarWidth($(".toolbar").width());
+    }, 500);
+  }
+
+  public toolbarItems: ko.PureComputed<IToolbarItem[]> = ko.pureComputed(() => {
+    var remainingToolbarSpace = this._toolbarWidth();
+    var toolbarItems: IToolbarItem[] = [];
+
+    var moreItem: IDropdown = {
+      type: "dropdown",
+      title: "More",
+      displayName: "More",
+      id: "more-actions-toggle",
+      enabled: ko.observable(true),
+      visible: ko.observable(true),
+      icon: "images/ASX_More.svg",
+      subgroup: []
+    };
+
+    var showHasMoreItem = false;
+    var addSeparator = false;
+    this._actionConfigs.forEach(actionConfig => {
+      if (actionConfig.type === "separator") {
+        addSeparator = true;
+      } else if (remainingToolbarSpace / 60 > 2) {
+        if (addSeparator) {
+          addSeparator = false;
+          toolbarItems.push(Toolbar._createToolbarItemFromConfig({ type: "separator" }));
+          remainingToolbarSpace -= 10;
+        }
+
+        toolbarItems.push(Toolbar._createToolbarItemFromConfig(actionConfig));
+        remainingToolbarSpace -= 60;
+      } else {
+        showHasMoreItem = true;
+        if (addSeparator) {
+          addSeparator = false;
+          moreItem.subgroup.push({
+            type: "separator"
+          });
+        }
+
+        if (!!actionConfig) {
+          moreItem.subgroup.push(actionConfig);
+        }
+      }
+    });
+
+    if (showHasMoreItem) {
+      toolbarItems.push(
+        Toolbar._createToolbarItemFromConfig({ type: "separator" }),
+        Toolbar._createToolbarItemFromConfig(moreItem)
+      );
+    }
+
+    return toolbarItems;
+  });
+
+  public focus() {
+    this._hasFocus = true;
+    this._focusFirstEnabledItem(this.toolbarItems());
+  }
+
+  private _focusFirstEnabledItem = (items: IToolbarItem[]) => {
+    if (!!this._focusedSubscription) {
+      // no memory leaks! :D
+      this._focusedSubscription.dispose();
+    }
+    if (this._hasFocus) {
+      for (var i = 0; i < items.length; i++) {
+        if (items[i].type !== "separator" && (<any>items[i]).enabled()) {
+          (<any>items[i]).focused(true);
+          this._focusedSubscription = (<any>items[i]).focused.subscribe((newValue: any) => {
+            if (!newValue) {
+              this._hasFocus = false;
+              this._focusedSubscription.dispose();
+            }
+          });
+          break;
+        }
+      }
+    }
+  };
+
+  private static _createToolbarItemFromConfig(
+    configItem: IActionConfigItem,
+    afterExecute?: (id: string) => void
+  ): IToolbarItem {
+    switch (configItem.type) {
+      case "dropdown":
+        return new ToolbarDropDown(configItem, afterExecute);
+      case "action":
+        return new ToolbarAction(configItem, afterExecute);
+      case "toggle":
+        return new ToolbarToggle(configItem, afterExecute);
+      case "separator":
+        return {
+          type: "separator",
+          visible: ko.observable(true)
+        };
+    }
+  }
+}
+
+/**
+ * Helper class for ko component registration
+ */
+export class ToolbarComponent {
+  constructor() {
+    return {
+      viewModel: Toolbar,
+      template
+    };
+  }
+}
--- a/src/Explorer/Controls/Toolbar/ToolbarAction.ts
+++ b/src/Explorer/Controls/Toolbar/ToolbarAction.ts
@@ -0,0 +1,86 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+import * as ko from "knockout";
+import { IAction } from "./IToolbarDropDown";
+import IToolbarAction from "./IToolbarAction";
+import KeyCodes from "./KeyCodes";
+import Utilities from "./Utilities";
+
+export default class ToolbarAction implements IToolbarAction {
+  public type: "action" = "action";
+  public id: string;
+  public icon: string;
+  public title: ko.Observable<string>;
+  public displayName: ko.Observable<string>;
+  public enabled: ko.Subscribable<boolean>;
+  public visible: ko.Observable<boolean>;
+  public focused: ko.Observable<boolean>;
+  public action: () => void;
+  private _afterExecute: (id: string) => void;
+
+  constructor(actionItem: IAction, afterExecute?: (id: string) => void) {
+    this.action = actionItem.action;
+    this.title = ko.observable(actionItem.title);
+    this.displayName = ko.observable(actionItem.displayName);
+    this.id = actionItem.id;
+    this.enabled = actionItem.enabled;
+    this.visible = actionItem.visible ? actionItem.visible : ko.observable(true);
+    this.focused = ko.observable(false);
+    this.icon = actionItem.icon;
+    this._afterExecute = afterExecute;
+  }
+
+  private _executeAction = () => {
+    this.action();
+    if (!!this._afterExecute) {
+      this._afterExecute(this.id);
+    }
+  };
+
+  public mouseDown = (data: any, event: MouseEvent): boolean => {
+    this._executeAction();
+    return false;
+  };
+
+  public keyUp = (data: any, event: KeyboardEvent): boolean => {
+    var handled: boolean = false;
+
+    handled = Utilities.onEnter(event, ($sourceElement: JQuery) => {
+      this._executeAction();
+      if ($sourceElement.hasClass("active")) {
+        $sourceElement.removeClass("active");
+      }
+      return true;
+    });
+
+    return !handled;
+  };
+
+  public keyDown = (data: any, event: KeyboardEvent): boolean => {
+    var handled: boolean = false;
+
+    handled = Utilities.onEnter(event, ($sourceElement: JQuery) => {
+      if ($sourceElement.hasClass("active")) {
+        $sourceElement.removeClass("active");
+      }
+      return true;
+    });
+
+    if (!handled) {
+      // Reset color if [shift-] tabbing, 'up/down arrowing', or 'esc'-aping away from button while holding down 'enter'
+      Utilities.onKeys(
+        event,
+        [KeyCodes.Tab, KeyCodes.UpArrow, KeyCodes.DownArrow, KeyCodes.Esc],
+        ($sourceElement: JQuery) => {
+          if ($sourceElement.hasClass("active")) {
+            $sourceElement.removeClass("active");
+          }
+        }
+      );
+    }
+
+    return !handled;
+  };
+}
--- a/src/Explorer/Controls/Toolbar/ToolbarDropDown.ts
+++ b/src/Explorer/Controls/Toolbar/ToolbarDropDown.ts
@@ -0,0 +1,167 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+import * as ko from "knockout";
+import { IDropdown } from "./IToolbarDropDown";
+import { IActionConfigItem } from "./IToolbarDropDown";
+import IToolbarDropDown from "./IToolbarDropDown";
+import KeyCodes from "./KeyCodes";
+import Utilities from "./Utilities";
+
+interface IMenuItem {
+  id?: string;
+  type: "normal" | "separator" | "submenu";
+  label?: string;
+  enabled?: boolean;
+  visible?: boolean;
+  submenu?: IMenuItem[];
+}
+
+export default class ToolbarDropDown implements IToolbarDropDown {
+  public type: "dropdown" = "dropdown";
+  public title: ko.Observable<string>;
+  public displayName: ko.Observable<string>;
+  public id: string;
+  public enabled: ko.Observable<boolean>;
+  public visible: ko.Observable<boolean>;
+  public focused: ko.Observable<boolean>;
+  public icon: string;
+  public subgroup: IActionConfigItem[] = [];
+  public expanded: ko.Observable<boolean> = ko.observable(false);
+  private _afterExecute: (id: string) => void;
+
+  constructor(dropdown: IDropdown, afterExecute?: (id: string) => void) {
+    this.subgroup = dropdown.subgroup;
+    this.title = ko.observable(dropdown.title);
+    this.displayName = ko.observable(dropdown.displayName);
+    this.id = dropdown.id;
+    this.enabled = dropdown.enabled;
+    this.visible = dropdown.visible ? dropdown.visible : ko.observable(true);
+    this.focused = ko.observable(false);
+    this.icon = dropdown.icon;
+    this._afterExecute = afterExecute;
+  }
+
+  private static _convertToMenuItem = (
+    actionConfigs: IActionConfigItem[],
+    actionMap: { [id: string]: () => void } = {}
+  ): { menuItems: IMenuItem[]; actionMap: { [id: string]: () => void } } => {
+    var returnValue = {
+      menuItems: actionConfigs.map<IMenuItem>((actionConfig: IActionConfigItem, index, array) => {
+        var menuItem: IMenuItem;
+        switch (actionConfig.type) {
+          case "action":
+            menuItem = <IMenuItem>{
+              id: actionConfig.id,
+              type: "normal",
+              label: actionConfig.displayName,
+              enabled: actionConfig.enabled(),
+              visible: actionConfig.visible ? actionConfig.visible() : true
+            };
+            actionMap[actionConfig.id] = actionConfig.action;
+            break;
+          case "dropdown":
+            menuItem = <IMenuItem>{
+              id: actionConfig.id,
+              type: "submenu",
+              label: actionConfig.displayName,
+              enabled: actionConfig.enabled(),
+              visible: actionConfig.visible ? actionConfig.visible() : true,
+              submenu: ToolbarDropDown._convertToMenuItem(actionConfig.subgroup, actionMap).menuItems
+            };
+            break;
+          case "toggle":
+            menuItem = <IMenuItem>{
+              id: actionConfig.id,
+              type: "normal",
+              label: actionConfig.checked() ? actionConfig.checkedDisplayName : actionConfig.displayName,
+              enabled: actionConfig.enabled(),
+              visible: actionConfig.visible ? actionConfig.visible() : true
+            };
+            actionMap[actionConfig.id] = () => {
+              actionConfig.checked(!actionConfig.checked());
+            };
+            break;
+          case "separator":
+            menuItem = <IMenuItem>{
+              type: "separator",
+              visible: true
+            };
+            break;
+        }
+        return menuItem;
+      }),
+      actionMap: actionMap
+    };
+
+    return returnValue;
+  };
+
+  public open = () => {
+    if (!!(<any>window).host) {
+      var convertedMenuItem = ToolbarDropDown._convertToMenuItem(this.subgroup);
+
+      (<any>window).host
+        .executeProviderOperation("MenuManager.showMenu", {
+          iFrameStack: [`#${window.frameElement.id}`],
+          anchor: `#${this.id}`,
+          menuItems: convertedMenuItem.menuItems
+        })
+        .then((id?: string) => {
+          if (!!id && !!convertedMenuItem.actionMap[id]) {
+            convertedMenuItem.actionMap[id]();
+          }
+        });
+
+      if (!!this._afterExecute) {
+        this._afterExecute(this.id);
+      }
+    }
+  };
+
+  public mouseDown = (data: any, event: MouseEvent): boolean => {
+    this.open();
+    return false;
+  };
+
+  public keyUp = (data: any, event: KeyboardEvent): boolean => {
+    var handled: boolean = false;
+
+    handled = Utilities.onEnter(event, ($sourceElement: JQuery) => {
+      this.open();
+      if ($sourceElement.hasClass("active")) {
+        $sourceElement.removeClass("active");
+      }
+      return true;
+    });
+
+    return !handled;
+  };
+
+  public keyDown = (data: any, event: KeyboardEvent): boolean => {
+    var handled: boolean = false;
+
+    handled = Utilities.onEnter(event, ($sourceElement: JQuery) => {
+      if ($sourceElement.hasClass("active")) {
+        $sourceElement.removeClass("active");
+      }
+      return true;
+    });
+
+    if (!handled) {
+      // Reset color if [shift-] tabbing, 'up/down arrowing', or 'esc'-aping away from button while holding down 'enter'
+      Utilities.onKeys(
+        event,
+        [KeyCodes.Tab, KeyCodes.UpArrow, KeyCodes.DownArrow, KeyCodes.Esc],
+        ($sourceElement: JQuery) => {
+          if ($sourceElement.hasClass("active")) {
+            $sourceElement.removeClass("active");
+          }
+        }
+      );
+    }
+
+    return !handled;
+  };
+}
--- a/src/Explorer/Controls/Toolbar/ToolbarToggle.ts
+++ b/src/Explorer/Controls/Toolbar/ToolbarToggle.ts
@@ -0,0 +1,109 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+import * as ko from "knockout";
+import { IToggle } from "./IToolbarDropDown";
+import IToolbarToggle from "./IToolbarToggle";
+import KeyCodes from "./KeyCodes";
+import Utilities from "./Utilities";
+
+export default class ToolbarToggle implements IToolbarToggle {
+  public type: "toggle" = "toggle";
+  public checked: ko.Observable<boolean>;
+  public id: string;
+  public enabled: ko.Observable<boolean>;
+  public visible: ko.Observable<boolean>;
+  public focused: ko.Observable<boolean>;
+  public icon: string;
+
+  private _title: string;
+  private _displayName: string;
+  private _checkedTitle: string;
+  private _checkedDisplayName: string;
+
+  private _afterExecute: (id: string) => void;
+
+  constructor(toggleItem: IToggle, afterExecute?: (id: string) => void) {
+    this._title = toggleItem.title;
+    this._displayName = toggleItem.displayName;
+    this.id = toggleItem.id;
+    this.enabled = toggleItem.enabled;
+    this.visible = toggleItem.visible ? toggleItem.visible : ko.observable(true);
+    this.focused = ko.observable(false);
+    this.icon = toggleItem.icon;
+    this.checked = toggleItem.checked;
+    this._checkedTitle = toggleItem.checkedTitle;
+    this._checkedDisplayName = toggleItem.checkedDisplayName;
+    this._afterExecute = afterExecute;
+  }
+
+  public title = ko.pureComputed(() => {
+    if (this.checked()) {
+      return this._checkedTitle;
+    } else {
+      return this._title;
+    }
+  });
+
+  public displayName = ko.pureComputed(() => {
+    if (this.checked()) {
+      return this._checkedDisplayName;
+    } else {
+      return this._displayName;
+    }
+  });
+
+  public toggle = () => {
+    this.checked(!this.checked());
+
+    if (this.checked() && !!this._afterExecute) {
+      this._afterExecute(this.id);
+    }
+  };
+
+  public mouseDown = (data: any, event: MouseEvent): boolean => {
+    this.toggle();
+    return false;
+  };
+
+  public keyUp = (data: any, event: KeyboardEvent): boolean => {
+    var handled: boolean = false;
+
+    handled = Utilities.onEnter(event, ($sourceElement: JQuery) => {
+      this.toggle();
+      if ($sourceElement.hasClass("active")) {
+        $sourceElement.removeClass("active");
+      }
+      return true;
+    });
+
+    return !handled;
+  };
+
+  public keyDown = (data: any, event: KeyboardEvent): boolean => {
+    var handled: boolean = false;
+
+    handled = Utilities.onEnter(event, ($sourceElement: JQuery) => {
+      if ($sourceElement.hasClass("active")) {
+        $sourceElement.removeClass("active");
+      }
+      return true;
+    });
+
+    if (!handled) {
+      // Reset color if [shift-] tabbing, 'up/down arrowing', or 'esc'-aping away from button while holding down 'enter'
+      Utilities.onKeys(
+        event,
+        [KeyCodes.Tab, KeyCodes.UpArrow, KeyCodes.DownArrow, KeyCodes.Esc],
+        ($sourceElement: JQuery) => {
+          if ($sourceElement.hasClass("active")) {
+            $sourceElement.removeClass("active");
+          }
+        }
+      );
+    }
+
+    return !handled;
+  };
+}
--- a/src/Explorer/Controls/Toolbar/Utilities.ts
+++ b/src/Explorer/Controls/Toolbar/Utilities.ts
@@ -0,0 +1,166 @@
+/*!---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *----------------------------------------------------------*/
+
+import KeyCodes from "./KeyCodes";
+
+export default class Utilities {
+  /**
+   * Executes an action on a keyboard event.
+   * Modifiers: ctrlKey - control/command key, shiftKey - shift key, altKey - alt/option key;
+   * pass on 'null' to ignore the modifier (default).
+   */
+  public static onKey(
+    event: any,
+    eventKeyCode: number,
+    action: ($sourceElement: JQuery) => void,
+    metaKey: boolean = null,
+    shiftKey: boolean = null,
+    altKey: boolean = null
+  ): boolean {
+    var source: any = event.target || event.srcElement,
+      keyCode: number = event.keyCode,
+      $sourceElement = $(source),
+      handled: boolean = false;
+
+    if (
+      $sourceElement.length &&
+      keyCode === eventKeyCode &&
+      $.isFunction(action) &&
+      (metaKey === null || metaKey === event.metaKey) &&
+      (shiftKey === null || shiftKey === event.shiftKey) &&
+      (altKey === null || altKey === event.altKey)
+    ) {
+      action($sourceElement);
+      handled = true;
+    }
+
+    return handled;
+  }
+
+  /**
+   * Executes an action on the first matched keyboard event.
+   */
+  public static onKeys(
+    event: any,
+    eventKeyCodes: number[],
+    action: ($sourceElement: JQuery) => void,
+    metaKey: boolean = null,
+    shiftKey: boolean = null,
+    altKey: boolean = null
+  ): boolean {
+    var handled: boolean = false,
+      keyCount: number,
+      i: number;
+
+    if ($.isArray(eventKeyCodes)) {
+      keyCount = eventKeyCodes.length;
+
+      for (i = 0; i < keyCount; ++i) {
+        handled = Utilities.onKey(event, eventKeyCodes[i], action, metaKey, shiftKey, altKey);
+
+        if (handled) {
+          break;
+        }
+      }
+    }
+
+    return handled;
+  }
+
+  /**
+   * Executes an action on an 'enter' keyboard event.
+   */
+  public static onEnter(
+    event: any,
+    action: ($sourceElement: JQuery) => void,
+    metaKey: boolean = null,
+    shiftKey: boolean = null,
+    altKey: boolean = null
+  ): boolean {
+    return Utilities.onKey(event, KeyCodes.Enter, action, metaKey, shiftKey, altKey);
+  }
+
+  /**
+   * Executes an action on a 'tab' keyboard event.
+   */
+  public static onTab(
+    event: any,
+    action: ($sourceElement: JQuery) => void,
+    metaKey: boolean = null,
+    shiftKey: boolean = null,
+    altKey: boolean = null
+  ): boolean {
+    return Utilities.onKey(event, KeyCodes.Tab, action, metaKey, shiftKey, altKey);
+  }
+
+  /**
+   * Executes an action on an 'Esc' keyboard event.
+   */
+  public static onEsc(
+    event: any,
+    action: ($sourceElement: JQuery) => void,
+    metaKey: boolean = null,
+    shiftKey: boolean = null,
+    altKey: boolean = null
+  ): boolean {
+    return Utilities.onKey(event, KeyCodes.Esc, action, metaKey, shiftKey, altKey);
+  }
+
+  /**
+   * Executes an action on an 'UpArrow' keyboard event.
+   */
+  public static onUpArrow(
+    event: any,
+    action: ($sourceElement: JQuery) => void,
+    metaKey: boolean = null,
+    shiftKey: boolean = null,
+    altKey: boolean = null
+  ): boolean {
+    return Utilities.onKey(event, KeyCodes.UpArrow, action, metaKey, shiftKey, altKey);
+  }
+
+  /**
+   * Executes an action on a 'DownArrow' keyboard event.
+   */
+  public static onDownArrow(
+    event: any,
+    action: ($sourceElement: JQuery) => void,
+    metaKey: boolean = null,
+    shiftKey: boolean = null,
+    altKey: boolean = null
+  ): boolean {
+    return Utilities.onKey(event, KeyCodes.DownArrow, action, metaKey, shiftKey, altKey);
+  }
+
+  /**
+   * Executes an action on a mouse event.
+   */
+  public static onButton(event: any, eventButtonCode: number, action: ($sourceElement: JQuery) => void): boolean {
+    var source: any = event.currentTarget;
+    var buttonCode: number = event.button;
+    var $sourceElement = $(source);
+    var handled: boolean = false;
+
+    if ($sourceElement.length && buttonCode === eventButtonCode && $.isFunction(action)) {
+      action($sourceElement);
+      handled = true;
+    }
+
+    return handled;
+  }
+
+  /**
+   * Executes an action on a 'left' mouse event.
+   */
+  public static onLeftButton(event: any, action: ($sourceElement: JQuery) => void): boolean {
+    return Utilities.onButton(event, buttonCodes.Left, action);
+  }
+}
+
+var buttonCodes = {
+  None: -1,
+  Left: 0,
+  Middle: 1,
+  Right: 2
+};
--- a/src/Explorer/Controls/Toolbar/toolbar.html
+++ b/src/Explorer/Controls/Toolbar/toolbar.html
@@ -0,0 +1,44 @@
+<div class="toolbar">
+  <!-- ko template: { name: 'toolbarItemTemplate', foreach: toolbarItems } -->
+  <!-- /ko -->
+</div>
+
+<script type="text/html" id="toolbarItemTemplate">
+  <!-- ko if: type === "action" -->
+  <div class="toolbar-group" data-bind="visible: visible">
+      <button class="toolbar-group-button" data-bind="hasFocus: focused, attr: {id: id, title: title, 'aria-label': displayName}, event: { mousedown: mouseDown, keydown: keyDown, keyup: keyUp }, enable: enabled">
+              <div class="toolbar-group-button-icon">
+                  <div class="toolbar_icon" data-bind="icon: icon"></div>
+              </div>
+              <span data-bind="text: displayName"></span>
+          </button>
+  </div>
+  <!-- /ko -->
+
+  <!-- ko if: type === "toggle" -->
+  <div class="toolbar-group" data-bind="visible: visible">
+      <button class="toolbar-group-button toggle-button" data-bind="hasFocus: focused, attr: {id: id, title: title}, event: { mousedown: mouseDown, keydown: keyDown, keyup: keyUp }, enable: enabled">
+              <div class="toolbar-group-button-icon" data-bind="css: { 'toggle-checked': checked }">
+                  <div class="toolbar_icon"  data-bind="icon: icon"></div>
+              </div>
+              <span data-bind="text: displayName"></span>
+          </button>
+  </div>
+  <!-- /ko -->
+  <!-- ko if: type === "dropdown" -->
+  <div class="toolbar-group" data-bind="visible: visible">
+      <div class="dropdown" data-bind="attr: {id: (id + '-dropdown')}">
+          <button role="menu" class="toolbar-group-button" data-bind="hasFocus: focused, attr: {id: id, title: title, 'aria-label': displayName},  event: { mousedown: mouseDown, keydown: keyDown, keyup: keyUp }, enable: enabled">
+                  <div class="toolbar-group-button-icon">
+                      <div class="toolbar_icon" data-bind="icon: icon"></div>
+                  </div>
+                  <span data-bind="text: displayName"></span>
+              </button>
+      </div>
+  </div>
+  <!-- /ko -->
+
+  <!-- ko if: type === "separator" -->
+  <div class="toolbar-group vertical-separator" data-bind="visible: visible"></div>
+  <!-- /ko -->
+</script>
--- a/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
+++ b/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
@@ -1,13 +1,12 @@
-jest.mock("../../Common/DocumentClientUtilityBase");
 import * as ko from "knockout";
 import * as sinon from "sinon";
 import * as ViewModels from "../../Contracts/ViewModels";
+import DocumentClientUtilityBase from "../../Common/DocumentClientUtilityBase";
 import Q from "q";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
-import * as DocumentClientUtility from "../../Common/DocumentClientUtilityBase";
+import { CosmosClient } from "../../Common/CosmosClient";
 import { GremlinClient } from "../Graph/GraphExplorerComponent/GremlinClient";
 import Explorer from "../Explorer";
-import { updateUserContext } from "../../UserContext";

 describe("ContainerSampleGenerator", () => {
  const createExplorerStub = (database: ViewModels.Database): Explorer => {
@@ -63,33 +62,27 @@ describe("ContainerSampleGenerator", () => {

    const explorerStub = createExplorerStub(database);
    explorerStub.isPreferredApiDocumentDB = ko.computed<boolean>(() => true);
+
+    const fakeDocumentClientUtility = sinon.createStubInstance(DocumentClientUtilityBase);
+    fakeDocumentClientUtility.getOrCreateDatabaseAndCollection.returns(Q.resolve(collection));
+    fakeDocumentClientUtility.createDocument.returns(Q.resolve());
+
+    explorerStub.documentClientUtility = fakeDocumentClientUtility;
+
    const generator = await ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub);
    generator.setData(sampleData);

    await generator.createSampleContainerAsync();

-    expect(DocumentClientUtility.createDocument).toHaveBeenCalled();
+    expect(fakeDocumentClientUtility.createDocument.called).toBe(true);
  });

  it("should send gremlin queries for Graph API account", async () => {
    sinon.stub(GremlinClient.prototype, "initialize").callsFake(() => {});
    const executeStub = sinon.stub(GremlinClient.prototype, "execute").returns(Q.resolve());

-    updateUserContext({
-      databaseAccount: {
-        id: "foo",
-        name: "foo",
-        location: "foo",
-        type: "foo",
-        kind: "foo",
-        tags: [],
-        properties: {
-          documentEndpoint: "bar",
-          gremlinEndpoint: "foo",
-          tableEndpoint: "foo",
-          cassandraEndpoint: "foo"
-        }
-      }
+    sinon.stub(CosmosClient, "databaseAccount").returns({
+      properties: {}
    });

    const sampleCollectionId = "SampleCollection";
@@ -116,12 +109,18 @@ describe("ContainerSampleGenerator", () => {
    const explorerStub = createExplorerStub(database);
    explorerStub.isPreferredApiGraph = ko.computed<boolean>(() => true);

+    const fakeDocumentClientUtility = sinon.createStubInstance(DocumentClientUtilityBase);
+    fakeDocumentClientUtility.getOrCreateDatabaseAndCollection.returns(Q.resolve(collection));
+    fakeDocumentClientUtility.createDocument.returns(Q.resolve());
+
+    explorerStub.documentClientUtility = fakeDocumentClientUtility;
+
    const generator = await ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub);
    generator.setData(sampleData);

    await generator.createSampleContainerAsync();

-    expect(DocumentClientUtility.createDocument).toHaveBeenCalled();
+    expect(fakeDocumentClientUtility.createDocument.called).toBe(false);
    expect(executeStub.called).toBe(true);
  });

--- a/src/Explorer/DataSamples/ContainerSampleGenerator.ts
+++ b/src/Explorer/DataSamples/ContainerSampleGenerator.ts
@@ -3,11 +3,10 @@ import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import GraphTab from ".././Tabs/GraphTab";
 import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent";
+import { CosmosClient } from "../../Common/CosmosClient";
 import { GremlinClient } from "../Graph/GraphExplorerComponent/GremlinClient";
-import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../Utils/NotificationConsoleUtils";
 import Explorer from "../Explorer";
-import { createDocument, getOrCreateDatabaseAndCollection } from "../../Common/DocumentClientUtilityBase";
-import { userContext } from "../../UserContext";

 interface SampleDataFile extends DataModels.CreateDatabaseAndCollectionRequest {
  data: any[];
@@ -65,7 +64,7 @@ export class ContainerSampleGenerator {
      options.initialHeaders[Constants.HttpHeaders.usePolygonsSmallerThanAHemisphere] = true;
    }

-    await getOrCreateDatabaseAndCollection(createRequest, options);
+    await this.container.documentClientUtility.getOrCreateDatabaseAndCollection(createRequest, options);
    await this.container.refreshAllDatabases();
    const database = this.container.findDatabaseWithId(this.sampleDataFile.databaseId);
    if (!database) {
@@ -87,14 +86,14 @@ export class ContainerSampleGenerator {
      if (!queries || queries.length < 1) {
        return;
      }
-      const account = userContext.databaseAccount;
+      const account = CosmosClient.databaseAccount();
      const databaseId = collection.databaseId;
      const gremlinClient = new GremlinClient();
      gremlinClient.initialize({
        endpoint: `wss://${GraphTab.getGremlinEndpoint(account)}`,
        databaseId: databaseId,
        collectionId: collection.id(),
-        masterKey: userContext.masterKey || "",
+        masterKey: CosmosClient.masterKey() || "",
        maxResultSize: 100
      });

@@ -104,7 +103,7 @@ export class ContainerSampleGenerator {
    } else {
      // For SQL all queries are executed at the same time
      this.sampleDataFile.data.forEach(doc => {
-        const subPromise = createDocument(collection, doc);
+        const subPromise = this.container.documentClientUtility.createDocument(collection, doc);
        subPromise.catch(reason => NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, reason));
        promises.push(subPromise);
      });
--- a/src/Explorer/DataSamples/DataSamplesUtil.ts
+++ b/src/Explorer/DataSamples/DataSamplesUtil.ts
@@ -1,6 +1,6 @@
 import * as ViewModels from "../../Contracts/ViewModels";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
-import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../Utils/NotificationConsoleUtils";
 import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent";
 import Explorer from "../Explorer";

--- a/src/Explorer/Explorer.ts
+++ b/src/Explorer/Explorer.ts
@@ -15,15 +15,13 @@ import CassandraAddCollectionPane from "./Panes/CassandraAddCollectionPane";
 import Database from "./Tree/Database";
 import DeleteCollectionConfirmationPane from "./Panes/DeleteCollectionConfirmationPane";
 import DeleteDatabaseConfirmationPane from "./Panes/DeleteDatabaseConfirmationPane";
-import { readOffers, refreshCachedResources } from "../Common/DocumentClientUtilityBase";
-import { readCollection } from "../Common/dataAccess/readCollection";
-import { readDatabases } from "../Common/dataAccess/readDatabases";
+import DocumentClientUtilityBase from "../Common/DocumentClientUtilityBase";
 import EditTableEntityPane from "./Panes/Tables/EditTableEntityPane";
 import EnvironmentUtility from "../Common/EnvironmentUtility";
 import GraphStylingPane from "./Panes/GraphStylingPane";
 import hasher from "hasher";
 import NewVertexPane from "./Panes/NewVertexPane";
-import NotebookV2Tab, { NotebookTabOptions } from "./Tabs/NotebookV2Tab";
+import NotebookV2Tab from "./Tabs/NotebookV2Tab";
 import Q from "q";
 import ResourceTokenCollection from "./Tree/ResourceTokenCollection";
 import TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
@@ -35,10 +33,12 @@ import { ArcadiaWorkspaceItem } from "./Controls/Arcadia/ArcadiaMenuPicker";
 import { AuthType } from "../AuthType";
 import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
 import { BrowseQueriesPane } from "./Panes/BrowseQueriesPane";
+import { CassandraApi } from "../Api/Apis";
 import { CassandraAPIDataClient, TableDataClient, TablesAPIDataClient } from "./Tables/TableDataClient";
 import { CommandBarComponentAdapter } from "./Menus/CommandBar/CommandBarComponentAdapter";
-import { configContext, updateConfigContext } from "../ConfigContext";
+import { config } from "../Config";
 import { ConsoleData, ConsoleDataType } from "./Menus/NotificationConsole/NotificationConsoleComponent";
+import { CosmosClient } from "../Common/CosmosClient";
 import { decryptJWTToken, getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 import { DefaultExperienceUtility } from "../Shared/DefaultExperienceUtility";
 import { DialogComponentAdapter } from "./Controls/DialogReactComponent/DialogComponentAdapter";
@@ -52,12 +52,12 @@ import { isInvalidParentFrameOrigin } from "../Utils/MessageValidation";
 import { IGalleryItem } from "../Juno/JunoClient";
 import { LoadQueryPane } from "./Panes/LoadQueryPane";
 import * as Logger from "../Common/Logger";
-import { sendMessage, sendCachedDataMessage, handleCachedDataMessage } from "../Common/MessageHandler";
+import { MessageHandler } from "../Common/MessageHandler";
 import { NotebookContentItem, NotebookContentItemType } from "./Notebook/NotebookContentItem";
 import { NotebookUtil } from "./Notebook/NotebookUtil";
 import { NotebookWorkspaceManager } from "../NotebookWorkspaceManager/NotebookWorkspaceManager";
 import { NotificationConsoleComponentAdapter } from "./Menus/NotificationConsole/NotificationConsoleComponentAdapter";
-import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../Utils/NotificationConsoleUtils";
 import { PlatformType } from "../PlatformType";
 import { QueriesClient } from "../Common/QueriesClient";
 import { QuerySelectPane } from "./Panes/Tables/QuerySelectPane";
@@ -82,11 +82,6 @@ import { toRawContentUri, fromContentUri } from "../Utils/GitHubUtils";
 import UserDefinedFunction from "./Tree/UserDefinedFunction";
 import StoredProcedure from "./Tree/StoredProcedure";
 import Trigger from "./Tree/Trigger";
-import { NotificationsClientBase } from "../Common/NotificationsClientBase";
-import { ContextualPaneBase } from "./Panes/ContextualPaneBase";
-import TabsBase from "./Tabs/TabsBase";
-import { CommandButtonComponentProps } from "./Controls/CommandButton/CommandButtonComponent";
-import { updateUserContext, userContext } from "../UserContext";

 BindingHandlersRegisterer.registerBindingHandlers();
 // Hold a reference to ComponentRegisterer to prevent transpiler to ignore import
@@ -97,15 +92,6 @@ enum ShareAccessToggleState {
  Read
 }

-interface ExplorerOptions {
-  notificationsClient: NotificationsClientBase;
-  isEmulator: boolean;
-}
-interface AdHocAccessData {
-  readWriteUrl: string;
-  readUrl: string;
-}
-
 export default class Explorer {
  public flight: ko.Observable<string> = ko.observable<string>(
    SharedConstants.CollectionCreation.DefaultAddCollectionDefaultFlight
@@ -121,7 +107,7 @@ export default class Explorer {
  public hasWriteAccess: ko.Observable<boolean>;
  public collapsedResourceTreeWidth: number = ExplorerMetrics.CollapsedResourceTreeWidth;

-  public databaseAccount: ko.Observable<DataModels.DatabaseAccount>;
+  public databaseAccount: ko.Observable<ViewModels.DatabaseAccount>;
  public collectionCreationDefaults: ViewModels.CollectionCreationDefaults = SharedConstants.CollectionCreationDefaults;
  public subscriptionType: ko.Observable<ViewModels.SubscriptionType>;
  public quotaId: ko.Observable<string>;
@@ -132,7 +118,6 @@ export default class Explorer {
  public isPreferredApiGraph: ko.Computed<boolean>;
  public isPreferredApiTable: ko.Computed<boolean>;
  public isFixedCollectionWithSharedThroughputSupported: ko.Computed<boolean>;
-  public isServerlessEnabled: ko.Computed<boolean>;
  public isEmulator: boolean;
  public isAccountReady: ko.Observable<boolean>;
  public canSaveQueries: ko.Computed<boolean>;
@@ -141,8 +126,9 @@ export default class Explorer {
  public extensionEndpoint: ko.Observable<string>;
  public armEndpoint: ko.Observable<string>;
  public isTryCosmosDBSubscription: ko.Observable<boolean>;
-  public notificationsClient: NotificationsClientBase;
-  public queriesClient: QueriesClient;
+  public documentClientUtility: DocumentClientUtilityBase;
+  public notificationsClient: ViewModels.NotificationsClient;
+  public queriesClient: ViewModels.QueriesClient;
  public tableDataClient: TableDataClient;
  public splitter: Splitter;
  public parentFrameDataExplorerVersion: ko.Observable<string> = ko.observable<string>("");
@@ -153,7 +139,7 @@ export default class Explorer {
  public isNotificationConsoleExpanded: ko.Observable<boolean>;

  // Panes
-  public contextPanes: ContextualPaneBase[];
+  public contextPanes: ViewModels.ContextualPane[];

  // Resource Tree
  public databases: ko.ObservableArray<ViewModels.Database>;
@@ -198,29 +184,25 @@ export default class Explorer {
  public uploadItemsPane: UploadItemsPane;
  public uploadItemsPaneAdapter: UploadItemsPaneAdapter;
  public loadQueryPane: LoadQueryPane;
-  public saveQueryPane: ContextualPaneBase;
+  public saveQueryPane: ViewModels.ContextualPane;
  public browseQueriesPane: BrowseQueriesPane;
  public uploadFilePane: UploadFilePane;
  public stringInputPane: StringInputPane;
  public setupNotebooksPane: SetupNotebooksPane;
-  public gitHubReposPane: ContextualPaneBase;
+  public gitHubReposPane: ViewModels.ContextualPane;
  public publishNotebookPaneAdapter: ReactAdapter;
-  public copyNotebookPaneAdapter: ReactAdapter;

  // features
  public isGalleryPublishEnabled: ko.Computed<boolean>;
-  public isCodeOfConductEnabled: ko.Computed<boolean>;
-  public isLinkInjectionEnabled: ko.Computed<boolean>;
  public isGitHubPaneEnabled: ko.Observable<boolean>;
  public isPublishNotebookPaneEnabled: ko.Observable<boolean>;
-  public isCopyNotebookPaneEnabled: ko.Observable<boolean>;
  public isHostedDataExplorerEnabled: ko.Computed<boolean>;
  public isRightPanelV2Enabled: ko.Computed<boolean>;
  public canExceedMaximumValue: ko.Computed<boolean>;
  public hasAutoPilotV2FeatureFlag: ko.Computed<boolean>;

  public shouldShowShareDialogContents: ko.Observable<boolean>;
-  public shareAccessData: ko.Observable<AdHocAccessData>;
+  public shareAccessData: ko.Observable<ViewModels.AdHocAccessData>;
  public renewExplorerShareAccess: (explorer: Explorer, token: string) => Q.Promise<void>;
  public renewTokenError: ko.Observable<string>;
  public tokenForRenewal: ko.Observable<string>;
@@ -246,7 +228,7 @@ export default class Explorer {
  public memoryUsageInfo: ko.Observable<DataModels.MemoryUsageInfo>;
  public notebookManager?: any; // This is dynamically loaded

-  private _panes: ContextualPaneBase[] = [];
+  private _panes: ViewModels.ContextualPane[] = [];
  private _importExplorerConfigComplete: boolean = false;
  private _isSystemDatabasePredicate: (database: ViewModels.Database) => boolean = database => false;
  private _isInitializingNotebooks: boolean;
@@ -269,7 +251,7 @@ export default class Explorer {

  private static readonly MaxNbDatabasesToAutoExpand = 5;

-  constructor(options: ExplorerOptions) {
+  constructor(options: ViewModels.ExplorerOptions) {
    const startKey: number = TelemetryProcessor.traceStart(Action.InitializeDataExplorer, {
      dataExplorerArea: Constants.Areas.ResourceTree
    });
@@ -282,7 +264,7 @@ export default class Explorer {
    this.deleteDatabaseText = ko.observable<string>("Delete Database");
    this.refreshTreeTitle = ko.observable<string>("Refresh collections");

-    this.databaseAccount = ko.observable<DataModels.DatabaseAccount>();
+    this.databaseAccount = ko.observable<ViewModels.DatabaseAccount>();
    this.subscriptionType = ko.observable<ViewModels.SubscriptionType>(
      SharedConstants.CollectionCreation.DefaultSubscriptionType
    );
@@ -375,6 +357,7 @@ export default class Explorer {
      }
    });
    this.memoryUsageInfo = ko.observable<DataModels.MemoryUsageInfo>();
+    this.documentClientUtility = options.documentClientUtility;
    this.notificationsClient = options.notificationsClient;
    this.isEmulator = options.isEmulator;

@@ -391,7 +374,7 @@ export default class Explorer {
    this.resourceTokenPartitionKey = ko.observable<string>();
    this.isAuthWithResourceToken = ko.observable<boolean>(false);

-    this.shareAccessData = ko.observable<AdHocAccessData>({
+    this.shareAccessData = ko.observable<ViewModels.AdHocAccessData>({
      readWriteUrl: undefined,
      readUrl: undefined
    });
@@ -414,15 +397,8 @@ export default class Explorer {
    this.isGalleryPublishEnabled = ko.computed<boolean>(() =>
      this.isFeatureEnabled(Constants.Features.enableGalleryPublish)
    );
-    this.isCodeOfConductEnabled = ko.computed<boolean>(() =>
-      this.isFeatureEnabled(Constants.Features.enableCodeOfConduct)
-    );
-    this.isLinkInjectionEnabled = ko.computed<boolean>(() =>
-      this.isFeatureEnabled(Constants.Features.enableLinkInjection)
-    );
    this.isGitHubPaneEnabled = ko.observable<boolean>(false);
    this.isPublishNotebookPaneEnabled = ko.observable<boolean>(false);
-    this.isCopyNotebookPaneEnabled = ko.observable<boolean>(false);

    this.canExceedMaximumValue = ko.computed<boolean>(() =>
      this.isFeatureEnabled(Constants.Features.canExceedMaximumValue)
@@ -483,14 +459,8 @@ export default class Explorer {
    });
    this.notificationConsoleData = ko.observableArray<ConsoleData>([]);
    this.defaultExperience = ko.observable<string>();
-    this.databaseAccount.subscribe(databaseAccount => {
-      const defaultExperience: string = DefaultExperienceUtility.getDefaultExperienceFromDatabaseAccount(
-        databaseAccount
-      );
-      this.defaultExperience(defaultExperience);
-      updateUserContext({
-        defaultExperience: DefaultExperienceUtility.mapDefaultExperienceStringToEnum(defaultExperience)
-      });
+    this.databaseAccount.subscribe((databaseAccount: ViewModels.DatabaseAccount) => {
+      this.defaultExperience(DefaultExperienceUtility.getDefaultExperienceFromDatabaseAccount(databaseAccount));
    });

    this.isPreferredApiDocumentDB = ko.computed(() => {
@@ -539,14 +509,6 @@ export default class Explorer {
      return false;
    });

-    this.isServerlessEnabled = ko.computed(
-      () =>
-        this.databaseAccount &&
-        this.databaseAccount()?.properties?.capabilities?.find(
-          item => item.name === Constants.CapabilityNames.EnableServerless
-        ) !== undefined
-    );
-
    this.isPreferredApiMongoDB = ko.computed(() => {
      const defaultExperience = (this.defaultExperience && this.defaultExperience()) || "";
      if (defaultExperience.toLowerCase() === Constants.DefaultAccountExperience.MongoDB.toLowerCase()) {
@@ -582,9 +544,8 @@ export default class Explorer {
        defaultExperience &&
        defaultExperience.toLowerCase() === Constants.DefaultAccountExperience.Cassandra.toLowerCase()
      ) {
-        this._isSystemDatabasePredicate = (database: ViewModels.Database): boolean => {
-          return database.id() === "system";
-        };
+        const api = new CassandraApi();
+        this._isSystemDatabasePredicate = api.isSystemDatabasePredicate;
      }
    });

@@ -614,6 +575,7 @@ export default class Explorer {
    });

    this.addDatabasePane = new AddDatabasePane({
+      documentClientUtility: this.documentClientUtility,
      id: "adddatabasepane",
      visible: ko.observable<boolean>(false),

@@ -622,6 +584,7 @@ export default class Explorer {

    this.addCollectionPane = new AddCollectionPane({
      isPreferredApiTable: ko.computed(() => this.isPreferredApiTable()),
+      documentClientUtility: this.documentClientUtility,
      id: "addcollectionpane",
      visible: ko.observable<boolean>(false),

@@ -629,6 +592,7 @@ export default class Explorer {
    });

    this.deleteCollectionConfirmationPane = new DeleteCollectionConfirmationPane({
+      documentClientUtility: this.documentClientUtility,
      id: "deletecollectionconfirmationpane",
      visible: ko.observable<boolean>(false),

@@ -636,6 +600,7 @@ export default class Explorer {
    });

    this.deleteDatabaseConfirmationPane = new DeleteDatabaseConfirmationPane({
+      documentClientUtility: this.documentClientUtility,
      id: "deletedatabaseconfirmationpane",
      visible: ko.observable<boolean>(false),

@@ -643,6 +608,7 @@ export default class Explorer {
    });

    this.graphStylingPane = new GraphStylingPane({
+      documentClientUtility: this.documentClientUtility,
      id: "graphstylingpane",
      visible: ko.observable<boolean>(false),

@@ -650,6 +616,7 @@ export default class Explorer {
    });

    this.addTableEntityPane = new AddTableEntityPane({
+      documentClientUtility: this.documentClientUtility,
      id: "addtableentitypane",
      visible: ko.observable<boolean>(false),

@@ -657,6 +624,7 @@ export default class Explorer {
    });

    this.editTableEntityPane = new EditTableEntityPane({
+      documentClientUtility: this.documentClientUtility,
      id: "edittableentitypane",
      visible: ko.observable<boolean>(false),

@@ -664,6 +632,7 @@ export default class Explorer {
    });

    this.tableColumnOptionsPane = new TableColumnOptionsPane({
+      documentClientUtility: this.documentClientUtility,
      id: "tablecolumnoptionspane",
      visible: ko.observable<boolean>(false),

@@ -671,6 +640,7 @@ export default class Explorer {
    });

    this.querySelectPane = new QuerySelectPane({
+      documentClientUtility: this.documentClientUtility,
      id: "queryselectpane",
      visible: ko.observable<boolean>(false),

@@ -678,6 +648,7 @@ export default class Explorer {
    });

    this.newVertexPane = new NewVertexPane({
+      documentClientUtility: this.documentClientUtility,
      id: "newvertexpane",
      visible: ko.observable<boolean>(false),

@@ -685,6 +656,7 @@ export default class Explorer {
    });

    this.cassandraAddCollectionPane = new CassandraAddCollectionPane({
+      documentClientUtility: this.documentClientUtility,
      id: "cassandraaddcollectionpane",
      visible: ko.observable<boolean>(false),

@@ -692,6 +664,7 @@ export default class Explorer {
    });

    this.settingsPane = new SettingsPane({
+      documentClientUtility: this.documentClientUtility,
      id: "settingspane",
      visible: ko.observable<boolean>(false),

@@ -699,6 +672,7 @@ export default class Explorer {
    });

    this.executeSprocParamsPane = new ExecuteSprocParamsPane({
+      documentClientUtility: this.documentClientUtility,
      id: "executesprocparamspane",
      visible: ko.observable<boolean>(false),

@@ -706,6 +680,7 @@ export default class Explorer {
    });

    this.renewAdHocAccessPane = new RenewAdHocAccessPane({
+      documentClientUtility: this.documentClientUtility,
      id: "renewadhocaccesspane",
      visible: ko.observable<boolean>(false),

@@ -713,6 +688,7 @@ export default class Explorer {
    });

    this.uploadItemsPane = new UploadItemsPane({
+      documentClientUtility: this.documentClientUtility,
      id: "uploaditemspane",
      visible: ko.observable<boolean>(false),

@@ -722,6 +698,7 @@ export default class Explorer {
    this.uploadItemsPaneAdapter = new UploadItemsPaneAdapter(this);

    this.loadQueryPane = new LoadQueryPane({
+      documentClientUtility: this.documentClientUtility,
      id: "loadquerypane",
      visible: ko.observable<boolean>(false),

@@ -729,6 +706,7 @@ export default class Explorer {
    });

    this.saveQueryPane = new SaveQueryPane({
+      documentClientUtility: this.documentClientUtility,
      id: "savequerypane",
      visible: ko.observable<boolean>(false),

@@ -736,6 +714,7 @@ export default class Explorer {
    });

    this.browseQueriesPane = new BrowseQueriesPane({
+      documentClientUtility: this.documentClientUtility,
      id: "browsequeriespane",
      visible: ko.observable<boolean>(false),

@@ -743,6 +722,7 @@ export default class Explorer {
    });

    this.uploadFilePane = new UploadFilePane({
+      documentClientUtility: this.documentClientUtility,
      id: "uploadfilepane",
      visible: ko.observable<boolean>(false),

@@ -750,6 +730,7 @@ export default class Explorer {
    });

    this.stringInputPane = new StringInputPane({
+      documentClientUtility: this.documentClientUtility,
      id: "stringinputpane",
      visible: ko.observable<boolean>(false),

@@ -757,6 +738,7 @@ export default class Explorer {
    });

    this.setupNotebooksPane = new SetupNotebooksPane({
+      documentClientUtility: this.documentClientUtility,
      id: "setupnotebookspane",
      visible: ko.observable<boolean>(false),

@@ -789,6 +771,7 @@ export default class Explorer {
      this.setupNotebooksPane
    ];
    this.addDatabaseText.subscribe((addDatabaseText: string) => this.addDatabasePane.title(addDatabaseText));
+    this.rebindDocumentClientUtility.bind(this);
    this.isTabsContentExpanded = ko.observable(false);

    document.addEventListener(
@@ -870,7 +853,7 @@ export default class Explorer {
          this.editTableEntityPane.title("Edit Table Entity");
          this.deleteCollectionConfirmationPane.title("Delete Table");
          this.deleteCollectionConfirmationPane.collectionIdConfirmationText("Confirm by typing the table id");
-          this.tableDataClient = new TablesAPIDataClient();
+          this.tableDataClient = new TablesAPIDataClient(this.documentClientUtility);
          break;
        case Constants.DefaultAccountExperience.Cassandra.toLowerCase():
          this.addCollectionText("New Table");
@@ -889,7 +872,7 @@ export default class Explorer {
          this.deleteCollectionConfirmationPane.collectionIdConfirmationText("Confirm by typing the table id");
          this.deleteDatabaseConfirmationPane.title("Delete Keyspace");
          this.deleteDatabaseConfirmationPane.databaseIdConfirmationText("Confirm by typing the keyspace id");
-          this.tableDataClient = new CassandraAPIDataClient();
+          this.tableDataClient = new CassandraAPIDataClient(this.documentClientUtility);
          break;
      }
    });
@@ -975,10 +958,6 @@ export default class Explorer {
        this.sparkClusterConnectionInfo.valueHasMutated();
      }

-      if (this.isFeatureEnabled(Constants.Features.enableSDKoperations)) {
-        updateUserContext({ useSDKOperations: true });
-      }
-
      featureSubcription.dispose();
    });

@@ -1039,7 +1018,7 @@ export default class Explorer {
        );

        try {
-          const databaseAccount: DataModels.DatabaseAccount = await resourceProviderClient.patchAsync(
+          const databaseAccount: ViewModels.DatabaseAccount = await resourceProviderClient.patchAsync(
            this.databaseAccount().id,
            "2019-12-12",
            {
@@ -1078,6 +1057,13 @@ export default class Explorer {
    // TODO: return result
  }

+  public rebindDocumentClientUtility(documentClientUtility: DocumentClientUtilityBase): void {
+    this.documentClientUtility = documentClientUtility;
+    this._panes.forEach((pane: ViewModels.ContextualPane) => {
+      pane.documentClientUtility = documentClientUtility;
+    });
+  }
+
  public copyUrlLink(src: any, event: MouseEvent): void {
    const urlLinkInput: HTMLInputElement = document.getElementById("shareUrlLink") as HTMLInputElement;
    urlLinkInput && urlLinkInput.select();
@@ -1396,7 +1382,7 @@ export default class Explorer {
    }

    const deferred: Q.Deferred<void> = Q.defer();
-    readCollection(databaseId, collectionId).then((collection: DataModels.Collection) => {
+    this.documentClientUtility.readCollection(databaseId, collectionId).then((collection: DataModels.Collection) => {
      this.resourceTokenCollection(new ResourceTokenCollection(this, databaseId, collection));
      this.selectedNode(this.resourceTokenCollection());
      deferred.resolve();
@@ -1420,71 +1406,66 @@ export default class Explorer {
        dataExplorerArea: Constants.Areas.ResourceTree
      });
    }
-
    // TODO: Refactor
    const deferred: Q.Deferred<any> = Q.defer();
-
-    const refreshDatabases = (offers?: DataModels.Offer[]) => {
-      this._setLoadingStatusText("Fetching databases...");
-      readDatabases().then(
-        (databases: DataModels.Database[]) => {
-          this._setLoadingStatusText("Successfully fetched databases.");
-          TelemetryProcessor.traceSuccess(
-            Action.LoadDatabases,
-            {
-              databaseAccountName: this.databaseAccount().name,
-              defaultExperience: this.defaultExperience(),
-              dataExplorerArea: Constants.Areas.ResourceTree
-            },
-            startKey
-          );
-          const currentlySelectedNode: ViewModels.TreeNode = this.selectedNode();
-          const deltaDatabases = this.getDeltaDatabases(databases, offers);
-          this.addDatabasesToList(deltaDatabases.toAdd);
-          this.deleteDatabasesFromList(deltaDatabases.toDelete);
-          this.selectedNode(currentlySelectedNode);
-          this._setLoadingStatusText("Fetching containers...");
-          this.refreshAndExpandNewDatabases(deltaDatabases.toAdd)
-            .then(
-              () => {
-                this._setLoadingStatusText("Successfully fetched containers.");
-                deferred.resolve();
-              },
-              reason => {
-                this._setLoadingStatusText("Failed to fetch containers.");
-                deferred.reject(reason);
-              }
-            )
-            .finally(() => this.isRefreshingExplorer(false));
-        },
-        error => {
-          this._setLoadingStatusText("Failed to fetch databases.");
-          this.isRefreshingExplorer(false);
-          deferred.reject(error);
-          TelemetryProcessor.traceFailure(
-            Action.LoadDatabases,
-            {
-              databaseAccountName: this.databaseAccount().name,
-              defaultExperience: this.defaultExperience(),
-              dataExplorerArea: Constants.Areas.ResourceTree,
-              error: JSON.stringify(error)
-            },
-            startKey
-          );
-          NotificationConsoleUtils.logConsoleMessage(
-            ConsoleDataType.Error,
-            `Error while refreshing databases: ${JSON.stringify(error)}`
-          );
-        }
-      );
-    };
-
-    const offerPromise: Q.Promise<DataModels.Offer[]> = readOffers({ isServerless: this.isServerlessEnabled() });
+    const offerPromise: Q.Promise<DataModels.Offer[]> = this.documentClientUtility.readOffers();
    this._setLoadingStatusText("Fetching offers...");
+
    offerPromise.then(
      (offers: DataModels.Offer[]) => {
        this._setLoadingStatusText("Successfully fetched offers.");
-        refreshDatabases(offers);
+        this._setLoadingStatusText("Fetching databases...");
+        this.documentClientUtility.readDatabases(null /*options*/).then(
+          (databases: DataModels.Database[]) => {
+            this._setLoadingStatusText("Successfully fetched databases.");
+            TelemetryProcessor.traceSuccess(
+              Action.LoadDatabases,
+              {
+                databaseAccountName: this.databaseAccount().name,
+                defaultExperience: this.defaultExperience(),
+                dataExplorerArea: Constants.Areas.ResourceTree
+              },
+              startKey
+            );
+            const currentlySelectedNode: ViewModels.TreeNode = this.selectedNode();
+            const deltaDatabases = this.getDeltaDatabases(databases, offers);
+            this.addDatabasesToList(deltaDatabases.toAdd);
+            this.deleteDatabasesFromList(deltaDatabases.toDelete);
+            this.selectedNode(currentlySelectedNode);
+            this._setLoadingStatusText("Fetching containers...");
+            this.refreshAndExpandNewDatabases(deltaDatabases.toAdd)
+              .then(
+                () => {
+                  this._setLoadingStatusText("Successfully fetched containers.");
+                  deferred.resolve();
+                },
+                reason => {
+                  this._setLoadingStatusText("Failed to fetch containers.");
+                  deferred.reject(reason);
+                }
+              )
+              .finally(() => this.isRefreshingExplorer(false));
+          },
+          error => {
+            this._setLoadingStatusText("Failed to fetch databases.");
+            this.isRefreshingExplorer(false);
+            deferred.reject(error);
+            TelemetryProcessor.traceFailure(
+              Action.LoadDatabases,
+              {
+                databaseAccountName: this.databaseAccount().name,
+                defaultExperience: this.defaultExperience(),
+                dataExplorerArea: Constants.Areas.ResourceTree,
+                error: JSON.stringify(error)
+              },
+              startKey
+            );
+            NotificationConsoleUtils.logConsoleMessage(
+              ConsoleDataType.Error,
+              `Error while refreshing databases: ${JSON.stringify(error)}`
+            );
+          }
+        );
      },
      error => {
        this._setLoadingStatusText("Failed to fetch offers.");
@@ -1554,7 +1535,7 @@ export default class Explorer {
      dataExplorerArea: Constants.Areas.ResourceTree
    });
    this.isRefreshingExplorer(true);
-    refreshCachedResources().then(
+    this.documentClientUtility.refreshCachedResources().then(
      () => {
        TelemetryProcessor.traceSuccess(
          Action.LoadDatabases,
@@ -1607,7 +1588,7 @@ export default class Explorer {

  public async getArcadiaToken(): Promise<string> {
    return new Promise<string>((resolve: (token: string) => void, reject: (error: any) => void) => {
-      sendCachedDataMessage<string>(MessageTypes.GetArcadiaToken, undefined /** params **/).then(
+      MessageHandler.sendCachedDataMessage<string>(MessageTypes.GetArcadiaToken, undefined /** params **/).then(
        (token: string) => {
          resolve(token);
        },
@@ -1621,7 +1602,7 @@ export default class Explorer {

  private async _getArcadiaWorkspaces(): Promise<ArcadiaWorkspaceItem[]> {
    try {
-      const workspaces = await this._arcadiaManager.listWorkspacesAsync([userContext.subscriptionId]);
+      const workspaces = await this._arcadiaManager.listWorkspacesAsync([CosmosClient.subscriptionId()]);
      let workspaceItems: ArcadiaWorkspaceItem[] = new Array(workspaces.length);
      const sparkPromises: Promise<void>[] = [];
      workspaces.forEach((workspace, i) => {
@@ -1645,11 +1626,11 @@ export default class Explorer {
  }

  public async createWorkspace(): Promise<string> {
-    return sendCachedDataMessage(MessageTypes.CreateWorkspace, undefined /** params **/);
+    return MessageHandler.sendCachedDataMessage(MessageTypes.CreateWorkspace, undefined /** params **/);
  }

  public async createSparkPool(workspaceId: string): Promise<string> {
-    return sendCachedDataMessage(MessageTypes.CreateSparkPool, [workspaceId]);
+    return MessageHandler.sendCachedDataMessage(MessageTypes.CreateSparkPool, [workspaceId]);
  }

  public async initNotebooks(databaseAccount: DataModels.DatabaseAccount): Promise<void> {
@@ -1724,7 +1705,7 @@ export default class Explorer {
    }

    try {
-      const workspaces = await this.notebookWorkspaceManager.getNotebookWorkspacesAsync(databaseAccount?.id);
+      const workspaces = await this.notebookWorkspaceManager.getNotebookWorkspacesAsync(databaseAccount.id);
      return workspaces && workspaces.length > 0 && workspaces.some(workspace => workspace.name === "default");
    } catch (error) {
      Logger.logError(error, "Explorer/_containsDefaultNotebookWorkspace");
@@ -1737,7 +1718,6 @@ export default class Explorer {
      return;
    }

-    let clearMessage;
    try {
      const notebookWorkspace = await this.notebookWorkspaceManager.getNotebookWorkspaceAsync(
        this.databaseAccount().id,
@@ -1749,14 +1729,10 @@ export default class Explorer {
        notebookWorkspace.properties.status &&
        notebookWorkspace.properties.status.toLowerCase() === "stopped"
      ) {
-        clearMessage = NotificationConsoleUtils.logConsoleProgress("Initializing notebook workspace");
        await this.notebookWorkspaceManager.startNotebookWorkspaceAsync(this.databaseAccount().id, "default");
      }
    } catch (error) {
      Logger.logError(error, "Explorer/ensureNotebookWorkspaceRunning");
-      NotificationConsoleUtils.logConsoleError(`Failed to initialize notebook workspace: ${JSON.stringify(error)}`);
-    } finally {
-      clearMessage && clearMessage();
    }
  }

@@ -1831,8 +1807,8 @@ export default class Explorer {

    const isRunningInPortal = window.dataExplorerPlatform == PlatformType.Portal;
    const isRunningInDevMode = process.env.NODE_ENV === "development";
-    if (inputs && configContext.BACKEND_ENDPOINT && isRunningInPortal && isRunningInDevMode) {
-      inputs.extensionEndpoint = configContext.PROXY_PATH;
+    if (inputs && config.BACKEND_ENDPOINT && isRunningInPortal && isRunningInDevMode) {
+      inputs.extensionEndpoint = config.PROXY_PATH;
    }

    const initPromise: Q.Promise<void> = inputs ? this.initDataExplorerWithFrameInputs(inputs) : Q();
@@ -1850,7 +1826,7 @@ export default class Explorer {
        }
      }
      if (message.actionType === ActionContracts.ActionType.TransmitCachedData) {
-        handleCachedDataMessage(message);
+        MessageHandler.handleCachedDataMessage(message);
        return;
      }
      if (message.type) {
@@ -1937,7 +1913,7 @@ export default class Explorer {
      this.features(inputs.features);
      this.serverId(inputs.serverId);
      this.extensionEndpoint(inputs.extensionEndpoint || "");
-      this.armEndpoint(EnvironmentUtility.normalizeArmEndpointUri(inputs.csmEndpoint || configContext.ARM_ENDPOINT));
+      this.armEndpoint(EnvironmentUtility.normalizeArmEndpointUri(inputs.csmEndpoint || config.ARM_ENDPOINT));
      this.notificationsClient.setExtensionEndpoint(this.extensionEndpoint());
      this.databaseAccount(databaseAccount);
      this.subscriptionType(inputs.subscriptionType);
@@ -1953,17 +1929,11 @@ export default class Explorer {

      this._importExplorerConfigComplete = true;

-      updateConfigContext({
-        ARM_ENDPOINT: this.armEndpoint()
-      });
-
-      updateUserContext({
-        authorizationToken,
-        masterKey,
-        databaseAccount,
-        resourceGroup: inputs.resourceGroup,
-        subscriptionId: inputs.subscriptionId
-      });
+      CosmosClient.authorizationToken(authorizationToken);
+      CosmosClient.masterKey(masterKey);
+      CosmosClient.databaseAccount(databaseAccount);
+      CosmosClient.subscriptionId(inputs.subscriptionId);
+      CosmosClient.resourceGroup(inputs.resourceGroup);
      TelemetryProcessor.traceSuccess(
        Action.LoadDatabaseAccount,
        {
@@ -1993,7 +1963,7 @@ export default class Explorer {
    return _.find(selectedCollection.storedProcedures(), (storedProcedure: StoredProcedure) => {
      const openedSprocTab = this.tabsManager.getTabs(
        ViewModels.CollectionTabKind.StoredProcedures,
-        tab => tab.node && tab.node.rid === storedProcedure.rid
+        (tab: ViewModels.Tab) => tab.node && tab.node.rid === storedProcedure.rid
      );
      return (
        storedProcedure.rid === this.selectedNode().rid ||
@@ -2007,7 +1977,7 @@ export default class Explorer {
    return _.find(selectedCollection.userDefinedFunctions(), (userDefinedFunction: UserDefinedFunction) => {
      const openedUdfTab = this.tabsManager.getTabs(
        ViewModels.CollectionTabKind.UserDefinedFunctions,
-        tab => tab.node && tab.node.rid === userDefinedFunction.rid
+        (tab: ViewModels.Tab) => tab.node && tab.node.rid === userDefinedFunction.rid
      );
      return (
        userDefinedFunction.rid === this.selectedNode().rid ||
@@ -2021,7 +1991,7 @@ export default class Explorer {
    return _.find(selectedCollection.triggers(), (trigger: Trigger) => {
      const openedTriggerTab = this.tabsManager.getTabs(
        ViewModels.CollectionTabKind.Triggers,
-        tab => tab.node && tab.node.rid === trigger.rid
+        (tab: ViewModels.Tab) => tab.node && tab.node.rid === trigger.rid
      );
      return (
        trigger.rid === this.selectedNode().rid ||
@@ -2031,7 +2001,7 @@ export default class Explorer {
  }

  public closeAllPanes(): void {
-    this._panes.forEach((pane: ContextualPaneBase) => pane.close());
+    this._panes.forEach((pane: ViewModels.ContextualPane) => pane.close());
  }

  public getPlatformType(): PlatformType {
@@ -2046,13 +2016,13 @@ export default class Explorer {
    );
  }

-  public onUpdateTabsButtons(buttons: CommandButtonComponentProps[]): void {
+  public onUpdateTabsButtons(buttons: ViewModels.NavbarButtonConfig[]): void {
    this.commandBarComponentAdapter.onUpdateTabsButtons(buttons);
  }

  public signInAad = () => {
    TelemetryProcessor.trace(Action.SignInAad, undefined, { area: "Explorer" });
-    sendMessage({
+    MessageHandler.sendMessage({
      type: MessageTypes.AadSignIn
    });
  };
@@ -2063,21 +2033,21 @@ export default class Explorer {
  };

  public clickHostedAccountSwitch = () => {
-    sendMessage({
+    MessageHandler.sendMessage({
      type: MessageTypes.UpdateAccountSwitch,
      click: true
    });
  };

  public clickHostedDirectorySwitch = () => {
-    sendMessage({
+    MessageHandler.sendMessage({
      type: MessageTypes.UpdateDirectoryControl,
      click: true
    });
  };

  public refreshDatabaseAccount = () => {
-    sendMessage({
+    MessageHandler.sendMessage({
      type: MessageTypes.RefreshDatabaseAccount
    });
  };
@@ -2106,7 +2076,9 @@ export default class Explorer {
          if (isNewDatabase) {
            database.expandDatabase();
          }
-          this.tabsManager.refreshActiveTab(tab => tab.collection && tab.collection.getDatabase().rid === database.rid);
+          this.tabsManager.refreshActiveTab(
+            (tab: ViewModels.Tab) => tab.collection && tab.collection.getDatabase().rid === database.rid
+          );
        })
      );
    });
@@ -2208,8 +2180,8 @@ export default class Explorer {
      return undefined;
    }

-    const urlPrefixWithKeyParam: string = `${configContext.hostedExplorerURL}?key=`;
-    const currentActiveTab = this.tabsManager.activeTab();
+    const urlPrefixWithKeyParam: string = `${config.hostedExplorerURL}?key=`;
+    const currentActiveTab: ViewModels.Tab = this.tabsManager.activeTab();

    return `${urlPrefixWithKeyParam}${token}#/${(currentActiveTab && currentActiveTab.hashLocation()) || ""}`;
  }
@@ -2320,7 +2292,7 @@ export default class Explorer {
    return _.find(offers, (offer: DataModels.Offer) => offer.resource === resourceId);
  }

-  public uploadFile(name: string, content: string, parent: NotebookContentItem): Promise<NotebookContentItem> {
+  private uploadFile(name: string, content: string, parent: NotebookContentItem): Promise<NotebookContentItem> {
    if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) {
      const error = "Attempt to upload notebook, but notebook is not enabled";
      Logger.logError(error, "Explorer/uploadFile");
@@ -2375,28 +2347,14 @@ export default class Explorer {
    return Promise.resolve(false);
  }

-  public async publishNotebook(name: string, content: string | unknown, parentDomElement: HTMLElement): Promise<void> {
+  public publishNotebook(name: string, content: string): void {
    if (this.notebookManager) {
-      await this.notebookManager.openPublishNotebookPane(
-        name,
-        content,
-        parentDomElement,
-        this.isCodeOfConductEnabled(),
-        this.isLinkInjectionEnabled()
-      );
+      this.notebookManager.openPublishNotebookPane(name, content);
      this.publishNotebookPaneAdapter = this.notebookManager.publishNotebookPaneAdapter;
      this.isPublishNotebookPaneEnabled(true);
    }
  }

-  public copyNotebook(name: string, content: string): void {
-    if (this.notebookManager) {
-      this.notebookManager.openCopyNotebookPane(name, content);
-      this.copyNotebookPaneAdapter = this.notebookManager.copyNotebookPaneAdapter;
-      this.isCopyNotebookPaneEnabled(true);
-    }
-  }
-
  public showOkModalDialog(title: string, msg: string): void {
    this._dialogProps({
      isModal: true,
@@ -2486,26 +2444,28 @@ export default class Explorer {
      throw new Error(`Invalid notebookContentItem: ${notebookContentItem}`);
    }

-    const notebookTabs = this.tabsManager.getTabs(
+    const notebookTabs: NotebookV2Tab[] = this.tabsManager.getTabs(
      ViewModels.CollectionTabKind.NotebookV2,
-      tab =>
+      (tab: ViewModels.Tab) =>
        (tab as NotebookV2Tab).notebookPath &&
        FileSystemUtil.isPathEqual((tab as NotebookV2Tab).notebookPath(), notebookContentItem.path)
    ) as NotebookV2Tab[];
-    let notebookTab = notebookTabs && notebookTabs[0];
+    let notebookTab: NotebookV2Tab = notebookTabs && notebookTabs[0];

    if (notebookTab) {
      this.tabsManager.activateTab(notebookTab);
    } else {
-      const options: NotebookTabOptions = {
-        account: userContext.databaseAccount,
+      const options: ViewModels.NotebookTabOptions = {
+        account: CosmosClient.databaseAccount(),
        tabKind: ViewModels.CollectionTabKind.NotebookV2,
        node: null,
        title: notebookContentItem.name,
        tabPath: notebookContentItem.path,
+        documentClientUtility: null,
+
        collection: null,
        selfLink: null,
-        masterKey: userContext.masterKey || "",
+        masterKey: CosmosClient.masterKey() || "",
        hashLocation: "notebooks",
        isActive: ko.observable(false),
        isTabsContentExpanded: ko.observable(true),
@@ -2561,7 +2521,7 @@ export default class Explorer {
        onSubmit: (input: string) => this.notebookManager?.notebookContentClient.renameNotebook(notebookFile, input)
      })
      .then(newNotebookFile => {
-        const notebookTabs = this.tabsManager.getTabs(
+        const notebookTabs: ViewModels.Tab[] = this.tabsManager.getTabs(
          ViewModels.CollectionTabKind.NotebookV2,
          (tab: NotebookV2Tab) => tab.notebookPath && FileSystemUtil.isPathEqual(tab.notebookPath(), originalPath)
        );
@@ -2649,11 +2609,7 @@ export default class Explorer {

  private async _refreshNotebooksEnabledStateForAccount(): Promise<void> {
    const authType = window.authType as AuthType;
-    if (
-      authType === AuthType.EncryptedToken ||
-      authType === AuthType.ResourceToken ||
-      authType === AuthType.MasterKey
-    ) {
+    if (authType === AuthType.EncryptedToken || authType === AuthType.ResourceToken) {
      this.isNotebooksEnabledForAccount(false);
      return;
    }
@@ -2695,7 +2651,7 @@ export default class Explorer {
  }

  public _refreshSparkEnabledStateForAccount = async (): Promise<void> => {
-    const subscriptionId = userContext.subscriptionId;
+    const subscriptionId = CosmosClient.subscriptionId();
    const armEndpoint = this.armEndpoint();
    const authType = window.authType as AuthType;
    if (!subscriptionId || !armEndpoint || authType === AuthType.EncryptedToken) {
@@ -2724,7 +2680,7 @@ export default class Explorer {
  };

  public _isAfecFeatureRegistered = async (featureName: string): Promise<boolean> => {
-    const subscriptionId = userContext.subscriptionId;
+    const subscriptionId = CosmosClient.subscriptionId();
    const armEndpoint = this.armEndpoint();
    const authType = window.authType as AuthType;
    if (!featureName || !subscriptionId || !armEndpoint || authType === AuthType.EncryptedToken) {
@@ -2753,7 +2709,6 @@ export default class Explorer {
    }

    await this.resourceTree.initialize();
-    this.notebookManager?.refreshPinnedRepos();
    if (this.notebookToImport) {
      this.importAndOpenContent(this.notebookToImport.name, this.notebookToImport.content);
    }
@@ -2936,7 +2891,7 @@ export default class Explorer {

    const terminalTabs: TerminalTab[] = this.tabsManager.getTabs(
      ViewModels.CollectionTabKind.Terminal,
-      tab => tab.hashLocation() == hashLocation
+      (tab: ViewModels.Tab) => tab.hashLocation() == hashLocation
    ) as TerminalTab[];
    let terminalTab: TerminalTab = terminalTabs && terminalTabs[0];

@@ -2944,11 +2899,13 @@ export default class Explorer {
      this.tabsManager.activateTab(terminalTab);
    } else {
      const newTab = new TerminalTab({
-        account: userContext.databaseAccount,
+        account: CosmosClient.databaseAccount(),
        tabKind: ViewModels.CollectionTabKind.Terminal,
        node: null,
        title: title,
        tabPath: title,
+        documentClientUtility: null,
+
        collection: null,
        selfLink: null,
        hashLocation: hashLocation,
@@ -2970,7 +2927,7 @@ export default class Explorer {

    const galleryTabs = this.tabsManager.getTabs(
      ViewModels.CollectionTabKind.Gallery,
-      tab => tab.hashLocation() == hashLocation
+      (tab: ViewModels.Tab) => tab.hashLocation() == hashLocation
    );
    let galleryTab = galleryTabs && galleryTabs[0];

@@ -2983,7 +2940,7 @@ export default class Explorer {

      const newTab = new this.galleryTab.default({
        // GalleryTabOptions
-        account: userContext.databaseAccount,
+        account: CosmosClient.databaseAccount(),
        container: this,
        junoClient: this.notebookManager?.junoClient,
        notebookUrl,
@@ -3016,21 +2973,24 @@ export default class Explorer {

    const notebookViewerTabModule = this.notebookViewerTab;

-    let isNotebookViewerOpen = (tab: TabsBase) => {
+    let isNotebookViewerOpen = (tab: ViewModels.Tab) => {
      const notebookViewerTab = tab as typeof notebookViewerTabModule.default;
      return notebookViewerTab.notebookUrl === notebookUrl;
    };

-    const notebookViewerTabs = this.tabsManager.getTabs(ViewModels.CollectionTabKind.NotebookV2, tab => {
-      return tab.hashLocation() == hashLocation && isNotebookViewerOpen(tab);
-    });
+    const notebookViewerTabs = this.tabsManager.getTabs(
+      ViewModels.CollectionTabKind.NotebookV2,
+      (tab: ViewModels.Tab) => {
+        return tab.hashLocation() == hashLocation && isNotebookViewerOpen(tab);
+      }
+    );
    let notebookViewerTab = notebookViewerTabs && notebookViewerTabs[0];

    if (notebookViewerTab) {
      this.tabsManager.activateNewTab(notebookViewerTab);
    } else {
      notebookViewerTab = new this.notebookViewerTab.default({
-        account: userContext.databaseAccount,
+        account: CosmosClient.databaseAccount(),
        tabKind: ViewModels.CollectionTabKind.NotebookViewer,
        node: null,
        title: title,
--- a/src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.ts
+++ b/src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.ts
@@ -15,7 +15,7 @@ import { GraphData, D3Node, D3Link } from "./GraphData";
 import { HashMap } from "../../../Common/HashMap";
 import { BaseType } from "d3";
 import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
-import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../../Utils/NotificationConsoleUtils";
 import { GraphConfig } from "../../Tabs/GraphTab";
 import { GraphExplorer } from "./GraphExplorer";
 import * as Constants from "../../../Common/Constants";
--- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
@@ -1,4 +1,3 @@
-jest.mock("../../../Common/DocumentClientUtilityBase");
 import React from "react";
 import * as sinon from "sinon";
 import { mount, ReactWrapper } from "enzyme";
@@ -8,11 +7,11 @@ import { GraphExplorer, GraphExplorerProps, GraphAccessor, GraphHighlightedNodeD
 import * as D3ForceGraph from "./D3ForceGraph";
 import { GraphData } from "./GraphData";
 import { TabComponent } from "../../Controls/Tabs/TabComponent";
+import * as ViewModels from "../../../Contracts/ViewModels";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as StorageUtility from "../../../Shared/StorageUtility";
 import GraphTab from "../../Tabs/GraphTab";
 import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
-import { queryDocuments, queryDocumentsPage } from "../../../Common/DocumentClientUtilityBase";

 describe("Check whether query result is vertex array", () => {
  it("should reject null as vertex array", () => {
@@ -87,31 +86,13 @@ describe("getPkIdFromDocumentId", () => {
    expect(GraphExplorer.getPkIdFromDocumentId(doc, "mypk")).toEqual("['pkvalue', 'id']");
  });

-  it("should create pkid pair from partitioned graph (pk as number)", () => {
-    const doc = createFakeDoc({ id: "id", mypk: 234 });
-    expect(GraphExplorer.getPkIdFromDocumentId(doc, "mypk")).toEqual("[234, 'id']");
-  });
-
-  it("should create pkid pair from partitioned graph (pk as boolean)", () => {
-    const doc = createFakeDoc({ id: "id", mypk: true });
-    expect(GraphExplorer.getPkIdFromDocumentId(doc, "mypk")).toEqual("[true, 'id']");
-  });
-
  it("should create pkid pair from partitioned graph (pk as valid array value)", () => {
    const doc = createFakeDoc({ id: "id", mypk: [{ id: "someid", _value: "pkvalue" }] });
    expect(GraphExplorer.getPkIdFromDocumentId(doc, "mypk")).toEqual("['pkvalue', 'id']");
  });

-  it("should error if id is not a string or number", () => {
-    let doc = createFakeDoc({ id: { foo: 1 } });
-    try {
-      GraphExplorer.getPkIdFromDocumentId(doc, undefined);
-      expect(true).toBe(false);
-    } catch (e) {
-      expect(true).toBe(true);
-    }
-
-    doc = createFakeDoc({ id: true });
+  it("should error if id is not a string", () => {
+    const doc = createFakeDoc({ id: { foo: 1 } });
    try {
      GraphExplorer.getPkIdFromDocumentId(doc, undefined);
      expect(true).toBe(false);
@@ -120,8 +101,16 @@ describe("getPkIdFromDocumentId", () => {
    }
  });

-  it("should error if pk is empty array", () => {
-    let doc = createFakeDoc({ mypk: [] });
+  it("should error if pk not string nor non-empty array", () => {
+    let doc = createFakeDoc({ mypk: { foo: 1 } });
+
+    try {
+      GraphExplorer.getPkIdFromDocumentId(doc, "mypk");
+    } catch (e) {
+      expect(true).toBe(true);
+    }
+
+    doc = createFakeDoc({ mypk: [] });
    try {
      GraphExplorer.getPkIdFromDocumentId(doc, "mypk");
      expect(true).toBe(false);
@@ -145,7 +134,7 @@ describe("GraphExplorer", () => {
  const COLLECTION_SELF_LINK = "collectionSelfLink";
  const gremlinRU = 789.12;

-  const createMockProps = (): GraphExplorerProps => {
+  const createMockProps = (documentClientUtility?: any): GraphExplorerProps => {
    const graphConfig = GraphTab.createGraphConfig();
    const graphConfigUi = GraphTab.createGraphConfigUiData(graphConfig);

@@ -160,6 +149,7 @@ describe("GraphExplorer", () => {
      onIsValidQueryChange: (isValidQuery: boolean): void => {},

      collectionPartitionKeyProperty: "collectionPartitionKeyProperty",
+      documentClientUtility: documentClientUtility,
      collectionRid: COLLECTION_RID,
      collectionSelfLink: COLLECTION_SELF_LINK,
      graphBackendEndpoint: "graphBackendEndpoint",
@@ -198,6 +188,7 @@ describe("GraphExplorer", () => {
    let wrapper: ReactWrapper;

    let connectStub: sinon.SinonSpy;
+    let queryDocStub: sinon.SinonSpy;
    let submitToBackendSpy: sinon.SinonSpy;
    let renderResultAsJsonStub: sinon.SinonSpy;
    let onMiddlePaneInitializedStub: sinon.SinonSpy;
@@ -224,6 +215,46 @@ describe("GraphExplorer", () => {
      [query: string]: AjaxResponse;
    }

+    const createDocumentClientUtilityMock = (docDBResponse: AjaxResponse) => {
+      const mock = {
+        queryDocuments: () => {},
+        queryDocumentsPage: (
+          rid: string,
+          iterator: any,
+          firstItemIndex: number,
+          options: any
+        ): Q.Promise<ViewModels.QueryResults> => {
+          const qresult = {
+            hasMoreResults: false,
+            firstItemIndex: firstItemIndex,
+            lastItemIndex: 0,
+            itemCount: 0,
+            documents: docDBResponse.response,
+            activityId: "",
+            headers: [] as any[],
+            requestCharge: gVRU
+          };
+
+          return Q.resolve(qresult);
+        }
+      };
+
+      const fakeIterator: any = {
+        nextItem: (callback: (error: any, document: DataModels.DocumentId) => void): void => {},
+        hasMoreResults: () => false,
+        executeNext: (callback: (error: any, documents: DataModels.DocumentId[], headers: any) => void): void => {}
+      };
+
+      queryDocStub = sinon.stub(mock, "queryDocuments").callsFake(
+        (container: ViewModels.DocumentRequestContainer, query: string, options: any): Q.Promise<any> => {
+          (fakeIterator as any)._query = query;
+          return Q.resolve(fakeIterator);
+        }
+      );
+
+      return mock;
+    };
+
    const setupMocks = (
      graphExplorer: GraphExplorer,
      backendResponses: BackendResponses,
@@ -302,29 +333,7 @@ describe("GraphExplorer", () => {
      done: any,
      ignoreD3Update: boolean
    ): GraphExplorer => {
-      (queryDocuments as jest.Mock).mockImplementation((container: any, query: string, options: any) => {
-        return Q.resolve({
-          _query: query,
-          nextItem: (callback: (error: any, document: DataModels.DocumentId) => void): void => {},
-          hasMoreResults: () => false,
-          executeNext: (callback: (error: any, documents: DataModels.DocumentId[], headers: any) => void): void => {}
-        });
-      });
-      (queryDocumentsPage as jest.Mock).mockImplementation(
-        (rid: string, iterator: any, firstItemIndex: number, options: any) => {
-          return Q.resolve({
-            hasMoreResults: false,
-            firstItemIndex: firstItemIndex,
-            lastItemIndex: 0,
-            itemCount: 0,
-            documents: docDBResponse.response,
-            activityId: "",
-            headers: [] as any[],
-            requestCharge: gVRU
-          });
-        }
-      );
-      const props: GraphExplorerProps = createMockProps();
+      const props: GraphExplorerProps = createMockProps(createDocumentClientUtilityMock(docDBResponse));
      wrapper = mount(<GraphExplorer {...props} />);
      graphExplorerInstance = wrapper.instance() as GraphExplorer;
      setupMocks(graphExplorerInstance, backendResponses, done, ignoreD3Update);
@@ -332,7 +341,7 @@ describe("GraphExplorer", () => {
    };

    const cleanUpStubsWrapper = () => {
-      jest.resetAllMocks();
+      queryDocStub.restore();
      connectStub.restore();
      submitToBackendSpy.restore();
      renderResultAsJsonStub.restore();
@@ -369,11 +378,22 @@ describe("GraphExplorer", () => {
        expect((graphExplorerInstance.submitToBackend as sinon.SinonSpy).calledWith("g.V()")).toBe(false);
      });

+      it("should submit g.V() as docdb query with proper query", () => {
+        expect(
+          (graphExplorerInstance.props.documentClientUtility.queryDocuments as sinon.SinonSpy).getCall(0).args[2]
+        ).toBe(DOCDB_G_DOT_V_QUERY);
+      });
+
      it("should submit g.V() as docdb query with proper parameters", () => {
-        expect(queryDocuments).toBeCalledWith("databaseId", "collectionId", DOCDB_G_DOT_V_QUERY, {
-          maxItemCount: GraphExplorer.ROOT_LIST_PAGE_SIZE,
-          enableCrossPartitionQuery: true
-        });
+        expect(
+          (graphExplorerInstance.props.documentClientUtility.queryDocuments as sinon.SinonSpy).getCall(0).args[0]
+        ).toEqual("databaseId");
+        expect(
+          (graphExplorerInstance.props.documentClientUtility.queryDocuments as sinon.SinonSpy).getCall(0).args[1]
+        ).toEqual("collectionId");
+        expect(
+          (graphExplorerInstance.props.documentClientUtility.queryDocuments as sinon.SinonSpy).getCall(0).args[3]
+        ).toEqual({ maxItemCount: GraphExplorer.ROOT_LIST_PAGE_SIZE, enableCrossPartitionQuery: true });
      });

      it("should call backend thrice (user query, fetch outE, then fetch inE)", () => {
@@ -406,11 +426,22 @@ describe("GraphExplorer", () => {
        expect((graphExplorerInstance.submitToBackend as sinon.SinonSpy).calledWith("g.V()")).toBe(false);
      });

+      it("should submit g.V() as docdb query with proper query", () => {
+        expect(
+          (graphExplorerInstance.props.documentClientUtility.queryDocuments as sinon.SinonSpy).getCall(0).args[2]
+        ).toBe(DOCDB_G_DOT_V_QUERY);
+      });
+
      it("should submit g.V() as docdb query with proper parameters", () => {
-        expect(queryDocuments).toBeCalledWith("databaseId", "collectionId", DOCDB_G_DOT_V_QUERY, {
-          maxItemCount: GraphExplorer.ROOT_LIST_PAGE_SIZE,
-          enableCrossPartitionQuery: true
-        });
+        expect(
+          (graphExplorerInstance.props.documentClientUtility.queryDocuments as sinon.SinonSpy).getCall(0).args[0]
+        ).toEqual("databaseId");
+        expect(
+          (graphExplorerInstance.props.documentClientUtility.queryDocuments as sinon.SinonSpy).getCall(0).args[1]
+        ).toEqual("collectionId");
+        expect(
+          (graphExplorerInstance.props.documentClientUtility.queryDocuments as sinon.SinonSpy).getCall(0).args[3]
+        ).toEqual({ maxItemCount: GraphExplorer.ROOT_LIST_PAGE_SIZE, enableCrossPartitionQuery: true });
      });

      it("should call backend thrice (user query, fetch outE, then fetch inE)", () => {
--- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
@@ -8,7 +8,7 @@ import * as D3ForceGraph from "./D3ForceGraph";
 import { GraphVizComponentProps } from "./GraphVizComponent";
 import * as GraphData from "./GraphData";
 import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
-import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../../Utils/NotificationConsoleUtils";
 import { GraphUtil } from "./GraphUtil";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
@@ -28,7 +28,7 @@ import * as Constants from "../../../Common/Constants";
 import { InputProperty } from "../../../Contracts/ViewModels";
 import { QueryIterator, ItemDefinition, Resource } from "@azure/cosmos";
 import LoadingIndicatorIcon from "../../../../images/LoadingIndicator_3Squares.gif";
-import { queryDocuments, queryDocumentsPage } from "../../../Common/DocumentClientUtilityBase";
+import DocumentClientUtilityBase from "../../../Common/DocumentClientUtilityBase";

 export interface GraphAccessor {
  applyFilter: () => void;
@@ -47,6 +47,7 @@ export interface GraphExplorerProps {
  onIsValidQueryChange: (isValidQuery: boolean) => void;

  collectionPartitionKeyProperty: string;
+  documentClientUtility: DocumentClientUtilityBase;
  collectionRid: string;
  collectionSelfLink: string;
  graphBackendEndpoint: string;
@@ -696,6 +697,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   * @param cmd
   */
  public submitToBackend(cmd: string): Q.Promise<GremlinClient.GremlinRequestResult> {
+    console.log("submit:", cmd);
    const id = GraphExplorer.reportToConsole(ConsoleDataType.InProgress, `Executing: ${cmd}`);
    this.setExecuteCounter(this.executeCounter + 1);

@@ -728,24 +730,26 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   */
  public executeNonPagedDocDbQuery(query: string): Q.Promise<DataModels.DocumentId[]> {
    // TODO maxItemCount: this reduces throttling, but won't cap the # of results
-    return queryDocuments(this.props.databaseId, this.props.collectionId, query, {
-      maxItemCount: GraphExplorer.PAGE_ALL,
-      enableCrossPartitionQuery:
-        StorageUtility.LocalStorageUtility.getEntryString(StorageUtility.StorageKey.IsCrossPartitionQueryEnabled) ===
-        "true"
-    }).then(
-      (iterator: QueryIterator<ItemDefinition & Resource>) => {
-        return iterator.fetchNext().then(response => response.resources);
-      },
-      (reason: any) => {
-        GraphExplorer.reportToConsole(
-          ConsoleDataType.Error,
-          `Failed to execute non-paged query ${query}. Reason:${reason}`,
-          reason
-        );
-        return null;
-      }
-    );
+    return this.props.documentClientUtility
+      .queryDocuments(this.props.databaseId, this.props.collectionId, query, {
+        maxItemCount: GraphExplorer.PAGE_ALL,
+        enableCrossPartitionQuery:
+          StorageUtility.LocalStorageUtility.getEntryString(StorageUtility.StorageKey.IsCrossPartitionQueryEnabled) ===
+          "true"
+      })
+      .then(
+        (iterator: QueryIterator<ItemDefinition & Resource>) => {
+          return iterator.fetchNext().then(response => response.resources);
+        },
+        (reason: any) => {
+          GraphExplorer.reportToConsole(
+            ConsoleDataType.Error,
+            `Failed to execute non-paged query ${query}. Reason:${reason}`,
+            reason
+          );
+          return null;
+        }
+      );
  }

  /**
@@ -1371,7 +1375,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl

    if (collectionPartitionKeyProperty && d.hasOwnProperty(collectionPartitionKeyProperty)) {
      let pk = (d as any)[collectionPartitionKeyProperty];
-      if (typeof pk !== "string" && typeof pk !== "number" && typeof pk !== "boolean") {
+      if (typeof pk !== "string") {
        if (Array.isArray(pk) && pk.length > 0) {
          // pk is [{ id: 'id', _value: 'value' }]
          pk = pk[0]["_value"];
@@ -1728,10 +1732,12 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      query = `select root.id, root.${this.props.collectionPartitionKeyProperty} from root where IS_DEFINED(root._isEdge) = false order by root._ts asc`;
    }

-    return queryDocuments(this.props.databaseId, this.props.collectionId, query, {
-      maxItemCount: GraphExplorer.ROOT_LIST_PAGE_SIZE,
-      enableCrossPartitionQuery: LocalStorageUtility.getEntryString(StorageKey.IsCrossPartitionQueryEnabled) === "true"
-    })
+    return this.props.documentClientUtility
+      .queryDocuments(this.props.databaseId, this.props.collectionId, query, {
+        maxItemCount: GraphExplorer.ROOT_LIST_PAGE_SIZE,
+        enableCrossPartitionQuery:
+          LocalStorageUtility.getEntryString(StorageKey.IsCrossPartitionQueryEnabled) === "true"
+      })
      .then(
        (iterator: QueryIterator<ItemDefinition & Resource>) => {
          this.currentDocDBQueryInfo = {
@@ -1760,15 +1766,16 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      .currentDocDBQueryInfo.index + GraphExplorer.ROOT_LIST_PAGE_SIZE})`;
    const id = GraphExplorer.reportToConsole(ConsoleDataType.InProgress, `Executing: ${queryInfoStr}`);

-    return queryDocumentsPage(
-      this.props.collectionRid,
-      this.currentDocDBQueryInfo.iterator,
-      this.currentDocDBQueryInfo.index,
-      {
-        enableCrossPartitionQuery:
-          LocalStorageUtility.getEntryString(StorageKey.IsCrossPartitionQueryEnabled) === "true"
-      }
-    )
+    return this.props.documentClientUtility
+      .queryDocumentsPage(
+        this.props.collectionRid,
+        this.currentDocDBQueryInfo.iterator,
+        this.currentDocDBQueryInfo.index,
+        {
+          enableCrossPartitionQuery:
+            LocalStorageUtility.getEntryString(StorageKey.IsCrossPartitionQueryEnabled) === "true"
+        }
+      )
      .then((results: ViewModels.QueryResults) => {
        GraphExplorer.clearConsoleProgress(id);
        this.currentDocDBQueryInfo.index = results.lastItemIndex + 1;
--- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorerAdapter.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorerAdapter.tsx
@@ -3,6 +3,7 @@ import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
 import { GraphConfig } from "../../Tabs/GraphTab";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { GraphExplorer, GraphAccessor } from "./GraphExplorer";
+import DocumentClientUtilityBase from "../../../Common/DocumentClientUtilityBase";

 interface Parameter {
  onIsNewVertexDisabledChange: (isEnabled: boolean) => void;
@@ -17,6 +18,7 @@ interface Parameter {
  graphConfig?: GraphConfig;

  collectionPartitionKeyProperty: string;
+  documentClientUtility: DocumentClientUtilityBase;
  collectionRid: string;
  collectionSelfLink: string;
  graphBackendEndpoint: string;
@@ -49,6 +51,7 @@ export class GraphExplorerAdapter implements ReactAdapter {
        onIsGraphDisplayed={this.params.onIsGraphDisplayed}
        onResetDefaultGraphConfigValues={this.params.onResetDefaultGraphConfigValues}
        collectionPartitionKeyProperty={this.params.collectionPartitionKeyProperty}
+        documentClientUtility={this.params.documentClientUtility}
        collectionRid={this.params.collectionRid}
        collectionSelfLink={this.params.collectionSelfLink}
        graphBackendEndpoint={this.params.graphBackendEndpoint}
--- a/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts
+++ b/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts
@@ -1,6 +1,6 @@
 import * as sinon from "sinon";
 import { GremlinClient, GremlinClientParameters } from "./GremlinClient";
-import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../../Utils/NotificationConsoleUtils";
 import * as Logger from "../../../Common/Logger";

 describe("Gremlin Client", () => {
--- a/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts
+++ b/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts
@@ -4,7 +4,7 @@

 import * as Q from "q";
 import { GremlinSimpleClient, Result } from "./GremlinSimpleClient";
-import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import { NotificationConsoleUtils } from "../../../Utils/NotificationConsoleUtils";
 import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import { HashMap } from "../../../Common/HashMap";
 import * as Logger from "../../../Common/Logger";
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
@@ -12,12 +12,11 @@ import { CommandBar, ICommandBarItemProps } from "office-ui-fabric-react/lib/Com
 import { StyleConstants } from "../../../Common/Constants";
 import { CommandBarUtil } from "./CommandBarUtil";
 import Explorer from "../../Explorer";
-import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";

 export class CommandBarComponentAdapter implements ReactAdapter {
  public parameters: ko.Observable<number>;
  public container: Explorer;
-  private tabsButtons: CommandButtonComponentProps[];
+  private tabsButtons: ViewModels.NavbarButtonConfig[];
  private isNotebookTabActive: ko.Computed<boolean>;

  constructor(container: Explorer) {
@@ -45,15 +44,14 @@ export class CommandBarComponentAdapter implements ReactAdapter {
      container.isHostedDataExplorerEnabled,
      container.isSynapseLinkUpdating,
      container.databaseAccount,
-      this.isNotebookTabActive,
-      container.isServerlessEnabled
+      this.isNotebookTabActive
    ];

    ko.computed(() => ko.toJSON(toWatch)).subscribe(() => this.triggerRender());
    this.parameters = ko.observable(Date.now());
  }

-  public onUpdateTabsButtons(buttons: CommandButtonComponentProps[]): void {
+  public onUpdateTabsButtons(buttons: ViewModels.NavbarButtonConfig[]): void {
    this.tabsButtons = buttons;
    this.triggerRender();
  }
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
@@ -7,47 +7,6 @@ import Explorer from "../../Explorer";
 describe("CommandBarComponentButtonFactory tests", () => {
  let mockExplorer: Explorer;

-  describe("Enable Azure Synapse Link Button", () => {
-    const enableAzureSynapseLinkBtnLabel = "Enable Azure Synapse Link (Preview)";
-
-    beforeAll(() => {
-      mockExplorer = {} as Explorer;
-      mockExplorer.addCollectionText = ko.observable("mockText");
-      mockExplorer.isAuthWithResourceToken = ko.observable(false);
-      mockExplorer.isPreferredApiTable = ko.computed(() => true);
-      mockExplorer.isPreferredApiMongoDB = ko.computed<boolean>(() => false);
-      mockExplorer.isPreferredApiCassandra = ko.computed<boolean>(() => false);
-      mockExplorer.isSparkEnabled = ko.observable(true);
-      mockExplorer.isSynapseLinkUpdating = ko.observable(false);
-      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
-      mockExplorer.hasAutoPilotV2FeatureFlag = ko.computed<boolean>(() => true);
-      mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
-      mockExplorer.isNotebookEnabled = ko.observable(false);
-      mockExplorer.isNotebooksEnabledForAccount = ko.observable(false);
-      mockExplorer.isRunningOnNationalCloud = () => false;
-    });
-
-    it("Account is not serverless - button should be visible", () => {
-      mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
-
-      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer);
-      const enableAzureSynapseLinkBtn = buttons.find(
-        button => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
-      );
-      expect(enableAzureSynapseLinkBtn).toBeDefined();
-    });
-
-    it("Account is serverless - button should be hidden", () => {
-      mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => true);
-
-      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer);
-      const enableAzureSynapseLinkBtn = buttons.find(
-        button => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
-      );
-      expect(enableAzureSynapseLinkBtn).toBeUndefined();
-    });
-  });
-
  describe("Enable notebook button", () => {
    const enableNotebookBtnLabel = "Enable Notebooks (Preview)";

@@ -64,7 +23,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
      mockExplorer.hasAutoPilotV2FeatureFlag = ko.computed<boolean>(() => true);
      mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
-      mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
    });

    it("Notebooks is already enabled - button should be hidden", () => {
@@ -128,7 +86,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
      mockExplorer.hasAutoPilotV2FeatureFlag = ko.computed<boolean>(() => true);
      mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
-      mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
    });

    beforeEach(() => {
@@ -210,7 +167,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
      mockExplorer.hasAutoPilotV2FeatureFlag = ko.computed<boolean>(() => true);
      mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
-      mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
    });

    beforeEach(() => {
@@ -298,7 +254,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
      mockExplorer.notebookManager = new NotebookManager();
      mockExplorer.notebookManager.gitHubOAuthService = new GitHubOAuthService(undefined);
-      mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
    });

    beforeEach(() => {
@@ -350,7 +305,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
      mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
      mockExplorer.hasAutoPilotV2FeatureFlag = ko.computed<boolean>(() => true);
      mockExplorer.isResourceTokenCollectionNodeSelected = ko.computed(() => true);
-      mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
    });

    it("should only show New SQL Query and Open Query buttons", () => {
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts
@@ -24,20 +24,19 @@ import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
 import ResetWorkspaceIcon from "../../../../images/notebook/Notebook-reset-workspace.svg";
 import GitHubIcon from "../../../../images/github.svg";
 import SynapseIcon from "../../../../images/synapse-link.svg";
-import { configContext, Platform } from "../../../ConfigContext";
+import { config, Platform } from "../../../Config";
 import Explorer from "../../Explorer";
-import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";

 export class CommandBarComponentButtonFactory {
  private static counter: number = 0;

-  public static createStaticCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
+  public static createStaticCommandBarButtons(container: Explorer): ViewModels.NavbarButtonConfig[] {
    if (container.isAuthWithResourceToken()) {
      return CommandBarComponentButtonFactory.createStaticCommandBarButtonsForResourceToken(container);
    }

    const newCollectionBtn = CommandBarComponentButtonFactory.createNewCollectionGroup(container);
-    const buttons: CommandButtonComponentProps[] = [newCollectionBtn];
+    const buttons: ViewModels.NavbarButtonConfig[] = [newCollectionBtn];

    const addSynapseLink = CommandBarComponentButtonFactory.createOpenSynapseLinkDialogButton(container);
    if (addSynapseLink) {
@@ -113,7 +112,7 @@ export class CommandBarComponentButtonFactory {

      if (CommandBarComponentButtonFactory.areScriptsSupported(container)) {
        const label = "New Stored Procedure";
-        const newStoredProcedureBtn: CommandButtonComponentProps = {
+        const newStoredProcedureBtn: ViewModels.NavbarButtonConfig = {
          iconSrc: AddStoredProcedureIcon,
          iconAlt: label,
          onCommandClick: () => {
@@ -134,12 +133,12 @@ export class CommandBarComponentButtonFactory {
    return buttons;
  }

-  public static createContextCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
-    const buttons: CommandButtonComponentProps[] = [];
+  public static createContextCommandBarButtons(container: Explorer): ViewModels.NavbarButtonConfig[] {
+    const buttons: ViewModels.NavbarButtonConfig[] = [];

    if (!container.isDatabaseNodeOrNoneSelected() && container.isPreferredApiMongoDB()) {
      const label = "New Shell";
-      const newMongoShellBtn: CommandButtonComponentProps = {
+      const newMongoShellBtn: ViewModels.NavbarButtonConfig = {
        iconSrc: HostedTerminalIcon,
        iconAlt: label,
        onCommandClick: () => {
@@ -157,15 +156,15 @@ export class CommandBarComponentButtonFactory {
    return buttons;
  }

-  public static createControlCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
-    const buttons: CommandButtonComponentProps[] = [];
+  public static createControlCommandBarButtons(container: Explorer): ViewModels.NavbarButtonConfig[] {
+    const buttons: ViewModels.NavbarButtonConfig[] = [];
    if (window.dataExplorerPlatform === PlatformType.Hosted) {
      return buttons;
    }

    if (!container.isPreferredApiCassandra()) {
      const label = "Settings";
-      const settingsPaneButton: CommandButtonComponentProps = {
+      const settingsPaneButton: ViewModels.NavbarButtonConfig = {
        iconSrc: SettingsIcon,
        iconAlt: label,
        onCommandClick: () => container.settingsPane.open(),
@@ -180,7 +179,7 @@ export class CommandBarComponentButtonFactory {

    if (container.isHostedDataExplorerEnabled()) {
      const label = "Open Full Screen";
-      const fullScreenButton: CommandButtonComponentProps = {
+      const fullScreenButton: ViewModels.NavbarButtonConfig = {
        iconSrc: OpenInTabIcon,
        iconAlt: label,
        onCommandClick: () => container.generateSharedAccessData(),
@@ -196,7 +195,7 @@ export class CommandBarComponentButtonFactory {

    if (!container.hasOwnProperty("isEmulator") || !container.isEmulator) {
      const label = "Feedback";
-      const feedbackButtonOptions: CommandButtonComponentProps = {
+      const feedbackButtonOptions: ViewModels.NavbarButtonConfig = {
        iconSrc: FeedbackIcon,
        iconAlt: label,
        onCommandClick: () => container.provideFeedbackEmail(),
@@ -212,7 +211,7 @@ export class CommandBarComponentButtonFactory {
    return buttons;
  }

-  public static createDivider(): CommandButtonComponentProps {
+  public static createDivider(): ViewModels.NavbarButtonConfig {
    const label = `divider${CommandBarComponentButtonFactory.counter++}`;
    return {
      isDivider: true,
@@ -229,7 +228,7 @@ export class CommandBarComponentButtonFactory {
    return container.isPreferredApiDocumentDB() || container.isPreferredApiGraph();
  }

-  private static createNewCollectionGroup(container: Explorer): CommandButtonComponentProps {
+  private static createNewCollectionGroup(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = container.addCollectionText();
    return {
      iconSrc: AddCollectionIcon,
@@ -242,15 +241,10 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonComponentProps {
-    if (configContext.platform === Platform.Emulator) {
+  private static createOpenSynapseLinkDialogButton(container: Explorer): ViewModels.NavbarButtonConfig {
+    if (config.platform === Platform.Emulator) {
      return null;
    }
-
-    if (container.isServerlessEnabled()) {
-      return null;
-    }
-
    if (
      container.databaseAccount &&
      container.databaseAccount() &&
@@ -282,7 +276,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createNewDatabase(container: Explorer): CommandButtonComponentProps {
+  private static createNewDatabase(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = container.addDatabaseText();
    return {
      iconSrc: AddDatabaseIcon,
@@ -297,7 +291,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createNewSQLQueryButton(container: Explorer): CommandButtonComponentProps {
+  private static createNewSQLQueryButton(container: Explorer): ViewModels.NavbarButtonConfig {
    if (container.isPreferredApiDocumentDB() || container.isPreferredApiGraph()) {
      const label = "New SQL Query";
      return {
@@ -331,15 +325,15 @@ export class CommandBarComponentButtonFactory {
    return null;
  }

-  public static createScriptCommandButtons(container: Explorer): CommandButtonComponentProps[] {
-    const buttons: CommandButtonComponentProps[] = [];
+  public static createScriptCommandButtons(container: Explorer): ViewModels.NavbarButtonConfig[] {
+    const buttons: ViewModels.NavbarButtonConfig[] = [];

    const shouldEnableScriptsCommands: boolean =
      !container.isDatabaseNodeOrNoneSelected() && CommandBarComponentButtonFactory.areScriptsSupported(container);

    if (shouldEnableScriptsCommands) {
      const label = "New Stored Procedure";
-      const newStoredProcedureBtn: CommandButtonComponentProps = {
+      const newStoredProcedureBtn: ViewModels.NavbarButtonConfig = {
        iconSrc: AddStoredProcedureIcon,
        iconAlt: label,
        onCommandClick: () => {
@@ -356,7 +350,7 @@ export class CommandBarComponentButtonFactory {

    if (shouldEnableScriptsCommands) {
      const label = "New UDF";
-      const newUserDefinedFunctionBtn: CommandButtonComponentProps = {
+      const newUserDefinedFunctionBtn: ViewModels.NavbarButtonConfig = {
        iconSrc: AddUdfIcon,
        iconAlt: label,
        onCommandClick: () => {
@@ -373,7 +367,7 @@ export class CommandBarComponentButtonFactory {

    if (shouldEnableScriptsCommands) {
      const label = "New Trigger";
-      const newTriggerBtn: CommandButtonComponentProps = {
+      const newTriggerBtn: ViewModels.NavbarButtonConfig = {
        iconSrc: AddTriggerIcon,
        iconAlt: label,
        onCommandClick: () => {
@@ -391,7 +385,7 @@ export class CommandBarComponentButtonFactory {
    return buttons;
  }

-  private static createScaleAndSettingsButton(container: Explorer): CommandButtonComponentProps {
+  private static createScaleAndSettingsButton(container: Explorer): ViewModels.NavbarButtonConfig {
    let isShared = false;
    if (container.isDatabaseNodeSelected()) {
      isShared = container.findSelectedDatabase().isDatabaseShared();
@@ -416,7 +410,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createNewNotebookButton(container: Explorer): CommandButtonComponentProps {
+  private static createNewNotebookButton(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = "New Notebook";
    return {
      iconSrc: NewNotebookIcon,
@@ -429,7 +423,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createuploadNotebookButton(container: Explorer): CommandButtonComponentProps {
+  private static createuploadNotebookButton(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = "Upload to Notebook Server";
    return {
      iconSrc: NewNotebookIcon,
@@ -442,7 +436,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createOpenQueryButton(container: Explorer): CommandButtonComponentProps {
+  private static createOpenQueryButton(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = "Open Query";
    return {
      iconSrc: BrowseQueriesIcon,
@@ -455,7 +449,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createOpenQueryFromDiskButton(container: Explorer): CommandButtonComponentProps {
+  private static createOpenQueryFromDiskButton(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = "Open Query From Disk";
    return {
      iconSrc: OpenQueryFromDiskIcon,
@@ -468,8 +462,8 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createEnableNotebooksButton(container: Explorer): CommandButtonComponentProps {
-    if (configContext.platform === Platform.Emulator) {
+  private static createEnableNotebooksButton(container: Explorer): ViewModels.NavbarButtonConfig {
+    if (config.platform === Platform.Emulator) {
      return null;
    }
    const label = "Enable Notebooks (Preview)";
@@ -489,7 +483,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createOpenTerminalButton(container: Explorer): CommandButtonComponentProps {
+  private static createOpenTerminalButton(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = "Open Terminal";
    return {
      iconSrc: CosmosTerminalIcon,
@@ -502,7 +496,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createOpenMongoTerminalButton(container: Explorer): CommandButtonComponentProps {
+  private static createOpenMongoTerminalButton(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = "Open Mongo Shell";
    const tooltip =
      "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
@@ -528,7 +522,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createOpenCassandraTerminalButton(container: Explorer): CommandButtonComponentProps {
+  private static createOpenCassandraTerminalButton(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = "Open Cassandra Shell";
    const tooltip =
      "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
@@ -554,7 +548,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createNotebookWorkspaceResetButton(container: Explorer): CommandButtonComponentProps {
+  private static createNotebookWorkspaceResetButton(container: Explorer): ViewModels.NavbarButtonConfig {
    const label = "Reset Workspace";
    return {
      iconSrc: ResetWorkspaceIcon,
@@ -567,7 +561,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createManageGitHubAccountButton(container: Explorer): CommandButtonComponentProps {
+  private static createManageGitHubAccountButton(container: Explorer): ViewModels.NavbarButtonConfig {
    let connectedToGitHub: boolean = container.notebookManager?.gitHubOAuthService.isLoggedIn();
    const label = connectedToGitHub ? "Manage GitHub settings" : "Connect to GitHub";
    return {
@@ -590,7 +584,7 @@ export class CommandBarComponentButtonFactory {
    };
  }

-  private static createStaticCommandBarButtonsForResourceToken(container: Explorer): CommandButtonComponentProps[] {
+  private static createStaticCommandBarButtonsForResourceToken(container: Explorer): ViewModels.NavbarButtonConfig[] {
    const newSqlQueryBtn = CommandBarComponentButtonFactory.createNewSQLQueryButton(container);
    const openQueryBtn = CommandBarComponentButtonFactory.createOpenQueryButton(container);

--- a/src/Explorer/Menus/CommandBar/CommandBarUtil.test.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarUtil.test.tsx
@@ -1,10 +1,9 @@
 import { CommandBarUtil } from "./CommandBarUtil";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { ICommandBarItemProps } from "office-ui-fabric-react/lib/CommandBar";
-import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";

 describe("CommandBarUtil tests", () => {
-  const createButton = (): CommandButtonComponentProps => {
+  const createButton = (): ViewModels.NavbarButtonConfig => {
    return {
      iconSrc: "icon",
      iconAlt: "label",
@@ -55,7 +54,7 @@ describe("CommandBarUtil tests", () => {
  });

  it("should create buttons with unique keys", () => {
-    const btns: CommandButtonComponentProps[] = [];
+    const btns: ViewModels.NavbarButtonConfig[] = [];
    for (let i = 0; i < 5; i++) {
      btns.push(createButton());
    }
--- a/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
@@ -1,11 +1,12 @@
 import _ from "underscore";
 import * as React from "react";
+import * as ViewModels from "../../../Contracts/ViewModels";
 import { Observable } from "knockout";
 import { IconType } from "office-ui-fabric-react/lib/Icon";
 import { IComponentAsProps } from "office-ui-fabric-react/lib/Utilities";
-import { StyleConstants } from "../../../Common/Constants";
+import { KeyCodes, StyleConstants } from "../../../Common/Constants";
 import { ICommandBarItemProps } from "office-ui-fabric-react/lib/CommandBar";
-import { Dropdown, IDropdownStyles, IDropdownOption } from "office-ui-fabric-react/lib/Dropdown";
+import { Dropdown, DropdownMenuItemType, IDropdownStyles, IDropdownOption } from "office-ui-fabric-react/lib/Dropdown";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import ChevronDownIcon from "../../../../images/Chevron_down.svg";
 import { ArcadiaMenuPicker } from "../../Controls/Arcadia/ArcadiaMenuPicker";
@@ -20,13 +21,13 @@ export class CommandBarUtil {
   * Convert our NavbarButtonConfig to UI Fabric buttons
   * @param btns
   */
-  public static convertButton(btns: CommandButtonComponentProps[], backgroundColor: string): ICommandBarItemProps[] {
+  public static convertButton(btns: ViewModels.NavbarButtonConfig[], backgroundColor: string): ICommandBarItemProps[] {
    const buttonHeightPx = StyleConstants.CommandBarButtonHeight;

    return btns
      .filter(btn => btn)
      .map(
-        (btn: CommandButtonComponentProps, index: number): ICommandBarItemProps => {
+        (btn: ViewModels.NavbarButtonConfig, index: number): ICommandBarItemProps => {
          if (btn.isDivider) {
            return CommandBarUtil.createDivider(btn.commandButtonLabel);
          }
--- a/src/Explorer/Menus/NavBar/ControlBarComponent.tsx
+++ b/src/Explorer/Menus/NavBar/ControlBarComponent.tsx
@@ -3,19 +3,17 @@
 */

 import * as React from "react";
-import {
-  CommandButtonComponent,
-  CommandButtonComponentProps
-} from "../../Controls/CommandButton/CommandButtonComponent";
+import * as ViewModels from "../../../Contracts/ViewModels";
+import { CommandButtonComponent } from "../../Controls/CommandButton/CommandButtonComponent";

 export interface ControlBarComponentProps {
-  buttons: CommandButtonComponentProps[];
+  buttons: ViewModels.NavbarButtonConfig[];
 }

 export class ControlBarComponent extends React.Component<ControlBarComponentProps> {
-  private static renderButtons(commandButtonOptions: CommandButtonComponentProps[]): JSX.Element[] {
+  private static renderButtons(commandButtonOptions: ViewModels.NavbarButtonConfig[]): JSX.Element[] {
    return commandButtonOptions.map(
-      (btn: CommandButtonComponentProps, index: number): JSX.Element => {
+      (btn: ViewModels.NavbarButtonConfig, index: number): JSX.Element => {
        // Remove label
        btn.commandButtonLabel = null;
        return CommandButtonComponent.renderButton(btn, `${index}`);
--- a/src/Explorer/Menus/NavBar/ControlBarComponentAdapter.tsx
+++ b/src/Explorer/Menus/NavBar/ControlBarComponentAdapter.tsx
@@ -8,12 +8,12 @@ import * as ko from "knockout";
 import * as React from "react";
 import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
 import { ControlBarComponent } from "./ControlBarComponent";
-import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
+import * as ViewModels from "../../../Contracts/ViewModels";

 export class ControlBarComponentAdapter implements ReactAdapter {
  public parameters: ko.Observable<number>;

-  constructor(private buttons: ko.ObservableArray<CommandButtonComponentProps>) {
+  constructor(private buttons: ko.ObservableArray<ViewModels.NavbarButtonConfig>) {
    this.buttons.subscribe(() => this.forceRender());
    this.parameters = ko.observable<number>(Date.now());
  }
--- a/src/Explorer/Notebook/MonacoEditor/MonacoEditor.tsx
+++ b/src/Explorer/Notebook/MonacoEditor/MonacoEditor.tsx
@@ -1,464 +0,0 @@
-import { Channels } from "@nteract/messaging";
-import * as monaco from "./monaco";
-import * as React from "react";
-import { completionProvider } from "./completions/completionItemProvider";
-import { AppState, ContentRef } from "@nteract/core";
-import { connect } from "react-redux";
-import "./styles.css";
-import { LightThemeName, HCLightThemeName, DarkThemeName } from "./theme";
-// import { logger } from "src/common/localLogger";
-import { getCellMonacoLanguage } from "./selectors";
-// import { DocumentUri } from "./documentUri";
-
-export type IModelContentChangedEvent = monaco.editor.IModelContentChangedEvent;
-
-/**
- * Initial props for Monaco received from agnostic component
- */
-export interface IMonacoProps {
-  id: string;
-  contentRef: ContentRef;
-  modelUri?: monaco.Uri;
-  theme: monaco.editor.IStandaloneThemeData | monaco.editor.BuiltinTheme | string;
-  cellLanguageOverride?: string;
-  notebookLanguageOverride?: string;
-  readOnly?: boolean;
-  channels: Channels | undefined;
-  enableCompletion: boolean;
-  shouldRegisterDefaultCompletion?: boolean;
-  onChange: (value: string, event?: unknown) => void;
-  onFocusChange: (focus: boolean) => void;
-  onCursorPositionChange?: (selection: monaco.ISelection | null) => void;
-  onRegisterCompletionProvider?: (languageId: string) => void;
-  value: string;
-  editorFocused: boolean;
-  lineNumbers: boolean;
-
-  /** set height of editor to fit the specified number of lines in display */
-  numberOfLines?: number;
-
-  options?: monaco.editor.IEditorOptions;
-}
-
-/**
- * Monaco specific props derived from State
- */
-interface IMonacoStateProps {
-  language: string;
-}
-
-// Cache the custom theme data to avoid repeatly defining the custom theme
-let customThemeData: monaco.editor.IStandaloneThemeData;
-
-function getMonacoTheme(theme: monaco.editor.IStandaloneThemeData | monaco.editor.BuiltinTheme | string) {
-  if (typeof theme === "string") {
-    switch (theme) {
-      case "vs-dark":
-        return DarkThemeName;
-      case "hc-black":
-        return "hc-black";
-      case "vs":
-        return LightThemeName;
-      case "hc-light":
-        return HCLightThemeName;
-      default:
-        return LightThemeName;
-    }
-  } else if (theme === undefined || typeof theme === "undefined") {
-    return LightThemeName;
-  } else {
-    const themeName = "custom-vs";
-
-    // Skip redefining the same custom theme if it is the same theme data.
-    if (customThemeData !== theme) {
-      monaco.editor.defineTheme(themeName, theme);
-      customThemeData = theme;
-    }
-
-    return themeName;
-  }
-}
-
-const makeMapStateToProps = (initialState: AppState, initialProps: IMonacoProps) => {
-  const { id, contentRef } = initialProps;
-  const mapStateToProps = (state: AppState, ownProps: IMonacoProps & IMonacoStateProps) => {
-    return {
-      language: getCellMonacoLanguage(
-        state,
-        contentRef,
-        id,
-        ownProps.cellLanguageOverride,
-        ownProps.notebookLanguageOverride
-      )
-    };
-  };
-  return mapStateToProps;
-};
-
-/**
- * Creates a MonacoEditor instance within the MonacoContainer div
- */
-export class MonacoEditor extends React.Component<IMonacoProps & IMonacoStateProps> {
-  editor?: monaco.editor.IStandaloneCodeEditor;
-  editorContainerRef = React.createRef<HTMLDivElement>();
-  contentHeight?: number;
-  private cursorPositionListener?: monaco.IDisposable;
-
-  constructor(props: IMonacoProps & IMonacoStateProps) {
-    super(props);
-    this.onFocus = this.onFocus.bind(this);
-    this.onBlur = this.onBlur.bind(this);
-    this.calculateHeight = this.calculateHeight.bind(this);
-  }
-
-  onDidChangeModelContent(e: monaco.editor.IModelContentChangedEvent): void {
-    if (this.editor) {
-      if (this.props.onChange) {
-        this.props.onChange(this.editor.getValue(), e);
-      }
-
-      this.calculateHeight();
-    }
-  }
-
-  /**
-   * Adjust the height of editor
-   *
-   * @remarks
-   * The way to determine how many lines we should display in editor:
-   * If numberOfLines is not set or set to 0, we adjust the height to fit the content
-   * If numberOfLines is specified we respect that setting
-   */
-  calculateHeight(): void {
-    // Make sure we have an editor
-    if (!this.editor) {
-      return;
-    }
-
-    // Make sure we have a model
-    const model = this.editor.getModel();
-    if (!model) {
-      return;
-    }
-
-    if (this.editorContainerRef && this.editorContainerRef.current) {
-      const expectedLines = this.props.numberOfLines || model.getLineCount();
-      // The find & replace menu takes up 2 lines, that is why 2 line is set as the minimum number of lines
-      // TODO: we should either disable the find/replace menu or auto expand the editor when find/replace is triggerred.
-      const finalizedLines = Math.max(expectedLines, 1) + 1;
-      const lineHeight = this.editor.getConfiguration().lineHeight;
-
-      const contentHeight = finalizedLines * lineHeight;
-      if (this.contentHeight !== contentHeight) {
-        this.editorContainerRef.current.style.height = contentHeight + "px";
-        this.editor.layout();
-        this.contentHeight = contentHeight;
-      }
-    }
-  }
-
-  componentDidMount(): void {
-    if (this.editorContainerRef && this.editorContainerRef.current) {
-      // Register Jupyter completion provider if needed
-      this.registerCompletionProvider();
-
-      // Use Monaco model uri if provided. Otherwise, create a new model uri using editor id.
-      const uri = this.props.modelUri ? this.props.modelUri : monaco.Uri.file(this.props.id);
-
-      // Only create a new model if it does not exist. For example, when we double click on a markdown cell,
-      // an editor model is created for it. Once we go back to markdown preview mode that doesn't use the editor,
-      // double clicking on the markdown cell will again instantiate a monaco editor. In that case, we should
-      // rebind the previously created editor model for the markdown instead of recreating one. Monaco does not
-      // allow models to be recreated with the same uri.
-      let model = monaco.editor.getModel(uri);
-      if (!model) {
-        model = monaco.editor.createModel(this.props.value, this.props.language, uri);
-      }
-
-      // Create Monaco editor backed by a Monaco model.
-      this.editor = monaco.editor.create(this.editorContainerRef.current, {
-        // Following are the default settings
-        minimap: {
-          enabled: false
-        },
-        autoIndent: true,
-        overviewRulerLanes: 1,
-        scrollbar: {
-          useShadows: false,
-          verticalHasArrows: false,
-          horizontalHasArrows: false,
-          vertical: "hidden",
-          horizontal: "hidden",
-          verticalScrollbarSize: 0,
-          horizontalScrollbarSize: 0,
-          arrowSize: 30
-        },
-        scrollBeyondLastLine: false,
-        find: {
-          // TODO Need this?
-          // addExtraSpaceOnTop: false, // pops the editor out of alignment if turned on
-          seedSearchStringFromSelection: true, // default is true
-          autoFindInSelection: false // default is false
-        },
-        // Disable highlight current line, too much visual noise with it on.
-        // VS Code also has it disabled for their notebook experience.
-        renderLineHighlight: "none",
-
-        // Allow editor pop up widgets such as context menus, signature help, hover tips to be able to be
-        // displayed outside of the editor. Without this, the pop up widgets can be clipped.
-        fixedOverflowWidgets: true,
-
-        // Apply custom settings from configuration
-        ...this.props.options,
-
-        // Apply specific settings passed-in as direct props
-        model,
-        value: this.props.value,
-        language: this.props.language,
-        readOnly: this.props.readOnly,
-        lineNumbers: this.props.lineNumbers ? "on" : "off",
-        theme: getMonacoTheme(this.props.theme)
-      });
-
-      this.addEditorTopMargin();
-
-      // Ignore Ctrl + Enter
-      // tslint:disable-next-line no-bitwise
-      this.editor.addCommand(
-        monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter,
-        () => {
-          // Do nothing. This is handled elsewhere, we just don't want the editor to put the newline.
-        },
-        undefined
-      );
-      // TODO Add right context
-
-      this.toggleEditorOptions(this.props.editorFocused);
-
-      if (this.props.editorFocused) {
-        if (!this.editor.hasTextFocus()) {
-          // Bring browser focus to the editor if text not already in focus
-          this.editor.focus();
-        }
-        this.registerCursorListener();
-      }
-
-      // TODO: Need to remove the event listener when the editor is disposed, or we have a memory leak here.
-      //       The same applies to the other event listeners below
-      // Adds listener under the resize window event which calls the resize method
-      window.addEventListener("resize", this.resize.bind(this));
-
-      // Adds listeners for undo and redo actions emitted from the toolbar
-      this.editorContainerRef.current.addEventListener("undo", () => {
-        if (this.editor) {
-          this.editor.trigger("undo-event", "undo", {});
-        }
-      });
-      this.editorContainerRef.current.addEventListener("redo", () => {
-        if (this.editor) {
-          this.editor.trigger("redo-event", "redo", {});
-        }
-      });
-
-      this.editor.onDidChangeModelContent(this.onDidChangeModelContent.bind(this));
-      this.editor.onDidFocusEditorText(this.onFocus);
-      this.editor.onDidBlurEditorText(this.onBlur);
-      this.calculateHeight();
-
-      // FIXME: This might need further investigation as the props value should be respected in construction
-      // The following is a mitigation measure till that time
-      // Ensures that the source contents of the editor (value) is consistent with the state of the editor
-      this.editor.setValue(this.props.value);
-    }
-  }
-
-  addEditorTopMargin(): void {
-    if (this.editor) {
-      // Monaco editor doesn't have margins
-      // https://github.com/notable/notable/issues/551
-      // This is a workaround to add an editor area 12px padding at the top
-      // so that cursors rendered by collab decorators could be visible without being cut.
-      this.editor.changeViewZones(changeAccessor => {
-        const domNode = document.createElement("div");
-        changeAccessor.addZone({
-          afterLineNumber: 0,
-          heightInPx: 12,
-          domNode
-        });
-      });
-    }
-  }
-
-  /**
-   * Tells editor to check the surrounding container size and resize itself appropriately
-   */
-  resize(): void {
-    if (this.editor && this.props.editorFocused) {
-      this.editor.layout();
-    }
-  }
-
-  componentDidUpdate(): void {
-    if (!this.editor) {
-      return;
-    }
-
-    const { value, channels, /* language, contentRef, id,*/ editorFocused, theme } = this.props;
-
-    // Ensures that the source contents of the editor (value) is consistent with the state of the editor
-    if (this.editor.getValue() !== value) {
-      this.editor.setValue(value);
-    }
-
-    completionProvider.setChannels(channels);
-
-    // Register Jupyter completion provider if needed
-    this.registerCompletionProvider();
-
-    /*
-    // Apply new model to the editor when the language is changed.
-    const model = this.editor.getModel();
-    if (model && language && model.getModeId() !== language) {
-      const newUri = DocumentUri.createCellUri(contentRef, id, language);
-      if (!monaco.editor.getModel(newUri)) {
-        // Save the cursor position before we set new model.
-        const position = this.editor.getPosition();
-
-        // Set new model targeting the changed language.
-        this.editor.setModel(monaco.editor.createModel(value, language, newUri));
-        this.addEditorTopMargin();
-
-        // Restore cursor position to new model.
-        if (position) {
-          this.editor.setPosition(position);
-        }
-
-        // Dispose of the old model in a seperate event. We cannot dispose of the model within the
-        // componentDidUpdate method or else the editor will throw an exception. Zero in the timeout field
-        // means execute immediately but in a seperate next event.
-        setTimeout(() => model.dispose(), 0);
-      }
-    }
-    */
-
-    if (theme) {
-      monaco.editor.setTheme(getMonacoTheme(theme));
-    }
-
-    // In the multi-tabs scenario, when the notebook is hidden by setting "display:none",
-    // Any state update propagated here would cause a UI re-layout, monaco-editor will then recalculate
-    // and set its height to 5px.
-    // To work around that issue, we skip updating the UI when parent element's offsetParent is null (which
-    // indicate an ancient element is hidden by display set to none)
-    // We may revisit this when we get to refactor for multi-notebooks.
-    if (!this.editorContainerRef.current?.offsetParent) {
-      return;
-    }
-
-    // Set focus
-    if (editorFocused && !this.editor.hasTextFocus()) {
-      this.editor.focus();
-    }
-
-    // Tells the editor pane to check if its container has changed size and fill appropriately
-    this.editor.layout();
-  }
-
-  componentWillUnmount(): void {
-    if (this.editor) {
-      try {
-        const model = this.editor.getModel();
-        if (model) {
-          model.dispose();
-        }
-
-        this.editor.dispose();
-      } catch (err) {
-        console.error(`Error occurs in disposing editor: ${JSON.stringify(err)}`);
-      }
-    }
-  }
-
-  render(): JSX.Element {
-    return (
-      <div className="monaco-container">
-        <div ref={this.editorContainerRef} id={`editor-${this.props.id}`} />
-      </div>
-    );
-  }
-
-  /**
-   * Register default kernel-based completion provider.
-   * @param language Language
-   */
-  registerDefaultCompletionProvider(language: string): void {
-    // onLanguage event is emitted only once per language when language is first time needed.
-    monaco.languages.onLanguage(language, () => {
-      monaco.languages.registerCompletionItemProvider(language, completionProvider);
-    });
-  }
-
-  private onFocus() {
-    this.props.onFocusChange(true);
-    this.toggleEditorOptions(true);
-    this.registerCursorListener();
-  }
-
-  private onBlur() {
-    this.props.onFocusChange(false);
-    this.toggleEditorOptions(false);
-    this.unregisterCursorListener();
-  }
-
-  private registerCursorListener() {
-    if (this.editor && this.props.onCursorPositionChange) {
-      const selection = this.editor.getSelection();
-      this.props.onCursorPositionChange(selection);
-
-      if (!this.cursorPositionListener) {
-        this.cursorPositionListener = this.editor.onDidChangeCursorSelection(event =>
-          this.props.onCursorPositionChange!(event.selection)
-        );
-      }
-    }
-  }
-
-  private unregisterCursorListener() {
-    if (this.cursorPositionListener) {
-      this.cursorPositionListener.dispose();
-      this.cursorPositionListener = undefined;
-    }
-  }
-
-  /**
-   * Toggle editor options based on if the editor is in active state (i.e. focused).
-   * When the editor is not active, we want to deactivate some of the visual noise.
-   * @param isActive Whether editor is active.
-   */
-  private toggleEditorOptions(isActive: boolean) {
-    if (this.editor) {
-      this.editor.updateOptions({
-        matchBrackets: isActive,
-        occurrencesHighlight: isActive,
-        renderIndentGuides: isActive
-      });
-    }
-  }
-
-  /**
-   * Register language features for target language. Call before setting language type to model.
-   */
-  private registerCompletionProvider() {
-    const { enableCompletion, language, onRegisterCompletionProvider, shouldRegisterDefaultCompletion } = this.props;
-
-    if (enableCompletion && language) {
-      if (onRegisterCompletionProvider) {
-        onRegisterCompletionProvider(language);
-      } else if (shouldRegisterDefaultCompletion) {
-        this.registerDefaultCompletionProvider(language);
-      }
-    }
-  }
-}
-
-export default connect<IMonacoStateProps, void, IMonacoProps, AppState>(makeMapStateToProps)(MonacoEditor);
--- a/src/Explorer/Notebook/MonacoEditor/completions/completionItemProvider.ts
+++ b/src/Explorer/Notebook/MonacoEditor/completions/completionItemProvider.ts
@@ -1,239 +0,0 @@
-import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
-// import * as monaco from "../monaco";
-import { Observable, Observer } from "rxjs";
-import { first, map } from "rxjs/operators";
-import { childOf, JupyterMessage, ofMessageType, Channels } from "@nteract/messaging";
-
-/**
- * TODO: import from nteract when the changes under editor-base.ts are ported to nteract.
- */
-import { CompletionResults, CompletionMatch, completionRequest, js_idx_to_char_idx } from "../editor-base";
-
-/**
- * Jupyter to Monaco completion item kinds.
- */
-const unknownJupyterKind = "<unknown>";
-const jupyterToMonacoCompletionItemKind = {
-  [unknownJupyterKind]: monaco.languages.CompletionItemKind.Field,
-  class: monaco.languages.CompletionItemKind.Class,
-  function: monaco.languages.CompletionItemKind.Function,
-  keyword: monaco.languages.CompletionItemKind.Keyword,
-  instance: monaco.languages.CompletionItemKind.Variable,
-  statement: monaco.languages.CompletionItemKind.Variable
-};
-
-/**
- * Completion item provider.
- */
-class CompletionItemProvider implements monaco.languages.CompletionItemProvider {
-  private channels: Channels | undefined;
-
-  /**
-   * Set Channels of Jupyter kernel.
-   * @param channels Channels of Jupyter kernel.
-   */
-  setChannels(channels: Channels | undefined) {
-    this.channels = channels;
-  }
-
-  /**
-   * Whether provider is connected to Jupyter kernel.
-   */
-  get isConnectedToKernel() {
-    return !!this.channels;
-  }
-
-  /**
-   * Additional characters to trigger completion other than Ctrl+Space.
-   */
-  get triggerCharacters() {
-    return [" ", "<", "/", ".", "="];
-  }
-
-  /**
-   * Get list of completion items at position of cursor.
-   * @param model Monaco editor text model.
-   * @param position Position of cursor.
-   */
-  async provideCompletionItems(model: monaco.editor.ITextModel, position: monaco.Position) {
-    // Convert to zero-based index
-    let cursorPos = model.getOffsetAt(position);
-    const code = model.getValue();
-    cursorPos = js_idx_to_char_idx(cursorPos, code);
-
-    // Get completions from Jupyter kernel if its Channels is connected
-    let items = [];
-    if (this.channels) {
-      try {
-        const message = completionRequest(code, cursorPos);
-        items = await this.codeCompleteObservable(this.channels, message, model).toPromise();
-      } catch (error) {
-        // Temporary log error to console until we settle on how we log in V3
-        // tslint:disable-next-line
-        console.error(error);
-      }
-    }
-
-    return Promise.resolve<monaco.languages.CompletionList>({
-      suggestions: items,
-      incomplete: false
-    });
-  }
-
-  /**
-   * Get list of completion items from Jupyter kernel.
-   * @param channels Channels of Jupyter kernel.
-   * @param message Jupyter message for completion request.
-   * @param model Text model.
-   */
-  private codeCompleteObservable(channels: Channels, message: JupyterMessage, model: monaco.editor.ITextModel) {
-    // Process completion response
-    const completion$ = channels.pipe(
-      childOf(message),
-      ofMessageType("complete_reply"),
-      map(entry => entry.content),
-      first(),
-      map(results => this.adaptToMonacoCompletions(results, model))
-    );
-
-    // Subscribe and send completion request message
-    return Observable.create((observer: Observer<unknown>) => {
-      const subscription = completion$.subscribe(observer);
-      channels.next(message);
-      return subscription;
-    });
-  }
-
-  /**
-   * Converts Jupyter completion result to list of Monaco completion items.
-   */
-  private adaptToMonacoCompletions(results: CompletionResults, model: monaco.editor.ITextModel) {
-    let range: monaco.IRange;
-    let percentCount = 0;
-    let matches = results ? results.matches : [];
-    if (results.metadata && results.metadata._jupyter_types_experimental) {
-      matches = results.metadata._jupyter_types_experimental as CompletionMatch[];
-    }
-    return matches.map((match: CompletionMatch, index: number) => {
-      if (typeof match === "string") {
-        const text = this.sanitizeText(match);
-        const filtered = this.getFilterText(text);
-        return {
-          kind: this.adaptToMonacoCompletionItemKind(unknownJupyterKind),
-          label: text,
-          insertText: text,
-          filterText: filtered,
-          sortText: this.getSortText(index)
-        } as monaco.languages.CompletionItem;
-      } else {
-        // We only need to get the range once as the range is the same for all completion items in the list.
-        if (!range) {
-          const start = model.getPositionAt(match.start);
-          const end = model.getPositionAt(match.end);
-          range = {
-            startLineNumber: start.lineNumber,
-            startColumn: start.column,
-            endLineNumber: end.lineNumber,
-            endColumn: end.column
-          };
-
-          // Get the range representing the text before the completion action was invoked.
-          // If the text starts with magics % indicator, we need to track how many of these indicators exist
-          // so that we ensure the insertion text only inserts the delta between what the user typed versus
-          // what is recommended by the completion. Without this, there will be extra % insertions.
-          // Example:
-          // User types %%p then suggestion list will recommend %%python, if we now commit the item then the
-          // final text in the editor becomes %%p%%python instead of %%python. This is why the tracking code
-          // below is needed. This behavior is only specific to the magics % indicators as Monaco does not
-          // handle % characters in their completion list well.
-          const rangeText = model.getValueInRange(range);
-          if (rangeText.startsWith("%%")) {
-            percentCount = 2;
-          } else if (rangeText.startsWith("%")) {
-            percentCount = 1;
-          }
-        }
-
-        const text = this.sanitizeText(match.text);
-        const filtered = this.getFilterText(text);
-        const insert = this.getInsertText(text, percentCount);
-        return {
-          kind: this.adaptToMonacoCompletionItemKind(match.type as keyof typeof jupyterToMonacoCompletionItemKind),
-          label: text,
-          insertText: percentCount > 0 ? insert : text,
-          filterText: filtered,
-          sortText: this.getSortText(index)
-        } as monaco.languages.CompletionItem;
-      }
-    });
-  }
-
-  /**
-   * Converts Jupyter completion item kind to Monaco completion item kind.
-   * @param kind Jupyter completion item kind.
-   */
-  private adaptToMonacoCompletionItemKind(kind: keyof typeof jupyterToMonacoCompletionItemKind) {
-    const result = jupyterToMonacoCompletionItemKind[kind];
-    return result ? result : jupyterToMonacoCompletionItemKind[unknownJupyterKind];
-  }
-
-  /**
-   * Remove everything before a dot. Jupyter completion results like to include all characters before
-   * the trigger character. For example, if user types "myarray.", we expect the completion results to
-   * show "append", "pop", etc. but for the actual case, it will show "myarray.append", "myarray.pop",
-   * etc. so we are going to sanitize the text.
-   * @param text Text of Jupyter completion item
-   */
-  private sanitizeText(text: string) {
-    const index = text.lastIndexOf(".");
-    return index > -1 && index < text.length - 1 ? text.substring(index + 1) : text;
-  }
-
-  /**
-   * Remove magics all % characters as Monaco doesn't like them for the filtering text.
-   * Without this, completion won't show magics match items.
-   * @param text Text of Jupyter completion item.
-   */
-  private getFilterText(text: string) {
-    return text.replace(/%/g, "");
-  }
-
-  /**
-   * Get insertion text handling what to insert for the magics case depending on what
-   * has already been typed.
-   * @param text Text of Jupyter completion item.
-   * @param percentCount Number of percent characters to remove
-   */
-  private getInsertText(text: string, percentCount: number) {
-    for (let i = 0; i < percentCount; i++) {
-      text = text.replace("%", "");
-    }
-    return text;
-  }
-
-  /**
-   * Maps numbers to strings, such that if a>b numerically, f(a)>f(b) lexicograhically.
-   * 1 -> "za", 26 -> "zz", 27 -> "zza", 28 -> "zzb", 52 -> "zzz", 53 ->"zzza"
-   * @param order Number to be converted to a sorting-string. order >= 0.
-   * @returns A string representing the order.
-   */
-  private getSortText(order: number): string {
-    order++;
-    const numCharacters = 26; // "z" - "a" + 1;
-    const div = Math.floor(order / numCharacters);
-
-    let sortText = "z";
-    for (let i = 0; i < div; i++) {
-      sortText += "z";
-    }
-
-    const remainder = order % numCharacters;
-    if (remainder > 0) {
-      sortText += String.fromCharCode(96 + remainder);
-    }
-    return sortText;
-  }
-}
-
-const completionProvider = new CompletionItemProvider();
-export { completionProvider };
--- a/src/Explorer/Notebook/MonacoEditor/converter.ts
+++ b/src/Explorer/Notebook/MonacoEditor/converter.ts
@@ -1,44 +0,0 @@
-import Immutable from "immutable";
-import * as monaco from "./monaco";
-/**
- * Code Mirror to Monaco constants.
- */
-export enum Mode {
-  markdown = "markdown",
-  raw = "plaintext",
-  python = "python",
-  csharp = "csharp"
-}
-
-/**
- * Maps Code Mirror mode to a valid Monaco Editor supported langauge
- * defaults to plaintext if map not found.
- * @param mode Code Mirror mode
- * @returns Monaco language
- */
-export function mapCodeMirrorModeToMonaco(mode: string | { name: string }): string {
-  let language = "";
-
-  // Parse codemirror mode object
-  if (typeof mode === "string") {
-    language = mode;
-  }
-  // Vanilla object
-  else if (typeof mode === "object" && mode.name) {
-    language = mode.name;
-  }
-  // Immutable Map
-  else if (Immutable.Map.isMap(mode) && mode.has("name")) {
-    language = mode.get("name");
-  }
-
-  // Need to handle "ipython" as a special case since it is not a registered language
-  if (language === "ipython") {
-    return Mode.python;
-  } else if (language === "text/x-csharp") {
-    return Mode.csharp;
-  } else if (monaco.languages.getEncodedLanguageId(language) > 0) {
-    return language;
-  }
-  return Mode.raw;
-}
--- a/src/Explorer/Notebook/MonacoEditor/editor-base.ts
+++ b/src/Explorer/Notebook/MonacoEditor/editor-base.ts
@@ -1,76 +0,0 @@
-// Disable linting on file since we will be moving the code below to nteract which have different rules configured.
-// tslint:disable:variable-name
-// tslint:disable:interface-name
-
-/**
- * TODO: Create new editor-base package in nteract repo and move all code below to new package.
- */
-
-import { createMessage } from "@nteract/messaging";
-
-/**
- * Jupyter messaging protocol's _jupyter_types_experimental completion result.
- */
-interface CompletionResult {
-  end: number;
-  start: number;
-  type: string;
-  text: string;
-  displayText?: string;
-}
-
-/**
- * Juptyer completion match item.
- */
-export type CompletionMatch = string | CompletionResult;
-
-/**
- * Jupyter messaging protocol's complete_reply response.
- */
-export interface CompletionResults {
-  status: string;
-  cursor_start: number;
-  cursor_end: number;
-  matches: CompletionMatch[];
-  metadata?: {
-    _jupyter_types_experimental?: unknown;
-  };
-}
-
-/**
- * Create Jupyter messaging protocol's complete_request message.
- * @param code Code of editor.
- * @param cursorPos cursor position represented in the Jupyter messaging protocol (character position)
- */
-export const completionRequest = (code: string, cursorPos: number) =>
-  createMessage("complete_request", {
-    content: {
-      code,
-      cursor_pos: cursorPos
-    }
-  });
-
-/**
- * JavaScript stores text as utf16 and string indices use "code units",
- * which stores high-codepoint characters as "surrogate pairs",
- * which occupy two indices in the JavaScript string.
- * We need to translate cursor_pos in the protocol (in characters)
- * to js offset (with surrogate pairs taking two spots).
- * @param js_idx JavaScript index
- * @param text Text
- */
-export const js_idx_to_char_idx: (js_idx: number, text: string) => number = (js_idx: number, text: string): number => {
-  let char_idx: number = js_idx;
-  for (let i = 0; i + 1 < text.length && i < js_idx; i++) {
-    const char_code: number = text.charCodeAt(i);
-    // check for surrogate pair
-    if (char_code >= 0xd800 && char_code <= 0xdbff) {
-      const next_char_code: number = text.charCodeAt(i + 1);
-      if (next_char_code >= 0xdc00 && next_char_code <= 0xdfff) {
-        char_idx--;
-        i++;
-      }
-    }
-  }
-  return char_idx;
-};
--- a/src/Explorer/Notebook/MonacoEditor/monaco.ts
+++ b/src/Explorer/Notebook/MonacoEditor/monaco.ts
@@ -1,10 +0,0 @@
-export * from "monaco-editor/esm/vs/editor/editor.api";
-
-// /**
-//  * Set the custom worker url to workaround the cross-domain issue with creating web worker
-//  * See https://github.com/microsoft/monaco-editor/blob/master/docs/integrate-amd-cross.md for more details
-//  * This step has to be executed after a importing of monaco-editor once per chunk to make sure
-//  * the custom worker url overwrites the one from monaco-editor module itself.
-//  */
-// import { setMonacoWorkerUrl } from "./workerUrl";
-// setMonacoWorkerUrl();
--- a/src/Explorer/Notebook/MonacoEditor/selectors.ts
+++ b/src/Explorer/Notebook/MonacoEditor/selectors.ts
@@ -1,67 +0,0 @@
-import { AppState, ContentRef, selectors as nteractSelectors } from "@nteract/core";
-import { CellId } from "@nteract/commutable";
-import { Mode, mapCodeMirrorModeToMonaco } from "./converter";
-
-/**
- * Returns the language to use for syntax highlighting and autocompletion in the Monaco Editor for a given cell, falling back to the notebook language if one for the cell is not defined.
- */
-export const getCellMonacoLanguage = (
-  state: AppState,
-  contentRef: ContentRef,
-  cellId: CellId,
-  cellLanguageOverride?: string,
-  notebookLanguageOverride?: string
-): string => {
-  const model = nteractSelectors.model(state, { contentRef });
-  if (!model || model.type !== "notebook") {
-    throw new Error("Connected Editor components should not be used with non-notebook models");
-  }
-
-  const cell = nteractSelectors.notebook.cellById(model, { id: cellId });
-  if (!cell) {
-    throw new Error("Invalid cell id");
-  }
-
-  switch (cell.cell_type) {
-    case "markdown":
-      return Mode.markdown;
-    case "raw":
-      return Mode.raw;
-    case "code":
-      if (cellLanguageOverride) {
-        return mapCodeMirrorModeToMonaco(cellLanguageOverride);
-      } else {
-        // Fall back to notebook language if cell language isn't present.
-        return getNotebookMonacoLanguage(state, contentRef, notebookLanguageOverride);
-      }
-  }
-};
-
-/**
- * Returns the language to use for syntax highlighting and autocompletion in the Monaco Editor for a given notebook.
- */
-export const getNotebookMonacoLanguage = (
-  state: AppState,
-  contentRef: ContentRef,
-  notebookLanguageOverride?: string
-): string => {
-  const model = nteractSelectors.model(state, { contentRef });
-  if (!model || model.type !== "notebook") {
-    throw new Error("Connected Editor components should not be used with non-notebook models");
-  }
-
-  if (notebookLanguageOverride) {
-    return mapCodeMirrorModeToMonaco(notebookLanguageOverride);
-  }
-
-  const kernelRef = model.kernelRef;
-  let codeMirrorMode;
-  // Try to get the CodeMirror mode from the kernel.
-  if (kernelRef) {
-    codeMirrorMode = nteractSelectors.kernel(state, { kernelRef })?.info?.codemirrorMode;
-  }
-  // As a fallback, get the CodeMirror mode from the notebook itself.
-  codeMirrorMode = codeMirrorMode ?? nteractSelectors.notebook.codeMirrorMode(model);
-
-  return mapCodeMirrorModeToMonaco(codeMirrorMode);
-};
--- a/src/Explorer/Notebook/MonacoEditor/styles.css
+++ b/src/Explorer/Notebook/MonacoEditor/styles.css
@@ -1,22 +0,0 @@
-/*
-For the following components, we use the inherited width values from monaco-container.
-On resizing the browser, the width of monaco-container will be calculated
-and we just use the calculated width for the following components
-So we don't need to use Monaco editor's layout() function which is expensive operation and causes performance issues on resizing.
-*/
-/*
-TODO: These styles below are added for resizing perf improvement.
-Once the virtualization is implemented, we will revisit this later.
- */
-.monaco-container .monaco-editor {
-  width: inherit !important;
-}
-
-.monaco-container .monaco-editor .overflow-guard {
-  width: inherit !important;
-}
-
-/* 26px is the left margin for .monaco-scrollable-element  */
-.monaco-container .monaco-editor .monaco-scrollable-element.editor-scrollable.vs {
-  width: calc(100% - 26px) !important;
-}
--- a/src/Explorer/Notebook/MonacoEditor/theme.ts
+++ b/src/Explorer/Notebook/MonacoEditor/theme.ts
@@ -1,75 +0,0 @@
-import * as monaco from "./monaco";
-
-// TODO: move defineTheme calls to an initialization function
-
-/**
- * The default light theme with customized background
- */
-export const LightThemeName = "vs-light";
-
-/**
- * Default monaco theme for light theme
- */
-export const customMonacoLightTheme: monaco.editor.IStandaloneThemeData = {
-  base: "vs", // Derive from default light theme of Monaco
-  inherit: true,
-  rules: [],
-  colors: {
-    // We want Monaco background to use the same background for our themes.
-    // Without this, the Monaco light theme has a yellowish tone.
-    // Verified with UX that white meets all the accessbility requirements for light
-    // and high contrast light theme.
-    "editor.background": "#FFFFFF"
-  }
-};
-
-monaco.editor.defineTheme(LightThemeName, customMonacoLightTheme);
-
-/**
- * The default dark theme with customized background
- */
-export const DarkThemeName = "aznb-dark";
-
-/**
- * Default monaco theme for dark theme
- */
-export const customMonacoDarkTheme: monaco.editor.IStandaloneThemeData = {
-  base: "vs-dark", // Derive from default dark theme of Monaco
-  inherit: true,
-  rules: [],
-  colors: {
-    "editor.background": "#1b1a19"
-  }
-};
-
-monaco.editor.defineTheme(DarkThemeName, customMonacoDarkTheme);
-
-/**
- * The custom high contrast light theme with customized background
- */
-export const HCLightThemeName = "hc-light";
-
-/**
- * Default monaco theme for light high contrast mode
- */
-export const customMonacoHCLightTheme: monaco.editor.IStandaloneThemeData = {
-  base: "vs", // Derive from default light theme of Monaco; change all grey colors to black to comply with highcontrast rules
-  inherit: true,
-  rules: [
-    { token: "annotation", foreground: "000000" },
-    { token: "delimiter.html", foreground: "000000" },
-    { token: "operator.scss", foreground: "000000" },
-    { token: "operator.sql", foreground: "000000" },
-    { token: "operator.swift", foreground: "000000" },
-    { token: "predefined.sql", foreground: "000000" }
-  ],
-  colors: {
-    // We want Monaco background to use the same background for our themes.
-    // Without this, the Monaco light theme has a yellowish tone.
-    // Verified with UX that white meets all the accessbility requirements for light
-    // and high contrast light theme.
-    "editor.background": "#FFFFFF"
-  }
-};
-
-monaco.editor.defineTheme(HCLightThemeName, customMonacoHCLightTheme);
--- a/src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
+++ b/src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
@@ -8,7 +8,6 @@ import { actions, createContentRef, createKernelRef, selectors } from "@nteract/
 import VirtualCommandBarComponent from "./VirtualCommandBarComponent";
 import { NotebookContentItem } from "../NotebookContentItem";
 import { NotebookComponentBootstrapper } from "./NotebookComponentBootstrapper";
-import { CdbAppState } from "./types";

 export interface NotebookComponentAdapterOptions {
  contentItem: NotebookContentItem;
@@ -19,7 +18,6 @@ export interface NotebookComponentAdapterOptions {

 export class NotebookComponentAdapter extends NotebookComponentBootstrapper implements ReactAdapter {
  private onUpdateKernelInfo: () => void;
-  public getNotebookParentElement: () => HTMLElement;
  public parameters: any;

  constructor(options: NotebookComponentAdapterOptions) {
@@ -46,11 +44,6 @@ export class NotebookComponentAdapter extends NotebookComponentBootstrapper impl
        })
      );
    }
-
-    this.getNotebookParentElement = () => {
-      const cdbAppState = this.getStore().getState() as CdbAppState;
-      return cdbAppState.cdb.currentNotebookParentElements.get(this.contentRef);
-    };
  }

  protected renderExtraComponent = (): JSX.Element => {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Steve Faulkner	6870bd9b54	Tweaks	2020-07-23 21:53:46 -05:00
Steve Faulkner	8aeff8fb45	Tweaks	2020-07-23 21:52:05 -05:00
Steve Faulkner	ee6f635458	Tweak	2020-07-23 19:03:43 -05:00
Steve Faulkner	ad115a2cce	Functional version	2020-07-23 19:02:09 -05:00
Steve Faulkner	0c255a55c8	Fix strict	2020-07-23 18:40:55 -05:00
Steve Faulkner	08e84d93b5	Delete -> destory	2020-07-23 18:20:16 -05:00
Steve Faulkner	e2895b62b4	More updates	2020-07-23 18:18:58 -05:00
Steve Faulkner	155aacdf63	Sanitize usage of delete	2020-07-23 18:17:30 -05:00
Steve Faulkner	f4f2d00d7f	More tweaks	2020-07-23 18:12:58 -05:00
Steve Faulkner	f1812077e9	Split up generators	2020-07-23 16:35:05 -05:00
Steve Faulkner	cfe9bd8303	More updates	2020-07-23 11:17:20 -05:00
Steve Faulkner	9db8d11801	Setup Namespaces	2020-07-22 22:40:29 -05:00
Steve Faulkner	769a2e7d1c	more tweaks	2020-07-22 21:56:45 -05:00
Steve Faulkner	df544f88b2	First pass at a generated ARM client	2020-07-22 21:37:13 -05:00