diff --git a/README.md b/README.md
index e69de29b..a6b8431a 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,37 @@
+# Spin JS SDK
+
+This is an SDK for Javascript and Typescript based on [ComponentizeJS](https://github.com/bytecodealliance/ComponentizeJS).
+
+
+## Installing the templates
+
+[Spin](https://github.com/fermyon/spin) is a prerequisite. 
+
+The templates can be installed with the following command:
+
+```bash
+spin plugin install --update --git https://github.com/fermyon/spin-js-sdk --branch feat/sdk-v2
+```
+
+## Creating and building a new app
+
+```bash
+spin new -t http-ts hello-world -a
+cd hello-world
+npm install
+spin buiild
+```
+
+## Running the app
+
+```bash
+spin up
+```
+
+## Note: Installing the package
+
+Currently pre-release versions are published on NPM and can be installed using the following command: 
+
+```bash
+npm install @fermyon/spin-sdk@next
+```
\ No newline at end of file
diff --git a/bin/wit/spin.wit b/bin/wit/spin.wit
index 38431356..1e901776 100644
--- a/bin/wit/spin.wit
+++ b/bin/wit/spin.wit
@@ -2,6 +2,7 @@ package fermyon:spin@2.0.0;
 
 world spin-imports {
   import wasi:http/outgoing-handler@0.2.0;
+  include wasi:cli/imports@0.2.0;
   import llm;
   import redis;
   import postgres;
diff --git a/package-lock.json b/package-lock.json
index 1e4b8920..197d8527 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "@fermyon/spin-sdk",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@fermyon/spin-sdk",
-      "version": "2.0.0-alpha.1",
-      "license": "ISC",
+      "version": "2.0.0-alpha.2",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@bytecodealliance/componentize-js": "^0.8.3",
+        "@bytecodealliance/componentize-js": "https://github.com/fermyon/ComponentizeJS#use_fetch_event",
         "itty-router": "^3.0.12",
         "yargs": "^17.7.2"
       },
@@ -21,9 +21,9 @@
         "typescript": "^5.4.3"
       }
     },
-    "../../../adobe/aio-experiments/ComponentizeJS": {
-      "name": "@bytecodealliance/componentize-js",
+    "node_modules/@bytecodealliance/componentize-js": {
       "version": "0.8.3",
+      "resolved": "git+ssh://git@github.com/fermyon/ComponentizeJS.git#c3107d1240ca0e1b5b7d3bdad95f0168a1a808ef",
       "workspaces": [
         "."
       ],
@@ -31,22 +31,214 @@
         "@bytecodealliance/jco": "1.1.1",
         "@bytecodealliance/wizer": "^3.0.1",
         "es-module-lexer": "^1.4.1"
-      },
-      "devDependencies": {
+      }
+    },
+    "node_modules/@bytecodealliance/jco": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/jco/-/jco-1.1.1.tgz",
+      "integrity": "sha512-s8Zz6GFPlo2g+dsGp1OMIWXSZnM4FyIloxNAc4grF5TZwFoD00Gj8b0xvpmFSeZj36X/bJPa7x3za3j7Cfeetw==",
+      "workspaces": [
+        "packages/preview2-shim"
+      ],
+      "dependencies": {
         "@bytecodealliance/preview2-shim": "^0.16.1",
-        "mocha": "^10.2.0"
+        "binaryen": "^116.0.0",
+        "chalk-template": "^1",
+        "commander": "^12",
+        "mkdirp": "^3",
+        "ora": "^8",
+        "terser": "^5"
+      },
+      "bin": {
+        "jco": "src/jco.js"
       }
     },
-    "node_modules/@bytecodealliance/componentize-js": {
-      "resolved": "../../../adobe/aio-experiments/ComponentizeJS",
-      "link": true
+    "node_modules/@bytecodealliance/preview2-shim": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/preview2-shim/-/preview2-shim-0.16.2.tgz",
+      "integrity": "sha512-36MwesmbLSf3Y5/OHcS85iBaF0N92CQ4gpjtDVKSbrjxmrBKCWlWVfoQ03F/cqDg8k5K7pzVaVBH0XBIbTCfTQ=="
+    },
+    "node_modules/@bytecodealliance/wizer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/wizer/-/wizer-3.0.1.tgz",
+      "integrity": "sha512-f0NBiBHCNBkbFHTPRbA7aKf/t4KyNhi2KvSqw3QzCgi8wFF/uLZ0dhejj93rbiKO/iwWbmU7v9K3SVkW81mcjQ==",
+      "bin": {
+        "wizer": "wizer.js"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "optionalDependencies": {
+        "@bytecodealliance/wizer-darwin-arm64": "3.0.1",
+        "@bytecodealliance/wizer-darwin-x64": "3.0.1",
+        "@bytecodealliance/wizer-linux-arm64": "3.0.1",
+        "@bytecodealliance/wizer-linux-s390x": "3.0.1",
+        "@bytecodealliance/wizer-linux-x64": "3.0.1",
+        "@bytecodealliance/wizer-win32-x64": "3.0.1"
+      }
+    },
+    "node_modules/@bytecodealliance/wizer-darwin-arm64": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/wizer-darwin-arm64/-/wizer-darwin-arm64-3.0.1.tgz",
+      "integrity": "sha512-/8KYSajyhO9koAE3qQhYfC6belZheJw9X3XqW7hrizTpj6n4z4OJFhhqwJmiYFUUsPtC7OxcXMFFPbTuSQPBcw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "bin": {
+        "wizer-darwin-arm64": "wizer"
+      }
+    },
+    "node_modules/@bytecodealliance/wizer-darwin-x64": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/wizer-darwin-x64/-/wizer-darwin-x64-3.0.1.tgz",
+      "integrity": "sha512-bMReultN/r+W/BRXV0F+28U5dZwbQT/ZO0k4icZlhUhrv5/wpQJix7Z/ZvBnVQ+/JHb0QDUpFk2/zCtgkRXP6Q==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "bin": {
+        "wizer-darwin-x64": "wizer"
+      }
+    },
+    "node_modules/@bytecodealliance/wizer-linux-arm64": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/wizer-linux-arm64/-/wizer-linux-arm64-3.0.1.tgz",
+      "integrity": "sha512-35ZhAeYxWK3bTqqgwysbBWlGlrlMNKNng3ZITQV2PAtafpE7aCeqywl7VAS4lLRG5eTb7wxNgN7zf8d3wiIFTQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "bin": {
+        "wizer-linux-arm64": "wizer"
+      }
+    },
+    "node_modules/@bytecodealliance/wizer-linux-s390x": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/wizer-linux-s390x/-/wizer-linux-s390x-3.0.1.tgz",
+      "integrity": "sha512-Smvy9mguEMtX0lupDLTPshXUzAHeOhgscr1bhGNjeCCLD1sd8rIjBvWV19Wtra0BL1zTuU2EPOHjR/4k8WoyDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "bin": {
+        "wizer-linux-s390x": "wizer"
+      }
+    },
+    "node_modules/@bytecodealliance/wizer-linux-x64": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/wizer-linux-x64/-/wizer-linux-x64-3.0.1.tgz",
+      "integrity": "sha512-uUue78xl7iwndsGgTsagHLTLyLBVHhwzuywiwHt1xw8y0X0O8REKRLBoB7+LdM+pttDPdFtKJgbTFL4UPAA7Yw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "bin": {
+        "wizer-linux-x64": "wizer"
+      }
+    },
+    "node_modules/@bytecodealliance/wizer-win32-x64": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/wizer-win32-x64/-/wizer-win32-x64-3.0.1.tgz",
+      "integrity": "sha512-ycd38sx1UTZpHZwh8IfH/4N3n0OQUB8awxkUSLXf9PolEd088YbxoPB3noHy4E+L2oYN7KZMrg9517pX0z2RhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "bin": {
+        "wizer-win32-x64": "wizer"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
+      "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/ansi-styles": {
@@ -63,6 +255,70 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/binaryen": {
+      "version": "116.0.0",
+      "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-116.0.0.tgz",
+      "integrity": "sha512-Hp0dXC6Cb/rTwWEoUS2BRghObE7g/S9umKtxuTDt3f61G6fNTE/YVew/ezyy3IdHcLx3f17qfh6LwETgCfvWkQ==",
+      "bin": {
+        "wasm-opt": "bin/wasm-opt",
+        "wasm2js": "bin/wasm2js"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
+    "node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk-template": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-1.1.0.tgz",
+      "integrity": "sha512-T2VJbcDuZQ0Tb2EWwSotMPJjgpy1/tGee1BTpUNsGZ/qgNjV2t7Mvu+d4600U564nbLesN1x2dPL+xii174Ekg==",
+      "dependencies": {
+        "chalk": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk-template?sponsor=1"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
+      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+      "dependencies": {
+        "restore-cursor": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -76,6 +332,14 @@
         "node": ">=12"
       }
     },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cliui/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -94,6 +358,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -110,6 +385,24 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
+    "node_modules/commander": {
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
+      "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw=="
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz",
+      "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg=="
+    },
     "node_modules/escalade": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
@@ -126,6 +419,17 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
+      "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -134,15 +438,121 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-interactive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
+      "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz",
+      "integrity": "sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/itty-router": {
       "version": "3.0.12",
       "resolved": "https://registry.npmjs.org/itty-router/-/itty-router-3.0.12.tgz",
       "integrity": "sha512-s98XTPhle6GGbaFf0kYrOD3Q8gyhnqvOqkwYijC3AmkceNKqWUp13YHg6dWmqmVv4pP7l7c94XI92I0EXVGO0w=="
     },
+    "node_modules/log-symbols": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz",
+      "integrity": "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==",
+      "dependencies": {
+        "chalk": "^5.3.0",
+        "is-unicode-supported": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/is-unicode-supported": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
+      "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-8.0.1.tgz",
+      "integrity": "sha512-ANIvzobt1rls2BDny5fWZ3ZVKyD6nscLvfFRpQgfWsythlcsVUC9kL0zq6j2Z5z9wwp1kd7wpsD/T9qNPVLCaQ==",
+      "dependencies": {
+        "chalk": "^5.3.0",
+        "cli-cursor": "^4.0.0",
+        "cli-spinners": "^2.9.2",
+        "is-interactive": "^2.0.0",
+        "is-unicode-supported": "^2.0.0",
+        "log-symbols": "^6.0.0",
+        "stdin-discarder": "^0.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz",
+      "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -162,17 +572,106 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/restore-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
+      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/stdin-discarder": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz",
+      "integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz",
+      "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==",
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.31.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz",
+      "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+    },
     "node_modules/typescript": {
       "version": "5.4.5",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
@@ -202,6 +701,14 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrap-ansi/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -220,6 +727,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -253,6 +771,14 @@
         "node": ">=12"
       }
     },
+    "node_modules/yargs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/yargs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -270,6 +796,17 @@
       "engines": {
         "node": ">=8"
       }
+    },
+    "node_modules/yargs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 2890292a..9208829e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fermyon/spin-sdk",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.2",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -20,7 +20,7 @@
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@bytecodealliance/componentize-js": "^0.8.3",
+    "@bytecodealliance/componentize-js": "https://github.com/fermyon/ComponentizeJS#use_fetch_event",
     "itty-router": "^3.0.12",
     "yargs": "^17.7.2"
   }
diff --git a/plugins/webpack/index.js b/plugins/webpack/index.js
index 84b8e802..02cb062b 100644
--- a/plugins/webpack/index.js
+++ b/plugins/webpack/index.js
@@ -2,6 +2,8 @@ class SpinSdkPlugin {
     constructor() {
         this.externals = {
             "wasi:http/types@0.2.0": "wasi:http/types@0.2.0",
+            "wasi:cli/environment@0.2.0": "wasi:cli/environment@0.2.0",
+            "wasi:filesystem/preopens@0.2.0": "wasi:filesystem/preopens@0.2.0",
             "fermyon:spin/llm@2.0.0": "fermyon:spin/llm@2.0.0",
             "fermyon:spin/variables@2.0.0": "fermyon:spin/variables@2.0.0",
             "fermyon:spin/redis@2.0.0": "fermyon:spin/redis@2.0.0",
diff --git a/src/inboundHttp.ts b/src/inboundHttp.ts
index 84d8c5fe..e6880401 100644
--- a/src/inboundHttp.ts
+++ b/src/inboundHttp.ts
@@ -1,121 +1,15 @@
-import {
-  ResponseOutparam,
-  Fields,
-  OutgoingResponse,
-  OutgoingBody,
-  // @ts-ignore
-} from 'wasi:http/types@0.2.0';
-import {
-  headers,
-  IncomingRequest,
-  OutputStream,
-  OutgoingResponse as OutgoingResponseType,
-  OutgoingBody as OutgoingBodyType,
-} from './types/wasi-http';
-
-const decoder = new TextDecoder();
-const encoder = new TextEncoder();
-
-const MAX_BLOCKING_BODY_READ_SIZE = 16 * 1024;
-const MAX_BLOCKING_BODY_WRITE_SIZE = 4 * 1024;
-
-export abstract class HttpHandler {
-  abstract handleRequest(req: HttpRequest, res: ResponseBuilder): Promise<void>;
-
-  handle = async (
-    request: IncomingRequest,
-    responseOut: OutputStream,
-  ): Promise<void> => {
-    let method = request.method();
-
-    let requestBody = request.consume();
-    let requestStream = requestBody.stream();
-    let body = new Uint8Array();
-
-    while (true) {
-      try {
-        body = new Uint8Array([
-          ...body,
-          ...requestStream.blockingRead(MAX_BLOCKING_BODY_READ_SIZE),
-        ]);
-      } catch (e: any) {
-        if (e.payload?.tag === 'closed') {
-          break;
-        }
-        throw e;
-      }
-    }
-
-    let requestUri = request.pathWithQuery();
-    let url = requestUri ? requestUri : '/';
-
-    let headers = new Headers();
-    request
-      .headers()
-      .entries()
-      .forEach(([key, value]) => {
-        headers.append(key, decoder.decode(value));
-      });
-
-    let req: HttpRequest = {
-      method: method.tag.toString().toUpperCase(),
-      uri: url,
-      headers: headers,
-      body: body,
-      text: () => {
-        return decoder.decode(body);
-      },
-      json: (): any => {
-        return JSON.parse(decoder.decode(body));
-      },
-    };
-
-    let res = new ResponseBuilder(responseOut);
-    try {
-      await this.handleRequest(req, res);
-    } catch (e: any) {
-      console.log(e.message);
-    }
-  };
-}
-
-export interface WasiHttpRequest {
-  method: string;
-  uri: string;
-  headers: Headers;
-  body?: Uint8Array;
-}
-
-export interface HttpRequest extends WasiHttpRequest {
-  text: () => string;
-  json: () => any;
-}
-
-// FormData and Blob need to be added
-export type BodyInit =
-  | BufferSource
-  | URLSearchParams
-  | ReadableStream<Uint8Array>
-  | USVString;
-
-export type USVString = string | ArrayBuffer | ArrayBufferView;
+type ResolveFunction = (value: Response | PromiseLike<Response>) => void;
 
 export class ResponseBuilder {
-  headers: Headers;
-  private hasWrittenHeaders: boolean;
-  private hasSentResponse: boolean;
-  private responseOut: OutputStream;
-  private statusCode: number;
-  private responseBody: OutgoingBodyType | undefined;
-  private responseStream: OutputStream | undefined;
-  private response: OutgoingResponseType | undefined;
-
-  constructor(responseOut: OutputStream) {
-    this.responseOut = responseOut;
-    this.statusCode = 200;
-    this.headers = new Headers();
-    this.hasWrittenHeaders = false;
-    this.hasSentResponse = false;
+  headers: Headers = new Headers();
+  statusCode: number = 200;
+  private hasWrittenHeaders: boolean = false;
+  private hasSentResponse: boolean = false;
+  private resolveFunction: ResolveFunction;
+  private internalWriter: WritableStreamDefaultWriter<any> | undefined;
+
+  constructor(resolve: ResolveFunction) {
+    this.resolveFunction = resolve;
   }
   status(code: number): ResponseBuilder {
     if (this.hasWrittenHeaders) {
@@ -128,7 +22,7 @@ export class ResponseBuilder {
     return this.statusCode;
   }
   set(
-    arg1: string | { [key: string]: string },
+    arg1: string | { [key: string]: string } | Headers,
     arg2?: string,
   ): ResponseBuilder {
     if (this.hasWrittenHeaders) {
@@ -136,6 +30,10 @@ export class ResponseBuilder {
     }
     if (typeof arg1 === 'string' && typeof arg2 === 'string') {
       this.headers.set(arg1, arg2);
+    } else if (typeof arg1 === 'object' && arg1 instanceof Headers) {
+      arg1.forEach((value, key) => {
+        this.headers.set(key, value);
+      });
     } else if (typeof arg1 === 'object' && arg2 === undefined) {
       for (const key in arg1) {
         this.headers.set(key, arg1[key]);
@@ -145,56 +43,60 @@ export class ResponseBuilder {
     }
     return this;
   }
-  send(value: BodyInit = new Uint8Array()) {
+  send(value?: BodyInit) {
     if (this.hasSentResponse) {
       throw new Error('Response has already been sent');
     }
-    this.write(value);
-    this.end();
+    // If headers have not already been sent, Set the value on the engine and
+    // let it take care of setting content type/length headers
+    if (!this.hasWrittenHeaders) {
+      this.resolveFunction(
+        new Response(value, { headers: this.headers, status: this.statusCode }),
+      );
+      this.hasWrittenHeaders = true;
+    } else {
+      // If headers have been sent already, it is a streaming response, continue
+      // writing to Readable stream
+      if (value) {
+        this.write(value);
+      }
+      this.end();
+    }
     this.hasSentResponse = true;
   }
   write(value: BodyInit) {
     if (this.hasSentResponse) {
       throw new Error('Response has already been sent');
     }
+    let contents = convertToUint8Array(value);
     if (!this.hasWrittenHeaders) {
-      let headers = new Fields() as headers;
-      this.headers.forEach((value, key) => {
-        headers.append(key, encoder.encode(value));
-      });
-      this.response = new OutgoingResponse(headers) as OutgoingResponseType;
-      this.responseBody = this.response.body();
-      this.responseStream = this.responseBody.write();
-      this.response.setStatusCode(this.statusCode);
-      ResponseOutparam.set(this.responseOut, { tag: 'ok', val: this.response });
+      let { readable, writable } = new TransformStream();
+      this.internalWriter = writable.getWriter();
+      this.resolveFunction(
+        new Response(readable, {
+          headers: this.headers,
+          status: this.statusCode,
+        }),
+      );
       this.hasWrittenHeaders = true;
     }
-    writeBytesToOutputStream(value, this.responseStream!);
+    this.internalWriter!.write(contents);
+    return;
   }
   end() {
     if (this.hasSentResponse) {
       throw new Error('Response has already been sent');
     }
-    // The OutgoingBody here is untyped because I have not figured out how to do that in typescript yet.
-    this.responseStream?.[Symbol.dispose]();
-    OutgoingBody.finish(this.responseBody!, { tag: 'none' });
+    // Not a streaming response, use 'send()' directly to send reponse.
+    if (!this.internalWriter) {
+      this.send();
+    }
+    // close stream
+    this.internalWriter!.close();
     this.hasSentResponse = true;
   }
 }
 
-function writeBytesToOutputStream(
-  body: BodyInit,
-  responseStream: OutputStream,
-) {
-  let bytes = convertToUint8Array(body);
-  let offset = 0;
-  while (offset < bytes.length) {
-    const count = Math.min(bytes.length - offset, MAX_BLOCKING_BODY_WRITE_SIZE);
-    responseStream.blockingWriteAndFlush(bytes.slice(offset, offset + count));
-    offset += count;
-  }
-}
-
 function convertToUint8Array(body: BodyInit): Uint8Array {
   if (body instanceof ArrayBuffer) {
     return new Uint8Array(body);
diff --git a/src/index.ts b/src/index.ts
index ff58884c..2d5d5e3d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,4 @@
-import { ResponseBuilder, HttpHandler, HttpRequest } from './inboundHttp';
+import { ResponseBuilder } from './inboundHttp';
 import { RedisHandler } from './inboundRedis';
 import * as Llm from './llm';
 import * as Variables from './variables';
@@ -11,7 +11,6 @@ import * as Mqtt from './mqtt';
 import { Router } from './router';
 
 export {
-  HttpHandler,
   Router,
   Llm,
   Variables,
@@ -23,5 +22,4 @@ export {
   Mqtt,
   RedisHandler,
   ResponseBuilder,
-  HttpRequest,
 };
diff --git a/src/router.ts b/src/router.ts
index 4731eacf..b0951bbb 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,5 +1,5 @@
 import { Router as _router } from 'itty-router';
-import { HttpRequest, ResponseBuilder } from './inboundHttp';
+import { ResponseBuilder } from './inboundHttp';
 
 declare type GenericTraps = {
   [key: string]: any;
@@ -27,12 +27,7 @@ interface RouteHandler {
 }
 
 interface SpinRouteHandler {
-  (
-    metadata: IRequest,
-    req: HttpRequest,
-    res: ResponseBuilder,
-    ...args: any
-  ): any;
+  (metadata: IRequest, req: Request, res: ResponseBuilder, ...args: any): any;
 }
 
 declare type RouteEntry = [string, RegExp, RouteHandler[]];
@@ -61,7 +56,7 @@ interface routerType {
   get(path: string, ...handlers: SpinRouteHandler[]): RouterType;
   handle(request: RequestLike, ...extras: any): Promise<any>;
   handleRequest(
-    request: HttpRequest,
+    request: Request,
     response: ResponseBuilder,
     ...extras: any
   ): Promise<any>;
@@ -93,7 +88,7 @@ function Router(): routerType {
       return _spinRouter.handle(request, ...extra);
     },
     handleRequest: function (
-      request: HttpRequest,
+      request: Request,
       response: ResponseBuilder,
       ...a: any
     ): Promise<any> {
@@ -134,7 +129,7 @@ function wrapRouteHandler(handlers: SpinRouteHandler[]): RouteHandler[] {
   for (let handler of handlers) {
     let fn = async (
       metadata: IRequest,
-      req: HttpRequest,
+      req: Request,
       res: ResponseBuilder,
       ...args: any
     ) => {
diff --git a/templates/http-ts/content/package.json b/templates/http-ts/content/package.json
index 484a4302..3bb49f16 100644
--- a/templates/http-ts/content/package.json
+++ b/templates/http-ts/content/package.json
@@ -15,11 +15,9 @@
         "ts-loader": "^9.4.1",
         "typescript": "^4.8.4",
         "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0",
-        "@bytecodealliance/componentize-js": "^0.8.3",
-        "yargs": "^17.7.2"
+        "webpack-cli": "^4.10.0"
     },
     "dependencies": {
-        "@fermyon/spin-sdk": "^2.0.0-alpha.1"
+        "@fermyon/spin-sdk": "^2.0.0-alpha.2"
     }
-}
\ No newline at end of file
+}
diff --git a/templates/http-ts/content/src/index.ts b/templates/http-ts/content/src/index.ts
index 9bb73012..61144ef2 100644
--- a/templates/http-ts/content/src/index.ts
+++ b/templates/http-ts/content/src/index.ts
@@ -1,6 +1,6 @@
-import { HttpRequest, ResponseBuilder } from "@fermyon/spin-sdk";
+import { ResponseBuilder } from "@fermyon/spin-sdk";
 
-export async function handler(req: HttpRequest, res: ResponseBuilder) {
-    console.log("Request: ", req.uri);
-    res.send("Hello, Universe!");
+export async function handler(req: Request, res: ResponseBuilder) {
+    console.log(req);
+    res.send("hello universe");
 }
diff --git a/templates/http-ts/content/src/spin.ts b/templates/http-ts/content/src/spin.ts
index 609ed478..204d914e 100644
--- a/templates/http-ts/content/src/spin.ts
+++ b/templates/http-ts/content/src/spin.ts
@@ -1,10 +1,28 @@
-import { HttpHandler, HttpRequest, ResponseBuilder } from "@fermyon/spin-sdk";
+import { ResponseBuilder } from "@fermyon/spin-sdk";
 import { handler } from ".";
 
-class App extends HttpHandler {
-    handleRequest(req: HttpRequest, res: ResponseBuilder): Promise<void> {
-        return handler(req, res)
-    }
+//@ts-ignore
+addEventListener('fetch', (event: FetchEvent) => {
+    handleEvent(event);
+});
+
+async function handleEvent(event: FetchEvent) {
+
+    let resolve: any, reject: any;
+    let responsePromise = new Promise(async (res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    //@ts-ignore
+    event.respondWith(responsePromise);
+
+    let res = new ResponseBuilder(resolve);
+
+    await handler(event.request, res)
 }
 
-export const incomingHandler = new App()
+// Keep wizer happy during pre-init. Should go away
+// oncehttps://github.com/bytecodealliance/ComponentizeJS/issues/114 is resolved
+export const incomingHandler = {
+    handle() { }
+}
diff --git a/templates/http-ts/content/tsconfig.json b/templates/http-ts/content/tsconfig.json
index 8d86d98b..851fe99f 100644
--- a/templates/http-ts/content/tsconfig.json
+++ b/templates/http-ts/content/tsconfig.json
@@ -7,7 +7,8 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015"
+            "ES2015",
+            "WebWorker"
         ],
         "allowJs": true,
         "strict": true,
diff --git a/test/test-app/package-lock.json b/test/test-app/package-lock.json
index 29a8dd37..63f8cf80 100644
--- a/test/test-app/package-lock.json
+++ b/test/test-app/package-lock.json
@@ -9,7 +9,7 @@
             "version": "1.0.0",
             "license": "ISC",
             "dependencies": {
-                "@fermyon/spin-sdk": "^2.0.0-alpha.1"
+                "@fermyon/spin-sdk": "file:../../"
             },
             "devDependencies": {
                 "@bytecodealliance/componentize-js": "^0.8.3",
@@ -21,10 +21,28 @@
                 "yargs": "^17.7.2"
             }
         },
+        "../..": {
+            "name": "@fermyon/spin-sdk",
+            "version": "2.0.0-alpha.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@bytecodealliance/componentize-js": "https://github.com/fermyon/ComponentizeJS#use_fetch_event",
+                "itty-router": "^3.0.12",
+                "yargs": "^17.7.2"
+            },
+            "bin": {
+                "j2w": "bin/j2w.mjs"
+            },
+            "devDependencies": {
+                "prettier": "^3.2.5",
+                "typescript": "^5.4.3"
+            }
+        },
         "node_modules/@bytecodealliance/componentize-js": {
             "version": "0.8.3",
             "resolved": "https://registry.npmjs.org/@bytecodealliance/componentize-js/-/componentize-js-0.8.3.tgz",
             "integrity": "sha512-QyEHRtVg/Cg6RsA75AvRSbSOr0u+FLuXqB89X4Sys44K/VT5g/S9eMn8gqTotfuXVU3btS3Z4QAiyHSF2bja3w==",
+            "dev": true,
             "workspaces": [
                 "."
             ],
@@ -38,6 +56,7 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/@bytecodealliance/jco/-/jco-1.1.1.tgz",
             "integrity": "sha512-s8Zz6GFPlo2g+dsGp1OMIWXSZnM4FyIloxNAc4grF5TZwFoD00Gj8b0xvpmFSeZj36X/bJPa7x3za3j7Cfeetw==",
+            "dev": true,
             "workspaces": [
                 "packages/preview2-shim"
             ],
@@ -57,12 +76,14 @@
         "node_modules/@bytecodealliance/preview2-shim": {
             "version": "0.16.2",
             "resolved": "https://registry.npmjs.org/@bytecodealliance/preview2-shim/-/preview2-shim-0.16.2.tgz",
-            "integrity": "sha512-36MwesmbLSf3Y5/OHcS85iBaF0N92CQ4gpjtDVKSbrjxmrBKCWlWVfoQ03F/cqDg8k5K7pzVaVBH0XBIbTCfTQ=="
+            "integrity": "sha512-36MwesmbLSf3Y5/OHcS85iBaF0N92CQ4gpjtDVKSbrjxmrBKCWlWVfoQ03F/cqDg8k5K7pzVaVBH0XBIbTCfTQ==",
+            "dev": true
         },
         "node_modules/@bytecodealliance/wizer": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/@bytecodealliance/wizer/-/wizer-3.0.1.tgz",
             "integrity": "sha512-f0NBiBHCNBkbFHTPRbA7aKf/t4KyNhi2KvSqw3QzCgi8wFF/uLZ0dhejj93rbiKO/iwWbmU7v9K3SVkW81mcjQ==",
+            "dev": true,
             "bin": {
                 "wizer": "wizer.js"
             },
@@ -85,6 +106,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "optional": true,
             "os": [
                 "darwin"
@@ -100,6 +122,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "optional": true,
             "os": [
                 "darwin"
@@ -115,6 +138,7 @@
             "cpu": [
                 "arm64"
             ],
+            "dev": true,
             "optional": true,
             "os": [
                 "linux"
@@ -130,6 +154,7 @@
             "cpu": [
                 "s390x"
             ],
+            "dev": true,
             "optional": true,
             "os": [
                 "linux"
@@ -145,6 +170,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "optional": true,
             "os": [
                 "linux"
@@ -160,6 +186,7 @@
             "cpu": [
                 "x64"
             ],
+            "dev": true,
             "optional": true,
             "os": [
                 "win32"
@@ -178,22 +205,14 @@
             }
         },
         "node_modules/@fermyon/spin-sdk": {
-            "version": "2.0.0-alpha.1",
-            "resolved": "https://registry.npmjs.org/@fermyon/spin-sdk/-/spin-sdk-2.0.0-alpha.1.tgz",
-            "integrity": "sha512-XKLUDgWQfbPYpxVdWjwN1K5nXJVK9KR9G3zfm2VDA8u4QUAWpWXd0PzoHZrrkMDCfTtRUBmyTBJfCoosFZ92hA==",
-            "dependencies": {
-                "@bytecodealliance/componentize-js": "^0.8.3",
-                "itty-router": "^3.0.12",
-                "yargs": "^17.7.2"
-            },
-            "bin": {
-                "j2w": "bin/j2w.mjs"
-            }
+            "resolved": "../..",
+            "link": true
         },
         "node_modules/@jridgewell/gen-mapping": {
             "version": "0.3.5",
             "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
             "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+            "dev": true,
             "dependencies": {
                 "@jridgewell/set-array": "^1.2.1",
                 "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -207,6 +226,7 @@
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
             "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+            "dev": true,
             "engines": {
                 "node": ">=6.0.0"
             }
@@ -215,6 +235,7 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
             "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+            "dev": true,
             "engines": {
                 "node": ">=6.0.0"
             }
@@ -223,6 +244,7 @@
             "version": "0.3.6",
             "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
             "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+            "dev": true,
             "dependencies": {
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25"
@@ -231,12 +253,14 @@
         "node_modules/@jridgewell/sourcemap-codec": {
             "version": "1.4.15",
             "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+            "dev": true
         },
         "node_modules/@jridgewell/trace-mapping": {
             "version": "0.3.25",
             "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
             "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+            "dev": true,
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
                 "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -481,6 +505,7 @@
             "version": "8.11.3",
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
             "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+            "dev": true,
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -526,6 +551,7 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
             "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+            "dev": true,
             "engines": {
                 "node": ">=12"
             },
@@ -537,6 +563,7 @@
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -551,6 +578,7 @@
             "version": "116.0.0",
             "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-116.0.0.tgz",
             "integrity": "sha512-Hp0dXC6Cb/rTwWEoUS2BRghObE7g/S9umKtxuTDt3f61G6fNTE/YVew/ezyy3IdHcLx3f17qfh6LwETgCfvWkQ==",
+            "dev": true,
             "bin": {
                 "wasm-opt": "bin/wasm-opt",
                 "wasm2js": "bin/wasm2js"
@@ -603,7 +631,8 @@
         "node_modules/buffer-from": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "dev": true
         },
         "node_modules/caniuse-lite": {
             "version": "1.0.30001618",
@@ -629,6 +658,7 @@
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
             "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+            "dev": true,
             "engines": {
                 "node": "^12.17.0 || ^14.13 || >=16.0.0"
             },
@@ -640,6 +670,7 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-1.1.0.tgz",
             "integrity": "sha512-T2VJbcDuZQ0Tb2EWwSotMPJjgpy1/tGee1BTpUNsGZ/qgNjV2t7Mvu+d4600U564nbLesN1x2dPL+xii174Ekg==",
+            "dev": true,
             "dependencies": {
                 "chalk": "^5.2.0"
             },
@@ -663,6 +694,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
             "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+            "dev": true,
             "dependencies": {
                 "restore-cursor": "^4.0.0"
             },
@@ -677,6 +709,7 @@
             "version": "2.9.2",
             "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
             "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+            "dev": true,
             "engines": {
                 "node": ">=6"
             },
@@ -688,6 +721,7 @@
             "version": "8.0.1",
             "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
             "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+            "dev": true,
             "dependencies": {
                 "string-width": "^4.2.0",
                 "strip-ansi": "^6.0.1",
@@ -701,6 +735,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -708,12 +743,14 @@
         "node_modules/cliui/node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
         },
         "node_modules/cliui/node_modules/string-width": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -727,6 +764,7 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -752,6 +790,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
             "dependencies": {
                 "color-name": "~1.1.4"
             },
@@ -762,7 +801,8 @@
         "node_modules/color-name": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true
         },
         "node_modules/colorette": {
             "version": "2.0.20",
@@ -774,6 +814,7 @@
             "version": "12.0.0",
             "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz",
             "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==",
+            "dev": true,
             "engines": {
                 "node": ">=18"
             }
@@ -801,7 +842,8 @@
         "node_modules/emoji-regex": {
             "version": "10.3.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
-            "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw=="
+            "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==",
+            "dev": true
         },
         "node_modules/enhanced-resolve": {
             "version": "5.16.1",
@@ -831,12 +873,14 @@
         "node_modules/es-module-lexer": {
             "version": "1.5.2",
             "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz",
-            "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA=="
+            "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==",
+            "dev": true
         },
         "node_modules/escalade": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
             "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+            "dev": true,
             "engines": {
                 "node": ">=6"
             }
@@ -961,6 +1005,7 @@
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
             "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "dev": true,
             "engines": {
                 "node": "6.* || 8.* || >= 10.*"
             }
@@ -969,6 +1014,7 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
             "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
+            "dev": true,
             "engines": {
                 "node": ">=18"
             },
@@ -1053,6 +1099,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -1061,6 +1108,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
             "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
+            "dev": true,
             "engines": {
                 "node": ">=12"
             },
@@ -1093,6 +1141,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz",
             "integrity": "sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==",
+            "dev": true,
             "engines": {
                 "node": ">=18"
             },
@@ -1115,11 +1164,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/itty-router": {
-            "version": "3.0.12",
-            "resolved": "https://registry.npmjs.org/itty-router/-/itty-router-3.0.12.tgz",
-            "integrity": "sha512-s98XTPhle6GGbaFf0kYrOD3Q8gyhnqvOqkwYijC3AmkceNKqWUp13YHg6dWmqmVv4pP7l7c94XI92I0EXVGO0w=="
-        },
         "node_modules/jest-worker": {
             "version": "27.5.1",
             "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -1180,6 +1224,7 @@
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz",
             "integrity": "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==",
+            "dev": true,
             "dependencies": {
                 "chalk": "^5.3.0",
                 "is-unicode-supported": "^1.3.0"
@@ -1195,6 +1240,7 @@
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
             "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
+            "dev": true,
             "engines": {
                 "node": ">=12"
             },
@@ -1246,6 +1292,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
             "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true,
             "engines": {
                 "node": ">=6"
             }
@@ -1254,6 +1301,7 @@
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
             "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+            "dev": true,
             "bin": {
                 "mkdirp": "dist/cjs/src/bin.js"
             },
@@ -1280,6 +1328,7 @@
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
             "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+            "dev": true,
             "dependencies": {
                 "mimic-fn": "^2.1.0"
             },
@@ -1294,6 +1343,7 @@
             "version": "8.0.1",
             "resolved": "https://registry.npmjs.org/ora/-/ora-8.0.1.tgz",
             "integrity": "sha512-ANIvzobt1rls2BDny5fWZ3ZVKyD6nscLvfFRpQgfWsythlcsVUC9kL0zq6j2Z5z9wwp1kd7wpsD/T9qNPVLCaQ==",
+            "dev": true,
             "dependencies": {
                 "chalk": "^5.3.0",
                 "cli-cursor": "^4.0.0",
@@ -1436,6 +1486,7 @@
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
             "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "dev": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1482,6 +1533,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
             "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+            "dev": true,
             "dependencies": {
                 "onetime": "^5.1.0",
                 "signal-exit": "^3.0.2"
@@ -1588,12 +1640,14 @@
         "node_modules/signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
         },
         "node_modules/source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
             "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "dev": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1602,6 +1656,7 @@
             "version": "0.5.21",
             "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
             "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "dev": true,
             "dependencies": {
                 "buffer-from": "^1.0.0",
                 "source-map": "^0.6.0"
@@ -1611,6 +1666,7 @@
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz",
             "integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==",
+            "dev": true,
             "engines": {
                 "node": ">=18"
             },
@@ -1622,6 +1678,7 @@
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz",
             "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==",
+            "dev": true,
             "dependencies": {
                 "emoji-regex": "^10.3.0",
                 "get-east-asian-width": "^1.0.0",
@@ -1638,6 +1695,7 @@
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
             "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+            "dev": true,
             "dependencies": {
                 "ansi-regex": "^6.0.1"
             },
@@ -1688,6 +1746,7 @@
             "version": "5.31.0",
             "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
             "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
+            "dev": true,
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
                 "acorn": "^8.8.2",
@@ -1738,7 +1797,8 @@
         "node_modules/terser/node_modules/commander": {
             "version": "2.20.3",
             "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true
         },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
@@ -2031,6 +2091,7 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
             "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
             "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "string-width": "^4.1.0",
@@ -2047,6 +2108,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -2054,12 +2116,14 @@
         "node_modules/wrap-ansi/node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
         },
         "node_modules/wrap-ansi/node_modules/string-width": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -2073,6 +2137,7 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -2084,6 +2149,7 @@
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
             "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
             "engines": {
                 "node": ">=10"
             }
@@ -2092,6 +2158,7 @@
             "version": "17.7.2",
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
             "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+            "dev": true,
             "dependencies": {
                 "cliui": "^8.0.1",
                 "escalade": "^3.1.1",
@@ -2109,6 +2176,7 @@
             "version": "21.1.1",
             "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
             "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+            "dev": true,
             "engines": {
                 "node": ">=12"
             }
@@ -2117,6 +2185,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -2124,12 +2193,14 @@
         "node_modules/yargs/node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
         },
         "node_modules/yargs/node_modules/string-width": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -2143,6 +2214,7 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
diff --git a/test/test-app/package.json b/test/test-app/package.json
index 9d3a5cc4..1babd022 100644
--- a/test/test-app/package.json
+++ b/test/test-app/package.json
@@ -20,6 +20,6 @@
         "yargs": "^17.7.2"
     },
     "dependencies": {
-        "@fermyon/spin-sdk": "^2.0.0-alpha.1"
+        "@fermyon/spin-sdk": "file:../../"
     }
 }
\ No newline at end of file
diff --git a/test/test-app/src/index.ts b/test/test-app/src/index.ts
index a5e46e5e..873d0a05 100644
--- a/test/test-app/src/index.ts
+++ b/test/test-app/src/index.ts
@@ -1,4 +1,4 @@
-import { HttpRequest, ResponseBuilder, Router } from "@fermyon/spin-sdk";
+import { ResponseBuilder, Router } from "@fermyon/spin-sdk";
 import { testFunctionality, health } from "./test";
 
 let router = Router()
@@ -6,6 +6,6 @@ let router = Router()
 router.get("/", async (_, req, res) => { await testFunctionality(req, res) })
 router.get("/health", async (_, req, res) => { await health(req, res) })
 
-export async function handler(req: HttpRequest, res: ResponseBuilder) {
+export async function handler(req: Request, res: ResponseBuilder) {
     await router.handleRequest(req, res)
 }
diff --git a/test/test-app/src/spin.ts b/test/test-app/src/spin.ts
index 609ed478..f757f021 100644
--- a/test/test-app/src/spin.ts
+++ b/test/test-app/src/spin.ts
@@ -1,10 +1,28 @@
-import { HttpHandler, HttpRequest, ResponseBuilder } from "@fermyon/spin-sdk";
+import { ResponseBuilder } from "@fermyon/spin-sdk";
 import { handler } from ".";
 
-class App extends HttpHandler {
-    handleRequest(req: HttpRequest, res: ResponseBuilder): Promise<void> {
-        return handler(req, res)
-    }
+//@ts-ignore
+addEventListener('fetch', (event: FetchEvent) => {
+    handleEvent(event);
+});
+
+async function handleEvent(event: FetchEvent) {
+
+    let resolve: any, reject: any;
+    let responsePromise = new Promise(async (res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    //@ts-ignore
+    event.respondWith(responsePromise);
+
+    let res = new ResponseBuilder(resolve);
+
+    await handler(event.request, res)
 }
 
-export const incomingHandler = new App()
+// Keep wizer happy during pre-init. Should go away
+// oncehttps://github.com/bytecodealliance/ComponentizeJS/issues/114 is resolved
+export const incomingHandler = {
+    handle() { }
+}
\ No newline at end of file
diff --git a/test/test-app/src/test.ts b/test/test-app/src/test.ts
index 5237b482..5d78ec7a 100644
--- a/test/test-app/src/test.ts
+++ b/test/test-app/src/test.ts
@@ -1,14 +1,14 @@
-import { HttpRequest, ResponseBuilder } from "@fermyon/spin-sdk";
+import { ResponseBuilder } from "@fermyon/spin-sdk";
 
 const encoder = new TextEncoder()
 const decoder = new TextDecoder()
 
-function health(req: HttpRequest, res: ResponseBuilder) {
+function health(req: Request, res: ResponseBuilder) {
     res.status(200)
     res.send("Server is healthy")
 }
 
-async function testFunctionality(req: HttpRequest, res: ResponseBuilder) {
+async function testFunctionality(req: Request, res: ResponseBuilder) {
     //TODO: Add tests once fetch is available
     res.status(200)
     res.send("test completed successfully")
diff --git a/test/test-app/tsconfig.json b/test/test-app/tsconfig.json
index 8d86d98b..851fe99f 100644
--- a/test/test-app/tsconfig.json
+++ b/test/test-app/tsconfig.json
@@ -7,7 +7,8 @@
         "jsx": "react",
         "skipLibCheck": true,
         "lib": [
-            "ES2015"
+            "ES2015",
+            "WebWorker"
         ],
         "allowJs": true,
         "strict": true,
diff --git a/tsconfig.json b/tsconfig.json
index e11bf930..29b2abdc 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "exclude": [
         "templates/**/*",
+        "plugins/**/*",
         "lib/**/*",
         "bin/**/*",
         "test/**/*"