correct to zig

Merge branch 'main' into readme-language-icons
oracle not java
2026-01-12 07:18:02 -05:00 · 2023-01-18 14:49:12 -06:00 · 2023-01-18 14:47:58 -06:00 · 2022-12-27 11:37:02 -06:00 · 2022-12-27 11:35:12 -06:00
151 changed files with 2822 additions and 11056 deletions
--- a/.github/workflows/browser-ci.yml
+++ b/.github/workflows/browser-ci.yml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
        rust:
          - stable
    steps:
--- a/.github/workflows/ci-go.yml
+++ b/.github/workflows/ci-go.yml
@@ -34,6 +34,6 @@ jobs:
      - name: Test Go Host SDK
        run: |
          go version
-          LD_LIBRARY_PATH=/usr/local/lib go test
          cd go
-          LD_LIBRARY_PATH=/usr/local/lib go run main.go | grep "Hello from Go!"
+          LD_LIBRARY_PATH=/usr/local/lib go run main.go
+          LD_LIBRARY_PATH=/usr/local/lib go test
--- a/.github/workflows/ci-zig.yml
+++ b/.github/workflows/ci-zig.yml
@@ -18,7 +18,6 @@ jobs:
    strategy:
      matrix:
        os: [ubuntu-latest, macos-latest]
-        zig_version: ["master"] # eventually use multiple versions once stable
        rust:
          - stable
    steps:
@@ -27,8 +26,6 @@ jobs:
      - uses: ./.github/actions/extism
      - name: Setup Zig env
        uses: goto-bus-stop/setup-zig@v2
-        with: 
-          version: ${{ matrix.zig_version }}

      - name: Test Zig Host SDK
        run: |
--- a/.github/workflows/release-elixir.yaml
+++ b/.github/workflows/release-elixir.yaml
@@ -10,6 +10,13 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
+      - name: Install extism shared library
+        shell: bash
+        run: |
+          mkdir -p /home/runner/.local/bin/  
+          export PATH="/home/runner/.local/bin/:$PATH"
+          curl https://raw.githubusercontent.com/extism/cli/main/install.sh | sh
+          extism --sudo --prefix /usr/local install
      - name: Setup Elixir Host SDK
        uses: erlef/setup-beam@v1
        with:
--- a/.github/workflows/release-haskell.yaml
+++ b/.github/workflows/release-haskell.yaml
@@ -1,7 +1,7 @@
 on:
  workflow_dispatch:

-name: Release Haskell SDK
+name: Release Rust SDK

 jobs:
  release-sdks:
@@ -10,6 +10,7 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
+      
      - uses: cachix/haskell-release-action@v1
        with:
          - hackage-token: "${{ secrets.HACKAGE_TOKEN }}"
--- a/.github/workflows/release-rust.yaml
+++ b/.github/workflows/release-rust.yaml
@@ -19,22 +19,16 @@ jobs:
          override: true
          target: ${{ matrix.target }}

-      - name: Release Rust Manifest Crate
-        if: always()
+      - name: Release Rust Host SDK
        env:
          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_API_TOKEN }}
        run: |
          # order of crate publication matter: manifest, runtime, rust
+
          cargo publish --manifest-path manifest/Cargo.toml
          # allow for crates.io to update so dependant crates can locate extism-manifest
          sleep 5 

-      - name: Release Rust Host SDK
-        if: always()
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_API_TOKEN }}
-        run: |
-
          cargo publish --manifest-path runtime/Cargo.toml --no-verify
          cargo publish --manifest-path rust/Cargo.toml
      
--- a/.gitignore
+++ b/.gitignore
@@ -30,15 +30,9 @@ rust/test.log
 duniverse
 _build
 php/Extism.php
-python/docs
 dist-newstyle
 .stack-work
 vendor
 zig/zig-*
 zig/example-out/
 zig/*.log
-java/*.iml
-java/*.log
-java/.idea
-java/.DS_Store
-
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,5 +4,5 @@ members = [
  "runtime",
  "rust",
  "libextism",
+  "elixir/native/extism_nif"
 ]
-exclude = ["kernel"]
--- a/4
+++ b/4
@@ -21,10 +21,6 @@ endif
 build:
 	cargo build --release $(FEATURE_FLAGS) --manifest-path libextism/Cargo.toml

-.PHONY: kernel
-kernel:
-	cd kernel && bash build.sh
-
 lint:
 	cargo clippy --release --no-deps --manifest-path runtime/Cargo.toml

--- a/README.md
+++ b/README.md
@@ -1,26 +1,31 @@
 ### _Welcome!_

-**Please note:** This project still under active development and APIs may change until we hit v1.0.
-
-If you're interested in working on or building with Extism, please join our [Discord](https://discord.gg/cx3usBCWnc) and let us know - we are happy to help get you started.
+**Please note:** this project still under active development. It's usable, but expect some rough edges while work is underway. If you're interested in working on or building with Extism, please join our [Discord](https://discord.gg/cx3usBCWnc) and let us know - we are happy to help get you started.

 [![Discord](https://img.shields.io/discord/1011124058408112148?color=%23404eed&label=Community%20Chat&logo=Discord&logoColor=%23404eed)](https://discord.gg/cx3usBCWnc)

 # [Extism](https://extism.org)

-The universal plug-in system. Run WebAssembly extensions inside your app. Use idiomatic Host SDKs for [Go](https://extism.org/docs/integrate-into-your-codebase/go-host-sdk), 
-[Ruby](https://extism.org/docs/integrate-into-your-codebase/ruby-host-sdk), [Python](https://extism.org/docs/integrate-into-your-codebase/python-host-sdk), 
-[Node](https://extism.org/docs/integrate-into-your-codebase/node-host-sdk), [Rust](https://extism.org/docs/integrate-into-your-codebase/rust-host-sdk), 
-[C](https://extism.org/docs/integrate-into-your-codebase/c-host-sdk), [C++](https://extism.org/docs/integrate-into-your-codebase/cpp-host-sdk), 
-[OCaml](https://extism.org/docs/integrate-into-your-codebase/ocaml-host-sdk), 
-[Haskell](https://extism.org/docs/integrate-into-your-codebase/haskell-host-sdk), 
-[PHP](https://extism.org/docs/integrate-into-your-codebase/php-host-sdk), 
-[Elixir/Erlang](https://extism.org/docs/integrate-into-your-codebase/elixir-or-erlang-host-sdk), 
-[.NET](https://extism.org/docs/integrate-into-your-codebase/dotnet-host-sdk),
-[Java](https://extism.org/docs/integrate-into-your-codebase/java-host-sdk),
-[Zig](https://extism.org/docs/integrate-into-your-codebase/zig-host-sdk) &amp; more (others coming soon). 
+The universal plug-in system. Run WebAssembly extensions inside your app. Use idiomatic Host SDKs for [<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/go.svg" width="18" height="18" />  Go](https://extism.org/docs/integrate-into-your-codebase/go-host-sdk), 
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/ruby.svg" width="18" height="18" />  Ruby](https://extism.org/docs/integrate-into-your-codebase/ruby-host-sdk), [<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/python.svg" width="18" height="18" />  Python](https://extism.org/docs/integrate-into-your-codebase/python-host-sdk), 
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/nodedotjs.svg" width="18" height="18" />  Node](https://extism.org/docs/integrate-into-your-codebase/node-host-sdk), [<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/rust.svg" width="18" height="18" /> Rust](https://extism.org/docs/integrate-into-your-codebase/rust-host-sdk), 
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/c.svg" width="18" height="18" /> C](https://extism.org/docs/integrate-into-your-codebase/c-host-sdk), [<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/cplusplus.svg" width="18" height="18" /> C++](https://extism.org/docs/integrate-into-your-codebase/cpp-host-sdk), 
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/ocaml.svg" width="18" height="18" /> OCaml](https://extism.org/docs/integrate-into-your-codebase/ocaml-host-sdk), 
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/haskell.svg" width="18" height="18" /> Haskell](https://extism.org/docs/integrate-into-your-codebase/haskell-host-sdk), 
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/php.svg" width="18" height="18" /> PHP](https://extism.org/docs/integrate-into-your-codebase/php-host-sdk), 
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/elixir.svg" width="18" height="18" /> Elixir / <img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/erlang.svg" width="18" height="18" /> Erlang](https://extism.org/docs/integrate-into-your-codebase/elixir-or-erlang-host-sdk), 
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/dotnet.svg" width="18" height="18" /> .NET](https://extism.org/docs/integrate-into-your-codebase/dotnet-host-sdk),
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/oracle.svg" width="18" height="18" /> Java](https://extism.org/docs/integrate-into-your-codebase/java-host-sdk),
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/zig.svg" width="18" height="18" /> Zig](https://extism.org/docs/integrate-into-your-codebase/zig-host-sdk) &amp; more (others coming soon). 

-Plug-in development kits (PDK) for plug-in authors supported in [Rust](https://github.com/extism/rust-pdk), [AssemblyScript](https://github.com/extism/assemblyscript-pdk), [Go](https://github.com/extism/go-pdk), [C/C++](https://github.com/extism/c-pdk), [Haskell](https://github.com/extism/haskell-pdk), and [Zig](https://github.com/extism/zig-pdk).
+Plug-in development kits (PDK) for plug-in authors supported in
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/rust.svg" width="18" height="18" /> Rust](https://github.com/extism/rust-pdk),
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/assemblyscript.svg" width="18" height="18" /> AssemblyScript](https://github.com/extism/assemblyscript-pdk),
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/go.svg" width="18" height="18" /> Go](https://github.com/extism/go-pdk),
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/c.svg" width="18" height="18" />
+C / <img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/cplusplus.svg" width="18" height="18" /> C++](https://github.com/extism/c-pdk),
+[<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/haskell.svg" width="18" height="18" /> Haskell](https://github.com/extism/haskell-pdk),
+and [<img src="https://cdn.rawgit.com/simple-icons/simple-icons/develop/icons/zig.svg" width="18" height="18" /> Zig](https://github.com/extism/zig-pdk).

 <p align="center">
  <img style="width: 70%;" src="https://user-images.githubusercontent.com/7517515/210286900-39b144fd-1b26-4dd0-b7a9-2b5755bc174d.png" alt="Extism embedded SDK language support"/>
@@ -64,4 +69,5 @@ Extism is an open-source product from the team at:
 </p>


+
 _Reach out and tell us what you're building! We'd love to help._
--- a/browser/index.html
+++ b/browser/index.html
@@ -103,11 +103,7 @@
        }

        async loadFunctions(url) {
-            let helloWorld = function(index){
-              console.log("Hello, " + this.allocator.getString(index));
-              return index;
-            };
-            let plugin = await this.extismContext.newPlugin({ "wasm": [ { "path": url } ] }, {"hello_world": helloWorld});
+            let plugin = await this.extismContext.newPlugin({ "wasm": [ { "path": url } ] }) 
            let functions = Object.keys(await plugin.getExports())
            console.log("funcs ", functions)
            this.setState({functions})
@@ -139,13 +135,7 @@

        async handleOnRun(e) {
          e && e.preventDefault && e.preventDefault();
-          let helloWorld = function(index){
-            console.log("Hello, " + this.allocator.getString(index));
-            return index;
-          };
-          let plugin = await this.extismContext.newPlugin({ "wasm": [ { "path": this.state.url } ] }, {
-              "hello_world": helloWorld
-          });
+          let plugin = await this.extismContext.newPlugin({ "wasm": [ { "path": this.state.url } ] }) 
          let result = await plugin.call(this.state.func_name, this.state.input)
          let output = result
          this.setState({output})
--- a/browser/jest.config.js
+++ b/browser/jest.config.js
@@ -1,5 +1,5 @@
 /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
 module.exports = {
  preset: 'ts-jest',
-  testEnvironment: 'jsdom',
+  testEnvironment: 'node',
 };
--- a/browser/package-lock.json
+++ b/browser/package-lock.json
--- a/browser/package.json
+++ b/browser/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@extism/runtime-browser",
-  "version": "0.3.0",
+  "version": "0.2.2",
  "description": "Extism runtime in the browser",
  "scripts": {
    "build": "node build.js && tsc --emitDeclarationOnly --outDir dist",
@@ -23,9 +23,7 @@
  "devDependencies": {
    "@types/jest": "^29.2.2",
    "esbuild": "^0.15.13",
-    "esbuild-jest": "^0.5.0",
    "jest": "^29.2.2",
-    "jest-environment-jsdom": "^29.3.1",
    "prettier": "^2.7.1",
    "ts-jest": "^29.0.3",
    "tslint": "^6.1.3",
@@ -34,6 +32,6 @@
    "typescript": "^4.8.4"
  },
  "dependencies": {
-    "@bjorn3/browser_wasi_shim": "^0.2.7"
+    "@bjorn3/browser_wasi_shim": "^0.2.1"
  }
 }
--- a/browser/src/context.ts
+++ b/browser/src/context.ts
@@ -1,5 +1,5 @@
 import { Manifest, PluginConfig, ManifestWasmFile, ManifestWasmData } from './manifest';
-import { ExtismPlugin } from './plugin';
+import ExtismPlugin from './plugin';

 /**
 * Can be a {@link Manifest} or just the raw bytes of the WASM module as an ArrayBuffer.
@@ -20,7 +20,7 @@ export default class ExtismContext {
   * @param config - Config details for the plugin
   * @returns A new Plugin scoped to this Context
   */
-  async newPlugin(manifest: ManifestData, functions: Record<string, any> = {}, config?: PluginConfig) {
+  async newPlugin(manifest: ManifestData, config?: PluginConfig) {
    let moduleData: ArrayBuffer | null = null;
    if (manifest instanceof ArrayBuffer) {
      moduleData = manifest;
@@ -40,6 +40,6 @@ export default class ExtismContext {
      throw Error(`Unsure how to interpret manifest ${manifest}`);
    }

-    return new ExtismPlugin(moduleData, functions, config);
+    return new ExtismPlugin(moduleData, config);
  }
 }
--- a/browser/src/index.test.ts
+++ b/browser/src/index.test.ts
@@ -8,17 +8,16 @@ function parse(bytes: Uint8Array): any {

 describe('', () => {
  it('can load and call a plugin', async () => {
-    // const data = fs.readFileSync(path.join(__dirname, '..', 'data', 'code.wasm'));
-    // const ctx = new ExtismContext();
-    // const plugin = await ctx.newPlugin({ wasm: [{ data: data }] });
-    // const functions = await plugin.getExports();
-    // expect(Object.keys(functions).filter((x) => !x.startsWith('__') && x !== 'memory')).toEqual(['count_vowels']);
-    // let output = await plugin.call('count_vowels', 'this is a test');
-    // expect(parse(output)).toEqual({ count: 4 });
-    // output = await plugin.call('count_vowels', 'this is a test again');
-    // expect(parse(output)).toEqual({ count: 7 });
-    // output = await plugin.call('count_vowels', 'this is a test thrice');
-    // expect(parse(output)).toEqual({ count: 6 });
-    expect(true).toEqual(true);
+    const data = fs.readFileSync(path.join(__dirname, '..', 'data', 'code.wasm'));
+    const ctx = new ExtismContext();
+    const plugin = await ctx.newPlugin({ wasm: [{ data: data }] });
+    const functions = await plugin.getExports();
+    expect(Object.keys(functions).filter((x) => !x.startsWith('__') && x !== 'memory')).toEqual(['count_vowels']);
+    let output = await plugin.call('count_vowels', 'this is a test');
+    expect(parse(output)).toEqual({ count: 4 });
+    output = await plugin.call('count_vowels', 'this is a test again');
+    expect(parse(output)).toEqual({ count: 7 });
+    output = await plugin.call('count_vowels', 'this is a test thrice');
+    expect(parse(output)).toEqual({ count: 6 });
  });
 });
--- a/browser/src/index.ts
+++ b/browser/src/index.ts
@@ -1,4 +1,3 @@
 import ExtismContext from './context';
-import { ExtismFunction, ExtismPlugin } from './plugin';

-export { ExtismContext, ExtismFunction, ExtismPlugin };
+export { ExtismContext };
--- a/browser/src/plugin.ts
+++ b/browser/src/plugin.ts
@@ -1,10 +1,9 @@
 import Allocator from './allocator';
 import { PluginConfig } from './manifest';
-import { WASI, Fd } from '@bjorn3/browser_wasi_shim';
+//@ts-ignore TODO add types to this library
+import { WASI, File } from "@bjorn3/browser_wasi_shim";

-export type ExtismFunction = any;
-
-export class ExtismPlugin {
+export default class ExtismPlugin {
  moduleData: ArrayBuffer;
  allocator: Allocator;
  config?: PluginConfig;
@@ -12,16 +11,14 @@ export class ExtismPlugin {
  input: Uint8Array;
  output: Uint8Array;
  module?: WebAssembly.WebAssemblyInstantiatedSource;
-  functions: Record<string, ExtismFunction>;

-  constructor(moduleData: ArrayBuffer, functions: Record<string, ExtismFunction> = {}, config?: PluginConfig) {
+  constructor(moduleData: ArrayBuffer, config?: PluginConfig) {
    this.moduleData = moduleData;
    this.allocator = new Allocator(1024 * 1024);
    this.config = config;
    this.vars = {};
    this.input = new Uint8Array();
    this.output = new Uint8Array();
-    this.functions = functions;
  }

  async getExports(): Promise<WebAssembly.Exports> {
@@ -68,31 +65,23 @@ export class ExtismPlugin {
    const environment = this.makeEnv();
    const args: Array<string> = [];
    const envVars: Array<string> = [];
-    let fds: Fd[] = [
-      // new XtermStdio(term), // stdin
-      // new XtermStdio(term), // stdout
-      // new XtermStdio(term), // stderr
+    let fds = [
+        new File([]), // stdin
+        new File([]), // stdout
+        new File([]), // stderr
    ];
    let wasi = new WASI(args, envVars, fds);
    let env = {
      wasi_snapshot_preview1: wasi.wasiImport,
-      env: environment,
+      env: environment
    };
    this.module = await WebAssembly.instantiate(this.moduleData, env);
-    // normally we would call wasi.start here but it doesn't respect when there is
-    // no _start function
-    //@ts-ignore
-    wasi.inst = this.module.instance;
-    if (this.module.instance.exports._start) {
-      //@ts-ignore
-      this.module.instance.exports._start();
-    }
    return this.module;
  }

  makeEnv(): any {
    const plugin = this;
-    var env: any = {
+    return {
      extism_alloc(n: bigint): bigint {
        return plugin.allocator.alloc(n);
      },
@@ -191,13 +180,5 @@ export class ExtismPlugin {
        console.error(s);
      },
    };
-
-    for (const [name, func] of Object.entries(this.functions)) {
-      env[name] = function () {
-        return func.apply(plugin, arguments);
-      };
-    }
-
-    return env;
  }
 }
--- a/browser/tsconfig.json
+++ b/browser/tsconfig.json
@@ -1,13 +1,13 @@
 {
-  "compilerOptions": {
-    "target": "es2016", 
-    "module": "commonjs",  
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "declaration": true,
-    "strict": true,                   
-    "skipLibCheck": true,
-    "allowJs": true
-  },
-  "exclude": ["node_modules", "dist", "**/*.test.ts"]
-}
+    "compilerOptions": {
+      "target": "es2016", 
+      "module": "commonjs",  
+      "esModuleInterop": true,
+      "forceConsistentCasingInFileNames": true,
+      "declaration": true,
+      "strict": true,                   
+      "skipLibCheck": true,
+      "allowJs": true
+    },
+    "exclude": ["node_modules", "dist", "**/*.test.ts"]
+  }
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -13,4 +13,3 @@ build-test:
 .PHONY: test
 test: build-test
 	cd test && ./test
-
--- a/cpp/example.cpp
+++ b/cpp/example.cpp
@@ -15,6 +15,7 @@ std::vector<uint8_t> read(const char *filename) {

 int main(int argc, char *argv[]) {
  auto wasm = read("../wasm/code-functions.wasm");
+  Context context = Context();
  std::string tmp = "Testing";

  // A lambda can be used as a host function
@@ -33,7 +34,7 @@ int main(int argc, char *argv[]) {
               [](void *x) { std::cout << "Free user data" << std::endl; }),
  };

-  Plugin plugin(wasm, true, functions);
+  Plugin plugin = context.plugin(wasm, true, functions);

  const char *input = argc > 1 ? argv[1] : "this is a test";
  ExtismSize length = strlen(input);
--- a/cpp/extism.hpp
+++ b/cpp/extism.hpp
@@ -1,6 +1,5 @@
 #pragma once

-#include <cstring>
 #include <functional>
 #include <map>
 #include <memory>
@@ -240,32 +239,6 @@ public:
  void free(uint64_t offs) {
    extism_current_plugin_memory_free(this->pointer, offs);
  }
-
-  void returnString(Val &output, const std::string &s) {
-    this->returnBytes(output, (const uint8_t *)s.c_str(), s.size());
-  }
-
-  void returnBytes(Val &output, const uint8_t *bytes, size_t len) {
-    auto offs = this->alloc(len);
-    memcpy(this->memory() + offs, bytes, len);
-    output.v.i64 = offs;
-  }
-
-  uint8_t *inputBytes(Val &inp, size_t *length = nullptr) {
-    if (inp.t != ValType::I64) {
-      return nullptr;
-    }
-    if (length != nullptr) {
-      *length = this->memory_length(inp.v.i64);
-    }
-    return this->memory() + inp.v.i64;
-  }
-
-  std::string inputString(Val &inp) {
-    size_t length = 0;
-    char *buf = (char *)this->inputBytes(inp, &length);
-    return std::string(buf, length);
-  }
 };

 typedef std::function<void(CurrentPlugin, const std::vector<Val> &,
@@ -318,23 +291,11 @@ public:
    this->func = std::shared_ptr<ExtismFunction>(ptr, extism_function_free);
  }

-  void set_namespace(std::string s) {
-    extism_function_set_namespace(this->func.get(), s.c_str());
-  }
-
  Function(const Function &f) { this->func = f.func; }

  ExtismFunction *get() { return this->func.get(); }
 };

-class CancelHandle {
-  const ExtismCancelHandle *handle;
-
-public:
-  CancelHandle(const ExtismCancelHandle *x) : handle(x){};
-  bool cancel() { return extism_plugin_cancel(this->handle); }
-};
-
 class Plugin {
  std::shared_ptr<ExtismContext> context;
  ExtismPlugin plugin;
@@ -342,10 +303,9 @@ class Plugin {

 public:
  // Create a new plugin
-  Plugin(const uint8_t *wasm, ExtismSize length, bool with_wasi = false,
-         std::vector<Function> functions = std::vector<Function>(),
-         std::shared_ptr<ExtismContext> ctx = std::shared_ptr<ExtismContext>(
-             extism_context_new(), extism_context_free))
+  Plugin(std::shared_ptr<ExtismContext> ctx, const uint8_t *wasm,
+         ExtismSize length, bool with_wasi = false,
+         std::vector<Function> functions = std::vector<Function>())
      : functions(functions) {
    std::vector<const ExtismFunction *> ptrs;
    for (auto i : this->functions) {
@@ -360,30 +320,10 @@ public:
    this->context = ctx;
  }

-  Plugin(const std::string &str, bool with_wasi = false,
-         std::vector<Function> functions = {},
-         std::shared_ptr<ExtismContext> ctx = std::shared_ptr<ExtismContext>(
-             extism_context_new(), extism_context_free))
-      : Plugin((const uint8_t *)str.c_str(), str.size(), with_wasi, functions,
-               ctx) {}
-
-  Plugin(const std::vector<uint8_t> &data, bool with_wasi = false,
-         std::vector<Function> functions = {},
-         std::shared_ptr<ExtismContext> ctx = std::shared_ptr<ExtismContext>(
-             extism_context_new(), extism_context_free))
-      : Plugin(data.data(), data.size(), with_wasi, functions, ctx) {}
-
-  CancelHandle cancel_handle() {
-    return CancelHandle(
-        extism_plugin_cancel_handle(this->context.get(), this->id()));
-  }
-
 #ifndef EXTISM_NO_JSON
  // Create a new plugin from Manifest
-  Plugin(const Manifest &manifest, bool with_wasi = false,
-         std::vector<Function> functions = {},
-         std::shared_ptr<ExtismContext> ctx = std::shared_ptr<ExtismContext>(
-             extism_context_new(), extism_context_free)) {
+  Plugin(std::shared_ptr<ExtismContext> ctx, const Manifest &manifest,
+         bool with_wasi = false, std::vector<Function> functions = {}) {
    std::vector<const ExtismFunction *> ptrs;
    for (auto i : this->functions) {
      ptrs.push_back(i.get());
@@ -522,28 +462,28 @@ public:
  // Create plugin from uint8_t*
  Plugin plugin(const uint8_t *wasm, size_t length, bool with_wasi = false,
                std::vector<Function> functions = {}) const {
-    return Plugin(wasm, length, with_wasi, functions, this->pointer);
+    return Plugin(this->pointer, wasm, length, with_wasi, functions);
  }

  // Create plugin from std::string
  Plugin plugin(const std::string &str, bool with_wasi = false,
                std::vector<Function> functions = {}) const {
-    return Plugin((const uint8_t *)str.c_str(), str.size(), with_wasi,
-                  functions, this->pointer);
+    return Plugin(this->pointer, (const uint8_t *)str.c_str(), str.size(),
+                  with_wasi, functions);
  }

  // Create plugin from uint8_t vector
  Plugin plugin(const std::vector<uint8_t> &data, bool with_wasi = false,
                std::vector<Function> functions = {}) const {
-    return Plugin(data.data(), data.size(), with_wasi, functions,
-                  this->pointer);
+    return Plugin(this->pointer, data.data(), data.size(), with_wasi,
+                  functions);
  }

 #ifndef EXTISM_NO_JSON
  // Create plugin from Manifest
  Plugin plugin(const Manifest &manifest, bool with_wasi = false,
                std::vector<Function> functions = {}) const {
-    return Plugin(manifest, with_wasi, functions, this->pointer);
+    return Plugin(this->pointer, manifest, with_wasi, functions);
  }
 #endif

--- a/cpp/test/code.wasm
+++ b/cpp/test/code.wasm
--- a/cpp/test/test.cpp
+++ b/cpp/test/test.cpp
@@ -10,8 +10,6 @@ std::vector<uint8_t> read(const char *filename) {
                              std::istreambuf_iterator<char>());
 }

-const std::string code = "../../wasm/code.wasm";
-
 namespace {
 using namespace extism;

@@ -21,24 +19,26 @@ TEST(Context, Basic) {
 }

 TEST(Plugin, Manifest) {
-  Manifest manifest = Manifest::path(code);
+  Context context;
+  Manifest manifest = Manifest::path("code.wasm");
  manifest.set_config("a", "1");

-  ASSERT_NO_THROW(Plugin plugin(manifest));
-  Plugin plugin(manifest);
+  ASSERT_NO_THROW(Plugin plugin = context.plugin(manifest));
+  Plugin plugin = context.plugin(manifest);

  Buffer buf = plugin.call("count_vowels", "this is a test");
  ASSERT_EQ((std::string)buf, "{\"count\": 4}");
 }

 TEST(Plugin, BadManifest) {
+  Context context;
  Manifest manifest;
-  ASSERT_THROW(Plugin plugin(manifest), Error);
+  ASSERT_THROW(Plugin plugin = context.plugin(manifest), Error);
 }

 TEST(Plugin, Bytes) {
  Context context;
-  auto wasm = read(code.c_str());
+  auto wasm = read("code.wasm");
  ASSERT_NO_THROW(Plugin plugin = context.plugin(wasm));
  Plugin plugin = context.plugin(wasm);

@@ -48,7 +48,7 @@ TEST(Plugin, Bytes) {

 TEST(Plugin, UpdateConfig) {
  Context context;
-  auto wasm = read(code.c_str());
+  auto wasm = read("code.wasm");
  Plugin plugin = context.plugin(wasm);

  Config config;
@@ -58,33 +58,13 @@ TEST(Plugin, UpdateConfig) {

 TEST(Plugin, FunctionExists) {
  Context context;
-  auto wasm = read(code.c_str());
+  auto wasm = read("code.wasm");
  Plugin plugin = context.plugin(wasm);

  ASSERT_FALSE(plugin.function_exists("bad_function"));
  ASSERT_TRUE(plugin.function_exists("count_vowels"));
 }

-TEST(Plugin, HostFunction) {
-  auto wasm = read("../../wasm/code-functions.wasm");
-  auto t = std::vector<ValType>{ValType::I64};
-  Function hello_world =
-      Function("hello_world", t, t,
-               [](CurrentPlugin plugin, const std::vector<Val> &params,
-                  std::vector<Val> &results, void *user_data) {
-                 auto offs = plugin.alloc(4);
-                 memcpy(plugin.memory() + offs, "test", 4);
-                 results[0].v.i64 = (int64_t)offs;
-               });
-  auto functions = std::vector<Function>{
-      hello_world,
-  };
-  Plugin plugin(wasm, true, functions);
-  auto buf = plugin.call("count_vowels", "aaa");
-  ASSERT_EQ(buf.length, 4);
-  ASSERT_EQ((std::string)buf, "test");
-}
-
 }; // namespace

 int main(int argc, char **argv) {
--- a/dotnet/nuget/Extism.runtime.win.csproj
+++ b/dotnet/nuget/Extism.runtime.win.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-    <NoBuild>true</NoBuild>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+        <NoBuild>true</NoBuild>
+        <IncludeBuildOutput>false</IncludeBuildOutput>
+    </PropertyGroup>

-  <PropertyGroup>
-    <PackageId>Extism.runtime.win-x64</PackageId>
-    <Version>0.7.0</Version>
-    <Authors>Extism Contributors</Authors>
-    <Description>Internal implementation package for Extism to work on Windows x64</Description>
-    <Tags>extism, wasm, plugin</Tags>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
-  </PropertyGroup>
+    <PropertyGroup>
+        <PackageId>Extism.runtime.win-x64</PackageId>
+        <Version>0.2.0</Version>
+        <Authors>Extism Contributors</Authors>
+        <Description>Internal implementation package for Extism to work on Windows x64</Description>
+        <Tags>extism, wasm, plugin</Tags>
+        <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
+    </PropertyGroup>

-  <ItemGroup>
-    <Content Include="runtimes/win-x64.dll"
-      CopyToOutputDirectory="Always"
-      Pack="true"
-      PackagePath="runtimes\win-x64\native\extism.dll" />
-  </ItemGroup>
+    <ItemGroup>
+        <Content Include="runtimes/win-x64.dll"
+            CopyToOutputDirectory="Always"
+            Pack="true"
+            PackagePath="runtimes\win-x64\native\extism.dll" />
+    </ItemGroup>
 </Project>
--- a/dotnet/samples/Extism.Sdk.Sample/Extism.Sdk.Sample.csproj
+++ b/dotnet/samples/Extism.Sdk.Sample/Extism.Sdk.Sample.csproj
@@ -1,29 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<PropertyGroup>
-		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>

-	<ItemGroup>
-		<None Include="..\..\..\wasm\code.wasm" Link="code.wasm">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="..\..\..\wasm\code-functions.wasm" Link="code-functions.wasm">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\wasm\code.wasm" Link="code.wasm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>

-	<ItemGroup>
-		<PackageReference Include="Extism.runtime.win-x64" Version="0.4.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\src\Extism.Sdk\Extism.Sdk.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Extism.Sdk\Extism.Sdk.csproj" />
+  </ItemGroup>


-</Project>
+</Project>
--- a/dotnet/samples/Extism.Sdk.Sample/Program.cs
+++ b/dotnet/samples/Extism.Sdk.Sample/Program.cs
@@ -1,40 +1,11 @@
-using Extism.Sdk;
 using Extism.Sdk.Native;
-
-using System.Runtime.InteropServices;
 using System.Text;

 var context = new Context();
-
-var userData = Marshal.StringToHGlobalAnsi("Hello again!");
-
-using var helloWorld = new HostFunction(
-    "hello_world",
-    "env",
-    new[] { ExtismValType.I64 },
-    new[] { ExtismValType.I64 },
-    userData,
-    HelloWorld);
-
-void HelloWorld(CurrentPlugin plugin, Span<ExtismVal> inputs, Span<ExtismVal> outputs, nint data)
-{
-    Console.WriteLine("Hello from .NET!");
-
-    var text = Marshal.PtrToStringAnsi(data);
-    Console.WriteLine(text);
-
-    var input = plugin.ReadString(new nint(inputs[0].v.i64));
-    Console.WriteLine($"Input: {input}");
-
-    outputs[0].v.i64 = plugin.WriteString(input);
-}
-
-var wasm = File.ReadAllBytes("./code-functions.wasm");
-using var plugin = context.CreatePlugin(wasm, new[] { helloWorld }, withWasi: true);
+var wasm = await File.ReadAllBytesAsync("./code.wasm");
+using var plugin = context.CreatePlugin(wasm, withWasi: true);

 var output = Encoding.UTF8.GetString(
    plugin.CallFunction("count_vowels", Encoding.UTF8.GetBytes("Hello World!"))
 );
-
-Console.WriteLine($"Output: {output}");
-
+Console.WriteLine(output); // prints {"count": 3}
--- a/dotnet/src/Extism.Sdk/Context.cs
+++ b/dotnet/src/Extism.Sdk/Context.cs
@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;

@@ -7,10 +6,8 @@ namespace Extism.Sdk.Native;
 /// <summary>
 /// Represents an Extism context through which you can load <see cref="Plugin"/>s.
 /// </summary>
-public unsafe class Context : IDisposable
+public class Context : IDisposable
 {
-    private readonly ConcurrentDictionary<int, Plugin> _plugins = new ConcurrentDictionary<int, Plugin>();
-
    private const int DisposedMarker = 1;

    private int _disposed;
@@ -20,63 +17,33 @@ public unsafe class Context : IDisposable
    /// </summary>
    public Context()
    {
-        unsafe
-        {
-            NativeHandle = LibExtism.extism_context_new();
-        }
+        NativeHandle = LibExtism.extism_context_new();
    }

    /// <summary>
    /// Native pointer to the Extism Context.
    /// </summary>
-    internal LibExtism.ExtismContext* NativeHandle { get; }
+    internal IntPtr NativeHandle { get; }

    /// <summary>
    /// Loads an Extism <see cref="Plugin"/>.
    /// </summary>
    /// <param name="wasm">A WASM module (wat or wasm) or a JSON encoded manifest.</param>
-    /// <param name="functions">List of host functions expected by the plugin.</param>
    /// <param name="withWasi">Enable/Disable WASI.</param>
-    public Plugin CreatePlugin(ReadOnlySpan<byte> wasm, HostFunction[] functions, bool withWasi)
+    public Plugin CreatePlugin(ReadOnlySpan<byte> wasm, bool withWasi)
    {
        CheckNotDisposed();

-        var functionHandles = functions.Select(f => f.NativeHandle).ToArray();
-
        unsafe
        {
            fixed (byte* wasmPtr = wasm)
-            fixed (IntPtr* functionsPtr = functionHandles)
            {
-                var index = LibExtism.extism_plugin_new(NativeHandle, wasmPtr, wasm.Length, functionsPtr, functions.Length, withWasi);
-                if (index == -1)
-                {
-                    var errorMsg = GetError();
-                    if (errorMsg != null)
-                    {
-                        throw new ExtismException(errorMsg);
-                    }
-                    else
-                    {
-                        throw new ExtismException("Failed to create plugin.");
-                    }
-                }
-
-                return _plugins[index] = new Plugin(this, functions, index);
+                var plugin = LibExtism.extism_plugin_new(NativeHandle, wasmPtr, wasm.Length, null, 0, withWasi);
+                return new Plugin(this, plugin);
            }
        }
    }

-    /// <summary>
-    /// Get a plugin by index.
-    /// </summary>
-    /// <param name="index">Index of plugin.</param>
-    /// <returns></returns>
-    public Plugin GetPlugin(int index)
-    {
-        return _plugins[index];
-    }
-
    /// <summary>
    /// Remove all plugins from this <see cref="Context"/>'s registry.
    /// </summary>
@@ -143,11 +110,6 @@ public unsafe class Context : IDisposable
            // Free up any managed resources here
        }

-        foreach (var plugin in _plugins.Values)
-        {
-            plugin.Dispose();
-        }
-
        // Free up unmanaged resources
        LibExtism.extism_context_free(NativeHandle);
    }
@@ -189,3 +151,34 @@ public unsafe class Context : IDisposable
        return LibExtism.extism_log_file(logPath, logLevel);
    }
 }
+
+/// <summary>
+/// Extism Log Levels
+/// </summary>
+public enum LogLevel
+{
+    /// <summary>
+    /// Designates very serious errors.
+    /// </summary>
+    Error,
+
+    /// <summary>
+    /// Designates hazardous situations.
+    /// </summary>
+    Warning,
+
+    /// <summary>
+    /// Designates useful information.
+    /// </summary>
+    Info,
+
+    /// <summary>
+    /// Designates lower priority information.
+    /// </summary>
+    Debug,
+
+    /// <summary>
+    /// Designates very low priority, often extremely verbose, information.
+    /// </summary>
+    Trace
+}
--- a/dotnet/src/Extism.Sdk/CurrentPlugin.cs
+++ b/dotnet/src/Extism.Sdk/CurrentPlugin.cs
@@ -1,138 +0,0 @@
-using Extism.Sdk.Native;
-
-using System.Text;
-
-namespace Extism.Sdk
-{
-    /// <summary>
-    /// Represents the current plugin. Can only be used within <see cref="HostFunction"/>s.
-    /// </summary>
-    public class CurrentPlugin
-    {
-        internal CurrentPlugin(nint nativeHandle)
-        {
-            NativeHandle = nativeHandle;
-        }
-
-        internal nint NativeHandle { get; }
-
-        /// <summary>
-        /// Returns a pointer to the memory of the currently running plugin.
-        /// NOTE: this should only be called from host functions.
-        /// </summary>
-        /// <returns></returns>
-        public nint GetMemory()
-        {
-            return LibExtism.extism_current_plugin_memory(NativeHandle);
-        }
-
-        /// <summary>
-        /// Reads a string from a memory block using UTF8.
-        /// </summary>
-        /// <param name="pointer"></param>
-        /// <returns></returns>
-        public string ReadString(nint pointer)
-        {
-            return ReadString(pointer, Encoding.UTF8);
-        }
-
-        /// <summary>
-        /// Reads a string form a memory block.
-        /// </summary>
-        /// <param name="pointer"></param>
-        /// <param name="encoding"></param>
-        /// <returns></returns>
-        public string ReadString(nint pointer, Encoding encoding)
-        {
-            var buffer = ReadBytes(pointer);
-
-            return encoding.GetString(buffer);
-        }
-
-        /// <summary>
-        /// Returns a span of bytes for a given block.
-        /// </summary>
-        /// <param name="pointer"></param>
-        /// <returns></returns>
-        public unsafe Span<byte> ReadBytes(nint pointer)
-        {
-            var mem = GetMemory();
-            var length = (int)BlockLength(pointer);
-            var ptr = (byte*)mem + pointer;
-
-            return new Span<byte>(ptr, length);
-        }
-
-        /// <summary>
-        /// Writes a string into the current plugin memory using UTF-8 encoding and returns the pointer of the block.
-        /// </summary>
-        /// <param name="value"></param>
-        public nint WriteString(string value)
-            => WriteString(value, Encoding.UTF8);
-
-        /// <summary>
-        /// Writes a string into the current plugin memory and returns the pointer of the block.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="encoding"></param>
-        public nint WriteString(string value, Encoding encoding)
-        {
-            var bytes = encoding.GetBytes(value);
-            var pointer = AllocateBlock(bytes.Length);
-            WriteBytes(pointer, bytes);
-
-            return pointer;
-        }
-
-        /// <summary>
-        /// Writes a byte array into a block of memory.
-        /// </summary>
-        /// <param name="pointer"></param>
-        /// <param name="bytes"></param>
-        public unsafe void WriteBytes(nint pointer, Span<byte> bytes)
-        {
-            var length = BlockLength(pointer);
-            if (length < bytes.Length)
-            {
-                throw new InvalidOperationException("Destination block length is less than source block length.");
-            }
-
-            var mem = GetMemory();
-            var ptr = (void*)(mem + pointer);
-            var destination = new Span<byte>(ptr, bytes.Length);
-
-            bytes.CopyTo(destination);
-        }
-
-        /// <summary>
-        /// Frees a block of memory belonging to the current plugin.
-        /// </summary>
-        /// <param name="pointer"></param>
-        public void FreeBlock(nint pointer)
-        {
-            LibExtism.extism_current_plugin_memory_free(NativeHandle, pointer);
-        }
-
-        /// <summary>
-        /// Allocate a memory block in the currently running plugin.
-        /// 
-        /// </summary>
-        /// <param name="length"></param>
-        /// <returns></returns>
-        public nint AllocateBlock(long length)
-        {
-            return LibExtism.extism_current_plugin_memory_alloc(NativeHandle, length);
-        }
-
-        /// <summary>
-        /// Get the length of an allocated block.
-        /// NOTE: this should only be called from host functions.
-        /// </summary>
-        /// <param name="pointer"></param>
-        /// <returns></returns>
-        public long BlockLength(nint pointer)
-        {
-            return LibExtism.extism_current_plugin_memory_length(NativeHandle, pointer);
-        }
-    }
-}
--- a/dotnet/src/Extism.Sdk/ExtismException.cs
+++ b/dotnet/src/Extism.Sdk/ExtismException.cs
@@ -28,7 +28,7 @@ public class ExtismException : Exception
    /// with a specified error message and a reference to the inner exception
    /// that is the cause of this exception.
    /// </summary>
-    /// <param name="message">The message that describes the error.</param>
+    /// <param name="message">The message that describes the error .</param>
    /// <param name="innerException">
    ///  The exception that is the cause of the current exception, or a null reference
    ///  (Nothing in Visual Basic) if no inner exception is specified.
--- a/dotnet/src/Extism.Sdk/Extism.Sdk.csproj
+++ b/dotnet/src/Extism.Sdk/Extism.Sdk.csproj
@@ -1,28 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <LangVersion>10</LangVersion>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.1</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+		<LangVersion>10</LangVersion>
+	</PropertyGroup>

-  <PropertyGroup>
-    <PackageId>Extism.Sdk</PackageId>
-    <Version>0.7.0</Version>
-    <Authors>Extism Contributors</Authors>
-    <Description>Extism SDK that allows hosting Extism plugins in .NET apps.</Description>
-    <Tags>extism, wasm, plugin</Tags>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-  </PropertyGroup>
+	<PropertyGroup>
+		<PackageId>Extism.Sdk</PackageId>
+		<Version>0.2.0</Version>
+		<Authors>Extism Contributors</Authors>
+		<Description>Extism SDK that allows hosting Extism plugins in .NET apps.</Description>
+		<Tags>extism, wasm, plugin</Tags>
+		<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+	</PropertyGroup>

-  <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Include="README.md" Pack="true" PackagePath="\"/>
+	</ItemGroup>

-  <ItemGroup>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+	</ItemGroup>
 </Project>
--- a/dotnet/src/Extism.Sdk/HostFunction.cs
+++ b/dotnet/src/Extism.Sdk/HostFunction.cs
@@ -1,146 +0,0 @@
-using Extism.Sdk.Native;
-
-using System.Diagnostics.CodeAnalysis;
-
-namespace Extism.Sdk
-{
-    /// <summary>
-    /// A host function signature.
-    /// </summary>
-    /// <param name="plugin">Plugin Index</param>
-    /// <param name="inputs">Input parameters</param>
-    /// <param name="outputs">Output parameters, the host function can change this.</param>
-    /// <param name="userData">A data passed in during Host Function creation.</param>
-    public delegate void ExtismFunction(CurrentPlugin plugin, Span<ExtismVal> inputs, Span<ExtismVal> outputs, IntPtr userData);
-
-    /// <summary>
-    /// A function provided by the host that plugins can call.
-    /// </summary>
-    public class HostFunction : IDisposable
-    {
-        private const int DisposedMarker = 1;
-        private int _disposed;
-
-        /// <summary>
-        /// Registers a Host Function.
-        /// </summary>
-        /// <param name="functionName">The literal name of the function, how it would be called from a <see cref="Plugin"/>.</param>
-        /// <param name="inputTypes">The types of the input arguments/parameters the <see cref="Plugin"/> caller will provide.</param>
-        /// <param name="outputTypes">The types of the output returned from the host function to the <see cref="Plugin"/>.</param>
-        /// <param name="userData">An opaque pointer to an object from the host, accessible to the <see cref="Plugin"/>.
-        /// NOTE: it is the shared responsibility of the host and <see cref="Plugin"/> to cast/dereference this value properly.</param>
-        /// <param name="hostFunction"></param>
-        public HostFunction(
-            string functionName,
-            Span<ExtismValType> inputTypes,
-            Span<ExtismValType> outputTypes,
-            IntPtr userData,
-            ExtismFunction hostFunction) :
-            this(functionName, "", inputTypes, outputTypes, userData, hostFunction)
-        {
-
-        }
-
-        /// <summary>
-        /// Registers a Host Function.
-        /// </summary>
-        /// <param name="functionName">The literal name of the function, how it would be called from a <see cref="Plugin"/>.</param>
-        /// <param name="namespace">Function namespace.</param>
-        /// <param name="inputTypes">The types of the input arguments/parameters the <see cref="Plugin"/> caller will provide.</param>
-        /// <param name="outputTypes">The types of the output returned from the host function to the <see cref="Plugin"/>.</param>
-        /// <param name="userData">An opaque pointer to an object from the host, accessible to the <see cref="Plugin"/>.
-        /// NOTE: it is the shared responsibility of the host and <see cref="Plugin"/> to cast/dereference this value properly.</param>
-        /// <param name="hostFunction"></param>
-        unsafe public HostFunction(
-            string functionName,
-            string @namespace,
-            Span<ExtismValType> inputTypes,
-            Span<ExtismValType> outputTypes,
-            IntPtr userData,
-            ExtismFunction hostFunction)
-        {
-            fixed (ExtismValType* inputs = inputTypes)
-            fixed (ExtismValType* outputs = outputTypes)
-            {
-                NativeHandle = LibExtism.extism_function_new(functionName, inputs, inputTypes.Length, outputs, outputTypes.Length, CallbackImpl, userData, IntPtr.Zero);
-            }
-
-            if (!string.IsNullOrEmpty(@namespace))
-            {
-                LibExtism.extism_function_set_namespace(NativeHandle, @namespace);
-            }
-
-            void CallbackImpl(
-                nint plugin,
-                ExtismVal* inputsPtr,
-                uint n_inputs,
-                ExtismVal* outputsPtr,
-                uint n_outputs,
-                IntPtr data)
-            {
-                var outputs = new Span<ExtismVal>(outputsPtr, (int)n_outputs);
-                var inputs = new Span<ExtismVal>(inputsPtr, (int)n_inputs);
-
-                hostFunction(new CurrentPlugin(plugin), inputs, outputs, data);
-            }
-        }
-
-        internal IntPtr NativeHandle { get; }
-
-        /// <summary>
-        /// Frees all resources held by this Host Function.
-        /// </summary>
-        public void Dispose()
-        {
-            if (Interlocked.Exchange(ref _disposed, DisposedMarker) == DisposedMarker)
-            {
-                // Already disposed.
-                return;
-            }
-
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Throw an appropriate exception if the Host Function has been disposed.
-        /// </summary>
-        /// <exception cref="ObjectDisposedException"></exception>
-        protected void CheckNotDisposed()
-        {
-            Interlocked.MemoryBarrier();
-            if (_disposed == DisposedMarker)
-            {
-                ThrowDisposedException();
-            }
-        }
-
-        [DoesNotReturn]
-        private static void ThrowDisposedException()
-        {
-            throw new ObjectDisposedException(nameof(HostFunction));
-        }
-
-        /// <summary>
-        /// Frees all resources held by this Host Function.
-        /// </summary>
-        unsafe protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                // Free up any managed resources here
-            }
-
-            // Free up unmanaged resources
-            LibExtism.extism_function_free(NativeHandle);
-        }
-
-        /// <summary>
-        /// Destructs the current Host Function and frees all resources used by it.
-        /// </summary>
-        ~HostFunction()
-        {
-            Dispose(false);
-        }
-    }
-}
--- a/dotnet/src/Extism.Sdk/LibExtism.cs
+++ b/dotnet/src/Extism.Sdk/LibExtism.cs
@@ -2,197 +2,24 @@ using System.Runtime.InteropServices;

 namespace Extism.Sdk.Native;

-/// <summary>
-/// A union type for host function argument/return values.
-/// </summary>
-[StructLayout(LayoutKind.Explicit)]
-public struct ExtismValUnion
-{
-    /// <summary>
-    /// Set this for 32 bit integers
-    /// </summary>
-    [FieldOffset(0)]
-    public int i32;
-
-    /// <summary>
-    /// Set this for 64 bit integers
-    /// </summary>
-    [FieldOffset(0)]
-    public long i64;
-
-    /// <summary>
-    /// Set this for 32 bit floats
-    /// </summary>
-    [FieldOffset(0)]
-    public float f32;
-
-    /// <summary>
-    /// Set this for 64 bit floats
-    /// </summary>
-    [FieldOffset(0)]
-    public double f64;
-}
-
-/// <summary>
-/// Represents Wasm data types that Extism can understand
-/// </summary>
-public enum ExtismValType : byte
-{
-    /// <summary>
-    /// Signed 32 bit integer. Equivalent of <see cref="int"/> or <see cref="uint"/>
-    /// </summary>
-    I32,
-
-    /// <summary>
-    /// Signed 64 bit integer. Equivalent of <see cref="long"/> or <see cref="ulong"/>
-    /// </summary>
-    I64,
-
-    /// <summary>
-    /// Floating point 32 bit integer. Equivalent of <see cref="float"/>
-    /// </summary>
-    F32,
-
-    /// <summary>
-    /// Floating point 64 bit integer. Equivalent of <see cref="double"/>
-    /// </summary>
-    F64,
-
-    /// <summary>
-    /// A 128 bit number.
-    /// </summary>
-    V128,
-
-    /// <summary>
-    /// A reference to opaque data in the Wasm instance.
-    /// </summary>
-    FuncRef,
-
-    /// <summary>
-    /// A reference to opaque data in the Wasm instance.
-    /// </summary>
-    ExternRef
-}
-
-/// <summary>
-/// `ExtismVal` holds the type and value of a function argument/return
-/// </summary>
-[StructLayout(LayoutKind.Sequential)]
-public struct ExtismVal
-{
-    /// <summary>
-    /// The type for the argument
-    /// </summary>
-    public ExtismValType t;
-
-    /// <summary>
-    /// The value for the argument
-    /// </summary>
-    public ExtismValUnion v;
-}
-
 /// <summary>
 /// Functions exposed by the native Extism library.
 /// </summary>
 internal static class LibExtism
 {
-    /// <summary>
-    /// A `Context` is used to store and manage plugins.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ExtismContext { }
-
-    /// <summary>
-    /// Host function signature
-    /// </summary>
-    /// <param name="plugin"></param>
-    /// <param name="inputs"></param>
-    /// <param name="n_inputs"></param>
-    /// <param name="outputs"></param>
-    /// <param name="n_outputs"></param>
-    /// <param name="data"></param>
-    unsafe internal delegate void InternalExtismFunction(nint plugin, ExtismVal* inputs, uint n_inputs, ExtismVal* outputs, uint n_outputs, IntPtr data);
-
-    /// <summary>
-    /// Returns a pointer to the memory of the currently running plugin.
-    /// NOTE: this should only be called from host functions.
-    /// </summary>
-    /// <param name="plugin"></param>
-    /// <returns></returns>
-    [DllImport("extism", EntryPoint = "extism_current_plugin_memory")]
-    internal static extern IntPtr extism_current_plugin_memory(nint plugin);
-
-    /// <summary>
-    /// Allocate a memory block in the currently running plugin
-    /// </summary>
-    /// <param name="plugin"></param>
-    /// <param name="n"></param>
-    /// <returns></returns>
-    [DllImport("extism", EntryPoint = "extism_current_plugin_memory_alloc")]
-    internal static extern IntPtr extism_current_plugin_memory_alloc(nint plugin, long n);
-
-    /// <summary>
-    /// Get the length of an allocated block.
-    /// NOTE: this should only be called from host functions.
-    /// </summary>
-    /// <param name="plugin"></param>
-    /// <param name="n"></param>
-    /// <returns></returns>
-    [DllImport("extism", EntryPoint = "extism_current_plugin_memory_length")]
-    internal static extern long extism_current_plugin_memory_length(nint plugin, long n);
-
-    /// <summary>
-    /// Get the length of an allocated block.
-    /// NOTE: this should only be called from host functions.
-    /// </summary>
-    /// <param name="plugin"></param>
-    /// <param name="ptr"></param>
-    [DllImport("extism", EntryPoint = "extism_current_plugin_memory_free")]
-    internal static extern void extism_current_plugin_memory_free(nint plugin, IntPtr ptr);
-
-    /// <summary>
-    /// Create a new host function.
-    /// </summary>
-    /// <param name="name">function name, this should be valid UTF-8</param>
-    /// <param name="inputs">argument types</param>
-    /// <param name="nInputs">number of argument types</param>
-    /// <param name="outputs">return types</param>
-    /// <param name="nOutputs">number of return types</param>
-    /// <param name="func">the function to call</param>
-    /// <param name="userData">a pointer that will be passed to the function when it's called this value should live as long as the function exists</param>
-    /// <param name="freeUserData">a callback to release the `user_data` value when the resulting `ExtismFunction` is freed.</param>
-    /// <returns></returns>
-    [DllImport("extism", EntryPoint = "extism_function_new")]
-    unsafe internal static extern IntPtr extism_function_new(string name, ExtismValType* inputs, long nInputs, ExtismValType* outputs, long nOutputs, InternalExtismFunction func, IntPtr userData, IntPtr freeUserData);
-
-    /// <summary>
-    /// Set the namespace of an <see cref="ExtismFunction"/>
-    /// </summary>
-    /// <param name="ptr"></param>
-    /// <param name="namespace"></param>
-    [DllImport("extism", EntryPoint = "extism_function_set_namespace")]
-    internal static extern void extism_function_set_namespace(IntPtr ptr, string @namespace);
-
-    /// <summary>
-    /// Free an <see cref="ExtismFunction"/>
-    /// </summary>
-    /// <param name="ptr"></param>
-    [DllImport("extism", EntryPoint = "extism_function_free")]
-    internal static extern void extism_function_free(IntPtr ptr);
-
    /// <summary>
    /// Create a new context.
    /// </summary>
    /// <returns>A pointer to the newly created context.</returns>
    [DllImport("extism")]
-    unsafe internal static extern ExtismContext* extism_context_new();
+    public static extern IntPtr extism_context_new();

    /// <summary>
    /// Remove a context from the registry and free associated memory.
    /// </summary>
    /// <param name="context"></param>
    [DllImport("extism")]
-    unsafe internal static extern void extism_context_free(ExtismContext* context);
+    public static extern void extism_context_free(IntPtr context);

    /// <summary>
    /// Load a WASM plugin.
@@ -205,7 +32,7 @@ internal static class LibExtism
    /// <param name="withWasi">Enables/disables WASI.</param>
    /// <returns></returns>
    [DllImport("extism")]
-    unsafe internal static extern int extism_plugin_new(ExtismContext* context, byte* wasm, int wasmSize, IntPtr* functions, int nFunctions, bool withWasi);
+    unsafe public static extern IntPtr extism_plugin_new(IntPtr context, byte* wasm, int wasmSize, IntPtr *functions, int nFunctions, bool withWasi);

    /// <summary>
    /// Update a plugin, keeping the existing ID.
@@ -215,13 +42,13 @@ internal static class LibExtism
    /// <param name="context">Pointer to the context the plugin is associated with.</param>
    /// <param name="plugin">Pointer to the plugin you want to update.</param>
    /// <param name="wasm">A WASM module (wat or wasm) or a JSON encoded manifest.</param>
-    /// <param name="wasmSize">The length of the `wasm` parameter.</param>
+    /// <param name="wasmLength">The length of the `wasm` parameter.</param>
    /// <param name="functions">Array of host function pointers.</param>
    /// <param name="nFunctions">Number of host functions.</param>
    /// <param name="withWasi">Enables/disables WASI.</param>
    /// <returns></returns>
    [DllImport("extism")]
-    unsafe internal static extern bool extism_plugin_update(ExtismContext* context, int plugin, byte* wasm, long wasmSize, Span<IntPtr> functions, long nFunctions, bool withWasi);
+    unsafe public static extern bool extism_plugin_update(IntPtr context, IntPtr plugin, byte* wasm, int wasmLength, IntPtr *functions, int nFunctions, bool withWasi);

    /// <summary>
    /// Remove a plugin from the registry and free associated memory.
@@ -229,14 +56,14 @@ internal static class LibExtism
    /// <param name="context">Pointer to the context the plugin is associated with.</param>
    /// <param name="plugin">Pointer to the plugin you want to free.</param>
    [DllImport("extism")]
-    unsafe internal static extern void extism_plugin_free(ExtismContext* context, int plugin);
+    public static extern void extism_plugin_free(IntPtr context, IntPtr plugin);

    /// <summary>
    /// Remove all plugins from the registry.
    /// </summary>
    /// <param name="context"></param>
    [DllImport("extism")]
-    unsafe internal static extern void extism_context_reset(ExtismContext* context);
+    public static extern void extism_context_reset(IntPtr context);

    /// <summary>
    /// Update plugin config values, this will merge with the existing values.
@@ -247,7 +74,7 @@ internal static class LibExtism
    /// <param name="jsonLength">The length of the `json` parameter.</param>
    /// <returns></returns>
    [DllImport("extism")]
-    unsafe internal static extern bool extism_plugin_config(ExtismContext* context, int plugin, byte* json, int jsonLength);
+    unsafe public static extern bool extism_plugin_config(IntPtr context, IntPtr plugin, byte* json, int jsonLength);

    /// <summary>
    /// Returns true if funcName exists.
@@ -257,7 +84,7 @@ internal static class LibExtism
    /// <param name="funcName"></param>
    /// <returns></returns>
    [DllImport("extism")]
-    unsafe internal static extern bool extism_plugin_function_exists(ExtismContext* context, int plugin, string funcName);
+    public static extern bool extism_plugin_function_exists(IntPtr context, IntPtr plugin, string funcName);

    /// <summary>
    /// Call a function.
@@ -269,7 +96,7 @@ internal static class LibExtism
    /// <param name="dataLen">The length of the `data` parameter.</param>
    /// <returns></returns>
    [DllImport("extism")]
-    unsafe internal static extern int extism_plugin_call(ExtismContext* context, int plugin, string funcName, byte* data, int dataLen);
+    unsafe public static extern int extism_plugin_call(IntPtr context, IntPtr plugin, string funcName, byte* data, int dataLen);

    /// <summary>
    /// Get the error associated with a Context or Plugin, if plugin is -1 then the context error will be returned.
@@ -278,7 +105,7 @@ internal static class LibExtism
    /// <param name="plugin">A plugin pointer, or -1 for the context error.</param>
    /// <returns></returns>
    [DllImport("extism")]
-    unsafe internal static extern IntPtr extism_error(ExtismContext* context, nint plugin);
+    public static extern IntPtr extism_error(IntPtr context, nint plugin);

    /// <summary>
    /// Get the length of a plugin's output data.
@@ -287,7 +114,7 @@ internal static class LibExtism
    /// <param name="plugin"></param>
    /// <returns></returns>
    [DllImport("extism")]
-    unsafe internal static extern long extism_plugin_output_length(ExtismContext* context, int plugin);
+    public static extern long extism_plugin_output_length(IntPtr context, IntPtr plugin);

    /// <summary>
    /// Get the plugin's output data.
@@ -296,7 +123,7 @@ internal static class LibExtism
    /// <param name="plugin"></param>
    /// <returns></returns>
    [DllImport("extism")]
-    unsafe internal static extern IntPtr extism_plugin_output_data(ExtismContext* context, int plugin);
+    public static extern IntPtr extism_plugin_output_data(IntPtr context, IntPtr plugin);

    /// <summary>
    /// Set log file and level.
@@ -305,43 +132,43 @@ internal static class LibExtism
    /// <param name="logLevel"></param>
    /// <returns></returns>
    [DllImport("extism")]
-    internal static extern bool extism_log_file(string filename, string logLevel);
+    public static extern bool extism_log_file(string filename, string logLevel);

    /// <summary>
    /// Get the Extism version string.
    /// </summary>
    /// <returns></returns>
    [DllImport("extism", EntryPoint = "extism_version")]
-    internal static extern IntPtr extism_version();
+    public static extern IntPtr extism_version();

    /// <summary>
    /// Extism Log Levels
    /// </summary>
-    internal static class LogLevels
+    public static class LogLevels
    {
        /// <summary>
        /// Designates very serious errors.
        /// </summary>
-        internal const string Error = "Error";
+        public const string Error = "Error";

        /// <summary>
        /// Designates hazardous situations.
        /// </summary>
-        internal const string Warn = "Warn";
+        public const string Warn = "Warn";

        /// <summary>
        /// Designates useful information.
        /// </summary>
-        internal const string Info = "Info";
+        public const string Info = "Info";

        /// <summary>
        /// Designates lower priority information.
        /// </summary>
-        internal const string Debug = "Debug";
+        public const string Debug = "Debug";

        /// <summary>
        /// Designates very low priority, often extremely verbose, information.
        /// </summary>
-        internal const string Trace = "Trace";
+        public const string Trace = "Trace";
    }
-}
+}
--- a/dotnet/src/Extism.Sdk/LogLevel.cs
+++ b/dotnet/src/Extism.Sdk/LogLevel.cs
@@ -1,32 +0,0 @@
-namespace Extism.Sdk.Native;
-
-/// <summary>
-/// Extism Log Levels
-/// </summary>
-public enum LogLevel
-{
-    /// <summary>
-    /// Designates very serious errors.
-    /// </summary>
-    Error,
-
-    /// <summary>
-    /// Designates hazardous situations.
-    /// </summary>
-    Warning,
-
-    /// <summary>
-    /// Designates useful information.
-    /// </summary>
-    Info,
-
-    /// <summary>
-    /// Designates lower priority information.
-    /// </summary>
-    Debug,
-
-    /// <summary>
-    /// Designates very low priority, often extremely verbose, information.
-    /// </summary>
-    Trace
-}
--- a/dotnet/src/Extism.Sdk/Plugin.cs
+++ b/dotnet/src/Extism.Sdk/Plugin.cs
@@ -11,32 +11,18 @@ public class Plugin : IDisposable
    private const int DisposedMarker = 1;

    private readonly Context _context;
-    private readonly HostFunction[] _functions;
    private int _disposed;

-    /// <summary>
-    /// Create a and load a plug-in
-    /// Using this constructor will give the plug-in it's own internal Context
-    /// </summary>
-    /// <param name="wasm">A WASM module (wat or wasm) or a JSON encoded manifest.</param>
-    /// <param name="functions">List of host functions expected by the plugin.</param>
-    /// <param name="withWasi">Enable/Disable WASI.</param>
-    public static Plugin Create(ReadOnlySpan<byte> wasm, HostFunction[] functions, bool withWasi) {
-        var context = new Context();
-        return context.CreatePlugin(wasm, functions, withWasi);
-    }
-
-    internal Plugin(Context context, HostFunction[] functions, int index)
+    internal Plugin(Context context, IntPtr handle)
    {
        _context = context;
-        _functions = functions;
-        Index = index;
+        NativeHandle = handle;
    }

    /// <summary>
    /// A pointer to the native Plugin struct.
    /// </summary>
-    internal int Index { get; }
+    internal IntPtr NativeHandle { get; }

    /// <summary>
    /// Update a plugin, keeping the existing ID.
@@ -47,10 +33,9 @@ public class Plugin : IDisposable
    {
        CheckNotDisposed();

-        var functions = _functions.Select(f => f.NativeHandle).ToArray();
        fixed (byte* wasmPtr = wasm)
        {
-            return LibExtism.extism_plugin_update(_context.NativeHandle, Index, wasmPtr, wasm.Length, functions, 0, withWasi);
+            return LibExtism.extism_plugin_update(_context.NativeHandle, NativeHandle, wasmPtr, wasm.Length, null, 0, withWasi);
        }
    }

@@ -64,18 +49,18 @@ public class Plugin : IDisposable

        fixed (byte* jsonPtr = json)
        {
-            return LibExtism.extism_plugin_config(_context.NativeHandle, Index, jsonPtr, json.Length);
+            return LibExtism.extism_plugin_config(_context.NativeHandle, NativeHandle, jsonPtr, json.Length);
        }
    }

    /// <summary>
    /// Checks if a specific function exists in the current plugin.
    /// </summary>
-    unsafe public bool FunctionExists(string name)
+    public bool FunctionExists(string name)
    {
        CheckNotDisposed();

-        return LibExtism.extism_plugin_function_exists(_context.NativeHandle, Index, name);
+        return LibExtism.extism_plugin_function_exists(_context.NativeHandle, NativeHandle, name);
    }

    /// <summary>
@@ -93,20 +78,14 @@ public class Plugin : IDisposable

        fixed (byte* dataPtr = data)
        {
-            int response = LibExtism.extism_plugin_call(_context.NativeHandle, Index, functionName, dataPtr, data.Length);
-            if (response == 0)
-            {
+            int response = LibExtism.extism_plugin_call(_context.NativeHandle, NativeHandle, functionName, dataPtr, data.Length);
+            if (response == 0) {
                return OutputData();
-            }
-            else
-            {
+            } else {
                var errorMsg = GetError();
-                if (errorMsg != null)
-                {
+                if (errorMsg != null) {
                    throw new ExtismException(errorMsg);
-                }
-                else
-                {
+                } else {
                    throw new ExtismException("Call to Extism failed");
                }
            }
@@ -117,11 +96,11 @@ public class Plugin : IDisposable
    /// Get the length of a plugin's output data.
    /// </summary>
    /// <returns></returns>
-    unsafe internal int OutputLength()
+    internal int OutputLength()
    {
        CheckNotDisposed();

-        return (int)LibExtism.extism_plugin_output_length(_context.NativeHandle, Index);
+        return (int)LibExtism.extism_plugin_output_length(_context.NativeHandle, NativeHandle);
    }

    /// <summary>
@@ -135,7 +114,7 @@ public class Plugin : IDisposable

        unsafe
        {
-            var ptr = LibExtism.extism_plugin_output_data(_context.NativeHandle, Index).ToPointer();
+            var ptr = LibExtism.extism_plugin_output_data(_context.NativeHandle, NativeHandle).ToPointer();
            return new Span<byte>(ptr, length);
        }
    }
@@ -144,11 +123,11 @@ public class Plugin : IDisposable
    /// Get the error associated with the current plugin.
    /// </summary>
    /// <returns></returns>
-    unsafe internal string? GetError()
+    internal string? GetError()
    {
        CheckNotDisposed();

-        var result = LibExtism.extism_error(_context.NativeHandle, Index);
+        var result = LibExtism.extism_error(_context.NativeHandle, NativeHandle);
        return Marshal.PtrToStringUTF8(result);
    }

@@ -189,7 +168,7 @@ public class Plugin : IDisposable
    /// <summary>
    /// Frees all resources held by this Plugin.
    /// </summary>
-    unsafe protected virtual void Dispose(bool disposing)
+    protected virtual void Dispose(bool disposing)
    {
        if (disposing)
        {
@@ -197,7 +176,7 @@ public class Plugin : IDisposable
        }

        // Free up unmanaged resources
-        LibExtism.extism_plugin_free(_context.NativeHandle, Index);
+        LibExtism.extism_plugin_free(_context.NativeHandle, NativeHandle);
    }

    /// <summary>
@@ -207,4 +186,4 @@ public class Plugin : IDisposable
    {
        Dispose(false);
    }
-}
+}
--- a/dotnet/test/Extism.Sdk/BasicTests.cs
+++ b/dotnet/test/Extism.Sdk/BasicTests.cs
@@ -1,7 +1,6 @@
 using Extism.Sdk.Native;

 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Text;

 using Xunit;
@@ -10,17 +9,6 @@ namespace Extism.Sdk.Tests;

 public class BasicTests
 {
-    [Fact]
-    public void CountHelloWorldVowelsWithoutContext()
-    {
-        var binDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
-        var wasm = File.ReadAllBytes(Path.Combine(binDirectory, "code.wasm"));
-        using var plugin = Plugin.Create(wasm, Array.Empty<HostFunction>(), withWasi: true);
-
-        var response = plugin.CallFunction("count_vowels", Encoding.UTF8.GetBytes("Hello World"));
-        Assert.Equal("{\"count\": 3}", Encoding.UTF8.GetString(response));
-    }
-
    [Fact]
    public void CountHelloWorldVowels()
    {
@@ -28,46 +16,9 @@ public class BasicTests

        var binDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
        var wasm = File.ReadAllBytes(Path.Combine(binDirectory, "code.wasm"));
-        using var plugin = context.CreatePlugin(wasm, Array.Empty<HostFunction>(), withWasi: true);
+        using var plugin = context.CreatePlugin(wasm, withWasi: true);

        var response = plugin.CallFunction("count_vowels", Encoding.UTF8.GetBytes("Hello World"));
        Assert.Equal("{\"count\": 3}", Encoding.UTF8.GetString(response));
    }
-
-    [Fact]
-    public void CountVowelsHostFunctions()
-    {
-        using var context = new Context();
-
-        var userData = Marshal.StringToHGlobalAnsi("Hello again!");
-
-        using var helloWorld = new HostFunction(
-            "hello_world",
-            "env",
-            new[] { ExtismValType.I64 },
-            new[] { ExtismValType.I64 },
-            userData,
-            HelloWorld);
-
-        var binDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
-        var wasm = File.ReadAllBytes(Path.Combine(binDirectory, "code-functions.wasm"));
-        using var plugin = context.CreatePlugin(wasm, new[] { helloWorld }, withWasi: true);
-
-        var response = plugin.CallFunction("count_vowels", Encoding.UTF8.GetBytes("Hello World"));
-        Assert.Equal("{\"count\": 3}", Encoding.UTF8.GetString(response));
-
-        void HelloWorld(CurrentPlugin plugin, Span<ExtismVal> inputs, Span<ExtismVal> outputs, nint data)
-        {
-            Console.WriteLine("Hello from .NET!");
-
-            var text = Marshal.PtrToStringAnsi(data);
-            Console.WriteLine(text);
-
-            var input = plugin.ReadString(new nint(inputs[0].v.i64));
-            Console.WriteLine($"Input: {input}");
-
-            var output = new string(input); // clone the string
-            outputs[0].v.i64 = plugin.WriteString(output);
-        }
-    }
-}
+}
--- a/dotnet/test/Extism.Sdk/Extism.Sdk.Tests.csproj
+++ b/dotnet/test/Extism.Sdk/Extism.Sdk.Tests.csproj
@@ -25,9 +25,6 @@
 		<None Include="..\..\..\wasm\code.wasm" Link="code.wasm">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Include="..\..\..\wasm\code-functions.wasm" Link="code-functions.wasm">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
 	</ItemGroup>


@@ -35,8 +32,4 @@
 		<ProjectReference Include="..\..\src\Extism.Sdk\Extism.Sdk.csproj" />
 	</ItemGroup>

-	<ItemGroup>
-		<PackageReference Include="Extism.runtime.win-x64" Version="0.4.0" />
-	</ItemGroup>
-
 </Project>
--- a/14
+++ b/14
@@ -21,13 +21,12 @@
 (description "Bindings to Extism, the universal plugin system")
 (depends 
  (ocaml (>= 4.14.1)) 
-  dune
-  (ctypes (>= 0.18.0))
+  (dune (>= 3.2))
  (ctypes-foreign (>= 0.18.0))
  (bigstringaf (>= 0.9.0))
-  (ppx_yojson_conv (>= v0.15.0))
-  (extism-manifest (= :version))
-  (ppx_inline_test (>= v0.15.0))
+  (ppx_yojson_conv (>= 0.15.0))
+  extism-manifest
+  (ppx_inline_test (>= 0.15.0))
  (cmdliner (>= 1.1.1))
 )
 (tags
@@ -39,9 +38,8 @@
 (description "Bindings to the Extism manifest format")
 (depends 
  (ocaml (>= 4.14.1)) 
-  dune
-  (ppx_yojson_conv (>= v0.15.0))
-  (ppx_inline_test (>= v0.15.0))
+  (dune (>= 3.2))
+  (ppx_yojson_conv (>= 0.15.0))
  (base64 (>= 3.5.0))
 )
 (tags
--- a/elixir/lib/extism/cancel_handle.ex
+++ b/elixir/lib/extism/cancel_handle.ex
@@ -1,31 +0,0 @@
-defmodule Extism.CancelHandle do
-  @moduledoc """
-  A CancelHandle is a handle generated by a plugin that allows it to be cancelled from another
-  thread while running.
-  """
-  defstruct [
-    # The actual NIF Resource. PluginIndex and the context
-    handle: nil
-  ]
-
-  def wrap_resource(handle) do
-    %__MODULE__{
-      handle: handle
-    }
-  end
-
-  @doc """
-  Cancel plugin execution
-  """
-  def cancel(handle) do
-    Extism.Native.plugin_cancel(handle.handle)
-  end
-end
-
-defimpl Inspect, for: Extim.CancelHandle do
-  import Inspect.Algebra
-
-  def inspect(dict, opts) do
-    concat(["#Extism.CancelHandle<", to_doc(dict.handle, opts), ">"])
-  end
-end
--- a/elixir/lib/extism/native.ex
+++ b/elixir/lib/extism/native.ex
@@ -16,8 +16,6 @@ defmodule Extism.Native do
  def plugin_has_function(_ctx, _plugin_id, _function_name), do: error()
  def plugin_free(_ctx, _plugin_id), do: error()
  def set_log_file(_filename, _level), do: error()
-  def plugin_cancel_handle(_ctx, _plugin_id), do: error()
-  def plugin_cancel(_handle), do: error()

  defp error, do: :erlang.nif_error(:nif_not_loaded)
 end
--- a/elixir/lib/extism/plugin.ex
+++ b/elixir/lib/extism/plugin.ex
@@ -15,25 +15,12 @@ defmodule Extism.Plugin do
    }
  end

-  @doc """
-  Creates a new plugin
-  """
-  def new(manifest, wasi \\ false, context \\ nil) do
-    ctx = context || Extism.Context.new()
-    {:ok, manifest_payload} = JSON.encode(manifest)
-
-    case Extism.Native.plugin_new_with_manifest(ctx.ptr, manifest_payload, wasi) do
-      {:error, err} -> {:error, err}
-      res -> {:ok, Extism.Plugin.wrap_resource(ctx, res)}
-    end
-  end
-
  @doc """
  Call a plugin's function by name

  ## Examples

-      iex> {:ok, plugin} = Extism.Plugin.new(manifest, false)
+      iex> {:ok, plugin} = Extism.Context.new_plugin(ctx, manifest, false)
      iex> {:ok, output} = Extism.Plugin.call(plugin, "count_vowels", "this is a test")
         # {:ok, "{\"count\": 4}"}

--- a/elixir/mix.exs
+++ b/elixir/mix.exs
@@ -4,7 +4,7 @@ defmodule Extism.MixProject do
  def project do
    [
      app: :extism,
-      version: "0.5.1",
+      version: "0.1.0",
      elixir: "~> 1.12",
      start_permanent: Mix.env() == :prod,
      deps: deps(),
@@ -23,7 +23,7 @@ defmodule Extism.MixProject do

  defp deps do
    [
-      {:rustler, "~> 0.29.1"},
+      {:rustler, "~> 0.26.0"},
      {:json, "~> 1.4"},
      {:ex_doc, "~> 0.21", only: :dev, runtime: false}
    ]
--- a/elixir/mix.lock
+++ b/elixir/mix.lock
@@ -1,12 +1,12 @@
 %{
-  "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
-  "ex_doc": {:hex, :ex_doc, "0.30.5", "aa6da96a5c23389d7dc7c381eba862710e108cee9cfdc629b7ec021313900e9e", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "88a1e115dcb91cefeef7e22df4a6ebbe4634fbf98b38adcbc25c9607d6d9d8e6"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.29", "149d50dcb3a93d9f3d6f3ecf18c918fb5a2d3c001b5d3305c926cddfbd33355b", [:mix], [], "hexpm", "4902af1b3eb139016aed210888748db8070b8125c2342ce3dcae4f38dcc63503"},
+  "ex_doc": {:hex, :ex_doc, "0.29.1", "b1c652fa5f92ee9cf15c75271168027f92039b3877094290a75abcaac82a9f77", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "b7745fa6374a36daf484e2a2012274950e084815b936b1319aeebcf7809574f6"},
  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
  "json": {:hex, :json, "1.4.1", "8648f04a9439765ad449bc56a3ff7d8b11dd44ff08ffcdefc4329f7c93843dfa", [:mix], [], "hexpm", "9abf218dbe4ea4fcb875e087d5f904ef263d012ee5ed21d46e9dbca63f053d16"},
  "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
-  "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
-  "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.3.1", "2c54013ecf170e249e9291ed0a62e5832f70a476c61da16f6aac6dca0189f2af", [:mix], [], "hexpm", "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"},
-  "rustler": {:hex, :rustler, "0.29.1", "880f20ae3027bd7945def6cea767f5257bc926f33ff50c0d5d5a5315883c084d", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:toml, "~> 0.6", [hex: :toml, repo: "hexpm", optional: false]}], "hexpm", "109497d701861bfcd26eb8f5801fe327a8eef304f56a5b63ef61151ff44ac9b6"},
-  "toml": {:hex, :toml, "0.7.0", "fbcd773caa937d0c7a02c301a1feea25612720ac3fa1ccb8bfd9d30d822911de", [:mix], [], "hexpm", "0690246a2478c1defd100b0c9b89b4ea280a22be9a7b313a8a058a2408a2fa70"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.16.0", "f8c570a0d33f8039513fbccaf7108c5d750f47d8defd44088371191b76492b0b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "28b2cbdc13960a46ae9a8858c4bebdec3c9a6d7b4b9e7f4ed1502f8159f338e7"},
+  "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
+  "rustler": {:hex, :rustler, "0.26.0", "06a2773d453ee3e9109efda643cf2ae633dedea709e2455ac42b83637c9249bf", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:toml, "~> 0.6", [hex: :toml, repo: "hexpm", optional: false]}], "hexpm", "42961e9d2083d004d5a53e111ad1f0c347efd9a05cb2eb2ffa1d037cdc74db91"},
+  "toml": {:hex, :toml, "0.6.2", "38f445df384a17e5d382befe30e3489112a48d3ba4c459e543f748c2f25dd4d1", [:mix], [], "hexpm", "d013e45126d74c0c26a38d31f5e8e9b83ea19fc752470feb9a86071ca5a672fa"},
 }
--- a/elixir/native/extism_nif/Cargo.toml
+++ b/elixir/native/extism_nif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "extism_nif"
-version = "0.3.0"
+version = "0.1.0"
 edition = "2021"
 authors = ["Benjamin Eckel <bhelx@simst.im>"]

@@ -9,10 +9,7 @@ name = "extism_nif"
 path = "src/lib.rs"
 crate-type = ["cdylib"]

-# need this to be here and be empty
-[workspace]
-
 [dependencies]
-rustler = "0.29.1"
-extism = "0.5.2"
+rustler = "0.26.0"
+extism = { version = "0.1.0", path = "../../../rust" }
 log = "0.4"
--- a/elixir/native/extism_nif/src/lib.rs
+++ b/elixir/native/extism_nif/src/lib.rs
@@ -17,19 +17,12 @@ mod atoms {
 struct ExtismContext {
    ctx: RwLock<Context>,
 }
+
 unsafe impl Sync for ExtismContext {}
 unsafe impl Send for ExtismContext {}

-struct ExtismCancelHandle {
-    handle: RwLock<extism::CancelHandle>,
-}
-
-unsafe impl Sync for ExtismCancelHandle {}
-unsafe impl Send for ExtismCancelHandle {}
-
 fn load(env: Env, _: Term) -> bool {
    rustler::resource!(ExtismContext, env);
-    rustler::resource!(ExtismCancelHandle, env);
    true
 }

@@ -62,8 +55,8 @@ fn plugin_new_with_manifest(
    manifest_payload: String,
    wasi: bool,
 ) -> Result<i32, rustler::Error> {
-    let context = ctx.ctx.write().unwrap();
-    let result = match Plugin::new(&context, manifest_payload, [], wasi) {
+    let context = &ctx.ctx.write().unwrap();
+    let result = match Plugin::new(context, manifest_payload, [], wasi) {
        Err(e) => Err(to_rustler_error(e)),
        Ok(plugin) => {
            let plugin_id = plugin.as_i32();
@@ -119,24 +112,6 @@ fn plugin_update_manifest(
    result
 }

-#[rustler::nif]
-fn plugin_cancel_handle(
-    ctx: ResourceArc<ExtismContext>,
-    plugin_id: i32,
-) -> Result<ResourceArc<ExtismCancelHandle>, rustler::Error> {
-    let context = &ctx.ctx.read().unwrap();
-    let plugin = unsafe { Plugin::from_id(plugin_id, context) };
-    let handle = plugin.cancel_handle();
-    Ok(ResourceArc::new(ExtismCancelHandle {
-        handle: RwLock::new(handle),
-    }))
-}
-
-#[rustler::nif]
-fn plugin_cancel(handle: ResourceArc<ExtismCancelHandle>) -> bool {
-    handle.handle.read().unwrap().cancel()
-}
-
 #[rustler::nif]
 fn plugin_free(ctx: ResourceArc<ExtismContext>, plugin_id: i32) -> Result<(), rustler::Error> {
    let context = &ctx.ctx.read().unwrap();
@@ -190,8 +165,6 @@ rustler::init!(
        plugin_call,
        plugin_update_manifest,
        plugin_has_function,
-        plugin_cancel_handle,
-        plugin_cancel,
        plugin_free,
        set_log_file,
    ],
--- a/extism-manifest.opam
+++ b/extism-manifest.opam
@@ -7,13 +7,12 @@ authors: ["Extism Authors <oss@extism.org>"]
 license: "BSD-3-Clause"
 tags: ["topics" "wasm" "plugin"]
 homepage: "https://github.com/extism/extism"
-doc: "https://github.com/extism/extism"
+doc: "https://extism.org"
 bug-reports: "https://github.com/extism/extism/issues"
 depends: [
  "ocaml" {>= "4.14.1"}
-  "dune" {>= "3.2"}
-  "ppx_yojson_conv" {>= "v0.15.0"}
-  "ppx_inline_test" {>= "v0.15.0"}
+  "dune" {>= "3.2" & >= "3.2"}
+  "ppx_yojson_conv" {>= "0.15.0"}
  "base64" {>= "3.5.0"}
  "odoc" {with-doc}
 ]
--- a/extism.go
+++ b/extism.go
@@ -14,41 +14,6 @@ import (
 #cgo LDFLAGS: -L/usr/local/lib -lextism
 #include <extism.h>
 #include <stdlib.h>
-
-int64_t extism_val_i64(ExtismValUnion* x){
-	return x->i64;
-}
-
-int32_t extism_val_i32(ExtismValUnion* x){
-	return x->i32;
-}
-
-float extism_val_f32(ExtismValUnion* x){
-	return x->f32;
-}
-
-double extism_val_f64(ExtismValUnion* x){
-	return x->f64;
-}
-
-
-void extism_val_set_i64(ExtismValUnion* x, int64_t i){
-	x->i64 = i;
-}
-
-
-void extism_val_set_i32(ExtismValUnion* x, int32_t i){
-	x->i32 = i;
-}
-
-void extism_val_set_f32(ExtismValUnion* x, float f){
-	x->f32 = f;
-}
-
-void extism_val_set_f64(ExtismValUnion* x, double f){
-	x->f64 = f;
-}
-
 */
 import "C"

@@ -68,7 +33,6 @@ var (
 	I64       ValType = C.I64
 	F32       ValType = C.F32
 	F64       ValType = C.F64
-	V128      ValType = C.V128
 	FuncRef   ValType = C.FuncRef
 	ExternRef ValType = C.ExternRef
 )
@@ -93,19 +57,11 @@ func NewFunction(name string, inputs []ValType, outputs []ValType, f unsafe.Poin
 	function.userData = cgo.NewHandle(userData)
 	cname := C.CString(name)
 	ptr := unsafe.Pointer(function.userData)
-	var inputsPtr *C.ExtismValType = nil
-	if len(inputs) > 0 {
-		inputsPtr = (*C.ExtismValType)(&inputs[0])
-	}
-	var outputsPtr *C.ExtismValType = nil
-	if len(outputs) > 0 {
-		outputsPtr = (*C.ExtismValType)(&outputs[0])
-	}
 	function.pointer = C.extism_function_new(
 		cname,
-		inputsPtr,
+		(*C.ExtismValType)(&inputs[0]),
 		C.uint64_t(len(inputs)),
-		outputsPtr,
+		(*C.ExtismValType)(&outputs[0]),
 		C.uint64_t(len(outputs)),
 		(*[0]byte)(f),
 		ptr,
@@ -115,24 +71,13 @@ func NewFunction(name string, inputs []ValType, outputs []ValType, f unsafe.Poin
 	return function
 }

-func (f *Function) SetNamespace(s string) {
-	cstr := C.CString(s)
-	defer C.free(unsafe.Pointer(cstr))
-	C.extism_function_set_namespace(f.pointer, cstr)
-}
-
-func (f Function) WithNamespace(s string) Function {
-	f.SetNamespace(s)
-	return f
-}
-
 type CurrentPlugin struct {
 	pointer *C.ExtismCurrentPlugin
 }

-func GetCurrentPlugin(ptr unsafe.Pointer) CurrentPlugin {
+func GetCurrentPlugin(ptr *C.ExtismCurrentPlugin) CurrentPlugin {
 	return CurrentPlugin{
-		pointer: (*C.ExtismCurrentPlugin)(ptr),
+		pointer: ptr,
 	}
 }

@@ -142,21 +87,6 @@ func (p *CurrentPlugin) Memory(offs uint) []byte {
 	return unsafe.Slice((*byte)(unsafe.Add(data, offs)), C.int(length))
 }

-// Alloc a new memory block of the given length, returning its offset
-func (p *CurrentPlugin) Alloc(n uint) uint {
-	return uint(C.extism_current_plugin_memory_alloc(p.pointer, C.uint64_t(n)))
-}
-
-// Free the memory block specified by the given offset
-func (p *CurrentPlugin) Free(offs uint) {
-	C.extism_current_plugin_memory_free(p.pointer, C.uint64_t(offs))
-}
-
-// Length returns the number of bytes allocated at the specified offset
-func (p *CurrentPlugin) Length(offs uint) uint {
-	return uint(C.extism_current_plugin_memory_length(p.pointer, C.uint64_t(offs)))
-}
-
 // NewContext creates a new context, it should be freed using the `Free` method
 func NewContext() Context {
 	p := C.extism_context_new()
@@ -173,9 +103,8 @@ func (ctx *Context) Free() {

 // Plugin is used to call WASM functions
 type Plugin struct {
-	ctx       *Context
-	id        int32
-	functions []Function
+	ctx *Context
+	id  int32
 }

 type WasmData struct {
@@ -273,7 +202,7 @@ func register(ctx *Context, data []byte, functions []Function, wasi bool) (Plugi
 		)
 	}

-	return Plugin{id: int32(plugin), ctx: ctx, functions: functions}, nil
+	return Plugin{id: int32(plugin), ctx: ctx}, nil
 }

 func update(ctx *Context, plugin int32, data []byte, functions []Function, wasi bool) error {
@@ -324,18 +253,6 @@ func update(ctx *Context, plugin int32, data []byte, functions []Function, wasi
 	)
 }

-// NewPlugin creates a plugin in its own context
-func NewPlugin(module io.Reader, functions []Function, wasi bool) (Plugin, error) {
-	ctx := NewContext()
-	return ctx.Plugin(module, functions, wasi)
-}
-
-// NewPlugin creates a plugin in its own context from a manifest
-func NewPluginFromManifest(manifest Manifest, functions []Function, wasi bool) (Plugin, error) {
-	ctx := NewContext()
-	return ctx.PluginFromManifest(manifest, functions, wasi)
-}
-
 // PluginFromManifest creates a plugin from a `Manifest`
 func (ctx *Context) PluginFromManifest(manifest Manifest, functions []Function, wasi bool) (Plugin, error) {
 	data, err := json.Marshal(manifest)
@@ -362,7 +279,7 @@ func (p *Plugin) Update(module io.Reader, functions []Function, wasi bool) error
 	if err != nil {
 		return err
 	}
-	p.functions = functions
+
 	return update(p.ctx, p.id, wasm, functions, wasi)
 }

@@ -373,7 +290,6 @@ func (p *Plugin) UpdateManifest(manifest Manifest, functions []Function, wasi bo
 		return err
 	}

-	p.functions = functions
 	return update(p.ctx, p.id, data, functions, wasi)
 }

@@ -444,80 +360,3 @@ func (plugin *Plugin) Free() {
 func (ctx Context) Reset() {
 	C.extism_context_reset(ctx.pointer)
 }
-
-// ValGetI64 returns an I64 from an ExtismVal, it accepts a pointer to a C.ExtismVal
-func ValGetI64(v unsafe.Pointer) int64 {
-	return int64(C.extism_val_i64(&(*Val)(v).v))
-}
-
-// ValGetUInt returns a uint from an ExtismVal, it accepts a pointer to a C.ExtismVal
-func ValGetUInt(v unsafe.Pointer) uint {
-	return uint(C.extism_val_i64(&(*Val)(v).v))
-}
-
-// ValGetI32 returns an int32 from an ExtismVal, it accepts a pointer to a C.ExtismVal
-func ValGetI32(v unsafe.Pointer) int32 {
-	return int32(C.extism_val_i32(&(*Val)(v).v))
-}
-
-// ValGetF32 returns a float32 from an ExtismVal, it accepts a pointer to a C.ExtismVal
-func ValGetF32(v unsafe.Pointer) float32 {
-	return float32(C.extism_val_f32(&(*Val)(v).v))
-}
-
-// ValGetF32 returns a float64 from an ExtismVal, it accepts a pointer to a C.ExtismVal
-func ValGetF64(v unsafe.Pointer) float64 {
-	return float64(C.extism_val_i64(&(*Val)(v).v))
-}
-
-// ValSetI64 stores an int64 in an ExtismVal, it accepts a pointer to a C.ExtismVal and the new value
-func ValSetI64(v unsafe.Pointer, i int64) {
-	C.extism_val_set_i64(&(*Val)(v).v, C.int64_t(i))
-}
-
-// ValSetI32 stores an int32 in an ExtismVal, it accepts a pointer to a C.ExtismVal and the new value
-func ValSetI32(v unsafe.Pointer, i int32) {
-	C.extism_val_set_i32(&(*Val)(v).v, C.int32_t(i))
-}
-
-// ValSetF32 stores a float32 in an ExtismVal, it accepts a pointer to a C.ExtismVal and the new value
-func ValSetF32(v unsafe.Pointer, i float32) {
-	C.extism_val_set_f32(&(*Val)(v).v, C.float(i))
-}
-
-// ValSetF64 stores a float64 in an ExtismVal, it accepts a pointer to a C.ExtismVal and the new value
-func ValSetF64(v unsafe.Pointer, f float64) {
-	C.extism_val_set_f64(&(*Val)(v).v, C.double(f))
-}
-
-func (p *CurrentPlugin) ReturnBytes(v unsafe.Pointer, b []byte) {
-	mem := p.Alloc(uint(len(b)))
-	ptr := p.Memory(mem)
-	copy(ptr, b)
-	ValSetI64(v, int64(mem))
-}
-
-func (p *CurrentPlugin) ReturnString(v unsafe.Pointer, s string) {
-	p.ReturnBytes(v, []byte(s))
-}
-
-func (p *CurrentPlugin) InputBytes(v unsafe.Pointer) []byte {
-	return p.Memory(ValGetUInt(v))
-}
-
-func (p *CurrentPlugin) InputString(v unsafe.Pointer) string {
-	return string(p.InputBytes(v))
-}
-
-type CancelHandle struct {
-	pointer *C.ExtismCancelHandle
-}
-
-func (p *Plugin) CancelHandle() CancelHandle {
-	pointer := C.extism_plugin_cancel_handle(p.ctx.pointer, C.int(p.id))
-	return CancelHandle{pointer}
-}
-
-func (c *CancelHandle) Cancel() bool {
-	return bool(C.extism_plugin_cancel(c.pointer))
-}
--- a/extism.opam
+++ b/extism.opam
@@ -7,17 +7,16 @@ authors: ["Extism Authors <oss@extism.org>"]
 license: "BSD-3-Clause"
 tags: ["topics" "wasm" "plugin"]
 homepage: "https://github.com/extism/extism"
-doc: "https://github.com/extism/extism"
+doc: "https://extism.org"
 bug-reports: "https://github.com/extism/extism/issues"
 depends: [
  "ocaml" {>= "4.14.1"}
-  "dune" {>= "3.2"}
-  "ctypes" {>= "0.18.0"}
+  "dune" {>= "3.2" & >= "3.2"}
  "ctypes-foreign" {>= "0.18.0"}
  "bigstringaf" {>= "0.9.0"}
-  "ppx_yojson_conv" {>= "v0.15.0"}
-  "extism-manifest" {= version}
-  "ppx_inline_test" {>= "v0.15.0"}
+  "ppx_yojson_conv" {>= "0.15.0"}
+  "extism-manifest"
+  "ppx_inline_test" {>= "0.15.0"}
  "cmdliner" {>= "1.1.1"}
  "odoc" {with-doc}
 ]
@@ -36,5 +35,3 @@ build: [
  ]
 ]
 dev-repo: "git+https://github.com/extism/extism.git"
-build-env: [EXTISM_TEST_NO_LIB = ""]
-post-messages: ["See https://extism.org/docs/install/ for information about installing libextism"]
--- a/extism.opam.template
+++ b/extism.opam.template
@@ -1,2 +0,0 @@
-build-env: [EXTISM_TEST_NO_LIB = ""]
-post-messages: ["See https://extism.org/docs/install/ for information about installing libextism"]
--- a/extism_test.go
+++ b/extism_test.go
@@ -4,19 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"testing"
-	"time"
 )

-func manifest(functions bool) Manifest {
-	path := "./wasm/code.wasm"
-	if functions {
-		path = "./wasm/code-functions.wasm"
-	}
-
+func manifest() Manifest {
 	return Manifest{
 		Wasm: []Wasm{
 			WasmFile{
-				Path: path,
+				Path: "./wasm/code.wasm",
 			},
 		},
 	}
@@ -44,7 +38,7 @@ func TestCallPlugin(t *testing.T) {
 	ctx := NewContext()
 	defer ctx.Free()

-	plugin, err := ctx.PluginFromManifest(manifest(false), []Function{}, false)
+	plugin, err := ctx.PluginFromManifest(manifest(), false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -64,7 +58,7 @@ func TestFreePlugin(t *testing.T) {
 	ctx := NewContext()
 	defer ctx.Free()

-	plugin, err := ctx.PluginFromManifest(manifest(false), []Function{}, false)
+	plugin, err := ctx.PluginFromManifest(manifest(), false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -84,7 +78,7 @@ func TestContextReset(t *testing.T) {
 	ctx := NewContext()
 	defer ctx.Free()

-	plugin, err := ctx.PluginFromManifest(manifest(false), []Function{}, false)
+	plugin, err := ctx.PluginFromManifest(manifest(), false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -104,7 +98,7 @@ func TestCanUpdateAManifest(t *testing.T) {
 	ctx := NewContext()
 	defer ctx.Free()

-	plugin, err := ctx.PluginFromManifest(manifest(false), []Function{}, false)
+	plugin, err := ctx.PluginFromManifest(manifest(), false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -113,7 +107,7 @@ func TestCanUpdateAManifest(t *testing.T) {
 		t.Error(err)
 	}

-	plugin.UpdateManifest(manifest(false), []Function{}, false)
+	plugin.UpdateManifest(manifest(), false)

 	// can still call the plugin
 	if err := expectVowelCount(plugin, "this is a test", 4); err != nil {
@@ -125,7 +119,7 @@ func TestFunctionExists(t *testing.T) {
 	ctx := NewContext()
 	defer ctx.Free()

-	plugin, err := ctx.PluginFromManifest(manifest(false), []Function{}, false)
+	plugin, err := ctx.PluginFromManifest(manifest(), false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -142,7 +136,7 @@ func TestErrorsOnUnknownFunction(t *testing.T) {
 	ctx := NewContext()
 	defer ctx.Free()

-	plugin, err := ctx.PluginFromManifest(manifest(false), []Function{}, false)
+	plugin, err := ctx.PluginFromManifest(manifest(), false)
 	if err != nil {
 		t.Error(err)
 	}
@@ -152,33 +146,3 @@ func TestErrorsOnUnknownFunction(t *testing.T) {
 		t.Fatal("Was expecting call to unknown function to fail")
 	}
 }
-
-func TestCancel(t *testing.T) {
-	manifest := Manifest{
-		Wasm: []Wasm{
-			WasmFile{
-				Path: "./wasm/loop.wasm",
-			},
-		},
-	}
-
-	ctx := NewContext()
-	defer ctx.Free()
-
-	plugin, err := ctx.PluginFromManifest(manifest, []Function{}, false)
-	if err != nil {
-		t.Error(err)
-	}
-
-	cancelHandle := plugin.CancelHandle()
-
-	go func(handle CancelHandle) {
-		time.Sleep(time.Second * 1)
-		handle.Cancel()
-	}(cancelHandle)
-
-	_, err = plugin.Call("infinite_loop", []byte(""))
-	if err == nil {
-		t.Fail()
-	}
-}
--- a/go/main.go
+++ b/go/main.go
@@ -17,18 +17,12 @@ EXTISM_GO_FUNCTION(hello_world);
 import "C"

 //export hello_world
-func hello_world(plugin unsafe.Pointer, inputs *C.ExtismVal, nInputs C.ExtismSize, outputs *C.ExtismVal, nOutputs C.ExtismSize, userData uintptr) {
+func hello_world(plugin *C.ExtismCurrentPlugin, inputs *C.ExtismVal, nInputs C.ExtismSize, outputs *C.ExtismVal, nOutputs C.ExtismSize, userData uintptr) {
 	fmt.Println("Hello from Go!")
 	s := cgo.Handle(userData)
 	fmt.Println(s.Value().(string))
 	inputSlice := unsafe.Slice(inputs, nInputs)
 	outputSlice := unsafe.Slice(outputs, nOutputs)
-
-	// Get memory pointed to by first element of input slice
-	p := extism.GetCurrentPlugin(plugin)
-	str := p.InputString(unsafe.Pointer(&inputSlice[0]))
-	fmt.Println(str)
-
 	outputSlice[0] = inputSlice[0]
 }

@@ -36,6 +30,9 @@ func main() {
 	version := extism.ExtismVersion()
 	fmt.Println("Extism Version: ", version)

+	ctx := extism.NewContext()
+	defer ctx.Free() // this will free the context and all associated plugins
+
 	// set some input data to provide to the plugin module
 	var data []byte
 	if len(os.Args) > 1 {
@@ -46,7 +43,7 @@ func main() {
 	manifest := extism.Manifest{Wasm: []extism.Wasm{extism.WasmFile{Path: "../wasm/code-functions.wasm"}}}
 	f := extism.NewFunction("hello_world", []extism.ValType{extism.I64}, []extism.ValType{extism.I64}, C.hello_world, "Hello again!")
 	defer f.Free()
-	plugin, err := extism.NewPluginFromManifest(manifest, []extism.Function{f}, true)
+	plugin, err := ctx.PluginFromManifest(manifest, []extism.Function{f}, true)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
--- a/haskell/Example.hs
+++ b/haskell/Example.hs
@@ -1,24 +1,16 @@
 module Main where

 import Extism
-import Extism.CurrentPlugin
 import Extism.Manifest(manifest, wasmFile)

 unwrap (Right x) = x
 unwrap (Left (ExtismError msg)) = do
  error msg

-hello plugin params msg = do
-  putStrLn "Hello from Haskell!"
-  putStrLn msg
-  offs <- allocBytes plugin (toByteString "{\"count\": 999}")
-  return [toI64 offs]
-
 main = do
-  setLogFile "stdout" Error
-  let m = manifest [wasmFile "../wasm/code-functions.wasm"]
-  f <- hostFunction "hello_world" [I64] [I64] hello "Hello, again"
-  plugin <- unwrap <$> createPluginFromManifest m [f] True
-  res <- unwrap <$> call plugin "count_vowels" (toByteString "this is a test")
-  putStrLn (fromByteString res)
-  free plugin
+  let m = manifest [wasmFile "../wasm/code.wasm"]
+  context <- Extism.newContext
+  plugin <- unwrap <$> Extism.pluginFromManifest context m False
+  res <- unwrap <$> Extism.call plugin "count_vowels" (Extism.toByteString "this is a test")
+  putStrLn (Extism.fromByteString res)
+  Extism.free plugin
--- a/haskell/extism.cabal
+++ b/haskell/extism.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               extism
-version:            0.5.0
+version:            0.0.1
 license:            BSD-3-Clause
 maintainer:         oss@extism.org
 author:             Extism authors
@@ -8,10 +8,10 @@ bug-reports:        https://github.com/extism/extism
 synopsis:           Extism bindings
 description:        Bindings to Extism, the universal plugin system
 category:           Plugins, WebAssembly
-extra-doc-files: CHANGELOG.md
+extra-source-files: CHANGELOG.md

 library
-    exposed-modules:    Extism Extism.CurrentPlugin
+    exposed-modules:    Extism
    reexported-modules: Extism.Manifest
    hs-source-dirs:     src
    other-modules:      Extism.Bindings
@@ -19,10 +19,10 @@ library
    extra-libraries:    extism
    extra-lib-dirs:     /usr/local/lib
    build-depends:
-        base              >= 4.16.1 && < 5,
-        bytestring        >= 0.11.3 && <= 0.12,
-        json              >= 0.10 && <= 0.11,
-        extism-manifest   >= 0.0.0 && < 0.4.0
+        base              >= 4.16.1 && < 4.18.0,
+        bytestring        >= 0.11.3 && < 0.12,
+        json              >= 0.10 && < 0.11,
+        extism-manifest   >= 0.0.0 && < 0.1.0

 test-suite extism-example
    type:             exitcode-stdio-1.0
--- a/haskell/manifest/Extism/JSON.hs
+++ b/haskell/manifest/Extism/JSON.hs
@@ -16,8 +16,8 @@ isNull JSNull = True
 isNull _ = False
 filterNulls obj = [(a, b) | (a, b) <- obj, not (isNull b)]
 object x = makeObj $ filterNulls x
-objectWithNulls = makeObj
-nonNull = NotNull
+objectWithNulls x = makeObj x
+nonNull x = NotNull x
 null' = Null
 (.=) a b = (a, showJSON b)
 toNullable (Just x) = NotNull x
@@ -40,7 +40,7 @@ find :: JSON a => String -> JSValue -> Nullable a
 find k obj = obj .? k

 update :: JSON a => String -> a -> JSValue -> JSValue
-update k v (JSObject obj) = object $ fromJSObject obj ++ [k .= v]
+update k v (JSObject obj) = object $ (fromJSObject obj) ++ [k .= v]

 instance JSON a => JSON (Nullable a) where
  showJSON (NotNull x) = showJSON x
--- a/haskell/manifest/extism-manifest.cabal
+++ b/haskell/manifest/extism-manifest.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               extism-manifest
-version:            0.3.0
+version:            0.0.1
 license:            BSD-3-Clause
 maintainer:         oss@extism.org
 author:             Extism authors
@@ -8,14 +8,14 @@ bug-reports:        https://github.com/extism/extism
 synopsis:           Extism manifest bindings
 description:        Bindings to Extism WebAssembly manifest
 category:           Plugins, WebAssembly
-extra-doc-files: CHANGELOG.md
+extra-source-files: CHANGELOG.md

 library
    exposed-modules:    Extism.Manifest Extism.JSON
    hs-source-dirs:     .
    default-language:   Haskell2010
    build-depends:
-        base              >= 4.16.1 && < 5,
-        bytestring        >= 0.11.3 && <= 0.12,
-        json              >= 0.10 && <= 0.11,
+        base              >= 4.16.1 && < 4.18.0,
+        bytestring        >= 0.11.3 && < 0.12,
+        json              >= 0.10 && < 0.11,
        base64-bytestring >= 1.2.1 && < 1.3,
--- a/haskell/src/Extism.hs
+++ b/haskell/src/Extism.hs
@@ -1,21 +1,10 @@
-module Extism (
-  module Extism,
-  module Extism.Manifest,
-  ValType(..),
-  Val(..)
-) where
-
+module Extism (module Extism, module Extism.Manifest) where
 import Data.Int
 import Data.Word
 import Control.Monad (void)
 import Foreign.ForeignPtr
 import Foreign.C.String
 import Foreign.Ptr
-import Foreign.Marshal.Array
-import Foreign.Storable
-import Foreign.StablePtr
-import Foreign.Concurrent
-import Foreign.Marshal.Utils (copyBytes, moveBytes)
 import Data.ByteString as B
 import Data.ByteString.Internal (c2w, w2c)
 import Data.ByteString.Unsafe (unsafeUseAsCString)
@@ -27,17 +16,8 @@ import Extism.Bindings
 -- | Context for managing plugins
 newtype Context = Context (ForeignPtr ExtismContext)

-- | Host function
-data Function = Function (ForeignPtr ExtismFunction) (StablePtr ())
-
 -- | Plugins can be used to call WASM function
-data Plugin = Plugin Context Int32 [Function]
-
-- | Cancellation handle for Plugins
-newtype CancelHandle = CancelHandle (Ptr ExtismCancelHandle)
-
-- | Access the plugin that is currently executing from inside a host function
-type CurrentPlugin = Ptr ExtismCurrentPlugin
+data Plugin = Plugin Context Int32

 -- | Log level
 data LogLevel = Error | Warn | Info | Debug | Trace deriving (Show)
@@ -71,94 +51,68 @@ reset (Context ctx) =
 newContext :: IO Context
 newContext = do
  ptr <- extism_context_new
-  fptr <- Foreign.ForeignPtr.newForeignPtr extism_context_free ptr
+  fptr <- newForeignPtr extism_context_free ptr
  return (Context fptr)
-
+ 
 -- | Execute a function with a new 'Context' that is destroyed when it returns
 withContext :: (Context -> IO a) -> IO a
 withContext f = do
  ctx <- newContext
  f ctx

-- | Execute a function with the provided 'Plugin' as a parameter, then frees the 'Plugin'
-- | before returning the result.
-withPlugin :: (Plugin -> IO a) -> Plugin -> IO a
-withPlugin f plugin = do
-  res <- f plugin
-  free plugin
-  return res
-
 -- | Create a 'Plugin' from a WASM module, `useWasi` determines if WASI should
 -- | be linked
-plugin :: Context -> B.ByteString -> [Function] -> Bool -> IO (Result Plugin)
-plugin c wasm functions useWasi =
-  let nfunctions = fromIntegral (Prelude.length functions) in
+plugin :: Context -> B.ByteString -> Bool -> IO (Result Plugin)
+plugin c wasm useWasi =
  let length = fromIntegral (B.length wasm) in
  let wasi = fromInteger (if useWasi then 1 else 0) in
  let Context ctx = c in
  do
-    funcs <- Prelude.mapM (\(Function ptr _) -> withForeignPtr ptr (\x -> do return x)) functions
    withForeignPtr ctx (\ctx -> do
      p <- unsafeUseAsCString wasm (\s ->
-        withArray funcs (\funcs ->
-          extism_plugin_new ctx (castPtr s) length funcs nfunctions wasi ))
+        extism_plugin_new ctx (castPtr s) length nullPtr 0 wasi )
      if p < 0 then do
        err <- extism_error ctx (-1)
        e <- peekCString err
        return $ Left (ExtismError e)
      else
-        return $ Right (Plugin c p functions))
-
-- | Create a 'Plugin' with its own 'Context'
-createPlugin :: B.ByteString -> [Function] -> Bool -> IO (Result Plugin)
-createPlugin c functions useWasi = do
-  ctx <- newContext
-  plugin ctx c functions useWasi
+        return $ Right (Plugin c p))

 -- | Create a 'Plugin' from a 'Manifest'
-pluginFromManifest :: Context -> Manifest -> [Function] -> Bool -> IO (Result Plugin)
-pluginFromManifest ctx manifest functions useWasi =
+pluginFromManifest :: Context -> Manifest -> Bool -> IO (Result Plugin)
+pluginFromManifest ctx manifest useWasi =
  let wasm = toByteString $ toString manifest in
-  plugin ctx wasm functions useWasi
-
-- | Create a 'Plugin' with its own 'Context' from a 'Manifest'
-createPluginFromManifest :: Manifest -> [Function] -> Bool -> IO (Result Plugin)
-createPluginFromManifest manifest functions useWasi = do
-  ctx <- newContext
-  pluginFromManifest ctx manifest functions useWasi
+  plugin ctx wasm useWasi

 -- | Update a 'Plugin' with a new WASM module
-update :: Plugin -> B.ByteString -> [Function] -> Bool -> IO (Result Plugin)
-update (Plugin (Context ctx) id _) wasm functions useWasi =
-  let nfunctions = fromIntegral (Prelude.length functions) in
+update :: Plugin -> B.ByteString -> Bool -> IO (Result ())
+update (Plugin (Context ctx) id) wasm useWasi =
  let length = fromIntegral (B.length wasm) in
  let wasi = fromInteger (if useWasi then 1 else 0) in
  do
-    funcs <- Prelude.mapM (\(Function ptr _ ) -> withForeignPtr ptr (\x -> do return x)) functions
-    withForeignPtr ctx (\ctx' -> do
+    withForeignPtr ctx (\ctx -> do
      b <- unsafeUseAsCString wasm (\s ->
-        withArray funcs (\funcs ->
-          extism_plugin_update ctx' id (castPtr s) length funcs nfunctions wasi))
+        extism_plugin_update ctx id (castPtr s) length nullPtr 0 wasi)
      if b <= 0 then do
-        err <- extism_error ctx' (-1)
+        err <- extism_error ctx (-1)
        e <- peekCString err
        return $ Left (ExtismError e)
      else
-        return (Right (Plugin (Context ctx) id functions)))
+        return (Right ()))

 -- | Update a 'Plugin' with a new 'Manifest'
-updateManifest :: Plugin -> Manifest -> [Function] -> Bool -> IO (Result Plugin)
-updateManifest plugin manifest functions useWasi =
+updateManifest :: Plugin -> Manifest -> Bool -> IO (Result ())
+updateManifest plugin manifest useWasi =
  let wasm = toByteString $ toString manifest in
-  update plugin wasm functions useWasi
+  update plugin wasm useWasi

 -- | Check if a 'Plugin' is valid
 isValid :: Plugin -> Bool
-isValid (Plugin _ p _) = p >= 0
+isValid (Plugin _ p) = p >= 0

 -- | Set configuration values for a plugin
 setConfig :: Plugin -> [(String, Maybe String)] -> IO Bool
-setConfig (Plugin (Context ctx) plugin _) x =
+setConfig (Plugin (Context ctx) plugin) x =
  if plugin < 0
    then return False
  else
@@ -187,14 +141,14 @@ setLogFile filename level =

 -- | Check if a function exists in the given plugin
 functionExists :: Plugin -> String -> IO Bool
-functionExists (Plugin (Context ctx) plugin _) name = do
+functionExists (Plugin (Context ctx) plugin) name = do
  withForeignPtr ctx (\ctx -> do
    b <- withCString name (extism_plugin_function_exists ctx plugin)
    if b == 1 then return True else return False)

 --- | Call a function provided by the given plugin
 call :: Plugin -> String -> B.ByteString -> IO (Result B.ByteString)
-call (Plugin (Context ctx) plugin _) name input =
+call (Plugin (Context ctx) plugin) name input =
  let length = fromIntegral (B.length input) in
  do
    withForeignPtr ctx (\ctx -> do
@@ -216,73 +170,5 @@ call (Plugin (Context ctx) plugin _) name input =
 -- | Free a 'Plugin', this will automatically be called for every plugin
 -- | associated with a 'Context' when that 'Context' is freed
 free :: Plugin -> IO ()
-free (Plugin (Context ctx) plugin _) =
+free (Plugin (Context ctx) plugin) =
  withForeignPtr ctx (`extism_plugin_free` plugin)
-
-- | Create a new 'CancelHandle' that can be used to cancel a running plugin
-- | from another thread.
-cancelHandle :: Plugin -> IO CancelHandle
-cancelHandle (Plugin (Context ctx) plugin _) = do
-  handle <- withForeignPtr ctx (`extism_plugin_cancel_handle` plugin)
-  return (CancelHandle handle)
-
-- | Cancel a running plugin using a 'CancelHandle'
-cancel :: CancelHandle -> IO Bool
-cancel (CancelHandle handle) =
-  extism_plugin_cancel handle
-
-
-- | Create a new 'Function' that can be called from a 'Plugin'
-hostFunction :: String -> [ValType] -> [ValType] -> (CurrentPlugin -> [Val] -> a -> IO [Val]) -> a -> IO Function
-hostFunction name params results f v =
-  let nparams = fromIntegral $ Prelude.length params in
-  let nresults = fromIntegral $ Prelude.length results in
-  do
-    cb <- callbackWrap (callback f :: CCallback)
-    free <- freePtrWrap freePtr
-    userData <- newStablePtr (v, free, cb)
-    let userDataPtr = castStablePtrToPtr userData
-    x <- withCString name (\name ->  do
-      withArray params (\params ->
-        withArray results (\results -> do
-          extism_function_new name params nparams results nresults cb userDataPtr free)))
-    let freeFn = extism_function_free x
-    fptr <- Foreign.Concurrent.newForeignPtr x freeFn
-    return $ Function fptr (castPtrToStablePtr userDataPtr)
-
-
-- | Create a new I32 'Val'
-toI32 :: Integral a => a -> Val
-toI32 x = ValI32 (fromIntegral x)
-
-- | Create a new I64 'Val'
-toI64 :: Integral a => a -> Val
-toI64 x = ValI64 (fromIntegral x)
-
-- | Create a new F32 'Val'
-toF32 :: Float -> Val
-toF32 = ValF32
-
-- | Create a new F64 'Val'
-toF64 :: Double -> Val
-toF64 = ValF64
-
-- | Get I32 'Val'
-fromI32 :: Integral a => Val -> Maybe a
-fromI32 (ValI32 x) = Just (fromIntegral x)
-fromI32 _ = Nothing
-
-- | Get I64 'Val'
-fromI64 :: Integral a => Val -> Maybe a
-fromI64 (ValI64 x) = Just (fromIntegral x)
-fromI64 _ = Nothing
-
-- | Get F32 'Val'
-fromF32 :: Val -> Maybe Float
-fromF32 (ValF32 x) = Just x
-fromF32 _ = Nothing
-
-- | Get F64 'Val'
-fromF64 :: Val -> Maybe Double
-fromF64 (ValF64 x) = Just x
-fromF64 _ = Nothing
--- a/haskell/src/Extism/Bindings.hs
+++ b/haskell/src/Extism/Bindings.hs
@@ -7,77 +7,9 @@ import Foreign.Ptr
 import Foreign.C.String
 import Data.Int
 import Data.Word
-import Foreign.Storable
-import Foreign.Marshal.Array
-import Foreign.StablePtr
-
-type FreeCallback = Ptr () -> IO ()

 newtype ExtismContext = ExtismContext () deriving Show
 newtype ExtismFunction = ExtismFunction () deriving Show
-newtype ExtismCancelHandle = ExtismCancelHandle () deriving Show
-newtype ExtismCurrentPlugin = ExtismCurrentPlugin () deriving Show
-data ValType = I32 | I64 | F32 | F64 | V128 | FuncRef | ExternRef deriving (Show, Eq)
-data Val = ValI32 Int32 | ValI64 Int64 | ValF32 Float | ValF64 Double deriving (Show, Eq)
-
-typeOfVal (ValI32 _) = I32
-typeOfVal (ValI64 _) = I64
-typeOfVal (ValF32 _) = F32
-typeOfVal (ValF64 _) = F64
-
-type CCallback = Ptr ExtismCurrentPlugin -> Ptr Val -> Word64 -> Ptr Val -> Word64 -> Ptr () -> IO ()
-
-_32Bit = sizeOf (undefined :: Int) == 4
-
-instance Storable Val where
-  sizeOf _ =
-    if _32Bit then 12 else 16
-  alignment _ = 1
-  peek ptr = do
-    let offs = if _32Bit then 4 else 8
-    t <- valTypeOfInt <$> peekByteOff ptr 0
-    case t of
-      I32 -> ValI32 <$> peekByteOff ptr offs
-      I64 -> ValI64 <$> peekByteOff ptr offs
-      F32 -> ValF32 <$> peekByteOff ptr offs
-      F64 -> ValF64 <$> peekByteOff ptr offs
-  poke ptr x = do
-    let offs = if _32Bit then 4 else 8
-    pokeByteOff ptr 0 (typeOfVal x)
-    case x of
-      ValI32 x -> pokeByteOff ptr offs x
-      ValI64 x -> pokeByteOff ptr offs x
-      ValF32 x -> pokeByteOff ptr offs x
-      ValF64 x -> pokeByteOff ptr offs x
-
-
-intOfValType :: ValType -> CInt
-intOfValType I32 = 0
-intOfValType I64 = 1
-intOfValType F32 = 2
-intOfValType F64 = 3
-intOfValType V128 = 4
-intOfValType FuncRef = 5
-intOfValType ExternRef = 6
-
-valTypeOfInt :: CInt -> ValType
-valTypeOfInt 0 = I32
-valTypeOfInt 1 = I64
-valTypeOfInt 2 = F32
-valTypeOfInt 3 = F64
-valTypeOfInt 4 = V128
-valTypeOfInt 5 = FuncRef
-valTypeOfInt 6 = ExternRef
-valTypeOfInt _ = error "Invalid ValType"
-
-instance Storable ValType where
-  sizeOf _ = 4
-  alignment _ = 1
-  peek ptr = do
-    x <- peekByteOff ptr 0
-    return $ valTypeOfInt (x :: CInt)
-  poke ptr x = do
-    pokeByteOff ptr 0 (intOfValType x)

 foreign import ccall safe "extism.h extism_context_new" extism_context_new :: IO (Ptr ExtismContext)
 foreign import ccall safe "extism.h &extism_context_free" extism_context_free :: FunPtr (Ptr ExtismContext -> IO ())
@@ -93,30 +25,3 @@ foreign import ccall safe "extism.h extism_plugin_config" extism_plugin_config :
 foreign import ccall safe "extism.h extism_plugin_free" extism_plugin_free :: Ptr ExtismContext -> Int32 -> IO ()
 foreign import ccall safe "extism.h extism_context_reset" extism_context_reset :: Ptr ExtismContext -> IO ()
 foreign import ccall safe "extism.h extism_version" extism_version :: IO CString
-foreign import ccall safe "extism.h extism_plugin_cancel_handle" extism_plugin_cancel_handle :: Ptr ExtismContext -> Int32 -> IO (Ptr ExtismCancelHandle)
-foreign import ccall safe "extism.h extism_plugin_cancel" extism_plugin_cancel :: Ptr ExtismCancelHandle -> IO Bool
-
-foreign import ccall safe "extism.h extism_function_new" extism_function_new :: CString -> Ptr ValType -> Word64 -> Ptr ValType -> Word64 -> FunPtr CCallback -> Ptr () -> FunPtr FreeCallback -> IO (Ptr ExtismFunction)
-foreign import ccall safe "extism.h extism_function_free" extism_function_free :: Ptr ExtismFunction -> IO ()
-foreign import ccall safe "extism.h extism_current_plugin_memory" extism_current_plugin_memory :: Ptr ExtismCurrentPlugin -> IO (Ptr Word8)
-foreign import ccall safe "extism.h extism_current_plugin_memory_alloc" extism_current_plugin_memory_alloc :: Ptr ExtismCurrentPlugin -> Word64 -> IO Word64
-foreign import ccall safe "extism.h extism_current_plugin_memory_length" extism_current_plugin_memory_length :: Ptr ExtismCurrentPlugin -> Word64 -> IO Word64
-foreign import ccall safe "extism.h extism_current_plugin_memory_free" extism_current_plugin_memory_free :: Ptr ExtismCurrentPlugin -> Word64 -> IO ()
-
-freePtr ptr = do
-  let s = castPtrToStablePtr ptr
-  (a, b, c) <- deRefStablePtr s
-  freeHaskellFunPtr b
-  freeHaskellFunPtr c
-  freeStablePtr s
-
-foreign import ccall "wrapper" freePtrWrap :: FreeCallback -> IO (FunPtr FreeCallback)
-
-foreign import ccall "wrapper" callbackWrap :: CCallback -> IO (FunPtr CCallback)
-
-callback :: (Ptr ExtismCurrentPlugin -> [Val] -> a -> IO [Val]) -> (Ptr ExtismCurrentPlugin -> Ptr Val -> Word64 -> Ptr Val -> Word64 -> Ptr () -> IO ())
-callback f plugin params nparams results nresults ptr = do
-    p <- peekArray (fromIntegral nparams) params
-    (userData, _, _)  <- deRefStablePtr (castPtrToStablePtr ptr)
-    res <- f plugin p userData
-    pokeArray results res
--- a/haskell/src/Extism/CurrentPlugin.hs
+++ b/haskell/src/Extism/CurrentPlugin.hs
@@ -1,48 +0,0 @@
-module Extism.CurrentPlugin where
-
-import Extism
-import Extism.Bindings
-import Data.Word
-import Data.ByteString as B
-import Foreign.Ptr
-import Foreign.Marshal.Array
-
-- | Allocate a new handle of the given size
-memoryAlloc :: CurrentPlugin -> Word64 -> IO Word64
-memoryAlloc = extism_current_plugin_memory_alloc
-
-- | Get the length of a handle, returns 0 if the handle is invalid
-memoryLength :: CurrentPlugin -> Word64 -> IO Word64
-memoryLength = extism_current_plugin_memory_length
-
-- | Free allocated memory
-memoryFree :: CurrentPlugin -> Word64 -> IO ()
-memoryFree = extism_current_plugin_memory_free
-
-- | Access a pointer to the entire memory region
-memory :: CurrentPlugin -> IO (Ptr Word8)
-memory = extism_current_plugin_memory
-
-- | Access a pointer the a specific offset in memory
-memoryOffset :: CurrentPlugin -> Word64 -> IO (Ptr Word8)
-memoryOffset plugin offs = do
-  x <- extism_current_plugin_memory plugin
-  return $ plusPtr x (fromIntegral offs)
-
-- | Access the data associated with a handle as a 'ByteString'
-memoryBytes :: CurrentPlugin -> Word64 ->  IO B.ByteString
-memoryBytes plugin offs = do
-  ptr <- memoryOffset plugin offs
-  len <- memoryLength plugin offs
-  arr <- peekArray (fromIntegral len) ptr
-  return $ B.pack arr
-
-- | Allocate memory and copy an existing 'ByteString' into it
-allocBytes :: CurrentPlugin -> B.ByteString -> IO Word64
-allocBytes plugin s = do
-  let length = B.length s
-  offs <- memoryAlloc plugin (fromIntegral length)
-  ptr <- memoryOffset plugin offs
-  pokeArray ptr (B.unpack s)
-  return offs
-
--- a/haskell/test/Test.hs
+++ b/haskell/test/Test.hs
@@ -1,66 +1,53 @@
 import Test.HUnit
 import Extism
 import Extism.Manifest
-import Extism.CurrentPlugin


 unwrap (Right x) = return x
 unwrap (Left (ExtismError msg)) =
  assertFailure msg

-defaultManifest = manifest [wasmFile "../../wasm/code.wasm"]
-hostFunctionManifest = manifest [wasmFile "../../wasm/code-functions.wasm"]
+defaultManifest = manifest [wasmFile "test/code.wasm"]

-initPlugin :: Maybe Context -> IO Plugin
-initPlugin Nothing =
-  Extism.createPluginFromManifest defaultManifest [] False >>= unwrap
-initPlugin (Just ctx) =
-  Extism.pluginFromManifest ctx defaultManifest [] False >>= unwrap
+initPlugin :: Context -> IO Plugin
+initPlugin context =
+  Extism.pluginFromManifest context defaultManifest False >>= unwrap

 pluginFunctionExists = do
-  p <- initPlugin Nothing
-  exists <- functionExists p "count_vowels"
-  assertBool "function exists" exists
-  exists' <- functionExists p "function_doesnt_exist"
-  assertBool "function doesn't exist" (not exists')
+  withContext (\ctx -> do
+    p <- initPlugin ctx
+    exists <- functionExists p "count_vowels"
+    assertBool "function exists" exists
+    exists' <- functionExists p "function_doesnt_exist"
+    assertBool "function doesn't exist" (not exists'))

 checkCallResult p = do
-  res <- call p "count_vowels" (toByteString "this is a test") >>= unwrap
-  assertEqual "count vowels output" "{\"count\": 4}" (fromByteString res)
+    res <- call p "count_vowels" (toByteString "this is a test") >>= unwrap
+    assertEqual "count vowels output" "{\"count\": 4}" (fromByteString res)

 pluginCall = do
-  p <- initPlugin Nothing
-  checkCallResult p
-
-
-hello plugin params () = do
-  putStrLn "Hello from Haskell!"
-  offs <- allocBytes plugin (toByteString "{\"count\": 999}")
-  return [toI64 offs]
-
-pluginCallHostFunction = do
-  p <- Extism.createPluginFromManifest hostFunctionManifest [] False >>= unwrap
-  res <- call p "count_vowels" (toByteString "this is a test") >>= unwrap
-  assertEqual "count vowels output" "{\"count\": 999}" (fromByteString res)
+  withContext (\ctx -> do
+    p <- initPlugin ctx
+    checkCallResult p)

 pluginMultiple = do
-  withContext(\ctx -> do
-    p <- initPlugin (Just ctx)
+  withContext (\ctx -> do
+    p <- initPlugin ctx
    checkCallResult p
-    q <- initPlugin (Just ctx)
-    r <- initPlugin (Just ctx)
+    q <- initPlugin ctx
+    r <- initPlugin ctx
    checkCallResult q
    checkCallResult r)

 pluginUpdate = do
  withContext (\ctx -> do
-    p <- initPlugin (Just ctx)
-    updateManifest p defaultManifest [] True >>= unwrap
+    p <- initPlugin ctx
+    updateManifest p defaultManifest True >>= unwrap
    checkCallResult p)

 pluginConfig = do
  withContext (\ctx -> do
-    p <- initPlugin (Just ctx)
+    p <- initPlugin ctx
    b <- setConfig p [("a", Just "1"), ("b", Just "2"), ("c", Just "3"), ("d", Nothing)]
    assertBool "set config" b)

@@ -75,7 +62,6 @@ main = do
    [
      t "Plugin.FunctionExists" pluginFunctionExists
      , t "Plugin.Call" pluginCall
-      , t "Plugin.CallHostFunction" pluginCallHostFunction
      , t "Plugin.Multiple" pluginMultiple
      , t "Plugin.Update" pluginUpdate
      , t "Plugin.Config" pluginConfig
--- a/haskell/test/code.wasm
+++ b/haskell/test/code.wasm
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,194 +1,190 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.extism.sdk</groupId>
-  <artifactId>extism</artifactId>
-  <packaging>jar</packaging>
-  <version>0.5.0</version>
-  <name>extism</name>
-  <url>https://github.com/extism/extism</url>
-  <description>Java-SDK for Extism to use webassembly from Java</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.extism.sdk</groupId>
+    <artifactId>extism</artifactId>
+    <packaging>jar</packaging>
+    <version>0.1.0</version>
+    <name>extism</name>
+    <url>https://github.com/extism/extism</url>
+    <description>Java-SDK for Extism to use webassembly from Java</description>

-  <licenses>
-    <license>
-      <name>BSD 3-Clause</name>
-      <url>https://opensource.org/licenses/BSD-3-Clause</url>
-    </license>
-  </licenses>
+    <licenses>
+        <license>
+            <name>BSD 3-Clause</name>
+            <url>https://opensource.org/licenses/BSD-3-Clause</url>
+        </license>
+    </licenses>

-  <organization>
-    <name>Dylibso, Inc.</name>
-    <url>https://dylib.so</url>
-  </organization>
+    <organization>
+        <name>Dylibso, Inc.</name>
+        <url>https://dylib.so</url>
+    </organization>

-  <developers>
-    <developer>
-      <name>The Extism Authors</name>
-      <email>oss@extism.org</email>
-      <roles>
-        <role>Maintainer</role>
-      </roles>
-      <organization>Dylibso, Inc.</organization>
-      <organizationUrl>https://dylib.so</organizationUrl>
-    </developer>
-  </developers>
+    <developers>
+        <developer>
+            <name>The Extism Authors</name>
+            <email>oss@extism.org</email>
+            <roles>
+                <role>Maintainer</role>
+            </roles>
+            <organization>Dylibso, Inc.</organization>
+            <organizationUrl>https://dylib.so</organizationUrl>
+        </developer>
+    </developers>

-  <scm>
-    <connection>scm:git:git://github.com/extism/extism.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/extism/extism.git</developerConnection>
-    <url>https://github.com/extism/extism/tree/main/java</url>
-    <tag>main</tag>
-  </scm>
+    <scm>
+        <connection>scm:git:git://github.com/extism/extism.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/extism/extism.git</developerConnection>
+        <url>https://github.com/extism/extism/java</url>
+        <tag>main</tag>
+    </scm>

-  <issueManagement>
-    <system>Github</system>
-    <url>https://github.com/extism/extism/issues</url>
-  </issueManagement>
+    <issueManagement>
+        <system>Github</system>
+        <url>https://github.com/extism/extism/issues</url>
+    </issueManagement>

-  <properties>
-    <java.version>11</java.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <properties>
+        <java.version>11</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-    <!-- dependencies -->
-    <jna.version>5.12.1</jna.version>
-    <gson.version>2.10</gson.version>
+        <!-- dependencies -->
+        <jna.version>5.12.1</jna.version>
+        <gson.version>2.10</gson.version>

-    <!-- testing -->
-    <junit-jupiter-engine.version>5.9.1</junit-jupiter-engine.version>
-    <assertj-core.version>3.23.1</assertj-core.version>
+        <!-- testing -->
+        <junit-jupiter-engine.version>5.9.1</junit-jupiter-engine.version>
+        <assertj-core.version>3.23.1</assertj-core.version>

-    <!-- maven plugins -->
-    <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-    <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <!-- maven plugins -->
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>

-    <!-- jreleaser -->
-    <jreleaser.git.root.search>true</jreleaser.git.root.search>
-  </properties>
+        <!-- jreleaser -->
+        <jreleaser.git.root.search>true</jreleaser.git.root.search>
+    </properties>

-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.4.1</version>
-            <configuration>
-              <additionalJOption>-Xdoclint:none</additionalJOption>
-            </configuration>
-            <executions>
-              <execution>
-                <id>attach-javadoc</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-source</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.jreleaser</groupId>
-            <artifactId>jreleaser-maven-plugin</artifactId>
-            <version>1.3.1</version>
-            <configuration>
-              <jreleaser>
-                <release>
-                  <github>
-                    <skipRelease>true</skipRelease>
-                  </github>
-                </release>
-                <signing>
-                  <active>ALWAYS</active>
-                  <armored>true</armored>
-                </signing>
-                <deploy>
-                  <maven>
-                    <nexus2>
-                      <maven-central>
-                        <active>ALWAYS</active>
-                        <url>https://s01.oss.sonatype.org/service/local</url>
-                        <!--
+    <profiles>
+      <profile>
+        <id>release</id>
+        <build>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>3.4.1</version>
+              <executions>
+                <execution>
+                  <id>attach-javadoc</id>
+                  <goals>
+                    <goal>jar</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-source-plugin</artifactId>
+              <version>3.2.1</version>
+              <executions>
+                <execution>
+                  <id>attach-source</id>
+                  <goals>
+                    <goal>jar</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+            <plugin>
+              <groupId>org.jreleaser</groupId>
+              <artifactId>jreleaser-maven-plugin</artifactId>
+              <version>1.3.1</version>
+              <configuration>
+                <jreleaser>
+                  <release>
+                    <github>
+                      <skipRelease>true</skipRelease>
+                    </github>
+                  </release>
+                  <signing>
+                    <active>ALWAYS</active>
+                    <armored>true</armored>
+                  </signing>
+                  <deploy>
+                    <maven>
+                      <nexus2>
+                        <maven-central>
+                          <active>ALWAYS</active>
+                          <url>https://s01.oss.sonatype.org/service/local</url>
+                          <!--
                          <closeRepository>false</closeRepository>
                          <releaseRepository>false</releaseRepository>
                          -->
-                        <stagingRepositories>target/staging-deploy</stagingRepositories>
-                      </maven-central>
-                    </nexus2>
-                  </maven>
-                </deploy>
-              </jreleaser>
-            </configuration>
-          </plugin>
+                          <stagingRepositories>target/staging-deploy</stagingRepositories>
+                        </maven-central>
+                      </nexus2>
+                    </maven>
+                  </deploy>
+                </jreleaser>
+              </configuration>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <release>${java.version}</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <jna.library.path>../target/release</jna.library.path>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
        </plugins>
-      </build>
-    </profile>
-  </profiles>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>${jna.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter-engine.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>

-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin.version}</version>
-        <configuration>
-          <release>${java.version}</release>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
-        <configuration>
-          <systemPropertyVariables>
-            <jna.library.path>../target/release</jna.library.path>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>net.java.dev.jna</groupId>
-      <artifactId>jna</artifactId>
-      <version>${jna.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>${gson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>${junit-jupiter-engine.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>${assertj-core.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>uk.org.webcompere</groupId>
-      <artifactId>model-assert</artifactId>
-      <version>1.0.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+        <dependency>
+            <groupId>uk.org.webcompere</groupId>
+            <artifactId>model-assert</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
--- a/java/src/main/java/org/extism/sdk/CancelHandle.java
+++ b/java/src/main/java/org/extism/sdk/CancelHandle.java
@@ -1,21 +0,0 @@
-package org.extism.sdk;
-
-import com.sun.jna.Pointer;
-
-/**
- * CancelHandle is used to cancel a running Plugin
- */
-public class CancelHandle {
-    private Pointer handle;
-
-    public CancelHandle(Pointer handle) {
-        this.handle = handle;
-    }
-
-    /**
-     * Cancel execution of the Plugin associated with the CancelHandle
-     */
-    boolean cancel() {
-        return LibExtism.INSTANCE.extism_plugin_cancel(this.handle);
-    }
-}
--- a/java/src/main/java/org/extism/sdk/Context.java
+++ b/java/src/main/java/org/extism/sdk/Context.java
@@ -28,11 +28,10 @@ public class Context implements AutoCloseable {
     *
     * @param manifest The manifest for the plugin
     * @param withWASI Set to true to enable WASI
-     * @param functions List of Host functions
     * @return the plugin instance
     */
-    public Plugin newPlugin(Manifest manifest, boolean withWASI, HostFunction[] functions) {
-        return new Plugin(this, manifest, withWASI, functions);
+    public Plugin newPlugin(Manifest manifest, boolean withWASI) {
+        return new Plugin(this, manifest, withWASI);
    }

    /**
--- a/java/src/main/java/org/extism/sdk/Extism.java
+++ b/java/src/main/java/org/extism/sdk/Extism.java
@@ -42,7 +42,7 @@ public class Extism {
     */
    public static String invokeFunction(Manifest manifest, String function, String input) throws ExtismException {
        try (var ctx = new Context()) {
-            try (var plugin = ctx.newPlugin(manifest, false, null)) {
+            try (var plugin = ctx.newPlugin(manifest, false)) {
                return plugin.call(function, input);
            }
        }
--- a/java/src/main/java/org/extism/sdk/ExtismCurrentPlugin.java
+++ b/java/src/main/java/org/extism/sdk/ExtismCurrentPlugin.java
@@ -1,78 +0,0 @@
-package org.extism.sdk;
-
-import com.sun.jna.Pointer;
-
-import java.nio.charset.StandardCharsets;
-
-public class ExtismCurrentPlugin {
-    public Pointer pointer;
-
-    public ExtismCurrentPlugin(Pointer pointer) {
-        this.pointer = pointer;
-    }
-
-    public Pointer memory() {
-        return LibExtism.INSTANCE.extism_current_plugin_memory(this.pointer);
-    }
-
-    public int alloc(int n) {
-        return LibExtism.INSTANCE.extism_current_plugin_memory_alloc(this.pointer, n);
-    }
-
-    public void free(long offset) {
-        LibExtism.INSTANCE.extism_current_plugin_memory_free(this.pointer, offset);
-    }
-
-    public long memoryLength(long offset) {
-        return LibExtism.INSTANCE.extism_current_plugin_memory_length(this.pointer, offset);
-    }
-
-    /**
-     * Return a string from a host function
-     * @param output - The output to set
-     * @param s - The string to return
-     */
-    public void returnString(LibExtism.ExtismVal output, String s) {
-        returnBytes(output, s.getBytes(StandardCharsets.UTF_8));
-    }
-
-    /**
-     * Return bytes from a host function
-     * @param output - The output to set
-     * @param b - The buffer to return
-     */
-    public void returnBytes(LibExtism.ExtismVal output, byte[] b) {
-        int offs = this.alloc(b.length);
-        Pointer ptr = this.memory();
-        ptr.write(offs, b, 0, b.length);
-        output.v.i64 = offs;
-    }
-
-    /**
-     * Get bytes from host function parameter
-     * @param input - The input to read
-     */
-    public byte[] inputBytes(LibExtism.ExtismVal input) {
-        switch (input.t) {
-            case 0:
-                return this.memory()
-                        .getByteArray(input.v.i32,
-                                LibExtism.INSTANCE.extism_current_plugin_memory_length(this.pointer, input.v.i32));
-            case 1:
-                return this.memory()
-                        .getByteArray(input.v.i64,
-                                LibExtism.INSTANCE.extism_current_plugin_memory_length(this.pointer, input.v.i64));
-            default:
-                throw new ExtismException("inputBytes error: ExtismValType " + LibExtism.ExtismValType.values()[input.t] + " not implemtented");
-        }
-    }
-
-
-    /**
-     * Get string from host function parameter
-     * @param input - The input to read
-     */
-    public String inputString(LibExtism.ExtismVal input) {
-        return new String(this.inputBytes(input));
-    }
-}
--- a/java/src/main/java/org/extism/sdk/ExtismFunction.java
+++ b/java/src/main/java/org/extism/sdk/ExtismFunction.java
@@ -1,12 +0,0 @@
-package org.extism.sdk;
-
-import java.util.Optional;
-
-public interface ExtismFunction<T extends HostUserData> {
-    void invoke(
-            ExtismCurrentPlugin plugin,
-            LibExtism.ExtismVal[] params,
-            LibExtism.ExtismVal[] returns,
-            Optional<T> data
-    );
-}
--- a/java/src/main/java/org/extism/sdk/HostFunction.java
+++ b/java/src/main/java/org/extism/sdk/HostFunction.java
@@ -1,92 +0,0 @@
-package org.extism.sdk;
-
-import com.sun.jna.Pointer;
-import com.sun.jna.PointerType;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-public class HostFunction<T extends HostUserData> {
-
-    private final LibExtism.InternalExtismFunction callback;
-
-    public final Pointer pointer;
-
-    public final String name;
-
-    public final LibExtism.ExtismValType[] params;
-
-    public final LibExtism.ExtismValType[] returns;
-
-    public final Optional<T> userData;
-
-    public HostFunction(String name, LibExtism.ExtismValType[] params, LibExtism.ExtismValType[] returns, ExtismFunction f, Optional<T> userData) {
-
-        this.name = name;
-        this.params = params;
-        this.returns = returns;
-        this.userData = userData;
-        this.callback = (Pointer currentPlugin,
-                         LibExtism.ExtismVal inputs,
-                         int nInputs,
-                         LibExtism.ExtismVal outs,
-                         int nOutputs,
-                         Pointer data) -> {
-
-            LibExtism.ExtismVal[] outputs = (LibExtism.ExtismVal []) outs.toArray(nOutputs);
-
-            f.invoke(
-                    new ExtismCurrentPlugin(currentPlugin),
-                    (LibExtism.ExtismVal []) inputs.toArray(nInputs),
-                    outputs,
-                    userData
-            );
-
-            for (LibExtism.ExtismVal output : outputs) {
-                convertOutput(output, output);
-            }
-        };
-
-        this.pointer = LibExtism.INSTANCE.extism_function_new(
-                this.name,
-                Arrays.stream(this.params).mapToInt(r -> r.v).toArray(),
-                this.params.length,
-                Arrays.stream(this.returns).mapToInt(r -> r.v).toArray(),
-                this.returns.length,
-                this.callback,
-                userData.map(PointerType::getPointer).orElse(null),
-                null
-        );
-    }
-
-    void convertOutput(LibExtism.ExtismVal original, LibExtism.ExtismVal fromHostFunction) {
-        if (fromHostFunction.t != original.t)
-            throw new ExtismException(String.format("Output type mismatch, got %d but expected %d", fromHostFunction.t, original.t));
-
-        if (fromHostFunction.t == LibExtism.ExtismValType.I32.v) {
-            original.v.setType(Integer.TYPE);
-            original.v.i32 = fromHostFunction.v.i32;
-        } else if (fromHostFunction.t == LibExtism.ExtismValType.I64.v) {
-            original.v.setType(Long.TYPE);
-            original.v.i64 = fromHostFunction.v.i64;
-        } else if (fromHostFunction.t == LibExtism.ExtismValType.F32.v) {
-            original.v.setType(Float.TYPE);
-            original.v.f32 = fromHostFunction.v.f32;
-        } else if (fromHostFunction.t == LibExtism.ExtismValType.F64.v) {
-            original.v.setType(Double.TYPE);
-            original.v.f64 = fromHostFunction.v.f64;
-        } else
-            throw new ExtismException(String.format("Unsupported return type: %s", original.t));
-    }
-
-    public void setNamespace(String name) {
-        if (this.pointer != null) {
-            LibExtism.INSTANCE.extism_function_set_namespace(this.pointer, name);
-        }
-    }
-
-    HostFunction withNamespace(String name) {
-        this.setNamespace(name);
-        return this;
-    }
-}
--- a/java/src/main/java/org/extism/sdk/HostUserData.java
+++ b/java/src/main/java/org/extism/sdk/HostUserData.java
@@ -1,7 +0,0 @@
-package org.extism.sdk;
-
-import com.sun.jna.PointerType;
-
-public class HostUserData extends PointerType {
-
-}
--- a/java/src/main/java/org/extism/sdk/LibExtism.java
+++ b/java/src/main/java/org/extism/sdk/LibExtism.java
@@ -1,6 +1,8 @@
 package org.extism.sdk;

-import com.sun.jna.*;
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;

 /**
 * Wrapper around the Extism library.
@@ -13,80 +15,7 @@ public interface LibExtism extends Library {
     */
    LibExtism INSTANCE = Native.load("extism", LibExtism.class);

-    interface InternalExtismFunction extends Callback {
-        void invoke(
-                Pointer currentPlugin,
-                ExtismVal inputs,
-                int nInputs,
-                ExtismVal outputs,
-                int nOutputs,
-                Pointer data
-        );
-    }
-
-    @Structure.FieldOrder({"t", "v"})
-    class ExtismVal extends Structure {
-        public int t;
-        public ExtismValUnion v;
-    }
-
-    class ExtismValUnion extends Union {
-        public int i32;
-        public long i64;
-        public float f32;
-        public double f64;
-    }
-
-    enum ExtismValType {
-        I32(0),
-        I64(1),
-        F32(2),
-        F64(3),
-        V128(4),
-        FuncRef(5),
-        ExternRef(6);
-
-        public final int v;
-
-        ExtismValType(int value) {
-            this.v = value;
-        }
-    }
-
-    Pointer extism_function_new(String name,
-                                int[] inputs,
-                                int nInputs,
-                                int[] outputs,
-                                int nOutputs,
-                                InternalExtismFunction func,
-                                Pointer userData,
-                                Pointer freeUserData);
-
    /**
-     * Get the length of an allocated block
-     * NOTE: this should only be called from host functions.
-     */
-    int extism_current_plugin_memory_length(Pointer plugin, long n);
-
-    /**
-     * Returns a pointer to the memory of the currently running plugin
-     * NOTE: this should only be called from host functions.
-     */
-    Pointer extism_current_plugin_memory(Pointer plugin);
-
-    /**
-     * Allocate a memory block in the currently running plugin
-     * NOTE: this should only be called from host functions.
-     */
-    int extism_current_plugin_memory_alloc(Pointer plugin, long n);
-
-    /**
-     * Free an allocated memory block
-     * NOTE: this should only be called from host functions.
-     */
-    void extism_current_plugin_memory_free(Pointer plugin, long ptr);
-
-        /**
     * Create a new context
     */
    Pointer extism_context_new();
@@ -132,13 +61,24 @@ public interface LibExtism extends Library {
     * @param withWASI       enables/disables WASI
     * @return id of the plugin or {@literal -1} in case of error
     */
-    int extism_plugin_new(Pointer contextPointer, byte[] wasm, long wasmSize, Pointer[] functions, int nFunctions, boolean withWASI);
+    int extism_plugin_new(Pointer contextPointer, byte[] wasm, long wasmSize, Pointer functions, int nFunctions, boolean withWASI);

    /**
     * Returns the Extism version string
     */
    String extism_version();

+    /**
+     * Create a new plugin.
+     *
+     * @param contextPointer pointer to the {@link Context}.
+     * @param wasm           is a WASM module (wat or wasm) or a JSON encoded manifest
+     * @param length         the length of the `wasm` parameter
+     * @param withWASI       enables/disables WASI
+     * @return id of the plugin or {@literal -1} in case of error
+     * @see #extism_plugin_new(long, byte[], long, boolean)
+     */
+    int extism_plugin_new(Pointer contextPointer, byte[] wasm, int length, boolean withWASI);

    /**
     * Calls a function from the @{@link Plugin} at the given {@code pluginIndex}.
@@ -172,7 +112,7 @@ public interface LibExtism extends Library {

    /**
     * Update a plugin, keeping the existing ID.
-     * Similar to {@link #extism_plugin_new(Pointer, byte[], long, Pointer[], int, boolean)} but takes an {@code pluginIndex} argument to specify which plugin to update.
+     * Similar to {@link #extism_plugin_new(long, byte[], long, boolean)} but takes an {@code pluginIndex} argument to specify which plugin to update.
     * Note: Memory for this plugin will be reset upon update.
     *
     * @param contextPointer
@@ -184,7 +124,7 @@ public interface LibExtism extends Library {
     * @param withWASI
     * @return {@literal true} if update was successful
     */
-    boolean extism_plugin_update(Pointer contextPointer, int pluginIndex, byte[] wasm, int length, Pointer[] functions, int nFunctions, boolean withWASI);
+    boolean extism_plugin_update(Pointer contextPointer, int pluginIndex, byte[] wasm, int length, Pointer functions, int nFunctions, boolean withWASI);

    /**
     * Remove a plugin from the registry and free associated memory.
@@ -204,7 +144,4 @@ public interface LibExtism extends Library {
     * @return {@literal true} if update was successful
     */
    boolean extism_plugin_config(Pointer contextPointer, int pluginIndex, byte[] json, int jsonLength);
-    Pointer extism_plugin_cancel_handle(Pointer contextPointer, int n);
-    boolean extism_plugin_cancel(Pointer contextPointer);
-    void extism_function_set_namespace(Pointer p, String name);
 }
--- a/java/src/main/java/org/extism/sdk/Plugin.java
+++ b/java/src/main/java/org/extism/sdk/Plugin.java
@@ -28,27 +28,15 @@ public class Plugin implements AutoCloseable {
     *
     * @param context       The context to manage the plugin
     * @param manifestBytes The manifest for the plugin
-     * @param functions     The Host functions for th eplugin
     * @param withWASI      Set to true to enable WASI
     */
-    public Plugin(Context context, byte[] manifestBytes, boolean withWASI, HostFunction[] functions) {
+    public Plugin(Context context, byte[] manifestBytes, boolean withWASI) {

        Objects.requireNonNull(context, "context");
        Objects.requireNonNull(manifestBytes, "manifestBytes");

-        Pointer[] ptrArr = new Pointer[functions == null ? 0 : functions.length];
-
-        if (functions != null)
-            for (int i = 0; i < functions.length; i++) {
-               ptrArr[i] = functions[i].pointer;
-            }
-
        Pointer contextPointer = context.getPointer();
-
-        int index = LibExtism.INSTANCE.extism_plugin_new(contextPointer, manifestBytes, manifestBytes.length,
-                ptrArr,
-                functions == null ? 0 : functions.length,
-                withWASI);
+        int index = LibExtism.INSTANCE.extism_plugin_new(contextPointer, manifestBytes, manifestBytes.length, null, 0, withWASI);
        if (index == -1) {
            String error = context.error(this);
            throw new ExtismException(error);
@@ -58,18 +46,8 @@ public class Plugin implements AutoCloseable {
        this.context = context;
    }

-    public Plugin(Context context, Manifest manifest, boolean withWASI, HostFunction[] functions) {
-        this(context, serialize(manifest), withWASI, functions);
-    }
-
-
-    public Plugin(byte[] manifestBytes, boolean withWASI, HostFunction[] functions) {
-        this(new Context(), manifestBytes, withWASI, functions);
-    }
-
-    
-    public Plugin(Manifest manifest, boolean withWASI, HostFunction[] functions) {
-        this(new Context(), serialize(manifest), withWASI, functions);
+    public Plugin(Context context, Manifest manifest, boolean withWASI) {
+        this(context, serialize(manifest), withWASI);
    }

    private static byte[] serialize(Manifest manifest) {
@@ -134,8 +112,8 @@ public class Plugin implements AutoCloseable {
     * @param withWASI Set to true to enable WASI
     * @return {@literal true} if update was successful
     */
-    public boolean update(Manifest manifest, boolean withWASI, HostFunction[] functions) {
-        return update(serialize(manifest), withWASI, functions);
+    public boolean update(Manifest manifest, boolean withWASI) {
+        return update(serialize(manifest), withWASI);
    }

    /**
@@ -145,19 +123,9 @@ public class Plugin implements AutoCloseable {
     * @param withWASI      Set to true to enable WASI
     * @return {@literal true} if update was successful
     */
-    public boolean update(byte[] manifestBytes, boolean withWASI, HostFunction[] functions) {
+    public boolean update(byte[] manifestBytes, boolean withWASI) {
        Objects.requireNonNull(manifestBytes, "manifestBytes");
-        Pointer[] ptrArr = new Pointer[functions == null ? 0 : functions.length];
-
-        if (functions != null)
-            for (int i = 0; i < functions.length; i++) {
-                ptrArr[i] = functions[i].pointer;
-            }
-
-        return LibExtism.INSTANCE.extism_plugin_update(context.getPointer(), index, manifestBytes, manifestBytes.length,
-                ptrArr,
-                functions == null ? 0 : functions.length,
-                withWASI);
+        return LibExtism.INSTANCE.extism_plugin_update(context.getPointer(), index, manifestBytes, manifestBytes.length, null, 0, withWASI);
    }

    /**
@@ -197,15 +165,4 @@ public class Plugin implements AutoCloseable {
    public void close() {
        free();
    }
-
-    /**
-     * Return a new `CancelHandle`, which can be used to cancel a running Plugin
-     */
-    public CancelHandle cancelHandle() {
-        if (this.context.getPointer() == null) {
-            throw new ExtismException("No Context set");
-        }
-        Pointer handle = LibExtism.INSTANCE.extism_plugin_cancel_handle(this.context.getPointer(), this.index);
-        return new CancelHandle(handle);
-    }
 }
--- a/java/src/main/java/org/extism/sdk/manifest/Manifest.java
+++ b/java/src/main/java/org/extism/sdk/manifest/Manifest.java
@@ -20,14 +20,11 @@ public class Manifest {
    @SerializedName("allowed_hosts")
    private final List<String> allowedHosts;

-    @SerializedName("allowed_paths")
-    private final Map<String, String> allowedPaths;
-
    @SerializedName("config")
    private final Map<String, String> config;

    public Manifest() {
-        this(new ArrayList<>(), null, null, null, null);
+        this(new ArrayList<>(), null, null, null);
    }

    public Manifest(WasmSource source) {
@@ -35,27 +32,22 @@ public class Manifest {
    }

    public Manifest(List<WasmSource> sources) {
-        this(sources, null, null, null, null);
+        this(sources, null, null, null);
    }

    public Manifest(List<WasmSource> sources, MemoryOptions memoryOptions) {
-        this(sources, memoryOptions, null, null, null);
+        this(sources, memoryOptions, null, null);
    }

    public Manifest(List<WasmSource> sources, MemoryOptions memoryOptions, Map<String, String> config) {
-        this(sources, memoryOptions, config, null, null);
+        this(sources, memoryOptions, config, null);
    }

    public Manifest(List<WasmSource> sources, MemoryOptions memoryOptions, Map<String, String> config, List<String> allowedHosts) {
-        this(sources, memoryOptions, config, allowedHosts, null);
-    }
-
-    public Manifest(List<WasmSource> sources, MemoryOptions memoryOptions, Map<String, String> config, List<String> allowedHosts, Map<String, String> allowedPaths) {
        this.sources = sources;
        this.memoryOptions = memoryOptions;
        this.config = config;
        this.allowedHosts = allowedHosts;
-        this.allowedPaths = allowedPaths;
    }

    public void addSource(WasmSource source) {
@@ -83,11 +75,4 @@ public class Manifest {
        }
        return Collections.unmodifiableList(allowedHosts);
    }
-
-    public Map<String, String> getAllowedPaths() {
-        if (allowedPaths == null || allowedPaths.isEmpty()) {
-            return Collections.emptyMap();
-        }
-        return Collections.unmodifiableMap(allowedPaths);
-    }
 }
--- a/java/src/main/java/org/extism/sdk/support/JsonSerde.java
+++ b/java/src/main/java/org/extism/sdk/support/JsonSerde.java
@@ -1,14 +1,18 @@
 package org.extism.sdk.support;

-import com.google.gson.*;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import org.extism.sdk.manifest.Manifest;

-import java.io.IOException;
 import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
 import java.util.Base64;

 public class JsonSerde {
@@ -19,7 +23,7 @@ public class JsonSerde {
        GSON = new GsonBuilder() //
                .disableHtmlEscaping() //
                // needed to convert the byte[] to a base64 encoded String
-                .registerTypeHierarchyAdapter(byte[].class, new ByteArrayAdapter()) //
+                .registerTypeHierarchyAdapter(byte[].class, new ByteArrayToBase64TypeAdapter()) //
                .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES) //
                .setPrettyPrinting() //
                .create();
@@ -29,28 +33,14 @@ public class JsonSerde {
        return GSON.toJson(manifest);
    }

-    private static class ByteArrayAdapter extends TypeAdapter<byte[]> {
+    private static class ByteArrayToBase64TypeAdapter implements JsonSerializer<byte[]>, JsonDeserializer<byte[]> {

-        @Override
-        public void write(JsonWriter out, byte[] byteValue) throws IOException {
-            out.value(new String(Base64.getEncoder().encode(byteValue)));
+        public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return Base64.getDecoder().decode(json.getAsString());
        }

-        @Override
-        public byte[] read(JsonReader in) {
-            try {
-                if (in.peek() == JsonToken.NULL) {
-                    in.nextNull();
-                    return new byte[]{};
-                }
-                String byteValue = in.nextString();
-                if (byteValue != null) {
-                    return Base64.getDecoder().decode(byteValue);
-                }
-                return new byte[]{};
-            } catch (Exception e) {
-                throw new JsonParseException(e);
-            }
+        public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContext context) {
+            return new JsonPrimitive(Base64.getEncoder().withoutPadding().encodeToString(src));
        }
    }
 }
--- a/java/src/test/java/org/extism/sdk/ManifestTests.java
+++ b/java/src/test/java/org/extism/sdk/ManifestTests.java
@@ -6,7 +6,6 @@ import org.extism.sdk.support.JsonSerde;
 import org.junit.jupiter.api.Test;

 import java.util.List;
-import java.util.HashMap;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.extism.sdk.TestWasmSources.CODE;
@@ -17,16 +16,13 @@ public class ManifestTests {

    @Test
    public void shouldSerializeManifestWithWasmSourceToJson() {
-        var paths = new HashMap<String, String>();
-        paths.put("/tmp/foo", "/tmp/extism-plugins/foo");
-        var manifest = new Manifest(List.of(CODE.pathWasmSource()), null, null, null, paths);
+
+        var manifest = new Manifest(CODE.pathWasmSource());
        var json = JsonSerde.toJson(manifest);
        assertNotNull(json);

        assertJson(json).at("/wasm").isArray();
        assertJson(json).at("/wasm").hasSize(1);
-        assertJson(json).at("/allowed_paths").isObject();
-        assertJson(json).at("/allowed_paths").hasSize(1);
    }

    @Test
--- a/java/src/test/java/org/extism/sdk/PluginTests.java
+++ b/java/src/test/java/org/extism/sdk/PluginTests.java
@@ -1,12 +1,12 @@
 package org.extism.sdk;

-import com.sun.jna.Pointer;
 import org.extism.sdk.manifest.Manifest;
 import org.extism.sdk.manifest.MemoryOptions;
 import org.extism.sdk.wasm.WasmSourceResolver;
 import org.junit.jupiter.api.Test;

-import java.util.*;
+import java.util.List;
+import java.util.Map;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.extism.sdk.TestWasmSources.CODE;
@@ -20,10 +20,10 @@ public class PluginTests {

    @Test
    public void shouldInvokeFunctionWithMemoryOptions() {
+        //FIXME check whether memory options are effective
        var manifest = new Manifest(List.of(CODE.pathWasmSource()), new MemoryOptions(0));
-        assertThrows(ExtismException.class, () -> {
-            Extism.invokeFunction(manifest, "count_vowels", "Hello World");
-        });
+        var output = Extism.invokeFunction(manifest, "count_vowels", "Hello World");
+        assertThat(output).isEqualTo("{\"count\": 3}");
    }

    @Test
@@ -42,12 +42,14 @@ public class PluginTests {
        assertThat(output).isEqualTo("{\"count\": 3}");
    }

-     @Test
-     public void shouldInvokeFunctionFromByteArrayWasmSource() {
-         var manifest = new Manifest(CODE.byteArrayWasmSource());
-         var output = Extism.invokeFunction(manifest, "count_vowels", "Hello World");
-         assertThat(output).isEqualTo("{\"count\": 3}");
-     }
+    // TODO This test breaks on CI with error:
+    // data did not match any variant of untagged enum Wasm at line 8 column 3
+    // @Test
+    // public void shouldInvokeFunctionFromByteArrayWasmSource() {
+    //     var manifest = new Manifest(CODE.byteArrayWasmSource());
+    //     var output = Extism.invokeFunction(manifest, "count_vowels", "Hello World");
+    //     assertThat(output).isEqualTo("{\"count\": 3}");
+    // }

    @Test
    public void shouldFailToInvokeUnknownFunction() {
@@ -78,7 +80,7 @@ public class PluginTests {
        var input = "Hello World";

        try (var ctx = new Context()) {
-            try (var plugin = ctx.newPlugin(manifest, false, null)) {
+            try (var plugin = ctx.newPlugin(manifest, false)) {
                var output = plugin.call(functionName, input);
                assertThat(output).isEqualTo("{\"count\": 3}");
            }
@@ -92,7 +94,7 @@ public class PluginTests {
        var input = "Hello World";

        try (var ctx = new Context()) {
-            try (var plugin = ctx.newPlugin(manifest, false, null)) {
+            try (var plugin = ctx.newPlugin(manifest, false)) {
                var output = plugin.call(functionName, input);
                assertThat(output).isEqualTo("{\"count\": 3}");

@@ -102,118 +104,4 @@ public class PluginTests {
        }
    }

-    @Test
-    public void shouldAllowInvokeHostFunctionFromPDK() {
-        var parametersTypes = new LibExtism.ExtismValType[]{LibExtism.ExtismValType.I64};
-        var resultsTypes = new LibExtism.ExtismValType[]{LibExtism.ExtismValType.I64};
-
-        class MyUserData extends HostUserData {
-            private String data1;
-            private int data2;
-
-            public MyUserData(String data1, int data2) {
-                super();
-                this.data1 = data1;
-                this.data2 = data2;
-            }
-        }
-
-        ExtismFunction helloWorldFunction = (ExtismFunction<MyUserData>) (plugin, params, returns, data) -> {
-            System.out.println("Hello from Java Host Function!");
-            System.out.println(String.format("Input string received from plugin, %s", plugin.inputString(params[0])));
-
-            int offs = plugin.alloc(4);
-            Pointer mem = plugin.memory();
-            mem.write(offs, "test".getBytes(), 0, 4);
-            returns[0].v.i64 = offs;
-
-            data.ifPresent(d -> System.out.println(String.format("Host user data, %s, %d", d.data1, d.data2)));
-        };
-
-        HostFunction helloWorld = new HostFunction<>(
-                "hello_world",
-                parametersTypes,
-                resultsTypes,
-                helloWorldFunction,
-                Optional.of(new MyUserData("test", 2))
-        );
-
-        HostFunction[] functions = {helloWorld};
-
-        try (var ctx = new Context()) {
-            Manifest manifest = new Manifest(Arrays.asList(CODE.pathWasmFunctionsSource()));
-            String functionName = "count_vowels";
-
-            try (var plugin = ctx.newPlugin(manifest, true, functions)) {
-                var output = plugin.call(functionName, "this is a test");
-                assertThat(output).isEqualTo("test");
-            }
-        }
-    }
-
-    @Test
-    public void shouldAllowInvokeHostFunctionWithoutUserData() {
-
-        var parametersTypes = new LibExtism.ExtismValType[]{LibExtism.ExtismValType.I64};
-        var resultsTypes = new LibExtism.ExtismValType[]{LibExtism.ExtismValType.I64};
-
-        ExtismFunction helloWorldFunction = (plugin, params, returns, data) -> {
-            System.out.println("Hello from Java Host Function!");
-            System.out.println(String.format("Input string received from plugin, %s", plugin.inputString(params[0])));
-
-            int offs = plugin.alloc(4);
-            Pointer mem = plugin.memory();
-            mem.write(offs, "test".getBytes(), 0, 4);
-            returns[0].v.i64 = offs;
-
-            assertThat(data.isEmpty());
-        };
-
-        HostFunction f = new HostFunction<>(
-                "hello_world",
-                parametersTypes,
-                resultsTypes,
-                helloWorldFunction,
-                Optional.empty()
-        )
-                .withNamespace("env");
-
-        HostFunction g = new HostFunction<>(
-                "hello_world",
-                parametersTypes,
-                resultsTypes,
-                helloWorldFunction,
-                Optional.empty()
-        )
-                .withNamespace("test");
-
-        HostFunction[] functions = {f,g};
-
-        try (var ctx = new Context()) {
-            Manifest manifest = new Manifest(Arrays.asList(CODE.pathWasmFunctionsSource()));
-            String functionName = "count_vowels";
-
-            try (var plugin = ctx.newPlugin(manifest, true, functions)) {
-                var output = plugin.call(functionName, "this is a test");
-                assertThat(output).isEqualTo("test");
-            }
-        }
-    }
-
-
-    @Test
-    public void shouldFailToInvokeUnknownHostFunction() {
-        try (var ctx = new Context()) {
-            Manifest manifest = new Manifest(Arrays.asList(CODE.pathWasmFunctionsSource()));
-            String functionName = "count_vowels";
-
-            try {
-                var plugin = ctx.newPlugin(manifest, true, null);
-                plugin.call(functionName, "this is a test");
-            }  catch (ExtismException e) {
-                assertThat(e.getMessage()).contains("unknown import: `env::hello_world` has not been defined");
-            }
-        }
-    }
-
 }
--- a/java/src/test/java/org/extism/sdk/TestWasmSources.java
+++ b/java/src/test/java/org/extism/sdk/TestWasmSources.java
@@ -16,28 +16,19 @@ public enum TestWasmSources {
        public Path getWasmFilePath() {
            return Paths.get(WASM_LOCATION, "code.wasm");
        }
-        public Path getWasmFunctionsFilePath() {
-            return Paths.get(WASM_LOCATION, "code-functions.wasm");
-        }
    };

    public static final String WASM_LOCATION = "src/test/resources";

    public abstract Path getWasmFilePath();

-    public abstract Path getWasmFunctionsFilePath();
-
    public PathWasmSource pathWasmSource() {
        return resolvePathWasmSource(getWasmFilePath());
    }

-    public PathWasmSource pathWasmFunctionsSource() {
-        return resolvePathWasmSource(getWasmFunctionsFilePath());
-    }
-
    public ByteArrayWasmSource byteArrayWasmSource() {
        try {
-            byte[] wasmBytes = Files.readAllBytes(getWasmFilePath());
+            var wasmBytes = Files.readAllBytes(getWasmFilePath());
            return new WasmSourceResolver().resolve("wasm@" + Arrays.hashCode(wasmBytes), wasmBytes);
        } catch (IOException ioe) {
            throw new RuntimeException(ioe);
--- a/java/src/test/resources/code-functions.wasm
+++ b/java/src/test/resources/code-functions.wasm
--- a/kernel/.cargo/config
+++ b/kernel/.cargo/config
@@ -1,2 +0,0 @@
-[build]
-target = "wasm32-unknown-unknown"
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -1,11 +0,0 @@
-[package]
-name = "extism-runtime-kernel"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-
-[workspace]
-members = [
-  "."
-]
--- a/kernel/README.md
+++ b/kernel/README.md
@@ -1,20 +0,0 @@
-# Extism kernel
-
-The Extism kernel implements core parts of the Extism runtime in Rust compiled to WebAssembly. This code is a conceptual
-re-write of [memory.rs][] with the goal of making core parts of the Extism implementation more portable across WebAssembly
-runtimes.
-
-See [lib.rs][] for more details about the implementation itself.
-
-## Building
-
-Because this crate is built using the `wasm32-unknown-unknown` target, it is a separate build process from the `extism-runtime` crate. 
-
-To build `extism-runtime.wasm`, strip it and copy it to the proper location in the `extism-runtime` tree you can run:
-
-```shell
-$ sh build.sh
-```
-
-[memory.rs]: https://github.com/extism/extism/blob/f4aa139eced4a74eb4a103f78222ba503e146109/runtime/src/memory.rs
-[lib.rs]: ./src/lib.rs
--- a/kernel/build.sh
+++ b/kernel/build.sh
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-cargo build --release --target wasm32-unknown-unknown --package extism-runtime-kernel --bin extism-runtime
-cp target/wasm32-unknown-unknown/release/extism-runtime.wasm .
-wasm-strip extism-runtime.wasm
-mv extism-runtime.wasm ../runtime/src/extism-runtime.wasm
-
--- a/kernel/src/bin/extism-runtime.rs
+++ b/kernel/src/bin/extism-runtime.rs
@@ -1,10 +0,0 @@
-#![no_main]
-#![no_std]
-
-pub use extism_runtime_kernel::*;
-
-#[cfg(target_arch = "wasm32")]
-#[panic_handler]
-fn panic(_info: &core::panic::PanicInfo) -> ! {
-    core::arch::wasm32::unreachable()
-}
--- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs
@@ -1,525 +0,0 @@
-//! # Extism kernel
-//!
-//! - Isolated memory from both host and plugin
-//! - An allocator for managing that memory
-//! - Input/output handling
-//! - Error message handling
-//! - Backward compatible `extism_*` functions
-//!
-//! ## Allocator
-//!
-//! The Extism allocator is a bump allocator that tracks the `length` of the total number of bytes
-//! available to the allocator and `position` to track how much of the data has been used. Things like memory
-//! have not really been optimized at all. When a new allocation that is larger than the remaning size is made,
-//! the allocator attempts to call `memory.grow` if that fails a `0` offset is returned, which should be interpreted
-//! as a failed allocation.
-//!
-//! ## Input/Output
-//!
-//! Input and output are just allocated blocks of memory that are marked as either input or output using
-//! the `extism_input_set` or `extism_output_set` functions. The MemoryRoot field `input_offset` contains
-//! the offset in memory to the input data and `input_length` contains the size of the input data. `output_offset`
-//! and `output_length` are used for the output data.
-//!
-//! ## Error handling
-//!
-//! The `error` field is used to track the current error message. If it is set to `0` then there is no error.
-//! The length of the error message can be retreived using `extism_length`.
-//!
-//! ## Memory offsets
-//! An offset of `0` is similar to a `NULL` pointer in C - it implies an allocation failure or memory error
-//! of some kind
-//!
-//! ## Extism functions
-//!
-//! These functions are backward compatible with the pre-kernel runtime, but a few new functions are added to
-//! give runtimes more access to the internals necesarry to load data in and out of a plugin.
-#![no_std]
-#![allow(clippy::missing_safety_doc)]
-
-use core::sync::atomic::*;
-
-pub type Pointer = u64;
-pub type Length = u64;
-
-/// WebAssembly page size
-const PAGE_SIZE: usize = 65536;
-
-/// Provides information about the usage status of a `MemoryBlock`
-#[repr(u8)]
-#[derive(PartialEq)]
-pub enum MemoryStatus {
-    /// Unused memory that is available b
-    Unused = 0,
-    /// In-use memory
-    Active = 1,
-    /// Free memory that is available for re-use
-    Free = 2,
-}
-
-/// A single `MemoryRoot` exists at the start of the memory to track information about the total
-/// size of the allocated memory and the position of the bump allocator.
-///
-/// The overall layout of the Extism-manged memory is organized like this:
-
-/// |------|-------+---------|-------+--------------|
-/// | Root | Block +  Data   | Block +     Data     | ...
-/// |------|-------+---------|-------+--------------|
-///
-/// Where `Root` and `Block` are fixed to the size of the `MemoryRoot` and `MemoryBlock` structs. But
-/// the size of `Data` is dependent on the allocation size.
-///
-/// This means that the offset of a `Block` is the size of `Root` plus the size of all existing `Blocks`
-/// including their data.
-#[repr(C)]
-pub struct MemoryRoot {
-    /// Set to true after initialization
-    pub initialized: AtomicBool,
-    /// Position of the bump allocator, relative to `blocks` field
-    pub position: AtomicU64,
-    /// The total size of all data allocated using this allocator
-    pub length: AtomicU64,
-    /// Offset of error block
-    pub error: AtomicU64,
-    /// Input position in memory
-    pub input_offset: Pointer,
-    /// Input length
-    pub input_length: Length,
-    /// Output position in memory
-    pub output_offset: Pointer,
-    /// Output length
-    pub output_length: Length,
-    /// A pointer to the start of the first block
-    pub blocks: [MemoryBlock; 0],
-}
-
-/// A `MemoryBlock` contains some metadata about a single allocation
-#[repr(C)]
-pub struct MemoryBlock {
-    /// The usage status of the block, `Unused` or `Free` blocks can be re-used.
-    pub status: AtomicU8,
-    /// The total size of the allocation
-    pub size: usize,
-    /// The number of bytes currently being used. If this block is a fresh allocation then `size` and `used` will
-    /// always be the same. If a block is re-used then these numbers may differ.
-    pub used: usize,
-    /// A pointer to the block data
-    pub data: [u8; 0],
-}
-
-/// Returns the number of pages needed for the given number of bytes
-pub fn num_pages(nbytes: u64) -> usize {
-    let npages = nbytes / PAGE_SIZE as u64;
-    let remainder = nbytes % PAGE_SIZE as u64;
-    if remainder != 0 {
-        (npages + 1) as usize
-    } else {
-        npages as usize
-    }
-}
-
-// Get the `MemoryRoot`, this is always stored at offset 1 in memory
-#[inline]
-unsafe fn memory_root() -> &'static mut MemoryRoot {
-    &mut *(1 as *mut MemoryRoot)
-}
-
-impl MemoryRoot {
-    /// Initialize or load the `MemoryRoot` from the correct position in memory
-    pub unsafe fn new() -> &'static mut MemoryRoot {
-        let root = memory_root();
-
-        // If this fails then `INITIALIZED` is already `true` and we can just return the
-        // already initialized `MemoryRoot`
-        if root
-            .initialized
-            .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
-            .is_err()
-        {
-            return root;
-        }
-
-        // Ensure that at least one page is allocated to store the `MemoryRoot` data
-        if core::arch::wasm32::memory_size(0) == 0 {
-            if core::arch::wasm32::memory_grow(0, 1) == usize::MAX {
-                core::arch::wasm32::unreachable()
-            }
-        }
-
-        root.input_offset = 0;
-        root.input_length = 0;
-        root.output_offset = 0;
-        root.output_length = 0;
-        root.error.store(0, Ordering::Release);
-
-        // Initialize the `MemoryRoot` length, position and data
-        root.length.store(
-            PAGE_SIZE as u64 - core::mem::size_of::<MemoryRoot>() as u64,
-            Ordering::Release,
-        );
-        root.position.store(0, Ordering::Release);
-
-        // Ensure the first block is marked as `Unused`
-        #[allow(clippy::size_of_in_element_count)]
-        core::ptr::write_bytes(
-            root.blocks.as_mut_ptr() as *mut _,
-            MemoryStatus::Unused as u8,
-            core::mem::size_of::<MemoryBlock>(),
-        );
-        root
-    }
-
-    /// Resets the position of the allocator and zeroes out all allocations
-    pub unsafe fn reset(&mut self) {
-        core::ptr::write_bytes(
-            self.blocks.as_mut_ptr() as *mut u8,
-            0,
-            self.length.load(Ordering::Acquire) as usize,
-        );
-        self.position.store(0, Ordering::Release);
-        self.error.store(0, Ordering::Release);
-        self.input_offset = 0;
-        self.input_length = 0;
-        self.output_offset = 0;
-        self.output_length = 0;
-    }
-
-    #[inline(always)]
-    #[allow(unused)]
-    fn pointer_in_bounds(&self, p: Pointer) -> bool {
-        let start_ptr = self.blocks.as_ptr() as Pointer;
-        p >= start_ptr && p < start_ptr + self.length.load(Ordering::Acquire) as Pointer
-    }
-
-    #[inline(always)]
-    #[allow(unused)]
-    fn pointer_in_bounds_fast(p: Pointer) -> bool {
-        // Similar to `pointer_in_bounds` but less accurate on the upper bound. This uses the total memory size,
-        // instead of checking `MemoryRoot::length`
-        let end = core::arch::wasm32::memory_size(0) << 16;
-        p >= core::mem::size_of::<Self>() as Pointer && p <= end as Pointer
-    }
-
-    // Find a block that is free to use, this can be a new block or an existing freed block. The `self_position` argument
-    // is used to avoid loading the allocators position more than once when performing an allocation.
-    unsafe fn find_free_block(
-        &mut self,
-        length: Length,
-        self_position: u64,
-    ) -> Option<&'static mut MemoryBlock> {
-        // Get the first block
-        let mut block = self.blocks.as_mut_ptr();
-
-        // Only loop while the block pointer is less then the current position
-        while (block as u64) < self.blocks.as_ptr() as u64 + self_position {
-            let b = &mut *block;
-
-            // Get the block status, this lets us know if we are able to re-use it
-            let status = b.status.load(Ordering::Acquire);
-
-            // An unused block is safe to use
-            if status == MemoryStatus::Unused as u8 {
-                return Some(b);
-            }
-
-            // Re-use freed blocks when they're large enough
-            if status == MemoryStatus::Free as u8 && b.size >= length as usize {
-                // Split block if there is too much excess
-                if b.size - length as usize >= 128 {
-                    b.size -= length as usize;
-                    b.used = 0;
-
-                    let block1 = b.data.as_mut_ptr().add(b.size) as *mut MemoryBlock;
-                    let b1 = &mut *block1;
-                    b1.size = length as usize;
-                    b1.used = 0;
-                    b1.status.store(MemoryStatus::Free as u8, Ordering::Release);
-                    return Some(b1);
-                }
-
-                // Otherwise return the whole block
-                return Some(b);
-            }
-
-            // Get the next block
-            block = b.next_ptr();
-        }
-
-        None
-    }
-
-    /// Create a new `MemoryBlock`, when `Some(block)` is returned, `block` will contain at least enough room for `length` bytes
-    /// but may be as large as `length` + `BLOCK_SPLIT_SIZE` bytes. When `None` is returned the allocation has failed.
-    pub unsafe fn alloc(&mut self, length: Length) -> Option<&'static mut MemoryBlock> {
-        let self_position = self.position.load(Ordering::Acquire);
-        let self_length = self.length.load(Ordering::Acquire);
-        let b = self.find_free_block(length, self_position);
-
-        // If there's a free block then re-use it
-        if let Some(b) = b {
-            b.used = length as usize;
-            b.status
-                .store(MemoryStatus::Active as u8, Ordering::Release);
-            return Some(b);
-        }
-
-        // Get the current index for a new block
-        let curr = self.blocks.as_ptr() as u64 + self_position;
-
-        // Get the number of bytes available
-        let mem_left = self_length - self_position - core::mem::size_of::<MemoryRoot>() as u64;
-
-        // When the allocation is larger than the number of bytes available
-        // we will need to try to grow the memory
-        if length >= mem_left {
-            // Calculate the number of pages needed to cover the remaining bytes
-            let npages = num_pages(length - mem_left);
-            let x = core::arch::wasm32::memory_grow(0, npages);
-            if x == usize::MAX {
-                return None;
-            }
-            self.length
-                .fetch_add(npages as u64 * PAGE_SIZE as u64, Ordering::SeqCst);
-        }
-
-        // Bump the position by the size of the actual data + the size of the MemoryBlock structure
-        self.position.fetch_add(
-            length + core::mem::size_of::<MemoryBlock>() as u64,
-            Ordering::SeqCst,
-        );
-
-        // Initialize a new block at the current position
-        let ptr = curr as *mut MemoryBlock;
-        let block = &mut *ptr;
-        block
-            .status
-            .store(MemoryStatus::Active as u8, Ordering::Release);
-        block.size = length as usize;
-        block.used = length as usize;
-        Some(block)
-    }
-
-    /// Finds the block at an offset in memory
-    pub unsafe fn find_block(&mut self, offs: Pointer) -> Option<&mut MemoryBlock> {
-        if !Self::pointer_in_bounds_fast(offs) {
-            return None;
-        }
-        let ptr = offs - core::mem::size_of::<MemoryBlock>() as u64;
-        let ptr = ptr as *mut MemoryBlock;
-        Some(&mut *ptr)
-    }
-}
-
-impl MemoryBlock {
-    /// Get a pointer to the next block
-    ///
-    /// NOTE: This does no checking to ensure the resulting pointer is valid, the offset
-    /// is calculated based on metadata provided by the current block
-    #[inline]
-    pub unsafe fn next_ptr(&mut self) -> *mut MemoryBlock {
-        self.data.as_mut_ptr().add(self.size) as *mut MemoryBlock
-    }
-
-    /// Mark a block as free
-    pub fn free(&mut self) {
-        self.status
-            .store(MemoryStatus::Free as u8, Ordering::Release);
-    }
-}
-
-// Extism functions
-
-/// Allocate a block of memory and return the offset
-#[no_mangle]
-pub unsafe fn extism_alloc(n: Length) -> Pointer {
-    if n == 0 {
-        return 0;
-    }
-    let region = MemoryRoot::new();
-    let block = region.alloc(n);
-    match block {
-        Some(block) => block.data.as_mut_ptr() as Pointer,
-        None => 0,
-    }
-}
-
-/// Free allocated memory
-#[no_mangle]
-pub unsafe fn extism_free(p: Pointer) {
-    if p == 0 {
-        return;
-    }
-    let root = MemoryRoot::new();
-    let block = root.find_block(p);
-    if let Some(block) = block {
-        block.free();
-
-        // If the input pointer is freed for some reason, make sure the input length to 0
-        // since the original data is gone
-        if p == root.input_offset {
-            root.input_length = 0;
-        }
-    }
-}
-
-/// Get the length of an allocated memory block
-#[no_mangle]
-pub unsafe fn extism_length(p: Pointer) -> Length {
-    if p == 0 {
-        return 0;
-    }
-    if let Some(block) = MemoryRoot::new().find_block(p) {
-        block.used as Length
-    } else {
-        0
-    }
-}
-
-/// Load a byte from Extism-managed memory
-#[no_mangle]
-pub unsafe fn extism_load_u8(p: Pointer) -> u8 {
-    #[cfg(feature = "bounds-checking")]
-    if !MemoryRoot::pointer_in_bounds_fast(p) {
-        return 0;
-    }
-    *(p as *mut u8)
-}
-
-/// Load a u64 from Extism-managed memory
-#[no_mangle]
-pub unsafe fn extism_load_u64(p: Pointer) -> u64 {
-    #[cfg(feature = "bounds-checking")]
-    if !MemoryRoot::pointer_in_bounds_fast(p + core::mem::size_of::<u64>() as u64 - 1) {
-        return 0;
-    }
-    *(p as *mut u64)
-}
-
-/// Load a byte from the input data
-#[no_mangle]
-pub unsafe fn extism_input_load_u8(p: Pointer) -> u8 {
-    let root = MemoryRoot::new();
-    #[cfg(feature = "bounds-checking")]
-    if p >= root.input_length {
-        return 0;
-    }
-    *((root.input_offset + p) as *mut u8)
-}
-
-/// Load a u64 from the input data
-#[no_mangle]
-pub unsafe fn extism_input_load_u64(p: Pointer) -> u64 {
-    let root = MemoryRoot::new();
-    #[cfg(feature = "bounds-checking")]
-    if p + core::mem::size_of::<u64>() as Pointer > root.input_length {
-        return 0;
-    }
-    *((root.input_offset + p) as *mut u64)
-}
-
-/// Write a byte in Extism-managed memory
-#[no_mangle]
-pub unsafe fn extism_store_u8(p: Pointer, x: u8) {
-    #[cfg(feature = "bounds-checking")]
-    if !MemoryRoot::pointer_in_bounds_fast(p) {
-        return;
-    }
-    *(p as *mut u8) = x;
-}
-
-/// Write a u64 in Extism-managed memory
-#[no_mangle]
-pub unsafe fn extism_store_u64(p: Pointer, x: u64) {
-    #[cfg(feature = "bounds-checking")]
-    if !MemoryRoot::pointer_in_bounds_fast(p + core::mem::size_of::<u64>() as u64 - 1) {
-        return;
-    }
-    *(p as *mut u64) = x;
-}
-
-/// Set the range of the input data in memory
-#[no_mangle]
-pub unsafe fn extism_input_set(p: Pointer, len: Length) {
-    let root = MemoryRoot::new();
-    #[cfg(feature = "bounds-checking")]
-    {
-        if !root.pointer_in_bounds(p) || !root.pointer_in_bounds(p + len - 1) {
-            return;
-        }
-    }
-    root.input_offset = p;
-    root.input_length = len;
-}
-
-/// Set the range of the output data in memory
-#[no_mangle]
-pub unsafe fn extism_output_set(p: Pointer, len: Length) {
-    let root = MemoryRoot::new();
-    #[cfg(feature = "bounds-checking")]
-    {
-        if !root.pointer_in_bounds(p) || !root.pointer_in_bounds(p + len - 1) {
-            return;
-        }
-    }
-    root.output_offset = p;
-    root.output_length = len;
-}
-
-/// Get the input length
-#[no_mangle]
-pub fn extism_input_length() -> Length {
-    unsafe { MemoryRoot::new().input_length }
-}
-
-/// Get the input offset in Exitsm-managed memory
-#[no_mangle]
-pub fn extism_input_offset() -> Length {
-    unsafe { MemoryRoot::new().input_offset }
-}
-
-/// Get the output length
-#[no_mangle]
-pub unsafe fn extism_output_length() -> Length {
-    unsafe { MemoryRoot::new().output_length }
-}
-
-/// Get the output offset in Extism-managed memory
-#[no_mangle]
-pub unsafe fn extism_output_offset() -> Length {
-    MemoryRoot::new().output_offset
-}
-
-/// Reset the allocator
-#[no_mangle]
-pub unsafe fn extism_reset() {
-    MemoryRoot::new().reset()
-}
-
-/// Set the error message offset
-#[no_mangle]
-pub unsafe fn extism_error_set(ptr: Pointer) {
-    let root = MemoryRoot::new();
-
-    // Allow ERROR to be set to 0
-    if ptr == 0 {
-        root.error.store(ptr, Ordering::SeqCst);
-        return;
-    }
-
-    if !root.pointer_in_bounds(ptr) {
-        return;
-    }
-    root.error.store(ptr, Ordering::SeqCst);
-}
-
-/// Get the error message offset, if it's `0` then no error has been set
-#[no_mangle]
-pub unsafe fn extism_error_get() -> Pointer {
-    MemoryRoot::new().error.load(Ordering::SeqCst)
-}
-
-/// Get the position of the allocator, this can be used as an indication of how many bytes are currently in-use
-#[no_mangle]
-pub unsafe fn extism_memory_bytes() -> Length {
-    MemoryRoot::new().position.load(Ordering::Acquire)
-}
--- a/libextism/Cargo.toml
+++ b/libextism/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libextism"
-version = "0.5.4"
+version = "0.1.0"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"
@@ -20,4 +20,4 @@ default = ["http", "register-http", "register-filesystem"]
 nn = ["extism-runtime/nn"]
 register-http = ["extism-runtime/register-http"] # enables wasm to be downloaded using http
 register-filesystem = ["extism-runtime/register-filesystem"] # enables wasm to be loaded from disk
-http = ["extism-runtime/http"] # enables extism_http_request
+http = ["extism-runtime/http"] # enables extism_http_request
--- a/manifest/Cargo.toml
+++ b/manifest/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "extism-manifest"
-version = "0.5.0"
+version = "0.1.0"
 edition = "2021"
 authors = ["The Extism Authors", "oss@extism.org"]
 license = "BSD-3-Clause"
--- a/manifest/src/lib.rs
+++ b/manifest/src/lib.rs
@@ -4,17 +4,15 @@ use std::path::{Path, PathBuf};
 #[deprecated]
 pub type ManifestMemory = MemoryOptions;

-#[derive(Default, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Default, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "json_schema", derive(schemars::JsonSchema))]
-#[serde(deny_unknown_fields)]
 pub struct MemoryOptions {
    #[serde(alias = "max")]
    pub max_pages: Option<u32>,
 }

-#[derive(Clone, serde::Serialize, serde::Deserialize)]
+#[derive(serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "json_schema", derive(schemars::JsonSchema))]
-#[serde(deny_unknown_fields)]
 pub struct HttpRequest {
    pub url: String,
    #[serde(default)]
@@ -43,9 +41,8 @@ impl HttpRequest {
    }
 }

-#[derive(Default, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Default, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "json_schema", derive(schemars::JsonSchema))]
-#[serde(deny_unknown_fields)]
 pub struct WasmMetadata {
    pub name: Option<String>,
    pub hash: Option<String>,
@@ -81,10 +78,9 @@ impl From<Vec<u8>> for Wasm {
 #[deprecated]
 pub type ManifestWasm = Wasm;

-#[derive(Clone, serde::Serialize, serde::Deserialize)]
+#[derive(serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "json_schema", derive(schemars::JsonSchema))]
 #[serde(untagged)]
-#[serde(deny_unknown_fields)]
 pub enum Wasm {
    File {
        path: PathBuf,
@@ -153,9 +149,8 @@ fn base64_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::
    schema.into()
 }

-#[derive(Default, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Default, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "json_schema", derive(schemars::JsonSchema))]
-#[serde(deny_unknown_fields)]
 pub struct Manifest {
    #[serde(default)]
    pub wasm: Vec<Wasm>,
--- a/node/example.js
+++ b/node/example.js
@@ -1,42 +1,43 @@
 const {
-  Plugin,
+  withContext,
+  Context,
  HostFunction,
  ValType,
 } = require("./dist/index.js");
 const { readFileSync } = require("fs");

 function f(currentPlugin, inputs, outputs, userData) {
-  console.log(currentPlugin.inputString(inputs[0]));
+  let mem = currentPlugin.memory(inputs[0].v.i64);
+  console.log(mem.length);
+  console.log(mem.toString());
  console.log("Hello from Javascript!");
  console.log(userData);
  outputs[0] = inputs[0];
 }

-const hello_world = new HostFunction(
+let hello_world = new HostFunction(
  "hello_world",
  [ValType.I64],
  [ValType.I64],
  f,
-  "Hello again!",
+  "Hello again!"
 );

-async function main() {
-  const functions = [hello_world];
+let functions = [hello_world];

-  const wasm = readFileSync("../wasm/code-functions.wasm");
-  const p = new Plugin(wasm, true, functions);
+withContext(async function (context) {
+  let wasm = readFileSync("../wasm/code-functions.wasm");
+  let p = context.plugin(wasm, true, functions);

  if (!p.functionExists("count_vowels")) {
    console.log("no function 'count_vowels' in wasm");
    process.exit(1);
  }

-  const buf = await p.call("count_vowels", process.argv[2] || "this is a test");
+  let buf = await p.call("count_vowels", process.argv[2] || "this is a test");
  console.log(JSON.parse(buf.toString())["count"]);
  p.free();
-}
-
-main();
+});

 // or, use a context like this:
 // let ctx = new Context();
--- a/node/package-lock.json
+++ b/node/package-lock.json
--- a/node/package.json
+++ b/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@extism/extism",
-  "version": "0.5.0",
+  "version": "0.1.0",
  "description": "Extism Host SDK for Node",
  "keywords": [
    "extism",
@@ -39,12 +39,12 @@
  "devDependencies": {
    "@types/ffi-napi": "^4.0.6",
    "@types/jest": "^29.2.0",
-    "@types/node": "^20.1.0",
+    "@types/node": "^18.11.4",
    "jest": "^29.2.2",
-    "prettier": "3.0.2",
+    "prettier": "2.8.3",
    "ts-jest": "^29.0.3",
    "ts-node": "^10.9.1",
-    "typedoc": "^0.24.1",
-    "typescript": "^5.0.4"
+    "typedoc": "^0.23.18",
+    "typescript": "^4.8.4"
  }
 }
--- a/node/src/index.ts
+++ b/node/src/index.ts
@@ -73,13 +73,10 @@ const _functions = {
    ],
  ],
  extism_function_free: ["void", [function_t]],
-  extism_function_set_namespace: ["void", [function_t, "string"]],
  extism_current_plugin_memory: ["uint8*", ["void*"]],
  extism_current_plugin_memory_alloc: ["uint64", ["void*", "uint64"]],
  extism_current_plugin_memory_length: ["uint64", ["void*", "uint64"]],
  extism_current_plugin_memory_free: ["void", ["void*", "uint64"]],
-  extism_plugin_cancel_handle: ["void*", [context, pluginIndex]],
-  extism_plugin_cancel: ["bool", ["void*"]],
 };

 /**
@@ -90,7 +87,6 @@ export enum ValType {
  I64,
  F32,
  F64,
-  V128,
  FuncRef,
  ExternRef,
 }
@@ -104,7 +100,7 @@ interface LibExtism {
    data_len: number,
    functions: Buffer,
    nfunctions: number,
-    wasi: boolean,
+    wasi: boolean
  ) => number;
  extism_plugin_update: (
    ctx: Buffer,
@@ -113,7 +109,7 @@ interface LibExtism {
    data_len: number,
    functions: Buffer,
    nfunctions: number,
-    wasi: boolean,
+    wasi: boolean
  ) => boolean;
  extism_error: (ctx: Buffer, plugin_id: number) => string;
  extism_plugin_call: (
@@ -121,7 +117,7 @@ interface LibExtism {
    plugin_id: number,
    func: string,
    input: string,
-    input_len: number,
+    input_len: number
  ) => number;
  extism_plugin_output_length: (ctx: Buffer, plugin_id: number) => number;
  extism_plugin_output_data: (ctx: Buffer, plugin_id: number) => Uint8Array;
@@ -129,13 +125,13 @@ interface LibExtism {
  extism_plugin_function_exists: (
    ctx: Buffer,
    plugin_id: number,
-    func: string,
+    func: string
  ) => boolean;
  extism_plugin_config: (
    ctx: Buffer,
    plugin_id: number,
    data: string | Buffer,
-    data_len: number,
+    data_len: number
  ) => void;
  extism_plugin_free: (ctx: Buffer, plugin_id: number) => void;
  extism_context_reset: (ctx: Buffer) => void;
@@ -148,16 +144,13 @@ interface LibExtism {
    nOutputs: number,
    f: Buffer,
    user_data: Buffer | null,
-    free: Buffer | null,
+    free: Buffer | null
  ) => Buffer;
-  extism_function_set_namespace: (f: Buffer, s: string) => void;
  extism_function_free: (f: Buffer) => void;
  extism_current_plugin_memory: (p: Buffer) => Buffer;
  extism_current_plugin_memory_alloc: (p: Buffer, n: number) => number;
  extism_current_plugin_memory_length: (p: Buffer, n: number) => number;
  extism_current_plugin_memory_free: (p: Buffer, n: number) => void;
-  extism_plugin_cancel_handle: (p: Buffer, n: number) => Buffer;
-  extism_plugin_cancel: (p: Buffer) => boolean;
 }

 function locate(paths: string[]): LibExtism {
@@ -321,9 +314,9 @@ export class Context {
    manifest: ManifestData,
    wasi: boolean = false,
    functions: HostFunction[] = [],
-    config?: PluginConfig,
+    config?: PluginConfig
  ) {
-    return new Plugin(manifest, wasi, functions, config, this);
+    return new Plugin(this, manifest, wasi, functions, config);
  }

  /**
@@ -385,7 +378,7 @@ export class CurrentPlugin {
    return Buffer.from(
      lib.extism_current_plugin_memory(this.pointer).buffer,
      offset,
-      length,
+      length
    );
  }

@@ -414,44 +407,6 @@ export class CurrentPlugin {
  memoryLength(offset: number): number {
    return lib.extism_current_plugin_memory_length(this.pointer, offset);
  }
-
-  /**
-   * Return a string from a host function
-   * @param output - The output to set
-   * @param s - The string to return
-   */
-  returnString(output: typeof Val, s: string) {
-    var offs = this.memoryAlloc(Buffer.byteLength(s));
-    this.memory(offs).write(s);
-    output.v.i64 = offs;
-  }
-
-  /**
-   * Return bytes from a host function
-   * @param output - The output to set
-   * @param b - The buffer to return
-   */
-  returnBytes(output: typeof Val, b: Buffer) {
-    var offs = this.memoryAlloc(b.length);
-    this.memory(offs).fill(b);
-    output.v.i64 = offs;
-  }
-
-  /**
-   * Get bytes from host function parameter
-   * @param input - The input to read
-   */
-  inputBytes(input: typeof Val): Buffer {
-    return this.memory(input.v.i64);
-  }
-
-  /**
-   * Get string from host function parameter
-   * @param input - The input to read
-   */
-  inputString(input: typeof Val): string {
-    return this.memory(input.v.i64).toString();
-  }
 }

 /**
@@ -489,7 +444,7 @@ export class HostFunction {
        nInputs: number,
        outputs: Buffer,
        nOutputs: number,
-        user_data,
+        user_data
      ) => {
        let inputArr = [];
        let outputArr = [];
@@ -506,13 +461,13 @@ export class HostFunction {
          new CurrentPlugin(currentPlugin),
          inputArr,
          outputArr,
-          ...this.userData,
+          ...this.userData
        );

        for (var i = 0; i < nOutputs; i++) {
          Val.set(outputs, i, outputArr[i]);
        }
-      },
+      }
    );
    this.name = name;
    this.inputs = new ValTypeArray(inputs);
@@ -525,26 +480,12 @@ export class HostFunction {
      this.outputs.length,
      this.callback,
      null,
-      null,
+      null
    );
    this.userData = userData;
    functionRegistry.register(this, this.pointer, this.pointer);
  }

-  /**
-   * Set function namespace
-   */
-  setNamespace(name: string) {
-    if (this.pointer !== null) {
-      lib.extism_function_set_namespace(this.pointer, name);
-    }
-  }
-
-  withNamespace(name: string): HostFunction {
-    this.setNamespace(name);
-    return this;
-  }
-
  /**
   *  Free a host function - this should be called to cleanup the associated resources
   */
@@ -559,24 +500,6 @@ export class HostFunction {
  }
 }

-/**
- * CancelHandle is used to cancel a running Plugin
- */
-export class CancelHandle {
-  handle: Buffer;
-
-  constructor(handle: Buffer) {
-    this.handle = handle;
-  }
-
-  /**
-   * Cancel execution of the Plugin associated with the CancelHandle
-   */
-  cancel(): boolean {
-    return lib.extism_plugin_cancel(this.handle);
-  }
-}
-
 /**
 * A Plugin represents an instance of your WASM program from the given manifest.
 */
@@ -589,22 +512,19 @@ export class Plugin {
  /**
   * Constructor for a plugin. @see {@link Context#plugin}.
   *
+   * @param ctx - The context to manage this plugin
   * @param manifest - The {@link Manifest}
   * @param wasi - Set to true to enable WASI support
   * @param functions - An array of {@link HostFunction}
   * @param config - The plugin config
-   * @param ctx - The context to manage this plugin, or null to use a new context
   */
  constructor(
+    ctx: Context,
    manifest: ManifestData,
    wasi: boolean = false,
    functions: HostFunction[] = [],
-    config?: PluginConfig,
-    ctx: Context | null = null,
+    config?: PluginConfig
  ) {
-    if (ctx == null) {
-      ctx = new Context();
-    }
    let dataRaw: string | Buffer;
    if (Buffer.isBuffer(manifest) || typeof manifest === "string") {
      dataRaw = manifest;
@@ -624,7 +544,7 @@ export class Plugin {
      Buffer.byteLength(dataRaw, "utf-8"),
      this.functions,
      functions.length,
-      wasi,
+      wasi
    );
    if (plugin < 0) {
      var err = lib.extism_error(ctx.pointer, -1);
@@ -643,20 +563,11 @@ export class Plugin {
        ctx.pointer,
        this.id,
        s,
-        Buffer.byteLength(s, "utf-8"),
+        Buffer.byteLength(s, "utf-8")
      );
    }
  }

-  /**
-   * Return a new `CancelHandle`, which can be used to cancel a running Plugin
-   */
-  cancelHandle(): CancelHandle {
-    if (!this.ctx.pointer) throw Error("No Context set");
-    let handle = lib.extism_plugin_cancel_handle(this.ctx.pointer, this.id);
-    return new CancelHandle(handle);
-  }
-
  /**
   * Update an existing plugin with new WASM or manifest
   *
@@ -669,7 +580,7 @@ export class Plugin {
    manifest: ManifestData,
    wasi: boolean = false,
    functions: HostFunction[] = [],
-    config?: PluginConfig,
+    config?: PluginConfig
  ) {
    let dataRaw: string | Buffer;
    if (Buffer.isBuffer(manifest) || typeof manifest === "string") {
@@ -691,7 +602,7 @@ export class Plugin {
      Buffer.byteLength(dataRaw, "utf-8"),
      this.functions,
      functions.length,
-      wasi,
+      wasi
    );
    if (!ok) {
      var err = lib.extism_error(this.ctx.pointer, -1);
@@ -707,7 +618,7 @@ export class Plugin {
        this.ctx.pointer,
        this.id,
        s,
-        Buffer.byteLength(s, "utf-8"),
+        Buffer.byteLength(s, "utf-8")
      );
    }
  }
@@ -724,7 +635,7 @@ export class Plugin {
    return lib.extism_plugin_function_exists(
      this.ctx.pointer,
      this.id,
-      functionName,
+      functionName
    );
  }

@@ -742,7 +653,7 @@ export class Plugin {
   *
   * @param functionName - The name of the function
   * @param input - The input data
-   * @returns A Buffer repreesentation of the output
+   *@returns A Buffer repreesentation of the output
   */
  async call(functionName: string, input: string | Buffer): Promise<Buffer> {
    return new Promise<Buffer>((resolve, reject) => {
@@ -752,7 +663,7 @@ export class Plugin {
        this.id,
        functionName,
        input.toString(),
-        Buffer.byteLength(input, "utf-8"),
+        Buffer.byteLength(input, "utf-8")
      );
      if (rc !== 0) {
        var err = lib.extism_error(this.ctx.pointer, this.id);
@@ -766,7 +677,7 @@ export class Plugin {
      var buf = Buffer.from(
        lib.extism_plugin_output_data(this.ctx.pointer, this.id).buffer,
        0,
-        out_len,
+        out_len
      );
      resolve(buf);
    });
--- a/node/tests/code.wasm
+++ b/node/tests/code.wasm
--- a/node/tests/index.test.ts
+++ b/node/tests/index.test.ts
@@ -2,23 +2,14 @@ import * as extism from "../src/index";
 import { readFileSync } from "fs";
 import { join } from "path";

-function manifest(functions: boolean = false): extism.Manifest {
+function manifest(): extism.Manifest {
  return {
-    wasm: [
-      {
-        path: join(
-          __dirname,
-          functions
-            ? "/../../wasm/code-functions.wasm"
-            : "/../../wasm/code.wasm"
-        ),
-      },
-    ],
+    wasm: [{ path: join(__dirname, "/code.wasm") }],
  };
 }

 function wasmBuffer(): Buffer {
-  return readFileSync(join(__dirname, "/../../wasm/code.wasm"));
+  return readFileSync(join(__dirname, "/code.wasm"));
 }

 describe("test extism", () => {
@@ -111,27 +102,4 @@ describe("test extism", () => {
      ).rejects.toMatch(/Plugin error/);
    });
  });
-
-  test("host functions work", async () => {
-    await extism.withContext(async (ctx: extism.Context) => {
-      const plugin = ctx.plugin(manifest(true), true, [
-        new extism.HostFunction(
-          "hello_world",
-          [extism.ValType.I64],
-          [extism.ValType.I64],
-          (plugin: any, params: any, results: any, user_data: string) => {
-            const offs = plugin.memoryAlloc(user_data.length);
-            const mem = plugin.memory(offs);
-            mem.write(user_data);
-            results[0].v.i64 = offs;
-          },
-          "test"
-        ),
-      ]);
-
-      const res = await plugin.call("count_vowels", "aaa");
-
-      expect(res.toString()).toBe("test");
-    });
-  });
 });
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,5 +1,4 @@
-VERSION?=0.4.0
-TAG?=0.5.0
+VERSION?=0.0.0

 build:
 	dune build
@@ -13,4 +12,4 @@ prepare:
 	opam install .. --deps-only

 publish:
-	opam publish -v $(VERSION) https://github.com/extism/extism/archive/refs/tags/v$(TAG).tar.gz ..
+	opam publish -v $(VERSION) -t $(VERSION) ..
--- a/ocaml/bin/main.ml
+++ b/ocaml/bin/main.ml
@@ -4,9 +4,10 @@ open Cmdliner
 let read_stdin () = In_channel.input_all stdin

 let main file func_name input =
+  with_context @@ fun ctx ->
  let input = if String.equal input "-" then read_stdin () else input in
  let file = In_channel.with_open_bin file In_channel.input_all in
-  let plugin = Plugin.create file ~wasi:true |> Result.get_ok in
+  let plugin = Plugin.create ctx file ~wasi:true |> Result.get_ok in
  let res = Plugin.call plugin ~name:func_name input |> Result.get_ok in
  print_endline res

--- a/ocaml/lib/bindings.ml
+++ b/ocaml/lib/bindings.ml
@@ -27,16 +27,7 @@ let locate () =
    init paths
  |> function
  | Some x -> x
-  | None -> (
-      let fail n =
-        Printf.fprintf stderr
-          "Unable to find Extism installation, see \
-           https://extism.org/docs/install/ for installation instructions\n";
-        exit n
-      in
-      match Sys.getenv_opt "EXTISM_TEST_NO_LIB" with
-      | None -> fail 1
-      | Some _ -> fail 0)
+  | None -> raise Not_found

 let from =
  let filename = locate () in
@@ -50,25 +41,23 @@ let extism_context_new = fn "extism_context_new" (void @-> returning context)
 let extism_context_free = fn "extism_context_free" (context @-> returning void)

 module Extism_val_type = struct
-  type t = I32 | I64 | F32 | F64 | V128 | FuncRef | ExternRef
+  type t = I32 | I64 | F32 | F64 | FuncRef | ExternRef

  let to_int = function
    | I32 -> 0
    | I64 -> 1
    | F32 -> 2
    | F64 -> 3
-    | V128 -> 4
-    | FuncRef -> 5
-    | ExternRef -> 6
+    | FuncRef -> 4
+    | ExternRef -> 5

  let of_int = function
    | 0 -> I32
    | 1 -> I64
    | 2 -> F32
    | 3 -> F64
-    | 4 -> V128
-    | 5 -> FuncRef
-    | 6 -> ExternRef
+    | 4 -> FuncRef
+    | 5 -> ExternRef
    | n -> invalid_arg ("Extism_val_type.of_int: " ^ string_of_int n)

  let t : t typ = view ~read:of_int ~write:to_int int
@@ -157,9 +146,6 @@ let extism_function_new =
   @-> uint64_t @-> extism_function_type @-> ptr void @-> extism_free_user_data
    @-> returning (ptr void))

-let extism_function_set_namespace =
-  fn "extism_function_set_namespace" (ptr void @-> string @-> returning void)
-
 let extism_function_free =
  fn "extism_function_free" (ptr void @-> returning void)

@@ -177,9 +163,3 @@ let extism_current_plugin_memory_alloc =
 let extism_current_plugin_memory_free =
  fn "extism_current_plugin_memory_free"
    (ptr void @-> uint64_t @-> returning void)
-
-let extism_plugin_cancel_handle =
-  fn "extism_plugin_cancel_handle" (context @-> int32_t @-> returning (ptr void))
-
-let extism_plugin_cancel =
-  fn "extism_plugin_cancel" (ptr void @-> returning bool)
--- a/ocaml/lib/current_plugin.ml
+++ b/ocaml/lib/current_plugin.ml
@@ -60,25 +60,3 @@ module Memory_block = struct
      p +@ i <-@ String.unsafe_get s i
    done
 end
-
-let return_string t (outputs : Types.Val_array.t) index s =
-  let mem = alloc t (String.length s) in
-  Memory_block.set_string t mem s;
-  Types.Val_array.(
-    outputs.$[index] <- Types.Val.of_i64 (Unsigned.UInt64.to_int64 mem.offs))
-
-let return_bigstring t (outputs : Types.Val_array.t) index s =
-  let mem = alloc t (Bigstringaf.length s) in
-  Memory_block.set_bigstring t mem s;
-  Types.Val_array.(
-    outputs.$[index] <- Types.Val.of_i64 (Unsigned.UInt64.to_int64 mem.offs))
-
-let input_string t inputs index =
-  let inp = Types.Val_array.(inputs.$[index]) in
-  let mem = Memory_block.of_val_exn t inp in
-  Memory_block.get_string t mem
-
-let input_bigstring t inputs index =
-  let inp = Types.Val_array.(inputs.$[index]) in
-  let mem = Memory_block.of_val_exn t inp in
-  Memory_block.get_bigstring t mem
--- a/ocaml/lib/extism.mli
+++ b/ocaml/lib/extism.mli
@@ -16,14 +16,7 @@ end

 (** [Val_type] enumerates every possible argument/result type *)
 module Val_type : sig
-  type t =
-    | I32
-    | I64
-    | F32
-    | F64
-    | V128
-    | FuncRef
-    | ExternRef  (** Value type *)
+  type t = I32 | I64 | F32 | F64 | FuncRef | ExternRef  (** Value type *)

  val of_int : int -> t
  val to_int : t -> int
@@ -116,11 +109,6 @@ module Current_plugin : sig
  val free : t -> memory_block -> unit
  (** Free an allocated block of memory *)

-  val return_string : t -> Val_array.t -> int -> string -> unit
-  val return_bigstring : t -> Val_array.t -> int -> Bigstringaf.t -> unit
-  val input_string : t -> Val_array.t -> int -> string
-  val input_bigstring : t -> Val_array.t -> int -> Bigstringaf.t
-
  (** Some helpter functions for reading/writing memory *)
  module Memory_block : sig
    val to_val : memory_block -> Val.t
@@ -155,7 +143,6 @@ module Function : sig

  val create :
    string ->
-    ?namespace:string ->
    params:Val_type.t list ->
    results:Val_type.t list ->
    user_data:'a ->
@@ -168,9 +155,6 @@ module Function : sig
      called.
  *)

-  val with_namespace : t -> string -> t
-  (** Update a function's namespace *)
-
  val free : t -> unit
  (** Free a function *)

@@ -208,7 +192,7 @@ module Plugin : sig
    ?config:Manifest.config ->
    ?wasi:bool ->
    ?functions:Function.t list ->
-    ?context:Context.t ->
+    Context.t ->
    string ->
    (t, Error.t) result
  (** Make a new plugin from raw WebAssembly or JSON encoded manifest *)
@@ -216,7 +200,7 @@ module Plugin : sig
  val of_manifest :
    ?wasi:bool ->
    ?functions:Function.t list ->
-    ?context:Context.t ->
+    Context.t ->
    Manifest.t ->
    (t, Error.t) result
  (** Make a new plugin from a [Manifest] *)
@@ -245,12 +229,4 @@ module Plugin : sig

  val function_exists : t -> string -> bool
  (** Check if a function is exported by a plugin *)
-
-  module Cancel_handle: sig
-    type t
-
-    val cancel: t -> bool
-  end
-
-  val cancel_handle: t -> Cancel_handle.t
 end
--- a/ocaml/lib/function.ml
+++ b/ocaml/lib/function.ml
@@ -18,7 +18,7 @@ let free t =

 let free_all l = List.iter free l

-let create name ?namespace ~params ~results ~user_data f =
+let create name ~params ~results ~user_data f =
  let inputs = CArray.of_list Bindings.Extism_val_type.t params in
  let n_inputs = Unsigned.UInt64.of_int (CArray.length inputs) in
  let outputs = CArray.of_list Bindings.Extism_val_type.t results in
@@ -35,13 +35,6 @@ let create name ?namespace ~params ~results ~user_data f =
    Bindings.extism_function_new name (CArray.start inputs) n_inputs
      (CArray.start outputs) n_outputs f user_data free'
  in
-  let () =
-    Option.iter (Bindings.extism_function_set_namespace pointer) namespace
-  in
  let t = { pointer; user_data; name } in
  Gc.finalise free t;
  t
-
-let with_namespace f ns =
-  Bindings.extism_function_set_namespace f.pointer ns;
-  f
--- a/ocaml/lib/plugin.ml
+++ b/ocaml/lib/plugin.ml
@@ -26,8 +26,7 @@ let free t =
  if not (Ctypes.is_null t.ctx.pointer) then
    Bindings.extism_plugin_free t.ctx.pointer t.id

-let create ?config ?(wasi = false) ?(functions = []) ?context wasm =
-  let ctx = match context with Some c -> c | None -> Context.create () in
+let create ?config ?(wasi = false) ?(functions = []) ctx wasm =
  let func_ptrs = List.map (fun x -> x.Function.pointer) functions in
  let arr = Ctypes.CArray.of_list Ctypes.(ptr void) func_ptrs in
  let n_funcs = Ctypes.CArray.length arr in
@@ -49,15 +48,16 @@ let create ?config ?(wasi = false) ?(functions = []) ?context wasm =
      let () = Gc.finalise free t in
      Ok t

-let of_manifest ?wasi ?functions ?context manifest =
+let of_manifest ?wasi ?functions ctx manifest =
  let data = Manifest.to_json manifest in
-  create ?wasi ?functions ?context data
+  create ctx ?wasi ?functions data

 let%test "free plugin" =
  let manifest = Manifest.(create [ Wasm.file "test/code.wasm" ]) in
-  let plugin = of_manifest manifest |> Error.unwrap in
-  free plugin;
-  true
+  with_context (fun ctx ->
+      let plugin = of_manifest ctx manifest |> Error.unwrap in
+      free plugin;
+      true)

 let update plugin ?config ?(wasi = false) ?(functions = []) wasm =
  let { id; ctx; _ } = plugin in
@@ -77,9 +77,7 @@ let update plugin ?config ?(wasi = false) ?(functions = []) wasm =
    | Some msg -> Error (`Msg msg)
  else if not (set_config plugin config) then
    Error (`Msg "call to set_config failed")
-  else
-    let () = plugin.functions <- functions in
-    Ok ()
+  else Ok ()

 let update_manifest plugin ?wasi manifest =
  let data = Manifest.to_json manifest in
@@ -87,10 +85,11 @@ let update_manifest plugin ?wasi manifest =

 let%test "update plugin manifest and config" =
  let manifest = Manifest.(create [ Wasm.file "test/code.wasm" ]) in
-  let config = [ ("a", Some "1") ] in
-  let plugin = of_manifest manifest |> Error.unwrap in
-  let manifest = Manifest.with_config manifest config in
-  update_manifest plugin manifest |> Result.is_ok
+  with_context (fun ctx ->
+      let config = [ ("a", Some "1") ] in
+      let plugin = of_manifest ctx manifest |> Error.unwrap in
+      let manifest = Manifest.with_config manifest config in
+      update_manifest plugin manifest |> Result.is_ok)

 let call' f { id; ctx; _ } ~name input len =
  let rc = f ctx.pointer id name input len in
@@ -115,10 +114,11 @@ let call_bigstring (t : t) ~name input =

 let%test "call_bigstring" =
  let manifest = Manifest.(create [ Wasm.file "test/code.wasm" ]) in
-  let plugin = of_manifest manifest |> Error.unwrap in
-  call_bigstring plugin ~name:"count_vowels"
-    (Bigstringaf.of_string ~off:0 ~len:14 "this is a test")
-  |> Error.unwrap |> Bigstringaf.to_string = "{\"count\": 4}"
+  with_context (fun ctx ->
+      let plugin = of_manifest ctx manifest |> Error.unwrap in
+      call_bigstring plugin ~name:"count_vowels"
+        (Bigstringaf.of_string ~off:0 ~len:14 "this is a test")
+      |> Error.unwrap |> Bigstringaf.to_string = "{\"count\": 4}")

 let call (t : t) ~name input =
  let len = String.length input in
@@ -127,9 +127,10 @@ let call (t : t) ~name input =

 let%test "call" =
  let manifest = Manifest.(create [ Wasm.file "test/code.wasm" ]) in
-  let plugin = of_manifest manifest |> Error.unwrap in
-  call plugin ~name:"count_vowels" "this is a test"
-  |> Error.unwrap = "{\"count\": 4}"
+  with_context (fun ctx ->
+      let plugin = of_manifest ctx manifest |> Error.unwrap in
+      call plugin ~name:"count_vowels" "this is a test"
+      |> Error.unwrap = "{\"count\": 4}")

 let%test "call_functions" =
  let open Types.Val_type in
@@ -138,7 +139,8 @@ let%test "call_functions" =
      ~user_data:"Hello again!"
    @@ fun plugin params results user_data ->
    let open Types.Val_array in
-    let s = Current_plugin.input_string plugin params 0 in
+    let mem = Current_plugin.Memory_block.of_val_exn plugin params.$[0] in
+    let s = Current_plugin.Memory_block.get_string plugin mem in
    let () = print_endline "Hello from OCaml!" in
    let () = print_endline user_data in
    let () = print_endline s in
@@ -146,24 +148,19 @@ let%test "call_functions" =
  in
  let functions = [ hello_world ] in
  let manifest = Manifest.(create [ Wasm.file "test/code-functions.wasm" ]) in
-  let plugin = of_manifest manifest ~functions ~wasi:true |> Error.unwrap in
-  call plugin ~name:"count_vowels" "this is a test"
-  |> Error.unwrap = "{\"count\": 4}"
+  with_context (fun ctx ->
+      let plugin =
+        of_manifest ctx manifest ~functions ~wasi:true |> Error.unwrap
+      in
+      call plugin ~name:"count_vowels" "this is a test"
+      |> Error.unwrap = "{\"count\": 4}")

 let function_exists { id; ctx; _ } name =
  Bindings.extism_plugin_function_exists ctx.pointer id name

 let%test "function exists" =
  let manifest = Manifest.(create [ Wasm.file "test/code.wasm" ]) in
-  let plugin = of_manifest manifest |> Error.unwrap in
-  function_exists plugin "count_vowels"
-  && not (function_exists plugin "function_does_not_exist")
-
-module Cancel_handle = struct
-  type t = { inner : unit Ctypes.ptr }
-
-  let cancel { inner } = Bindings.extism_plugin_cancel inner
-end
-
-let cancel_handle { id; ctx; _ } =
-  Cancel_handle.{ inner = Bindings.extism_plugin_cancel_handle ctx.pointer id }
+  with_context (fun ctx ->
+      let plugin = of_manifest ctx manifest |> Error.unwrap in
+      function_exists plugin "count_vowels"
+      && not (function_exists plugin "function_does_not_exist"))
--- a/ocaml/manifest/dune
+++ b/ocaml/manifest/dune
@@ -1,7 +1,6 @@
 (library
 (name extism_manifest)
 (public_name extism-manifest)
- (inline_tests)
 (libraries base64)
 (preprocess
-  (pps ppx_yojson_conv ppx_inline_test)))
+  (pps ppx_yojson_conv)))
--- a/ocaml/manifest/extism_manifest.ml
+++ b/ocaml/manifest/extism_manifest.ml
@@ -1,5 +1,3 @@
-open Ppx_yojson_conv_lib.Yojson_conv
-
 type base64 = string

 let yojson_of_base64 x = `String (Base64.encode_exn x)
@@ -98,16 +96,3 @@ let of_file filename =
  t_of_yojson j

 let with_config t config = { t with config = Some config }
-
-let%test "rountrip" =
-  let config = [ ("a", Some "b"); ("b", Some "c") ] in
-  let memory = { max_pages = Some 5 } in
-  let t =
-    create ~config ~memory ~allowed_hosts:[ "example.com" ]
-      ~allowed_paths:[ ("a", "b") ]
-      ~timeout_ms:1000 []
-  in
-  let a = to_json t in
-  let b = of_json a in
-  let c = to_json b in
-  String.equal a c
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benjamin Eckel	0c5188cd9a	correct to zig	2023-01-18 14:49:12 -06:00
Benjamin Eckel	92c9301f7a	Merge branch 'main' into readme-language-icons	2023-01-18 14:47:58 -06:00
Benjamin Eckel	0a47a9afde	oracle not java	2022-12-27 11:37:02 -06:00
Benjamin Eckel	30941efe09	docs: update readme with icons	2022-12-27 11:35:12 -06:00