diff --git a/package-lock.json b/package-lock.json
index 08f1a37d86..f0f45c326b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,41 +67,6 @@
         }
       }
     },
-    "@apollo/protobufjs": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.2.tgz",
-      "integrity": "sha512-vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ==",
-      "requires": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.0",
-        "@types/node": "^10.1.0",
-        "long": "^4.0.0"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "10.17.59",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.59.tgz",
-          "integrity": "sha512-7Uc8IRrL8yZz5ti45RaFxpbU8TxlzdC3HvxV+hOWo1EyLsuKv/w7y0n+TwZzwL3vdx3oZ2k3ubxPq131hNtXyg=="
-        }
-      }
-    },
-    "@apollographql/apollo-tools": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.0.tgz",
-      "integrity": "sha512-7IOZHVaKjBq44StXFJEITl4rxgZCsZFSWogAvIErKR9DYV20rt9bJ2mY5lCn+zghfGrweykjLb9g4TDxLg750w==",
-      "requires": {
-        "apollo-env": "^0.10.0"
-      }
-    },
     "@apollographql/graphql-playground-html": {
       "version": "1.6.27",
       "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz",
@@ -110,20 +75,6 @@
         "xss": "^1.0.8"
       }
     },
-    "@apollographql/graphql-upload-8-fork": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz",
-      "integrity": "sha512-ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g==",
-      "requires": {
-        "@types/express": "*",
-        "@types/fs-capacitor": "*",
-        "@types/koa": "*",
-        "busboy": "^0.3.1",
-        "fs-capacitor": "^2.0.4",
-        "http-errors": "^1.7.3",
-        "object-path": "^0.11.4"
-      }
-    },
     "@ardatan/aggregate-error": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.6.tgz",
@@ -1191,6 +1142,19 @@
         "kuler": "^2.0.0"
       }
     },
+    "@envelop/core": {
+      "version": "0.1.5-alpha-5e39864.0",
+      "resolved": "https://registry.npmjs.org/@envelop/core/-/core-0.1.5-alpha-5e39864.0.tgz",
+      "integrity": "sha512-CxgB1YxI0ldbMFBspuPk5xgd1yXZy+fJCrZ6chkys8AgXWO0+UmXUZS8Cixva7w+HNxjYSSuKUQMEoSKs8aCpQ==",
+      "requires": {
+        "@envelop/types": "0.1.4"
+      }
+    },
+    "@envelop/types": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@envelop/types/-/types-0.1.4.tgz",
+      "integrity": "sha512-sXVv1u3qpm+LDT/Rr/z5Abome4ayoisUSkyRRgvQrhqysg5W1WWDaUzGtqvrw//nkfFUsolAVSHPDAUWcDbppQ=="
+    },
     "@graphql-tools/batch-delegate": {
       "version": "6.2.6",
       "resolved": "https://registry.npmjs.org/@graphql-tools/batch-delegate/-/batch-delegate-6.2.6.tgz",
@@ -1452,11 +1416,6 @@
         }
       }
     },
-    "@josephg/resolvable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.1.tgz",
-      "integrity": "sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg=="
-    },
     "@napi-rs/triples": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@napi-rs/triples/-/triples-1.0.2.tgz",
@@ -1675,60 +1634,6 @@
         }
       }
     },
-    "@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
-    },
-    "@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
-    },
-    "@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
-    },
-    "@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
-    },
-    "@protobufjs/fetch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
-      "requires": {
-        "@protobufjs/aspromise": "^1.1.1",
-        "@protobufjs/inquire": "^1.1.0"
-      }
-    },
-    "@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
-    },
-    "@protobufjs/inquire": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
-    },
-    "@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
-    },
-    "@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
-    },
-    "@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
-    },
     "@samverschueren/stream-to-observable": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
@@ -1758,14 +1663,6 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
     },
-    "@types/accepts": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
-      "integrity": "sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/body-parser": {
       "version": "1.19.0",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
@@ -1795,27 +1692,6 @@
         "@types/node": "*"
       }
     },
-    "@types/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg=="
-    },
-    "@types/cookies": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.6.tgz",
-      "integrity": "sha512-FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w==",
-      "requires": {
-        "@types/connect": "*",
-        "@types/express": "*",
-        "@types/keygrip": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/cors": {
-      "version": "2.8.10",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz",
-      "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="
-    },
     "@types/express": {
       "version": "4.17.7",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.7.tgz",
@@ -1854,30 +1730,12 @@
         "@types/express": "*"
       }
     },
-    "@types/fs-capacitor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz",
-      "integrity": "sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/http-assert": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz",
-      "integrity": "sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ=="
-    },
     "@types/http-cache-semantics": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
       "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
       "dev": true
     },
-    "@types/http-errors": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.8.0.tgz",
-      "integrity": "sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA=="
-    },
     "@types/istanbul-lib-coverage": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
@@ -1903,11 +1761,6 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "@types/keygrip": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz",
-      "integrity": "sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw=="
-    },
     "@types/keyv": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
@@ -1917,34 +1770,6 @@
         "@types/node": "*"
       }
     },
-    "@types/koa": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.13.1.tgz",
-      "integrity": "sha512-Qbno7FWom9nNqu0yHZ6A0+RWt4mrYBhw3wpBAQ3+IuzGcLlfeYkzZrnMq5wsxulN2np8M4KKeUpTodsOsSad5Q==",
-      "requires": {
-        "@types/accepts": "*",
-        "@types/content-disposition": "*",
-        "@types/cookies": "*",
-        "@types/http-assert": "*",
-        "@types/http-errors": "*",
-        "@types/keygrip": "*",
-        "@types/koa-compose": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/koa-compose": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz",
-      "integrity": "sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==",
-      "requires": {
-        "@types/koa": "*"
-      }
-    },
-    "@types/long": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
-      "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
-    },
     "@types/mime": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -1955,15 +1780,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
       "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="
     },
-    "@types/node-fetch": {
-      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.10.tgz",
-      "integrity": "sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==",
-      "requires": {
-        "@types/node": "*",
-        "form-data": "^3.0.0"
-      }
-    },
     "@types/parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
@@ -1998,14 +1814,6 @@
         "@types/node": "*"
       }
     },
-    "@types/ws": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.2.tgz",
-      "integrity": "sha512-PbeN0Eydl7LQl4OIav29YmkO2LxbVuz3nZD/kb19lOS+wLgIkRbWMNmU/QQR7ABpOJ7D7xDOU8co7iohObewrw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/yargs": {
       "version": "15.0.13",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
@@ -2336,15 +2144,6 @@
         }
       }
     },
-    "apollo-cache-control": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.13.0.tgz",
-      "integrity": "sha512-ImUXwVc/8K9QA3mQiKbKw8bOS4lMNL4DoP4hldIx+gwna8dgh3gBChgxW5guMOhcvH/55ximS7ZNWUglFmQY4Q==",
-      "requires": {
-        "apollo-server-env": "^3.1.0",
-        "apollo-server-plugin-base": "^0.12.0"
-      }
-    },
     "apollo-cache-inmemory": {
       "version": "1.6.6",
       "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz",
@@ -2415,43 +2214,6 @@
         }
       }
     },
-    "apollo-datasource": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.9.0.tgz",
-      "integrity": "sha512-y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA==",
-      "requires": {
-        "apollo-server-caching": "^0.7.0",
-        "apollo-server-env": "^3.1.0"
-      }
-    },
-    "apollo-env": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.10.0.tgz",
-      "integrity": "sha512-7Geot+eyOl4jzPi9beiszeDmEEVZOVT11LSlkQluF5eaCNaIvld+xklZxITZGI/Wr+PQX380YJgQt1ndR2GtOg==",
-      "requires": {
-        "@types/node-fetch": "^2.5.10",
-        "core-js": "^3.0.1",
-        "node-fetch": "^2.6.1",
-        "sha.js": "^2.4.11"
-      }
-    },
-    "apollo-graphql": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.9.2.tgz",
-      "integrity": "sha512-+c/vqC2LPq3e5kO7MfBxDDiljzLog/THZr9Pd46HVaKAhHUxFL0rJEbT17VhjdOoZGWFWLYG7x9hiN6EQD1xZQ==",
-      "requires": {
-        "core-js-pure": "^3.10.2",
-        "lodash.sortby": "^4.7.0",
-        "sha.js": "^2.4.11"
-      },
-      "dependencies": {
-        "core-js-pure": {
-          "version": "3.11.3",
-          "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.3.tgz",
-          "integrity": "sha512-1c18Ef3sZh3l6R0I5ciNVxAfXxlQDW/6IoCayUvut4UipK3Ut682iuzhlEaHb4RITkLrzevUB+q/TEVbOA0p6g=="
-        }
-      }
-    },
     "apollo-link": {
       "version": "1.2.14",
       "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz",
@@ -2526,219 +2288,6 @@
         }
       }
     },
-    "apollo-reporting-protobuf": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.7.0.tgz",
-      "integrity": "sha512-PC+zDqPPJcseemqmvUEqFiDi45pz6UaPWt6czgmrrbcQ+9VWp6IEkm08V5xBKk7V1WGUw19YwiJ7kqXpcgVNyw==",
-      "requires": {
-        "@apollo/protobufjs": "1.2.2"
-      }
-    },
-    "apollo-server-caching": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz",
-      "integrity": "sha512-MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw==",
-      "requires": {
-        "lru-cache": "^6.0.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        }
-      }
-    },
-    "apollo-server-core": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.24.0.tgz",
-      "integrity": "sha512-uW7gykPzhin9fLgSvciN8tX7098mHnUM79W3+fWfK5J415JidIqW9O+JhYmEPo6BCgosu0cKSdYe7NB+FP4lFQ==",
-      "requires": {
-        "@apollographql/apollo-tools": "^0.5.0",
-        "@apollographql/graphql-playground-html": "1.6.27",
-        "@apollographql/graphql-upload-8-fork": "^8.1.3",
-        "@josephg/resolvable": "^1.0.0",
-        "@types/ws": "^7.0.0",
-        "apollo-cache-control": "^0.13.0",
-        "apollo-datasource": "^0.9.0",
-        "apollo-graphql": "^0.9.0",
-        "apollo-reporting-protobuf": "^0.7.0",
-        "apollo-server-caching": "^0.7.0",
-        "apollo-server-env": "^3.1.0",
-        "apollo-server-errors": "^2.5.0",
-        "apollo-server-plugin-base": "^0.12.0",
-        "apollo-server-types": "^0.8.0",
-        "apollo-tracing": "^0.14.0",
-        "async-retry": "^1.2.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graphql-extensions": "^0.14.0",
-        "graphql-tag": "^2.11.0",
-        "graphql-tools": "^4.0.8",
-        "loglevel": "^1.6.7",
-        "lru-cache": "^6.0.0",
-        "sha.js": "^2.4.11",
-        "subscriptions-transport-ws": "^0.9.11",
-        "uuid": "^8.0.0",
-        "ws": "^6.0.0"
-      },
-      "dependencies": {
-        "apollo-server-types": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.8.0.tgz",
-          "integrity": "sha512-adHJnHbRV2kWUY0VQY1M2KpSdGfm+4mX4w+2lROPExqOnkyTI7CGfpJCdEwYMKrIn3aH8HIcOH0SnpWRet6TNw==",
-          "requires": {
-            "apollo-reporting-protobuf": "^0.7.0",
-            "apollo-server-caching": "^0.7.0",
-            "apollo-server-env": "^3.1.0"
-          }
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "ws": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
-      }
-    },
-    "apollo-server-env": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.1.0.tgz",
-      "integrity": "sha512-iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ==",
-      "requires": {
-        "node-fetch": "^2.6.1",
-        "util.promisify": "^1.0.0"
-      }
-    },
-    "apollo-server-errors": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz",
-      "integrity": "sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="
-    },
-    "apollo-server-express": {
-      "version": "2.23.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.23.0.tgz",
-      "integrity": "sha512-tzil7c51ODH0rT1Bc5VMksdWzHrYGavdLtnDz4M0ePiTm18Gc81HD7X/4DPczorerEpfwwkf2YlADtPQfRSxlw==",
-      "requires": {
-        "@apollographql/graphql-playground-html": "1.6.27",
-        "@types/accepts": "^1.3.5",
-        "@types/body-parser": "1.19.0",
-        "@types/cors": "2.8.10",
-        "@types/express": "4.17.11",
-        "@types/express-serve-static-core": "4.17.19",
-        "accepts": "^1.3.5",
-        "apollo-server-core": "^2.23.0",
-        "apollo-server-types": "^0.7.0",
-        "body-parser": "^1.18.3",
-        "cors": "^2.8.5",
-        "express": "^4.17.1",
-        "graphql-subscriptions": "^1.0.0",
-        "graphql-tools": "^4.0.8",
-        "parseurl": "^1.3.2",
-        "subscriptions-transport-ws": "^0.9.16",
-        "type-is": "^1.6.16"
-      },
-      "dependencies": {
-        "@types/express": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz",
-          "integrity": "sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==",
-          "requires": {
-            "@types/body-parser": "*",
-            "@types/express-serve-static-core": "^4.17.18",
-            "@types/qs": "*",
-            "@types/serve-static": "*"
-          }
-        },
-        "@types/express-serve-static-core": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz",
-          "integrity": "sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==",
-          "requires": {
-            "@types/node": "*",
-            "@types/qs": "*",
-            "@types/range-parser": "*"
-          }
-        }
-      }
-    },
-    "apollo-server-plugin-base": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.12.0.tgz",
-      "integrity": "sha512-jnNIztYz34ImE7off0t9LwseGCR/J0H1wlbiBGvdXvQY+ZiMfVF2oF8KdSAPxG2vT6scvWP4GFS/FsZcOyP1Xw==",
-      "requires": {
-        "apollo-server-types": "^0.8.0"
-      },
-      "dependencies": {
-        "apollo-server-types": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.8.0.tgz",
-          "integrity": "sha512-adHJnHbRV2kWUY0VQY1M2KpSdGfm+4mX4w+2lROPExqOnkyTI7CGfpJCdEwYMKrIn3aH8HIcOH0SnpWRet6TNw==",
-          "requires": {
-            "apollo-reporting-protobuf": "^0.7.0",
-            "apollo-server-caching": "^0.7.0",
-            "apollo-server-env": "^3.1.0"
-          }
-        }
-      }
-    },
-    "apollo-server-types": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.7.0.tgz",
-      "integrity": "sha512-pJ6ri2N4xJ+e2PUUPHeCNpMDzHUagJyn0DDZGQmXDz6aoMlSd4B2KUvK81hHyHkw3wHk9clgcpfM9hKqbfZweA==",
-      "requires": {
-        "apollo-reporting-protobuf": "^0.6.2",
-        "apollo-server-caching": "^0.6.0",
-        "apollo-server-env": "^3.0.0"
-      },
-      "dependencies": {
-        "apollo-reporting-protobuf": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.2.tgz",
-          "integrity": "sha512-WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw==",
-          "requires": {
-            "@apollo/protobufjs": "^1.0.3"
-          }
-        },
-        "apollo-server-caching": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.6.0.tgz",
-          "integrity": "sha512-SfjKaccrhRzUQ8TAke9FrYppp4pZV3Rp8KCs+4Ox3kGtbco68acRPJkiYYtSVc4idR8XNAUOOVfAEZVNHdZQKQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        }
-      }
-    },
-    "apollo-tracing": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.14.0.tgz",
-      "integrity": "sha512-KH4mOoicZ2CQkEYVuNP9avJth59LwNqku3fKZ4S0UYE1RfxzIoLLsEyuY8MuJEgNdtKKfkX5G5Kn5Rp4LCJ4RQ==",
-      "requires": {
-        "apollo-server-env": "^3.1.0",
-        "apollo-server-plugin-base": "^0.12.0"
-      }
-    },
     "apollo-upload-client": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz",
@@ -2920,14 +2469,6 @@
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
       "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
     },
-    "async-retry": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz",
-      "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==",
-      "requires": {
-        "retry": "0.12.0"
-      }
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -3402,6 +2943,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -4063,11 +3605,6 @@
       "dev": true,
       "optional": true
     },
-    "core-js": {
-      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.3.tgz",
-      "integrity": "sha512-DFEW9BllWw781Op5KdYGtXfj3s9Cmykzt16bY6elaVuqXHCUwF/5pv0H3IJ7/I3BGjK7OeU+GrjD1ChCkBJPuA=="
-    },
     "core-js-compat": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.1.tgz",
@@ -4438,6 +3975,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
       "requires": {
         "object-keys": "^1.0.12"
       }
@@ -4550,11 +4088,6 @@
         }
       }
     },
-    "deprecated-decorator": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz",
-      "integrity": "sha1-AJZjF7ehL+kvPMgx91g68ym4bDc="
-    },
     "destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -5052,39 +4585,6 @@
         }
       }
     },
-    "es-abstract": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
-      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.2",
-        "is-string": "^1.0.5",
-        "object-inspect": "^1.9.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.0"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
     "es5-ext": {
       "version": "0.10.53",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
@@ -6156,14 +5656,6 @@
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.0.tgz",
       "integrity": "sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg=="
     },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -6222,11 +5714,6 @@
       "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
       "dev": true
     },
-    "fs-capacitor": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.4.tgz",
-      "integrity": "sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA=="
-    },
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -6270,7 +5757,8 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -6319,6 +5807,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
       "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -6517,27 +6006,10 @@
       "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz",
       "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA=="
     },
-    "graphql-extensions": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.14.0.tgz",
-      "integrity": "sha512-DFtD8G+6rSj/Xhtb0IPh4A/sB/qcSEm9MTS221ESCx+axrsME92wGEsr7ihVjn1/tEEIy+9V5lUQOH/dHkCb0A==",
-      "requires": {
-        "@apollographql/apollo-tools": "^0.5.0",
-        "apollo-server-env": "^3.1.0",
-        "apollo-server-types": "^0.8.0"
-      },
-      "dependencies": {
-        "apollo-server-types": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.8.0.tgz",
-          "integrity": "sha512-adHJnHbRV2kWUY0VQY1M2KpSdGfm+4mX4w+2lROPExqOnkyTI7CGfpJCdEwYMKrIn3aH8HIcOH0SnpWRet6TNw==",
-          "requires": {
-            "apollo-reporting-protobuf": "^0.7.0",
-            "apollo-server-caching": "^0.7.0",
-            "apollo-server-env": "^3.1.0"
-          }
-        }
-      }
+    "graphql-helix": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/graphql-helix/-/graphql-helix-1.6.0.tgz",
+      "integrity": "sha512-/u9W3hTwMA95gM1yWNLlB2kOp/4y3yvAaA12G9rRUv4Y21d/D1Q6SCVJVEyvA2vJU/6JK1DFOewMap+rqFEQZg=="
     },
     "graphql-list-fields": {
       "version": "2.0.2",
@@ -6559,14 +6031,6 @@
         }
       }
     },
-    "graphql-subscriptions": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz",
-      "integrity": "sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g==",
-      "requires": {
-        "iterall": "^1.3.0"
-      }
-    },
     "graphql-tag": {
       "version": "2.12.2",
       "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.2.tgz",
@@ -6582,25 +6046,6 @@
         }
       }
     },
-    "graphql-tools": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz",
-      "integrity": "sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg==",
-      "requires": {
-        "apollo-link": "^1.2.14",
-        "apollo-utilities": "^1.0.1",
-        "deprecated-decorator": "^0.1.6",
-        "iterall": "^1.1.3",
-        "uuid": "^3.1.0"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        }
-      }
-    },
     "graphql-upload": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/graphql-upload/-/graphql-upload-11.0.0.tgz",
@@ -6620,6 +6065,11 @@
         }
       }
     },
+    "graphql-ws": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.5.1.tgz",
+      "integrity": "sha512-GE7vCMKe2D7fc0ugkM1V8QMneHcbV9c3BpPBzdlW/Uzkqv0F/zZq9DDHxLzg55ZhE5OSLL+n/gyqAMPgH59hcw=="
+    },
     "graphviz": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.9.tgz",
@@ -6647,15 +6097,11 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
     },
-    "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
-    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -6671,7 +6117,8 @@
     "has-symbols": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true
     },
     "has-to-string-tag-x": {
       "version": "1.4.1",
@@ -7172,11 +6619,6 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
-    "is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="
-    },
     "is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
@@ -7187,14 +6629,6 @@
         "binary-extensions": "^1.0.0"
       }
     },
-    "is-boolean-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
-      "requires": {
-        "call-bind": "^1.0.0"
-      }
-    },
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -7202,11 +6636,6 @@
       "dev": true,
       "optional": true
     },
-    "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
-    },
     "is-core-module": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
@@ -7238,11 +6667,6 @@
         }
       }
     },
-    "is-date-object": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.3.tgz",
-      "integrity": "sha512-tDpEUInNcy2Yw3lNSepK3Wdw1RnXLcIVienz6Ou631Acl15cJyRWK4dgA1vCmOEgIbtOV0W7MHg+AR2Gdg1NXQ=="
-    },
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -7333,11 +6757,6 @@
       "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
       "dev": true
     },
-    "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
-    },
     "is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -7360,11 +6779,6 @@
         }
       }
     },
-    "is-number-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="
-    },
     "is-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
@@ -7407,15 +6821,6 @@
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
     },
-    "is-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
-      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.1"
-      }
-    },
     "is-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
@@ -7439,19 +6844,6 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
       "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
     },
-    "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -8491,11 +7883,6 @@
       "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
       "dev": true
     },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
-    },
     "lodash.startswith": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/lodash.startswith/-/lodash.startswith-4.2.1.tgz",
@@ -8643,16 +8030,6 @@
         }
       }
     },
-    "loglevel": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
-      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="
-    },
-    "long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
-    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -9689,15 +9066,11 @@
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz",
       "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ=="
     },
-    "object-inspect": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
-      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA=="
-    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
     },
     "object-path": {
       "version": "0.11.5",
@@ -9727,6 +9100,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
       "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
@@ -9734,16 +9108,6 @@
         "object-keys": "^1.1.1"
       }
     },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
-      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
-      }
-    },
     "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -10993,11 +10357,6 @@
       "dev": true,
       "optional": true
     },
-    "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
-    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -11248,15 +10607,6 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -11655,24 +11005,6 @@
         "strip-ansi": "^3.0.0"
       }
     },
-    "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -11803,6 +11135,33 @@
         }
       }
     },
+    "subscriptions-transport-ws-envelop": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/subscriptions-transport-ws-envelop/-/subscriptions-transport-ws-envelop-0.1.0.tgz",
+      "integrity": "sha512-BZ8SIOL4vIS+slX60TKKhszAsB52dwY8Nr5Lu0qzdH1W0sCq46B3anBoYC3WkVzypo5ZrOlKdYXYcZNJpDEXVA==",
+      "requires": {
+        "backo2": "^1.0.2",
+        "eventemitter3": "^3.1.2",
+        "iterall": "^1.3.0",
+        "symbol-observable": "^1.2.0",
+        "ws": "^5.2.2"
+      },
+      "dependencies": {
+        "symbol-observable": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+          "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
+        },
+        "ws": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -12226,17 +11585,6 @@
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
       "dev": true
     },
-    "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
     "unbzip2-stream": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
@@ -12423,18 +11771,6 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "util.promisify": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz",
-      "integrity": "sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==",
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "for-each": "^0.3.3",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.1"
-      }
-    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -12498,18 +11834,6 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
diff --git a/package.json b/package.json
index 634099c425..339320923a 100644
--- a/package.json
+++ b/package.json
@@ -20,12 +20,12 @@
   "license": "BSD-3-Clause",
   "dependencies": {
     "@apollographql/graphql-playground-html": "1.6.27",
+    "@envelop/core": "0.1.5-alpha-5e39864.0",
     "@graphql-tools/links": "6.2.5",
     "@graphql-tools/stitch": "6.2.4",
     "@graphql-tools/utils": "6.2.4",
     "@parse/fs-files-adapter": "1.2.0",
     "@parse/push-adapter": "3.4.0",
-    "apollo-server-express": "2.23.0",
     "bcryptjs": "2.4.3",
     "body-parser": "1.19.0",
     "commander": "5.1.0",
@@ -34,10 +34,12 @@
     "express": "4.17.1",
     "follow-redirects": "1.14.0",
     "graphql": "15.5.0",
+    "graphql-helix": "1.6.0",
     "graphql-list-fields": "2.0.2",
     "graphql-relay": "0.6.0",
     "graphql-tag": "2.12.2",
     "graphql-upload": "11.0.0",
+    "graphql-ws": "4.5.1",
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "1.12.3",
@@ -54,6 +56,7 @@
     "redis": "3.1.2",
     "semver": "7.3.4",
     "subscriptions-transport-ws": "0.9.18",
+    "subscriptions-transport-ws-envelop": "0.1.0",
     "tv4": "1.3.0",
     "uuid": "8.3.2",
     "winston": "3.3.3",
diff --git a/spec/ParseGraphQLServer.spec.js b/spec/ParseGraphQLServer.spec.js
index b8673cbe22..e97c6d8b7f 100644
--- a/spec/ParseGraphQLServer.spec.js
+++ b/spec/ParseGraphQLServer.spec.js
@@ -120,6 +120,33 @@ describe('ParseGraphQLServer', () => {
     });
   });
 
+  describe('_getGraphQLSchema', () => {
+    it('should load GraphQL schema in every call', async () => {
+      const originalLoad = parseGraphQLServer.parseGraphQLSchema.load;
+      let counter = 0;
+      parseGraphQLServer.parseGraphQLSchema.load = () => ++counter;
+      expect(await parseGraphQLServer._getGraphQLSchema()).toEqual(1);
+      expect(await parseGraphQLServer._getGraphQLSchema()).toEqual(2);
+      expect(await parseGraphQLServer._getGraphQLSchema()).toEqual(3);
+      parseGraphQLServer.parseGraphQLSchema.load = originalLoad;
+    });
+  });
+
+  describe('_getEnveloped', () => {
+    const request = {
+      info: new Object(),
+      config: new Object(),
+      auth: new Object(),
+    };
+    it("should return object with contextFactory function that creates context with req's info, config and auth", async () => {
+      const { contextFactory } = await parseGraphQLServer._getEnveloped();
+      const context = await contextFactory({ request });
+      expect(context.info).toEqual(request.info);
+      expect(context.config).toEqual(request.config);
+      expect(context.auth).toEqual(request.auth);
+    });
+  });
+
   describe('_transformMaxUploadSizeToBytes', () => {
     it('should transform to bytes', () => {
       expect(parseGraphQLServer._transformMaxUploadSizeToBytes('20mb')).toBe(20971520);
@@ -501,13 +528,18 @@ describe('ParseGraphQLServer', () => {
 
       it('should handle Parse headers', async () => {
         let checked = false;
-        const originalGetGraphQLOptions = parseGraphQLServer._getGraphQLOptions;
-        parseGraphQLServer._getGraphQLOptions = async req => {
-          expect(req.info).toBeDefined();
-          expect(req.config).toBeDefined();
-          expect(req.auth).toBeDefined();
+        const originalGetEnveloped = parseGraphQLServer._getEnveloped.bind(parseGraphQLServer);
+        parseGraphQLServer._getEnveloped = async () => {
+          const enveloped = await originalGetEnveloped();
+          const originalContextFactory = enveloped.contextFactory;
+          enveloped.contextFactory = async opts => {
+            expect(opts.request.info).toBeDefined();
+            expect(req.request.config).toBeDefined();
+            expect(req.request.auth).toBeDefined();
+            return originalContextFactory(opts);
+          };
           checked = true;
-          return await originalGetGraphQLOptions.bind(parseGraphQLServer)(req);
+          return enveloped;
         };
         const health = (
           await apolloClient.query({
@@ -520,7 +552,7 @@ describe('ParseGraphQLServer', () => {
         ).data.health;
         expect(health).toBeTruthy();
         expect(checked).toBeTruthy();
-        parseGraphQLServer._getGraphQLOptions = originalGetGraphQLOptions;
+        parseGraphQLServer._getEnveloped = originalGetEnveloped;
       });
     });
 
diff --git a/src/GraphQL/ParseGraphQLServer.js b/src/GraphQL/ParseGraphQLServer.js
index bb47ca2938..f0798fd0a8 100644
--- a/src/GraphQL/ParseGraphQLServer.js
+++ b/src/GraphQL/ParseGraphQLServer.js
@@ -1,15 +1,20 @@
 import corsMiddleware from 'cors';
 import bodyParser from 'body-parser';
 import { graphqlUploadExpress } from 'graphql-upload';
-import { graphqlExpress } from 'apollo-server-express/dist/expressApollo';
+import { getGraphQLParameters, processRequest } from 'graphql-helix';
+import { envelop, useExtendContext, useMaskedErrors } from '@envelop/core';
 import { renderPlaygroundPage } from '@apollographql/graphql-playground-html';
-import { execute, subscribe } from 'graphql';
-import { SubscriptionServer } from 'subscriptions-transport-ws';
+import { Server as WSServer } from 'ws';
 import { handleParseErrors, handleParseHeaders } from '../middlewares';
 import requiredParameter from '../requiredParameter';
 import defaultLogger from '../logger';
 import { ParseGraphQLSchema } from './ParseGraphQLSchema';
 import ParseGraphQLController, { ParseGraphQLConfig } from '../Controllers/ParseGraphQLController';
+import {
+  handleGraphQLWS,
+  handleLegacySubscriptionsTransportWS,
+  handleWebSocketUpgrade,
+} from './parseGraphQLWebSocket';
 
 class ParseGraphQLServer {
   parseGraphQLController: ParseGraphQLController;
@@ -30,22 +35,39 @@ class ParseGraphQLServer {
       graphQLCustomTypeDefs: this.config.graphQLCustomTypeDefs,
       appId: this.parseServer.config.appId,
     });
+    this._getEnveloped = envelop({
+      plugins: [
+        useMaskedErrors(),
+        useExtendContext(context => {
+          return {
+            info: context.request.info,
+            config: context.request.config,
+            auth: context.request.auth,
+          };
+        }),
+        ...(this.config.envelopPlugins || []),
+      ],
+    });
   }
 
   async _getGraphQLOptions(req) {
-    try {
-      return {
-        schema: await this.parseGraphQLSchema.load(),
-        context: {
+    const schema = await this._getGraphQLSchema();
+    const { contextFactory } = this._getEnveloped();
+    return {
+      schema,
+      context: await contextFactory({
+        request: {
           info: req.info,
           config: req.config,
           auth: req.auth,
         },
-        formatError: error => {
-          // Allow to console.log here to debug
-          return error;
-        },
-      };
+      }),
+    };
+  }
+
+  async _getGraphQLSchema() {
+    try {
+      return await this.parseGraphQLSchema.load();
     } catch (e) {
       this.log.error(e.stack || (typeof e.toString === 'function' && e.toString()) || e);
       throw e;
@@ -65,6 +87,89 @@ class ParseGraphQLServer {
     );
   }
 
+  async _handleGraphQLRequest(req, res) {
+    const request = {
+      body: req.body,
+      headers: req.headers,
+      method: req.method,
+      query: req.query,
+      info: req.info,
+      config: req.config,
+      auth: req.auth,
+    };
+
+    const { execute, subscribe, validate, parse, contextFactory } = this._getEnveloped();
+
+    // Extract the GraphQL parameters from the request
+    const { operationName, query, variables } = getGraphQLParameters(request);
+    const schema = await this._getGraphQLSchema();
+
+    // Validate and execute the query
+    const result = await processRequest({
+      execute,
+      subscribe,
+      validate,
+      parse,
+      operationName,
+      query,
+      variables,
+      request,
+      schema,
+      contextFactory,
+    });
+
+    if (result.type === 'RESPONSE') {
+      // We set the provided status and headers and just the send the payload back to the client
+      result.headers.forEach(({ name, value }) => res.setHeader(name, value));
+      res.status(result.status);
+      res.json(result.payload);
+    } else if (result.type === 'MULTIPART_RESPONSE') {
+      // Defer/Stream over multipart request
+      res.writeHead(200, {
+        Connection: 'keep-alive',
+        'Content-Type': 'multipart/mixed; boundary="-"',
+        'Transfer-Encoding': 'chunked',
+      });
+      req.on('close', () => {
+        result.unsubscribe();
+      });
+
+      res.write('---');
+      await result.subscribe(result => {
+        const chunk = Buffer.from(JSON.stringify(result), 'utf8');
+        const data = [
+          '',
+          'Content-Type: application/json; charset=utf-8',
+          'Content-Length: ' + String(chunk.length),
+          '',
+          chunk,
+        ];
+
+        if (result.hasNext) {
+          data.push('---');
+        }
+
+        res.write(data.join('\r\n'));
+      });
+
+      res.write('\r\n-----\r\n');
+      res.end();
+    } else {
+      // Subscription over SSE
+      res.writeHead(200, {
+        'Content-Type': 'text/event-stream',
+        Connection: 'keep-alive',
+        'Cache-Control': 'no-cache',
+      });
+      req.on('close', () => {
+        result.unsubscribe();
+      });
+      await result.subscribe(result => {
+        res.write(`data: ${JSON.stringify(result)}\n\n`);
+      });
+    }
+  }
+
   applyGraphQL(app) {
     if (!app || !app.use) {
       requiredParameter('You must provide an Express.js app instance!');
@@ -82,10 +187,7 @@ class ParseGraphQLServer {
     app.use(this.config.graphQLPath, bodyParser.json());
     app.use(this.config.graphQLPath, handleParseHeaders);
     app.use(this.config.graphQLPath, handleParseErrors);
-    app.use(
-      this.config.graphQLPath,
-      graphqlExpress(async req => await this._getGraphQLOptions(req))
-    );
+    app.use(this.config.graphQLPath, this._handleGraphQLRequest.bind(this));
   }
 
   applyPlayground(app) {
@@ -113,21 +215,58 @@ class ParseGraphQLServer {
     );
   }
 
-  createSubscriptions(server) {
-    SubscriptionServer.create(
-      {
-        execute,
-        subscribe,
-        onOperation: async (_message, params, webSocket) =>
-          Object.assign({}, params, await this._getGraphQLOptions(webSocket.upgradeReq)),
-      },
-      {
-        server,
-        path:
-          this.config.subscriptionsPath ||
-          requiredParameter('You must provide a config.subscriptionsPath to createSubscriptions!'),
-      }
-    );
+  createSubscriptions(server, config) {
+    // config.mode should be either "all", "graphql-transport-ws" or "legacy-graphql-ws"
+    const mode = config?.mode ?? 'all';
+
+    const path =
+      this.config.subscriptionsPath ||
+      requiredParameter('You must provide a config.subscriptionsPath to createSubscriptions!');
+
+    const GRAPHQL_TRANSPORT_WS_PROTOCOL = 'graphql-transport-ws';
+    const GRAPHQL_WS = 'graphql-ws';
+
+    let wsTuple;
+
+    if (mode === 'graphql-transport-ws') {
+      const wsServer = new WSServer({ noServer: true });
+      handleGraphQLWS(wsServer, this._getEnveloped.bind(this), this._getGraphQLSchema.bind(this));
+      wsTuple = ['graphql-transport-ws', wsServer];
+    } else if (mode === 'legacy-graphql-ws') {
+      const wsServer = new WSServer({ noServer: true });
+      handleLegacySubscriptionsTransportWS(
+        wsServer,
+        this._getEnveloped.bind(this),
+        this._getGraphQLSchema.bind(this)
+      );
+      wsTuple = ['legacy-graphql-ws', wsServer];
+    } else if (mode === 'all') {
+      const wsServer = new WSServer({ noServer: true });
+      handleGraphQLWS(wsServer, this._getEnveloped.bind(this), this._getGraphQLSchema);
+      const wsServerLegacy = new WSServer({ noServer: true });
+      handleLegacySubscriptionsTransportWS(
+        wsServerLegacy,
+        this._getEnveloped.bind(this),
+        this._getGraphQLSchema.bind(this)
+      );
+
+      wsTuple = [
+        'all',
+        protocol => {
+          const protocols = Array.isArray(protocol)
+            ? protocol
+            : protocol?.split(',').map(p => p.trim());
+          return protocols?.includes(GRAPHQL_WS) &&
+            !protocols.includes(GRAPHQL_TRANSPORT_WS_PROTOCOL)
+            ? wsServerLegacy
+            : wsServer;
+        },
+      ];
+    } else {
+      throw new Error(`Invalid subscription mode provided '${mode}'.`);
+    }
+
+    handleWebSocketUpgrade(server, path, wsTuple);
   }
 
   setGraphQLConfig(graphQLConfig: ParseGraphQLConfig): Promise {
diff --git a/src/GraphQL/parseGraphQLUtils.js b/src/GraphQL/parseGraphQLUtils.js
index 0bd6ad2b55..b0425209d1 100644
--- a/src/GraphQL/parseGraphQLUtils.js
+++ b/src/GraphQL/parseGraphQLUtils.js
@@ -1,5 +1,5 @@
 import Parse from 'parse/node';
-import { ApolloError } from 'apollo-server-core';
+import { EnvelopError } from '@envelop/core';
 
 export function enforceMasterKeyAccess(auth) {
   if (!auth.isMaster) {
@@ -16,7 +16,9 @@ export function toGraphQLError(error) {
     code = Parse.Error.INTERNAL_SERVER_ERROR;
     message = 'Internal server error';
   }
-  return new ApolloError(message, code);
+  return new EnvelopError(message, {
+    code,
+  });
 }
 
 export const extractKeysAndInclude = selectedFields => {
diff --git a/src/GraphQL/parseGraphQLWebSocket.js b/src/GraphQL/parseGraphQLWebSocket.js
new file mode 100644
index 0000000000..b19e026971
--- /dev/null
+++ b/src/GraphQL/parseGraphQLWebSocket.js
@@ -0,0 +1,101 @@
+/* eslint-disable indent */
+import { SubscriptionServer } from 'subscriptions-transport-ws-envelop';
+import { useServer as useGraphQLWSServer } from 'graphql-ws/lib/use/ws';
+
+function getPathname(path) {
+  return path && new URL('http://_' + path).pathname;
+}
+
+export function handleWebSocketUpgrade(httpServer, path, wsTuple) {
+  const wsServers = wsTuple[0] === 'all' ? wsTuple[2] : [wsTuple[1]];
+
+  const state = {
+    closing: false,
+    wsServers,
+  };
+
+  httpServer.on('upgrade', (rawRequest, socket, head) => {
+    const requestUrl = getPathname(rawRequest.url);
+
+    if (state.closing || requestUrl !== path) {
+      return wsServers[0].handleUpgrade(rawRequest, socket, head, webSocket => {
+        webSocket.close(1001);
+      });
+    }
+
+    switch (wsTuple[0]) {
+      case 'all': {
+        const server = wsTuple[1](rawRequest.headers['sec-websocket-protocol']);
+
+        return server.handleUpgrade(rawRequest, socket, head, ws => {
+          server.emit('connection', ws, rawRequest);
+        });
+      }
+      case 'graphql-transport-ws':
+      case 'legacy-graphql-ws': {
+        const server = wsTuple[1];
+
+        return server.handleUpgrade(rawRequest, socket, head, ws => {
+          server.emit('connection', ws, rawRequest);
+        });
+      }
+    }
+  });
+}
+
+export function handleLegacySubscriptionsTransportWS(wsServer, getEnveloped, getSchema) {
+  const { execute, subscribe, validate, parse, contextFactory } = getEnveloped();
+  SubscriptionServer.create(
+    {
+      execute,
+      subscribe,
+      validate,
+      parse,
+      onOperation: async (_message, params, webSocket) => {
+        const { schema } = await getSchema();
+        const request = {
+          info: webSocket.upgradeReq.info,
+          config: webSocket.upgradeReq.config,
+          auth: webSocket.upgradeReq.auth,
+        };
+        return Object.assign({}, params, { schema, context: await contextFactory({ request }) });
+      },
+    },
+    wsServer
+  );
+}
+
+export function handleGraphQLWS(wsServer, getEnveloped, getSchema) {
+  const { execute, subscribe, validate, parse, contextFactory } = getEnveloped();
+  useGraphQLWSServer(
+    {
+      execute,
+      subscribe,
+      async onOperation(
+        { connectionParams, extra: { request: req, socket } },
+        { payload: { operationName, query, variables } }
+      ) {
+        const request = {
+          info: req.info,
+          config: req.config,
+          auth: req.auth,
+        };
+        const args = {
+          schema: await getSchema(),
+          operationName: operationName,
+          document: parse(query),
+          variableValues: variables,
+          contextValue: await contextFactory({
+            connectionParams,
+            request,
+            socket,
+          }),
+        };
+        const errors = validate(args.schema, args.document);
+        if (errors.length) return errors;
+        return args;
+      },
+    },
+    wsServer
+  );
+}