diff --git a/package-lock.json b/package-lock.json
index f52fc25..550faf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "enonic-types",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -102,13 +102,13 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.0.tgz",
-      "integrity": "sha512-IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.1.tgz",
+      "integrity": "sha512-5JriGbYhtqMS1kRcZTQxndz1lKMwwEXKbwZbkUZNnp6MJX0+OVXnG0kOlBZP4LUAxEyzu3cs+EXd/97MJXsGfw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.14.0",
-        "@typescript-eslint/scope-manager": "4.14.0",
+        "@typescript-eslint/experimental-utils": "4.14.1",
+        "@typescript-eslint/scope-manager": "4.14.1",
         "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "lodash": "^4.17.15",
@@ -118,55 +118,55 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.0.tgz",
-      "integrity": "sha512-6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.1.tgz",
+      "integrity": "sha512-2CuHWOJwvpw0LofbyG5gvYjEyoJeSvVH2PnfUQSn0KQr4v8Dql2pr43ohmx4fdPQ/eVoTSFjTi/bsGEXl/zUUQ==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.14.0",
-        "@typescript-eslint/types": "4.14.0",
-        "@typescript-eslint/typescript-estree": "4.14.0",
+        "@typescript-eslint/scope-manager": "4.14.1",
+        "@typescript-eslint/types": "4.14.1",
+        "@typescript-eslint/typescript-estree": "4.14.1",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.14.0.tgz",
-      "integrity": "sha512-sUDeuCjBU+ZF3Lzw0hphTyScmDDJ5QVkyE21pRoBo8iDl7WBtVFS+WDN3blY1CH3SBt7EmYCw6wfmJjF0l/uYg==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.14.1.tgz",
+      "integrity": "sha512-mL3+gU18g9JPsHZuKMZ8Z0Ss9YP1S5xYZ7n68Z98GnPq02pYNQuRXL85b9GYhl6jpdvUc45Km7hAl71vybjUmw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.14.0",
-        "@typescript-eslint/types": "4.14.0",
-        "@typescript-eslint/typescript-estree": "4.14.0",
+        "@typescript-eslint/scope-manager": "4.14.1",
+        "@typescript-eslint/types": "4.14.1",
+        "@typescript-eslint/typescript-estree": "4.14.1",
         "debug": "^4.1.1"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.14.0.tgz",
-      "integrity": "sha512-/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.14.1.tgz",
+      "integrity": "sha512-F4bjJcSqXqHnC9JGUlnqSa3fC2YH5zTtmACS1Hk+WX/nFB0guuynVK5ev35D4XZbdKjulXBAQMyRr216kmxghw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.14.0",
-        "@typescript-eslint/visitor-keys": "4.14.0"
+        "@typescript-eslint/types": "4.14.1",
+        "@typescript-eslint/visitor-keys": "4.14.1"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.14.0.tgz",
-      "integrity": "sha512-VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.14.1.tgz",
+      "integrity": "sha512-SkhzHdI/AllAgQSxXM89XwS1Tkic7csPdndUuTKabEwRcEfR8uQ/iPA3Dgio1rqsV3jtqZhY0QQni8rLswJM2w==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz",
-      "integrity": "sha512-wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.1.tgz",
+      "integrity": "sha512-M8+7MbzKC1PvJIA8kR2sSBnex8bsR5auatLCnVlNTJczmJgqRn8M+sAlQfkEq7M4IY3WmaNJ+LJjPVRrREVSHQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.14.0",
-        "@typescript-eslint/visitor-keys": "4.14.0",
+        "@typescript-eslint/types": "4.14.1",
+        "@typescript-eslint/visitor-keys": "4.14.1",
         "debug": "^4.1.1",
         "globby": "^11.0.1",
         "is-glob": "^4.0.1",
@@ -176,12 +176,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz",
-      "integrity": "sha512-MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.1.tgz",
+      "integrity": "sha512-TAblbDXOI7bd0C/9PE1G+AFo7R5uc+ty1ArDoxmrC1ah61Hn6shURKy7gLdRb1qKJmjHkqu5Oq+e4Kt0jwf1IA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.14.0",
+        "@typescript-eslint/types": "4.14.1",
         "eslint-visitor-keys": "^2.0.0"
       }
     },
@@ -420,9 +420,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz",
-      "integrity": "sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz",
+      "integrity": "sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -609,9 +609,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz",
-      "integrity": "sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz",
+      "integrity": "sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -1151,9 +1151,9 @@
       "dev": true
     },
     "tsutils": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.19.1.tgz",
-      "integrity": "sha512-GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz",
+      "integrity": "sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg==",
       "dev": true,
       "requires": {
         "tslib": "^1.8.1"
diff --git a/package.json b/package.json
index b16ef13..7056282 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "enonic-types",
   "sideEffects": false,
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "TypeScript types for Enonic XP",
   "typings": "index.d.ts",
   "scripts": {
@@ -24,9 +24,9 @@
   },
   "homepage": "https://github.com/ItemConsulting/enonic-types#readme",
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.14.0",
-    "@typescript-eslint/parser": "^4.14.0",
-    "eslint": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^4.14.1",
+    "@typescript-eslint/parser": "^4.14.1",
+    "eslint": "^7.19.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.1.3"
   }
diff --git a/src/controller.ts b/src/controller.ts
index c2f2381..94154bd 100644
--- a/src/controller.ts
+++ b/src/controller.ts
@@ -1,5 +1,3 @@
-import {XOR} from "./types";
-
 export interface Request {
   readonly method: "GET" | "PUT" | "POST" | "DELETE";
   readonly scheme: string;
@@ -23,27 +21,25 @@ export type ResponseType =
   | Array<any>
   | ReadonlyArray<any>;
 
-export interface HttpResponse<ResponseBody = ResponseType> {
-  readonly status?: number;
-  readonly body?: ResponseBody;
-  readonly contentType?: string;
-  readonly headers?: { readonly [key: string]: string };
-  readonly cookies?: { readonly [key: string]: string | Cookie };
-  readonly redirect?: string;
-  readonly postProcess?: boolean;
-  readonly pageContributions?: PageContributions;
-  readonly applyFilters?: boolean;
+export interface Response<ResponseBody extends ResponseType = string> {
+  status?: number;
+  body?: ResponseBody;
+  contentType?: string;
+  headers?: { readonly [key: string]: string };
+  cookies?: { readonly [key: string]: string | Cookie };
+  redirect?: string;
+  postProcess?: boolean;
+  pageContributions?: PageContributions;
+  applyFilters?: boolean;
 }
 
 export interface WebSocketResponse<WebSocketData = {}> {
-  readonly webSocket: {
-    readonly data?: WebSocketData;
-    readonly subProtocols?: ReadonlyArray<string>;
+  webSocket: {
+    data?: WebSocketData;
+    subProtocols?: ReadonlyArray<string>;
   }
 }
 
-export type Response<ResponseBody = ResponseType, WebSocketData = {}> = XOR<HttpResponse<ResponseBody>, WebSocketResponse<WebSocketData>>;
-
 export interface MacroContext<Params = never> {
   readonly name: string;
   readonly body: string;
@@ -53,10 +49,10 @@ export interface MacroContext<Params = never> {
 }
 
 export interface PageContributions {
-  readonly headBegin?: string | ReadonlyArray<string>;
-  readonly headEnd?: string | ReadonlyArray<string>;
-  readonly bodyBegin?: string | ReadonlyArray<string>;
-  readonly bodyEnd?: string | ReadonlyArray<string>;
+  headBegin?: string | ReadonlyArray<string>;
+  headEnd?: string | ReadonlyArray<string>;
+  bodyBegin?: string | ReadonlyArray<string>;
+  bodyEnd?: string | ReadonlyArray<string>;
 }
 
 export interface Cookie {
@@ -109,7 +105,7 @@ export interface CustomSelectorServiceResponseBody {
 /**
  * This Response can be used by a Service that provides data to a CustomSelector input field
  */
-export type CustomSelectorServiceResponse = HttpResponse<CustomSelectorServiceResponseBody>;
+export type CustomSelectorServiceResponse = Response<CustomSelectorServiceResponseBody>;
 
 export interface CustomSelectorServiceResponseHit {
   readonly id: string;