diff --git a/spec/ParseWebSocket.spec.js b/spec/ParseWebSocket.spec.js
index baf232c1ee..ce540b9a42 100644
--- a/spec/ParseWebSocket.spec.js
+++ b/spec/ParseWebSocket.spec.js
@@ -9,26 +9,26 @@ describe('ParseWebSocket', function() {
     expect(parseWebSocket.ws).toBe(ws);
   });
 
-  it('can handle events defined in typeMap', function() {
+  it('can handle disconnect event', function(done) {
     const ws = {
-      on: jasmine.createSpy('on'),
+      onclose: () => {},
     };
-    const callback = {};
     const parseWebSocket = new ParseWebSocket(ws);
-    parseWebSocket.on('disconnect', callback);
-
-    expect(parseWebSocket.ws.on).toHaveBeenCalledWith('close', callback);
+    parseWebSocket.on('disconnect', () => {
+      done();
+    });
+    ws.onclose();
   });
 
-  it('can handle events which are not defined in typeMap', function() {
+  it('can handle message event', function(done) {
     const ws = {
-      on: jasmine.createSpy('on'),
+      onmessage: () => {},
     };
-    const callback = {};
     const parseWebSocket = new ParseWebSocket(ws);
-    parseWebSocket.on('open', callback);
-
-    expect(parseWebSocket.ws.on).toHaveBeenCalledWith('open', callback);
+    parseWebSocket.on('message', () => {
+      done();
+    });
+    ws.onmessage();
   });
 
   it('can send a message', function() {
diff --git a/spec/ParseWebSocketServer.spec.js b/spec/ParseWebSocketServer.spec.js
index e821a0979e..b8fb4d6d2d 100644
--- a/spec/ParseWebSocketServer.spec.js
+++ b/spec/ParseWebSocketServer.spec.js
@@ -1,5 +1,4 @@
-const ParseWebSocketServer = require('../lib/LiveQuery/ParseWebSocketServer')
-  .ParseWebSocketServer;
+const { ParseWebSocketServer } = require('../lib/LiveQuery/ParseWebSocketServer');
 
 describe('ParseWebSocketServer', function() {
   beforeEach(function(done) {
@@ -19,14 +18,14 @@ describe('ParseWebSocketServer', function() {
     const parseWebSocketServer = new ParseWebSocketServer(
       server,
       onConnectCallback,
-      5
+      { websocketTimeout: 5 }
     ).server;
     const ws = {
       readyState: 0,
       OPEN: 0,
       ping: jasmine.createSpy('ping'),
     };
-    parseWebSocketServer.emit('connection', ws);
+    parseWebSocketServer.onConnection(ws);
 
     // Make sure callback is called
     expect(onConnectCallback).toHaveBeenCalled();
diff --git a/src/Adapters/WebSocketServer/WSAdapter.js b/src/Adapters/WebSocketServer/WSAdapter.js
new file mode 100644
index 0000000000..d44ec7defd
--- /dev/null
+++ b/src/Adapters/WebSocketServer/WSAdapter.js
@@ -0,0 +1,22 @@
+/*eslint no-unused-vars: "off"*/
+import { WSSAdapter } from './WSSAdapter';
+const WebSocketServer = require('ws').Server;
+
+/**
+ * Wrapper for ws node module
+ */
+export class WSAdapter extends WSSAdapter {
+  constructor(options: any) {
+    super(options);
+    const wss = new WebSocketServer({ server: options.server });
+    wss.on('listening', this.onListen);
+    wss.on('connection', this.onConnection);
+  }
+
+  onListen() {}
+  onConnection(ws) {}
+  start() {}
+  close() {}
+}
+
+export default WSAdapter;
diff --git a/src/Adapters/WebSocketServer/WSSAdapter.js b/src/Adapters/WebSocketServer/WSSAdapter.js
new file mode 100644
index 0000000000..23fc4b9380
--- /dev/null
+++ b/src/Adapters/WebSocketServer/WSSAdapter.js
@@ -0,0 +1,52 @@
+/*eslint no-unused-vars: "off"*/
+// WebSocketServer Adapter
+//
+// Adapter classes must implement the following functions:
+// * onListen()
+// * onConnection(ws)
+// * start()
+// * close()
+//
+// Default is WSAdapter. The above functions will be binded.
+
+/**
+ * @module Adapters
+ */
+/**
+ * @interface WSSAdapter
+ */
+export class WSSAdapter {
+  /**
+   * @param {Object} options - {http.Server|https.Server} server
+   */
+  constructor(options) {
+    this.onListen = () => {}
+    this.onConnection = () => {}
+  }
+
+  // /**
+  //  * Emitted when the underlying server has been bound.
+  //  */
+  // onListen() {}
+
+  // /**
+  //  * Emitted when the handshake is complete.
+  //  *
+  //  * @param {WebSocket} ws - RFC 6455 WebSocket.
+  //  */
+  // onConnection(ws) {}
+
+  /**
+   * Initialize Connection.
+   *
+   * @param {Object} options
+   */
+  start(options) {}
+
+  /**
+   * Closes server.
+   */
+  close() {}
+}
+
+export default WSSAdapter;
diff --git a/src/LiveQuery/ParseLiveQueryServer.js b/src/LiveQuery/ParseLiveQueryServer.js
index 354f2d1b93..b3ee7c6ac5 100644
--- a/src/LiveQuery/ParseLiveQueryServer.js
+++ b/src/LiveQuery/ParseLiveQueryServer.js
@@ -61,7 +61,7 @@ class ParseLiveQueryServer {
     this.parseWebSocketServer = new ParseWebSocketServer(
       server,
       parseWebsocket => this._onConnect(parseWebsocket),
-      config.websocketTimeout
+      config
     );
 
     // Initialize subscriber
diff --git a/src/LiveQuery/ParseWebSocketServer.js b/src/LiveQuery/ParseWebSocketServer.js
index 774a42d12d..26497cd9e8 100644
--- a/src/LiveQuery/ParseWebSocketServer.js
+++ b/src/LiveQuery/ParseWebSocketServer.js
@@ -1,9 +1,7 @@
+import { loadAdapter } from '../Adapters/AdapterLoader';
+import { WSAdapter } from '../Adapters/WebSocketServer/WSAdapter';
 import logger from '../logger';
-
-const typeMap = new Map([['disconnect', 'close']]);
-const getWS = function(){
-  return require('ws');
-};
+import events from 'events';
 
 export class ParseWebSocketServer {
   server: Object;
@@ -11,14 +9,18 @@ export class ParseWebSocketServer {
   constructor(
     server: any,
     onConnect: Function,
-    websocketTimeout: number = 10 * 1000
+    config
   ) {
-    const WebSocketServer = getWS().Server;
-    const wss = new WebSocketServer({ server: server });
-    wss.on('listening', () => {
+    config.server = server;
+    const wss = loadAdapter(
+      config.wssAdapter,
+      WSAdapter,
+      config,
+    );
+    wss.onListen = () => {
       logger.info('Parse LiveQuery Server starts running');
-    });
-    wss.on('connection', ws => {
+    };
+    wss.onConnection = (ws) => {
       onConnect(new ParseWebSocket(ws));
       // Send ping to client periodically
       const pingIntervalId = setInterval(() => {
@@ -27,24 +29,29 @@ export class ParseWebSocketServer {
         } else {
           clearInterval(pingIntervalId);
         }
-      }, websocketTimeout);
-    });
+      }, config.websocketTimeout || 10 * 1000);
+    };
+    wss.start();
     this.server = wss;
   }
+
+  close() {
+    if (this.server && this.server.close) {
+      this.server.close();
+    }
+  }
 }
 
-export class ParseWebSocket {
+export class ParseWebSocket extends events.EventEmitter {
   ws: any;
 
   constructor(ws: any) {
+    super();
+    ws.onmessage = (request) => this.emit('message', request);
+    ws.onclose = () => this.emit('disconnect');
     this.ws = ws;
   }
 
-  on(type: string, callback): void {
-    const wsType = typeMap.has(type) ? typeMap.get(type) : type;
-    this.ws.on(wsType, callback);
-  }
-
   send(message: any): void {
     this.ws.send(message);
   }
diff --git a/src/Options/Definitions.js b/src/Options/Definitions.js
index 1139050b5f..d5da0d2031 100644
--- a/src/Options/Definitions.js
+++ b/src/Options/Definitions.js
@@ -3,494 +3,480 @@
 This code has been generated by resources/buildConfigDefinitions.js
 Do not edit manually, but update Options/index.js
 */
-var parsers = require('./parsers');
+var parsers = require("./parsers");
 
 module.exports.ParseServerOptions = {
-  accountLockout: {
-    env: 'PARSE_SERVER_ACCOUNT_LOCKOUT',
-    help: 'account lockout policy for failed login attempts',
-    action: parsers.objectParser,
-  },
-  allowClientClassCreation: {
-    env: 'PARSE_SERVER_ALLOW_CLIENT_CLASS_CREATION',
-    help: 'Enable (or disable) client class creation, defaults to true',
-    action: parsers.booleanParser,
-    default: true,
-  },
-  analyticsAdapter: {
-    env: 'PARSE_SERVER_ANALYTICS_ADAPTER',
-    help: 'Adapter module for the analytics',
-    action: parsers.moduleOrObjectParser,
-  },
-  appId: {
-    env: 'PARSE_SERVER_APPLICATION_ID',
-    help: 'Your Parse Application ID',
-    required: true,
-  },
-  appName: {
-    env: 'PARSE_SERVER_APP_NAME',
-    help: 'Sets the app name',
-  },
-  auth: {
-    env: 'PARSE_SERVER_AUTH_PROVIDERS',
-    help:
-      'Configuration for your authentication providers, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#oauth-and-3rd-party-authentication',
-    action: parsers.objectParser,
-  },
-  cacheAdapter: {
-    env: 'PARSE_SERVER_CACHE_ADAPTER',
-    help: 'Adapter module for the cache',
-    action: parsers.moduleOrObjectParser,
-  },
-  cacheMaxSize: {
-    env: 'PARSE_SERVER_CACHE_MAX_SIZE',
-    help: 'Sets the maximum size for the in memory cache, defaults to 10000',
-    action: parsers.numberParser('cacheMaxSize'),
-    default: 10000,
-  },
-  cacheTTL: {
-    env: 'PARSE_SERVER_CACHE_TTL',
-    help:
-      'Sets the TTL for the in memory cache (in ms), defaults to 5000 (5 seconds)',
-    action: parsers.numberParser('cacheTTL'),
-    default: 5000,
-  },
-  clientKey: {
-    env: 'PARSE_SERVER_CLIENT_KEY',
-    help: 'Key for iOS, MacOS, tvOS clients',
-  },
-  cloud: {
-    env: 'PARSE_SERVER_CLOUD',
-    help: 'Full path to your cloud code main.js',
-  },
-  cluster: {
-    env: 'PARSE_SERVER_CLUSTER',
-    help:
-      'Run with cluster, optionally set the number of processes default to os.cpus().length',
-    action: parsers.numberOrBooleanParser,
-  },
-  collectionPrefix: {
-    env: 'PARSE_SERVER_COLLECTION_PREFIX',
-    help: 'A collection prefix for the classes',
-    default: '',
-  },
-  customPages: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES',
-    help: 'custom pages for password validation and reset',
-    action: parsers.objectParser,
-    default: {},
-  },
-  databaseAdapter: {
-    env: 'PARSE_SERVER_DATABASE_ADAPTER',
-    help: 'Adapter module for the database',
-    action: parsers.moduleOrObjectParser,
-  },
-  databaseOptions: {
-    env: 'PARSE_SERVER_DATABASE_OPTIONS',
-    help: 'Options to pass to the mongodb client',
-    action: parsers.objectParser,
-  },
-  databaseURI: {
-    env: 'PARSE_SERVER_DATABASE_URI',
-    help:
-      'The full URI to your database. Supported databases are mongodb or postgres.',
-    required: true,
-    default: 'mongodb://localhost:27017/parse',
-  },
-  directAccess: {
-    env: 'PARSE_SERVER_ENABLE_EXPERIMENTAL_DIRECT_ACCESS',
-    help:
-      'Replace HTTP Interface when using JS SDK in current node runtime, defaults to false. Caution, this is an experimental feature that may not be appropriate for production.',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  dotNetKey: {
-    env: 'PARSE_SERVER_DOT_NET_KEY',
-    help: 'Key for Unity and .Net SDK',
-  },
-  emailAdapter: {
-    env: 'PARSE_SERVER_EMAIL_ADAPTER',
-    help: 'Adapter module for email sending',
-    action: parsers.moduleOrObjectParser,
-  },
-  emailVerifyTokenValidityDuration: {
-    env: 'PARSE_SERVER_EMAIL_VERIFY_TOKEN_VALIDITY_DURATION',
-    help: 'Email verification token validity duration, in seconds',
-    action: parsers.numberParser('emailVerifyTokenValidityDuration'),
-  },
-  enableAnonymousUsers: {
-    env: 'PARSE_SERVER_ENABLE_ANON_USERS',
-    help: 'Enable (or disable) anon users, defaults to true',
-    action: parsers.booleanParser,
-    default: true,
-  },
-  enableExpressErrorHandler: {
-    env: 'PARSE_SERVER_ENABLE_EXPRESS_ERROR_HANDLER',
-    help: 'Enables the default express error handler for all errors',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  enableSingleSchemaCache: {
-    env: 'PARSE_SERVER_ENABLE_SINGLE_SCHEMA_CACHE',
-    help:
-      'Use a single schema cache shared across requests. Reduces number of queries made to _SCHEMA, defaults to false, i.e. unique schema cache per request.',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  expireInactiveSessions: {
-    env: 'PARSE_SERVER_EXPIRE_INACTIVE_SESSIONS',
-    help:
-      'Sets wether we should expire the inactive sessions, defaults to true',
-    action: parsers.booleanParser,
-    default: true,
-  },
-  fileKey: {
-    env: 'PARSE_SERVER_FILE_KEY',
-    help: 'Key for your files',
-  },
-  filesAdapter: {
-    env: 'PARSE_SERVER_FILES_ADAPTER',
-    help: 'Adapter module for the files sub-system',
-    action: parsers.moduleOrObjectParser,
-  },
-  graphQLPath: {
-    env: 'PARSE_SERVER_GRAPHQL_PATH',
-    help: 'Mount path for the GraphQL endpoint, defaults to /graphql',
-    default: '/graphql',
-  },
-  graphQLSchema: {
-    env: 'PARSE_SERVER_GRAPH_QLSCHEMA',
-    help: 'Full path to your GraphQL custom schema.graphql file',
-  },
-  host: {
-    env: 'PARSE_SERVER_HOST',
-    help: 'The host to serve ParseServer on, defaults to 0.0.0.0',
-    default: '0.0.0.0',
-  },
-  javascriptKey: {
-    env: 'PARSE_SERVER_JAVASCRIPT_KEY',
-    help: 'Key for the Javascript SDK',
-  },
-  jsonLogs: {
-    env: 'JSON_LOGS',
-    help: 'Log as structured JSON objects',
-    action: parsers.booleanParser,
-  },
-  liveQuery: {
-    env: 'PARSE_SERVER_LIVE_QUERY',
-    help: "parse-server's LiveQuery configuration object",
-    action: parsers.objectParser,
-  },
-  liveQueryServerOptions: {
-    env: 'PARSE_SERVER_LIVE_QUERY_SERVER_OPTIONS',
-    help:
-      'Live query server configuration options (will start the liveQuery server)',
-    action: parsers.objectParser,
-  },
-  loggerAdapter: {
-    env: 'PARSE_SERVER_LOGGER_ADAPTER',
-    help: 'Adapter module for the logging sub-system',
-    action: parsers.moduleOrObjectParser,
-  },
-  logLevel: {
-    env: 'PARSE_SERVER_LOG_LEVEL',
-    help: 'Sets the level for logs',
-  },
-  logsFolder: {
-    env: 'PARSE_SERVER_LOGS_FOLDER',
-    help:
-      "Folder for the logs (defaults to './logs'); set to null to disable file based logging",
-    default: './logs',
-  },
-  masterKey: {
-    env: 'PARSE_SERVER_MASTER_KEY',
-    help: 'Your Parse Master Key',
-    required: true,
-  },
-  masterKeyIps: {
-    env: 'PARSE_SERVER_MASTER_KEY_IPS',
-    help:
-      'Restrict masterKey to be used by only these ips, defaults to [] (allow all ips)',
-    action: parsers.arrayParser,
-    default: [],
-  },
-  maxLimit: {
-    env: 'PARSE_SERVER_MAX_LIMIT',
-    help: 'Max value for limit option on queries, defaults to unlimited',
-    action: parsers.numberParser('maxLimit'),
-  },
-  maxUploadSize: {
-    env: 'PARSE_SERVER_MAX_UPLOAD_SIZE',
-    help: 'Max file size for uploads, defaults to 20mb',
-    default: '20mb',
-  },
-  middleware: {
-    env: 'PARSE_SERVER_MIDDLEWARE',
-    help: 'middleware for express server, can be string or function',
-  },
-  mountGraphQL: {
-    env: 'PARSE_SERVER_MOUNT_GRAPHQL',
-    help: 'Mounts the GraphQL endpoint',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  mountPath: {
-    env: 'PARSE_SERVER_MOUNT_PATH',
-    help: 'Mount path for the server, defaults to /parse',
-    default: '/parse',
-  },
-  mountPlayground: {
-    env: 'PARSE_SERVER_MOUNT_PLAYGROUND',
-    help: 'Mounts the GraphQL Playground - never use this option in production',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  objectIdSize: {
-    env: 'PARSE_SERVER_OBJECT_ID_SIZE',
-    help: "Sets the number of characters in generated object id's, default 10",
-    action: parsers.numberParser('objectIdSize'),
-    default: 10,
-  },
-  passwordPolicy: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY',
-    help: 'Password policy for enforcing password related rules',
-    action: parsers.objectParser,
-  },
-  playgroundPath: {
-    env: 'PARSE_SERVER_PLAYGROUND_PATH',
-    help: 'Mount path for the GraphQL Playground, defaults to /playground',
-    default: '/playground',
-  },
-  port: {
-    env: 'PORT',
-    help: 'The port to run the ParseServer, defaults to 1337.',
-    action: parsers.numberParser('port'),
-    default: 1337,
-  },
-  preserveFileName: {
-    env: 'PARSE_SERVER_PRESERVE_FILE_NAME',
-    help: 'Enable (or disable) the addition of a unique hash to the file names',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  preventLoginWithUnverifiedEmail: {
-    env: 'PARSE_SERVER_PREVENT_LOGIN_WITH_UNVERIFIED_EMAIL',
-    help:
-      'Prevent user from login if email is not verified and PARSE_SERVER_VERIFY_USER_EMAILS is true, defaults to false',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  protectedFields: {
-    env: 'PARSE_SERVER_PROTECTED_FIELDS',
-    help:
-      'Protected fields that should be treated with extra security when fetching details.',
-    action: parsers.objectParser,
-    default: {
-      _User: {
-        '*': ['email'],
-      },
-    },
-  },
-  publicServerURL: {
-    env: 'PARSE_PUBLIC_SERVER_URL',
-    help: 'Public URL to your parse server with http:// or https://.',
-  },
-  push: {
-    env: 'PARSE_SERVER_PUSH',
-    help:
-      'Configuration for push, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#push-notifications',
-    action: parsers.objectParser,
-  },
-  readOnlyMasterKey: {
-    env: 'PARSE_SERVER_READ_ONLY_MASTER_KEY',
-    help:
-      'Read-only key, which has the same capabilities as MasterKey without writes',
-  },
-  restAPIKey: {
-    env: 'PARSE_SERVER_REST_API_KEY',
-    help: 'Key for REST calls',
-  },
-  revokeSessionOnPasswordReset: {
-    env: 'PARSE_SERVER_REVOKE_SESSION_ON_PASSWORD_RESET',
-    help:
-      "When a user changes their password, either through the reset password email or while logged in, all sessions are revoked if this is true. Set to false if you don't want to revoke sessions.",
-    action: parsers.booleanParser,
-    default: true,
-  },
-  scheduledPush: {
-    env: 'PARSE_SERVER_SCHEDULED_PUSH',
-    help: 'Configuration for push scheduling, defaults to false.',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  schemaCacheTTL: {
-    env: 'PARSE_SERVER_SCHEMA_CACHE_TTL',
-    help:
-      'The TTL for caching the schema for optimizing read/write operations. You should put a long TTL when your DB is in production. default to 5000; set 0 to disable.',
-    action: parsers.numberParser('schemaCacheTTL'),
-    default: 5000,
-  },
-  serverURL: {
-    env: 'PARSE_SERVER_URL',
-    help: 'URL to your parse server with http:// or https://.',
-    required: true,
-  },
-  sessionLength: {
-    env: 'PARSE_SERVER_SESSION_LENGTH',
-    help: 'Session duration, in seconds, defaults to 1 year',
-    action: parsers.numberParser('sessionLength'),
-    default: 31536000,
-  },
-  silent: {
-    env: 'SILENT',
-    help: 'Disables console output',
-    action: parsers.booleanParser,
-  },
-  skipMongoDBServer13732Workaround: {
-    env: 'PARSE_SKIP_MONGODB_SERVER_13732_WORKAROUND',
-    help: 'Circumvent Parse workaround for historical MongoDB bug SERVER-13732',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  startLiveQueryServer: {
-    env: 'PARSE_SERVER_START_LIVE_QUERY_SERVER',
-    help: 'Starts the liveQuery server',
-    action: parsers.booleanParser,
-  },
-  userSensitiveFields: {
-    env: 'PARSE_SERVER_USER_SENSITIVE_FIELDS',
-    help:
-      'Personally identifiable information fields in the user table the should be removed for non-authorized users. Deprecated @see protectedFields',
-    action: parsers.arrayParser,
-  },
-  verbose: {
-    env: 'VERBOSE',
-    help: 'Set the logging to verbose',
-    action: parsers.booleanParser,
-  },
-  verifyUserEmails: {
-    env: 'PARSE_SERVER_VERIFY_USER_EMAILS',
-    help: 'Enable (or disable) user email validation, defaults to false',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  webhookKey: {
-    env: 'PARSE_SERVER_WEBHOOK_KEY',
-    help: 'Key sent with outgoing webhook calls',
-  },
+  "accountLockout": {
+    "env": "PARSE_SERVER_ACCOUNT_LOCKOUT",
+    "help": "account lockout policy for failed login attempts",
+    "action": parsers.objectParser
+  },
+  "allowClientClassCreation": {
+    "env": "PARSE_SERVER_ALLOW_CLIENT_CLASS_CREATION",
+    "help": "Enable (or disable) client class creation, defaults to true",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "analyticsAdapter": {
+    "env": "PARSE_SERVER_ANALYTICS_ADAPTER",
+    "help": "Adapter module for the analytics",
+    "action": parsers.moduleOrObjectParser
+  },
+  "appId": {
+    "env": "PARSE_SERVER_APPLICATION_ID",
+    "help": "Your Parse Application ID",
+    "required": true
+  },
+  "appName": {
+    "env": "PARSE_SERVER_APP_NAME",
+    "help": "Sets the app name"
+  },
+  "auth": {
+    "env": "PARSE_SERVER_AUTH_PROVIDERS",
+    "help": "Configuration for your authentication providers, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#oauth-and-3rd-party-authentication",
+    "action": parsers.objectParser
+  },
+  "cacheAdapter": {
+    "env": "PARSE_SERVER_CACHE_ADAPTER",
+    "help": "Adapter module for the cache",
+    "action": parsers.moduleOrObjectParser
+  },
+  "cacheMaxSize": {
+    "env": "PARSE_SERVER_CACHE_MAX_SIZE",
+    "help": "Sets the maximum size for the in memory cache, defaults to 10000",
+    "action": parsers.numberParser("cacheMaxSize"),
+    "default": 10000
+  },
+  "cacheTTL": {
+    "env": "PARSE_SERVER_CACHE_TTL",
+    "help": "Sets the TTL for the in memory cache (in ms), defaults to 5000 (5 seconds)",
+    "action": parsers.numberParser("cacheTTL"),
+    "default": 5000
+  },
+  "clientKey": {
+    "env": "PARSE_SERVER_CLIENT_KEY",
+    "help": "Key for iOS, MacOS, tvOS clients"
+  },
+  "cloud": {
+    "env": "PARSE_SERVER_CLOUD",
+    "help": "Full path to your cloud code main.js"
+  },
+  "cluster": {
+    "env": "PARSE_SERVER_CLUSTER",
+    "help": "Run with cluster, optionally set the number of processes default to os.cpus().length",
+    "action": parsers.numberOrBooleanParser
+  },
+  "collectionPrefix": {
+    "env": "PARSE_SERVER_COLLECTION_PREFIX",
+    "help": "A collection prefix for the classes",
+    "default": ""
+  },
+  "customPages": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES",
+    "help": "custom pages for password validation and reset",
+    "action": parsers.objectParser,
+    "default": {}
+  },
+  "databaseAdapter": {
+    "env": "PARSE_SERVER_DATABASE_ADAPTER",
+    "help": "Adapter module for the database",
+    "action": parsers.moduleOrObjectParser
+  },
+  "databaseOptions": {
+    "env": "PARSE_SERVER_DATABASE_OPTIONS",
+    "help": "Options to pass to the mongodb client",
+    "action": parsers.objectParser
+  },
+  "databaseURI": {
+    "env": "PARSE_SERVER_DATABASE_URI",
+    "help": "The full URI to your database. Supported databases are mongodb or postgres.",
+    "required": true,
+    "default": "mongodb://localhost:27017/parse"
+  },
+  "directAccess": {
+    "env": "PARSE_SERVER_ENABLE_EXPERIMENTAL_DIRECT_ACCESS",
+    "help": "Replace HTTP Interface when using JS SDK in current node runtime, defaults to false. Caution, this is an experimental feature that may not be appropriate for production.",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "dotNetKey": {
+    "env": "PARSE_SERVER_DOT_NET_KEY",
+    "help": "Key for Unity and .Net SDK"
+  },
+  "emailAdapter": {
+    "env": "PARSE_SERVER_EMAIL_ADAPTER",
+    "help": "Adapter module for email sending",
+    "action": parsers.moduleOrObjectParser
+  },
+  "emailVerifyTokenValidityDuration": {
+    "env": "PARSE_SERVER_EMAIL_VERIFY_TOKEN_VALIDITY_DURATION",
+    "help": "Email verification token validity duration, in seconds",
+    "action": parsers.numberParser("emailVerifyTokenValidityDuration")
+  },
+  "enableAnonymousUsers": {
+    "env": "PARSE_SERVER_ENABLE_ANON_USERS",
+    "help": "Enable (or disable) anon users, defaults to true",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "enableExpressErrorHandler": {
+    "env": "PARSE_SERVER_ENABLE_EXPRESS_ERROR_HANDLER",
+    "help": "Enables the default express error handler for all errors",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "enableSingleSchemaCache": {
+    "env": "PARSE_SERVER_ENABLE_SINGLE_SCHEMA_CACHE",
+    "help": "Use a single schema cache shared across requests. Reduces number of queries made to _SCHEMA, defaults to false, i.e. unique schema cache per request.",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "expireInactiveSessions": {
+    "env": "PARSE_SERVER_EXPIRE_INACTIVE_SESSIONS",
+    "help": "Sets wether we should expire the inactive sessions, defaults to true",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "fileKey": {
+    "env": "PARSE_SERVER_FILE_KEY",
+    "help": "Key for your files"
+  },
+  "filesAdapter": {
+    "env": "PARSE_SERVER_FILES_ADAPTER",
+    "help": "Adapter module for the files sub-system",
+    "action": parsers.moduleOrObjectParser
+  },
+  "graphQLPath": {
+    "env": "PARSE_SERVER_GRAPHQL_PATH",
+    "help": "Mount path for the GraphQL endpoint, defaults to /graphql",
+    "default": "/graphql"
+  },
+  "graphQLSchema": {
+    "env": "PARSE_SERVER_GRAPH_QLSCHEMA",
+    "help": "Full path to your GraphQL custom schema.graphql file"
+  },
+  "host": {
+    "env": "PARSE_SERVER_HOST",
+    "help": "The host to serve ParseServer on, defaults to 0.0.0.0",
+    "default": "0.0.0.0"
+  },
+  "javascriptKey": {
+    "env": "PARSE_SERVER_JAVASCRIPT_KEY",
+    "help": "Key for the Javascript SDK"
+  },
+  "jsonLogs": {
+    "env": "JSON_LOGS",
+    "help": "Log as structured JSON objects",
+    "action": parsers.booleanParser
+  },
+  "liveQuery": {
+    "env": "PARSE_SERVER_LIVE_QUERY",
+    "help": "parse-server's LiveQuery configuration object",
+    "action": parsers.objectParser
+  },
+  "liveQueryServerOptions": {
+    "env": "PARSE_SERVER_LIVE_QUERY_SERVER_OPTIONS",
+    "help": "Live query server configuration options (will start the liveQuery server)",
+    "action": parsers.objectParser
+  },
+  "loggerAdapter": {
+    "env": "PARSE_SERVER_LOGGER_ADAPTER",
+    "help": "Adapter module for the logging sub-system",
+    "action": parsers.moduleOrObjectParser
+  },
+  "logLevel": {
+    "env": "PARSE_SERVER_LOG_LEVEL",
+    "help": "Sets the level for logs"
+  },
+  "logsFolder": {
+    "env": "PARSE_SERVER_LOGS_FOLDER",
+    "help": "Folder for the logs (defaults to './logs'); set to null to disable file based logging",
+    "default": "./logs"
+  },
+  "masterKey": {
+    "env": "PARSE_SERVER_MASTER_KEY",
+    "help": "Your Parse Master Key",
+    "required": true
+  },
+  "masterKeyIps": {
+    "env": "PARSE_SERVER_MASTER_KEY_IPS",
+    "help": "Restrict masterKey to be used by only these ips, defaults to [] (allow all ips)",
+    "action": parsers.arrayParser,
+    "default": []
+  },
+  "maxLimit": {
+    "env": "PARSE_SERVER_MAX_LIMIT",
+    "help": "Max value for limit option on queries, defaults to unlimited",
+    "action": parsers.numberParser("maxLimit")
+  },
+  "maxUploadSize": {
+    "env": "PARSE_SERVER_MAX_UPLOAD_SIZE",
+    "help": "Max file size for uploads, defaults to 20mb",
+    "default": "20mb"
+  },
+  "middleware": {
+    "env": "PARSE_SERVER_MIDDLEWARE",
+    "help": "middleware for express server, can be string or function"
+  },
+  "mountGraphQL": {
+    "env": "PARSE_SERVER_MOUNT_GRAPHQL",
+    "help": "Mounts the GraphQL endpoint",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "mountPath": {
+    "env": "PARSE_SERVER_MOUNT_PATH",
+    "help": "Mount path for the server, defaults to /parse",
+    "default": "/parse"
+  },
+  "mountPlayground": {
+    "env": "PARSE_SERVER_MOUNT_PLAYGROUND",
+    "help": "Mounts the GraphQL Playground - never use this option in production",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "objectIdSize": {
+    "env": "PARSE_SERVER_OBJECT_ID_SIZE",
+    "help": "Sets the number of characters in generated object id's, default 10",
+    "action": parsers.numberParser("objectIdSize"),
+    "default": 10
+  },
+  "passwordPolicy": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY",
+    "help": "Password policy for enforcing password related rules",
+    "action": parsers.objectParser
+  },
+  "playgroundPath": {
+    "env": "PARSE_SERVER_PLAYGROUND_PATH",
+    "help": "Mount path for the GraphQL Playground, defaults to /playground",
+    "default": "/playground"
+  },
+  "port": {
+    "env": "PORT",
+    "help": "The port to run the ParseServer, defaults to 1337.",
+    "action": parsers.numberParser("port"),
+    "default": 1337
+  },
+  "preserveFileName": {
+    "env": "PARSE_SERVER_PRESERVE_FILE_NAME",
+    "help": "Enable (or disable) the addition of a unique hash to the file names",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "preventLoginWithUnverifiedEmail": {
+    "env": "PARSE_SERVER_PREVENT_LOGIN_WITH_UNVERIFIED_EMAIL",
+    "help": "Prevent user from login if email is not verified and PARSE_SERVER_VERIFY_USER_EMAILS is true, defaults to false",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "protectedFields": {
+    "env": "PARSE_SERVER_PROTECTED_FIELDS",
+    "help": "Protected fields that should be treated with extra security when fetching details.",
+    "action": parsers.objectParser,
+    "default": {
+      "_User": {
+        "*": ["email"]
+      }
+    }
+  },
+  "publicServerURL": {
+    "env": "PARSE_PUBLIC_SERVER_URL",
+    "help": "Public URL to your parse server with http:// or https://."
+  },
+  "push": {
+    "env": "PARSE_SERVER_PUSH",
+    "help": "Configuration for push, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#push-notifications",
+    "action": parsers.objectParser
+  },
+  "readOnlyMasterKey": {
+    "env": "PARSE_SERVER_READ_ONLY_MASTER_KEY",
+    "help": "Read-only key, which has the same capabilities as MasterKey without writes"
+  },
+  "restAPIKey": {
+    "env": "PARSE_SERVER_REST_API_KEY",
+    "help": "Key for REST calls"
+  },
+  "revokeSessionOnPasswordReset": {
+    "env": "PARSE_SERVER_REVOKE_SESSION_ON_PASSWORD_RESET",
+    "help": "When a user changes their password, either through the reset password email or while logged in, all sessions are revoked if this is true. Set to false if you don't want to revoke sessions.",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "scheduledPush": {
+    "env": "PARSE_SERVER_SCHEDULED_PUSH",
+    "help": "Configuration for push scheduling, defaults to false.",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "schemaCacheTTL": {
+    "env": "PARSE_SERVER_SCHEMA_CACHE_TTL",
+    "help": "The TTL for caching the schema for optimizing read/write operations. You should put a long TTL when your DB is in production. default to 5000; set 0 to disable.",
+    "action": parsers.numberParser("schemaCacheTTL"),
+    "default": 5000
+  },
+  "serverURL": {
+    "env": "PARSE_SERVER_URL",
+    "help": "URL to your parse server with http:// or https://.",
+    "required": true
+  },
+  "sessionLength": {
+    "env": "PARSE_SERVER_SESSION_LENGTH",
+    "help": "Session duration, in seconds, defaults to 1 year",
+    "action": parsers.numberParser("sessionLength"),
+    "default": 31536000
+  },
+  "silent": {
+    "env": "SILENT",
+    "help": "Disables console output",
+    "action": parsers.booleanParser
+  },
+  "skipMongoDBServer13732Workaround": {
+    "env": "PARSE_SKIP_MONGODB_SERVER_13732_WORKAROUND",
+    "help": "Circumvent Parse workaround for historical MongoDB bug SERVER-13732",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "startLiveQueryServer": {
+    "env": "PARSE_SERVER_START_LIVE_QUERY_SERVER",
+    "help": "Starts the liveQuery server",
+    "action": parsers.booleanParser
+  },
+  "userSensitiveFields": {
+    "env": "PARSE_SERVER_USER_SENSITIVE_FIELDS",
+    "help": "Personally identifiable information fields in the user table the should be removed for non-authorized users. Deprecated @see protectedFields",
+    "action": parsers.arrayParser
+  },
+  "verbose": {
+    "env": "VERBOSE",
+    "help": "Set the logging to verbose",
+    "action": parsers.booleanParser
+  },
+  "verifyUserEmails": {
+    "env": "PARSE_SERVER_VERIFY_USER_EMAILS",
+    "help": "Enable (or disable) user email validation, defaults to false",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "webhookKey": {
+    "env": "PARSE_SERVER_WEBHOOK_KEY",
+    "help": "Key sent with outgoing webhook calls"
+  }
 };
 module.exports.CustomPagesOptions = {
-  choosePassword: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_CHOOSE_PASSWORD',
-    help: 'choose password page path',
-  },
-  invalidLink: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_INVALID_LINK',
-    help: 'invalid link page path',
-  },
-  invalidVerificationLink: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_INVALID_VERIFICATION_LINK',
-    help: 'invalid verification link page path',
-  },
-  linkSendFail: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_LINK_SEND_FAIL',
-    help: 'verification link send fail page path',
-  },
-  linkSendSuccess: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_LINK_SEND_SUCCESS',
-    help: 'verification link send success page path',
-  },
-  parseFrameURL: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_PARSE_FRAME_URL',
-    help: 'for masking user-facing pages',
-  },
-  passwordResetSuccess: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_PASSWORD_RESET_SUCCESS',
-    help: 'password reset success page path',
-  },
-  verifyEmailSuccess: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_VERIFY_EMAIL_SUCCESS',
-    help: 'verify email success page path',
-  },
+  "choosePassword": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_CHOOSE_PASSWORD",
+    "help": "choose password page path"
+  },
+  "invalidLink": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_INVALID_LINK",
+    "help": "invalid link page path"
+  },
+  "invalidVerificationLink": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_INVALID_VERIFICATION_LINK",
+    "help": "invalid verification link page path"
+  },
+  "linkSendFail": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_LINK_SEND_FAIL",
+    "help": "verification link send fail page path"
+  },
+  "linkSendSuccess": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_LINK_SEND_SUCCESS",
+    "help": "verification link send success page path"
+  },
+  "parseFrameURL": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_PARSE_FRAME_URL",
+    "help": "for masking user-facing pages"
+  },
+  "passwordResetSuccess": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_PASSWORD_RESET_SUCCESS",
+    "help": "password reset success page path"
+  },
+  "verifyEmailSuccess": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_VERIFY_EMAIL_SUCCESS",
+    "help": "verify email success page path"
+  }
 };
 module.exports.LiveQueryOptions = {
-  classNames: {
-    env: 'PARSE_SERVER_LIVEQUERY_CLASSNAMES',
-    help: "parse-server's LiveQuery classNames",
-    action: parsers.arrayParser,
-  },
-  pubSubAdapter: {
-    env: 'PARSE_SERVER_LIVEQUERY_PUB_SUB_ADAPTER',
-    help: 'LiveQuery pubsub adapter',
-    action: parsers.moduleOrObjectParser,
-  },
-  redisOptions: {
-    env: 'PARSE_SERVER_LIVEQUERY_REDIS_OPTIONS',
-    help: "parse-server's LiveQuery redisOptions",
-    action: parsers.objectParser,
-  },
-  redisURL: {
-    env: 'PARSE_SERVER_LIVEQUERY_REDIS_URL',
-    help: "parse-server's LiveQuery redisURL",
-  },
+  "classNames": {
+    "env": "PARSE_SERVER_LIVEQUERY_CLASSNAMES",
+    "help": "parse-server's LiveQuery classNames",
+    "action": parsers.arrayParser
+  },
+  "pubSubAdapter": {
+    "env": "PARSE_SERVER_LIVEQUERY_PUB_SUB_ADAPTER",
+    "help": "LiveQuery pubsub adapter",
+    "action": parsers.moduleOrObjectParser
+  },
+  "redisOptions": {
+    "env": "PARSE_SERVER_LIVEQUERY_REDIS_OPTIONS",
+    "help": "parse-server's LiveQuery redisOptions",
+    "action": parsers.objectParser
+  },
+  "redisURL": {
+    "env": "PARSE_SERVER_LIVEQUERY_REDIS_URL",
+    "help": "parse-server's LiveQuery redisURL"
+  },
+  "wssAdapter": {
+    "env": "PARSE_SERVER_LIVEQUERY_WSS_ADAPTER",
+    "help": "Adapter module for the WebSocketServer",
+    "action": parsers.moduleOrObjectParser
+  }
 };
 module.exports.LiveQueryServerOptions = {
-  appId: {
-    env: 'PARSE_LIVE_QUERY_SERVER_APP_ID',
-    help:
-      'This string should match the appId in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same appId.',
-  },
-  cacheTimeout: {
-    env: 'PARSE_LIVE_QUERY_SERVER_CACHE_TIMEOUT',
-    help:
-      "Number in milliseconds. When clients provide the sessionToken to the LiveQuery server, the LiveQuery server will try to fetch its ParseUser's objectId from parse server and store it in the cache. The value defines the duration of the cache. Check the following Security section and our protocol specification for details, defaults to 30 * 24 * 60 * 60 * 1000 ms (~30 days).",
-    action: parsers.numberParser('cacheTimeout'),
-  },
-  keyPairs: {
-    env: 'PARSE_LIVE_QUERY_SERVER_KEY_PAIRS',
-    help:
-      'A JSON object that serves as a whitelist of keys. It is used for validating clients when they try to connect to the LiveQuery server. Check the following Security section and our protocol specification for details.',
-    action: parsers.objectParser,
-  },
-  logLevel: {
-    env: 'PARSE_LIVE_QUERY_SERVER_LOG_LEVEL',
-    help:
-      'This string defines the log level of the LiveQuery server. We support VERBOSE, INFO, ERROR, NONE, defaults to INFO.',
-  },
-  masterKey: {
-    env: 'PARSE_LIVE_QUERY_SERVER_MASTER_KEY',
-    help:
-      'This string should match the masterKey in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same masterKey.',
-  },
-  port: {
-    env: 'PARSE_LIVE_QUERY_SERVER_PORT',
-    help: 'The port to run the LiveQuery server, defaults to 1337.',
-    action: parsers.numberParser('port'),
-    default: 1337,
-  },
-  pubSubAdapter: {
-    env: 'PARSE_LIVE_QUERY_SERVER_PUB_SUB_ADAPTER',
-    help: 'LiveQuery pubsub adapter',
-    action: parsers.moduleOrObjectParser,
-  },
-  redisOptions: {
-    env: 'PARSE_LIVE_QUERY_SERVER_REDIS_OPTIONS',
-    help: "parse-server's LiveQuery redisOptions",
-    action: parsers.objectParser,
-  },
-  redisURL: {
-    env: 'PARSE_LIVE_QUERY_SERVER_REDIS_URL',
-    help: "parse-server's LiveQuery redisURL",
-  },
-  serverURL: {
-    env: 'PARSE_LIVE_QUERY_SERVER_SERVER_URL',
-    help:
-      'This string should match the serverURL in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same serverURL.',
-  },
-  websocketTimeout: {
-    env: 'PARSE_LIVE_QUERY_SERVER_WEBSOCKET_TIMEOUT',
-    help:
-      'Number of milliseconds between ping/pong frames. The WebSocket server sends ping/pong frames to the clients to keep the WebSocket alive. This value defines the interval of the ping/pong frame from the server to clients, defaults to 10 * 1000 ms (10 s).',
-    action: parsers.numberParser('websocketTimeout'),
-  },
+  "appId": {
+    "env": "PARSE_LIVE_QUERY_SERVER_APP_ID",
+    "help": "This string should match the appId in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same appId."
+  },
+  "cacheTimeout": {
+    "env": "PARSE_LIVE_QUERY_SERVER_CACHE_TIMEOUT",
+    "help": "Number in milliseconds. When clients provide the sessionToken to the LiveQuery server, the LiveQuery server will try to fetch its ParseUser's objectId from parse server and store it in the cache. The value defines the duration of the cache. Check the following Security section and our protocol specification for details, defaults to 30 * 24 * 60 * 60 * 1000 ms (~30 days).",
+    "action": parsers.numberParser("cacheTimeout")
+  },
+  "keyPairs": {
+    "env": "PARSE_LIVE_QUERY_SERVER_KEY_PAIRS",
+    "help": "A JSON object that serves as a whitelist of keys. It is used for validating clients when they try to connect to the LiveQuery server. Check the following Security section and our protocol specification for details.",
+    "action": parsers.objectParser
+  },
+  "logLevel": {
+    "env": "PARSE_LIVE_QUERY_SERVER_LOG_LEVEL",
+    "help": "This string defines the log level of the LiveQuery server. We support VERBOSE, INFO, ERROR, NONE, defaults to INFO."
+  },
+  "masterKey": {
+    "env": "PARSE_LIVE_QUERY_SERVER_MASTER_KEY",
+    "help": "This string should match the masterKey in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same masterKey."
+  },
+  "port": {
+    "env": "PARSE_LIVE_QUERY_SERVER_PORT",
+    "help": "The port to run the LiveQuery server, defaults to 1337.",
+    "action": parsers.numberParser("port"),
+    "default": 1337
+  },
+  "pubSubAdapter": {
+    "env": "PARSE_LIVE_QUERY_SERVER_PUB_SUB_ADAPTER",
+    "help": "LiveQuery pubsub adapter",
+    "action": parsers.moduleOrObjectParser
+  },
+  "redisOptions": {
+    "env": "PARSE_LIVE_QUERY_SERVER_REDIS_OPTIONS",
+    "help": "parse-server's LiveQuery redisOptions",
+    "action": parsers.objectParser
+  },
+  "redisURL": {
+    "env": "PARSE_LIVE_QUERY_SERVER_REDIS_URL",
+    "help": "parse-server's LiveQuery redisURL"
+  },
+  "serverURL": {
+    "env": "PARSE_LIVE_QUERY_SERVER_SERVER_URL",
+    "help": "This string should match the serverURL in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same serverURL."
+  },
+  "websocketTimeout": {
+    "env": "PARSE_LIVE_QUERY_SERVER_WEBSOCKET_TIMEOUT",
+    "help": "Number of milliseconds between ping/pong frames. The WebSocket server sends ping/pong frames to the clients to keep the WebSocket alive. This value defines the interval of the ping/pong frame from the server to clients, defaults to 10 * 1000 ms (10 s).",
+    "action": parsers.numberParser("websocketTimeout")
+  },
+  "wssAdapter": {
+    "env": "PARSE_LIVE_QUERY_SERVER_WSS_ADAPTER",
+    "help": "Adapter module for the WebSocketServer",
+    "action": parsers.moduleOrObjectParser
+  }
 };
diff --git a/src/Options/docs.js b/src/Options/docs.js
index 4883d133c4..72834c3086 100644
--- a/src/Options/docs.js
+++ b/src/Options/docs.js
@@ -88,6 +88,7 @@
  * @property {Adapter<PubSubAdapter>} pubSubAdapter LiveQuery pubsub adapter
  * @property {Any} redisOptions parse-server's LiveQuery redisOptions
  * @property {String} redisURL parse-server's LiveQuery redisURL
+ * @property {Adapter<WSSAdapter>} wssAdapter Adapter module for the WebSocketServer
  */
 
 /**
@@ -103,4 +104,6 @@
  * @property {String} redisURL parse-server's LiveQuery redisURL
  * @property {String} serverURL This string should match the serverURL in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same serverURL.
  * @property {Number} websocketTimeout Number of milliseconds between ping/pong frames. The WebSocket server sends ping/pong frames to the clients to keep the WebSocket alive. This value defines the interval of the ping/pong frame from the server to clients, defaults to 10 * 1000 ms (10 s).
+ * @property {Adapter<WSSAdapter>} wssAdapter Adapter module for the WebSocketServer
  */
+
diff --git a/src/Options/index.js b/src/Options/index.js
index f45c31b20a..e487509828 100644
--- a/src/Options/index.js
+++ b/src/Options/index.js
@@ -5,6 +5,7 @@ import { StorageAdapter } from '../Adapters/Storage/StorageAdapter';
 import { CacheAdapter } from '../Adapters/Cache/CacheAdapter';
 import { MailAdapter } from '../Adapters/Email/MailAdapter';
 import { PubSubAdapter } from '../Adapters/PubSub/PubSubAdapter';
+import { WSSAdapter } from '../Adapters/WebSocketServer/WSSAdapter';
 
 // @flow
 type Adapter<T> = string | any | T;
@@ -231,6 +232,8 @@ export interface LiveQueryOptions {
   redisURL: ?string;
   /* LiveQuery pubsub adapter */
   pubSubAdapter: ?Adapter<PubSubAdapter>;
+  /* Adapter module for the WebSocketServer */
+  wssAdapter: ?Adapter<WSSAdapter>;
 }
 
 export interface LiveQueryServerOptions {
@@ -257,4 +260,6 @@ export interface LiveQueryServerOptions {
   redisURL: ?string;
   /* LiveQuery pubsub adapter */
   pubSubAdapter: ?Adapter<PubSubAdapter>;
+  /* Adapter module for the WebSocketServer */
+  wssAdapter: ?Adapter<WSSAdapter>;
 }
diff --git a/src/ParseServer.js b/src/ParseServer.js
index 556d220b3f..4f7a788c10 100644
--- a/src/ParseServer.js
+++ b/src/ParseServer.js
@@ -45,32 +45,7 @@ import { ParseGraphQLServer } from './GraphQL/ParseGraphQLServer';
 addParseCloud();
 
 // ParseServer works like a constructor of an express app.
-// The args that we understand are:
-// "analyticsAdapter": an adapter class for analytics
-// "filesAdapter": a class like GridFSBucketAdapter providing create, get,
-//                 and delete
-// "loggerAdapter": a class like WinstonLoggerAdapter providing info, error,
-//                 and query
-// "jsonLogs": log as structured JSON objects
-// "databaseURI": a uri like mongodb://localhost:27017/dbname to tell us
-//          what database this Parse API connects to.
-// "cloud": relative location to cloud code to require, or a function
-//          that is given an instance of Parse as a parameter.  Use this instance of Parse
-//          to register your cloud code hooks and functions.
-// "appId": the application id to host
-// "masterKey": the master key for requests to this app
-// "collectionPrefix": optional prefix for database collection names
-// "fileKey": optional key from Parse dashboard for supporting older files
-//            hosted by Parse
-// "clientKey": optional key from Parse dashboard
-// "dotNetKey": optional key from Parse dashboard
-// "restAPIKey": optional key from Parse dashboard
-// "webhookKey": optional key from Parse dashboard
-// "javascriptKey": optional key from Parse dashboard
-// "push": optional key from configure push
-// "sessionLength": optional length in seconds for how long Sessions should be valid for
-// "maxLimit": optional upper bound for what can be specified for the 'limit' parameter on queries
-
+// https://parseplatform.org/parse-server/api/master/ParseServerOptions.html
 class ParseServer {
   /**
    * @constructor