diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c49b0a26a..71f536c60 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,25 +1,24 @@
-# 
-src/                        @syrusakbary @MarkMcCaskey
-
-# Backends
-lib/compiler-singlepass   	@losfair @nlewycky
-lib/compiler-cranelift      @syrusakbary @nlewycky
-lib/compiler-llvm           @nlewycky @losfair
-
-# Runtime
-lib/runtime   	            @syrusakbary @Hywan
-lib/c-api        	        @Hywan
-
-# Frontend integrations
-
-## Emscripten
-lib/emscripten        	    @MarkMcCaskey @syrusakbary
-
-## WASI
-lib/wasi            	    @MarkMcCaskey
-
-# Examples
-examples                    @syrusakbary
-
-# Examples
-tests                       @syrusakbary @MarkMcCaskey
+benches                            @syrusakbary
+examples                           @Hywan @jubianchi
+fuzz                               @syrusakbary
+lib/api                            @syrusakbary @Hywan @MarkMcCaskey
+lib/c-api                          @Hywan @MarkMcCaskey @jubianchi
+lib/cache                          @syrusakbary @Hywan
+lib/cli                            @syrusakbary @MarkMcCaskey
+lib/compiler                       @syrusakbary @nlewycky @losfair @Hywan @MarkMcCaskey
+lib/compiler-cranelift             @nlewycky @syrusakbary
+lib/compiler-llvm                  @nlewycky @losfair
+lib/compiler-singlepass            @losfair @nlewycky
+lib/deprecated                     @Hywan @MarkMcCaskey
+lib/emscripten                     @MarkMcCaskey
+lib/engine                         @syrusakbary @MarkMcCaskey @Hywan
+lib/engine-jit                     @syrusakbary @MarkMcCaskey @Hywan
+lib/engine-native                  @syrusakbary @MarkMcCaskey @Hywan
+lib/engine-object-file             @syrusakbary @MarkMcCaskey @Hywan
+lib/object                         @syrusakbary @nlewycky
+lib/vm                             @syrusakbary @nlewycky @MarkMcCaskey
+lib/wasi                           @MarkMcCaskey
+lib/wasi-experimental-io-devices   @MarkMcCaskey
+lib/wasmer-types                   @syrusakbary @Hywan
+scripts                            @syrusakbary
+tests                              @MarkMcCaskey
\ No newline at end of file
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 04e99e589..cdd9e2af7 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -143,8 +143,8 @@ jobs:
       - run: make test
       - name: Build and Test C API
         run: |
-          make build-capi
           make test-capi
+          make build-capi
         if: matrix.os != 'windows-latest'
       - name: Build C API on Windows
         run: make build-capi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64b844d6b..8b0db1ecd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,21 @@
 
 ## **[Unreleased]**
 
-- [#1710](https://github.com/wasmerio/wasmer/pull/1710) Memory for function call trampolines is now owned by the Artifact.
 ### Added
 
+- [#1649](https://github.com/wasmerio/wasmer/pull/1649) Add outline of migration to 1.0.0 docs.
+
+### Changed
+
+### Fixed
+
+- [#1764](https://github.com/wasmerio/wasmer/pull/1764) Fix bug in WASI `path_rename` allowing renamed files to be 1 directory below a preopened directory.
+
+## 1.0.0-alpha5 - 2020-11-06
+
+### Added
+
+- [#1761](https://github.com/wasmerio/wasmer/pull/1761) Implement the `wasm_trap_t**` argument of `wasm_instance_new` in the Wasm C API.
 - [#1687](https://github.com/wasmerio/wasmer/pull/1687) Add basic table example; fix ownership of local memory and local table metadata in the VM.
 - [#1751](https://github.com/wasmerio/wasmer/pull/1751) Implement `wasm_trap_t` inside a function declared with `wasm_func_new_with_env` in the Wasm C API.
 - [#1741](https://github.com/wasmerio/wasmer/pull/1741) Implement `wasm_memory_type` in the Wasm C API.
@@ -20,15 +32,26 @@
 - [#1715](https://github.com/wasmerio/wasmer/pull/1715) Register errors from `wasm_module_serialize` in the Wasm C API.
 - [#1709](https://github.com/wasmerio/wasmer/pull/1709) Implement `wasm_module_name` and `wasm_module_set_name` in the Wasm(er) C API.
 - [#1700](https://github.com/wasmerio/wasmer/pull/1700) Implement `wasm_externtype_copy` in the Wasm C API.
+- [#1785](https://github.com/wasmerio/wasmer/pull/1785) Add more examples on the Rust API.
+- [#1783](https://github.com/wasmerio/wasmer/pull/1783) Handle initialized but empty results in `wasm_func_call` in the Wasm C API.
+- [#1780](https://github.com/wasmerio/wasmer/pull/1780) Implement new SIMD zero-extend loads in compiler-llvm.
+- [#1754](https://github.com/wasmerio/wasmer/pull/1754) Implement aarch64 ABI for compiler-llvm.
+- [#1693](https://github.com/wasmerio/wasmer/pull/1693) Add `wasmer create-exe` subcommand.
 
 ### Changed
 
 - [#1772](https://github.com/wasmerio/wasmer/pull/1772) Remove lifetime parameter from `NativeFunc`.
 - [#1762](https://github.com/wasmerio/wasmer/pull/1762) Allow the `=` sign in a WASI environment variable value.
+- [#1710](https://github.com/wasmerio/wasmer/pull/1710) Memory for function call trampolines is now owned by the Artifact.
+- [#1781](https://github.com/wasmerio/wasmer/pull/1781) Cranelift upgrade to 0.67.
+- [#1777](https://github.com/wasmerio/wasmer/pull/1777) Wasmparser update to 0.65.
+- [#1775](https://github.com/wasmerio/wasmer/pull/1775) Improve LimitingTunables implementation.
+- [#1720](https://github.com/wasmerio/wasmer/pull/1720) Autodetect llvm regardless of architecture.
 
 ### Fixed
 
 - [#1718](https://github.com/wasmerio/wasmer/pull/1718) Fix panic in the API in some situations when the memory's min bound was greater than the memory's max bound.
+- [#1731](https://github.com/wasmerio/wasmer/pull/1731) In compiler-llvm always load before store, to trigger any traps before any bytes are written.
 
 ## 1.0.0-alpha4 - 2020-10-08
 
@@ -41,6 +64,7 @@
 - [#1690](https://github.com/wasmerio/wasmer/pull/1690) Fix `wasm_memorytype_limits` where `min` and `max` represents pages, not bytes. Additionally, fixes the max limit sentinel value.
 - [#1671](https://github.com/wasmerio/wasmer/pull/1671) Fix probestack firing inappropriately, and sometimes over/under allocating stack.
 - [#1660](https://github.com/wasmerio/wasmer/pull/1660) Fix issue preventing map-dir aliases starting with `/` from working properly.
+- [#1624](https://github.com/wasmerio/wasmer/pull/1624) Add Value::I32/Value::I64 converters from unsigned ints.
 
 ### Changed
 - [#1682](https://github.com/wasmerio/wasmer/pull/1682) Improve error reporting when making a memory with invalid settings.
diff --git a/Cargo.lock b/Cargo.lock
index fdd942ca8..a224f657a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,11 +8,11 @@ checksum = "955f37ac58af2416bac687c8ab66a4ccba282229bd7422a28d2281a5e66a6116"
 
 [[package]]
 name = "addr2line"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
+checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
 dependencies = [
- "gimli 0.22.0",
+ "gimli 0.23.0",
 ]
 
 [[package]]
@@ -28,10 +28,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
 
 [[package]]
-name = "aho-corasick"
-version = "0.7.13"
+name = "ahash"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c"
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
  "memchr",
 ]
@@ -47,9 +53,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.32"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
+checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
 
 [[package]]
 name = "arrayref"
@@ -59,9 +65,22 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
 [[package]]
 name = "arrayvec"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "assert_cmd"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da"
+dependencies = [
+ "doc-comment",
+ "predicates",
+ "predicates-core",
+ "predicates-tree",
+ "wait-timeout",
+]
 
 [[package]]
 name = "atty"
@@ -88,15 +107,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.50"
+version = "0.3.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
+checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
 dependencies = [
  "addr2line",
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object 0.20.0",
+ "object 0.22.0",
  "rustc-demangle",
 ]
 
@@ -124,7 +143,7 @@ checksum = "f1c85344eb535a31b62f0af37be84441ba9e7f0f4111eb0530f43d15e513fe57"
 dependencies = [
  "bitflags",
  "cexpr",
- "cfg-if",
+ "cfg-if 0.1.10",
  "clang-sys",
  "clap",
  "env_logger",
@@ -159,14 +178,14 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce4f9586c9a3151c4b49b19e82ba163dd073614dd057e53c969e1a4db5b52720"
+checksum = "e9ff35b701f3914bdb8fad3368d822c766ef2858b2583198e41639b936f09d3f"
 dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "constant_time_eq",
  "crypto-mac",
  "digest",
@@ -174,9 +193,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
+checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
 dependencies = [
  "lazy_static",
  "memchr",
@@ -217,7 +236,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
 dependencies = [
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
 [[package]]
@@ -241,9 +260,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.60"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
 
 [[package]]
 name = "cexpr"
@@ -251,7 +270,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
 dependencies = [
- "nom",
+ "nom 4.2.3",
 ]
 
 [[package]]
@@ -260,6 +279,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "clang-sys"
 version = "0.28.1"
@@ -347,6 +372,13 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "const_fn"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
+
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -355,18 +387,18 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.65.0"
+version = "0.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9413a2c6bdb01ab8acc867421bd7343ddea491d015453f4e56f4f60c816d120"
+checksum = "0f065f6889758f817f61a230220d1811ba99a9762af2fb69ae23048314f75ff2"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.65.0"
+version = "0.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28d389588c2375bb95292e0bc6cbf010e7f30fb4e9734738b576521b737826a"
+checksum = "510aa2ab4307644100682b94e449940a0ea15c5887f1d4b9678b8dd5ef31e736"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
@@ -385,9 +417,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.65.0"
+version = "0.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74dd3cf6f107c1df4c2b8aab91ec4181aee7ff17289673fcbec63325e7e40a83"
+checksum = "b4cb0c7e87c60d63b35f9670c15479ee4a5e557dd127efab88b2f9b2ca83c9a0"
 dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
@@ -395,24 +427,24 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.65.0"
+version = "0.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efaf050fab2dbf324544489443ff3cc8c67c9420c8902ec6628bd906bd7393e9"
+checksum = "60636227098693e06de8d6d88beea2a7d32ecf8a8030dacdb57c68e06f381826"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.65.0"
+version = "0.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f07eb8aa0a5da94b56339e4e3052c496a3df4354357cd5da8c7b02c6e8f1dc1d"
+checksum = "6156db73e0c9f65f80c512988d63ec736be0dee3dd66bf951e3e28aed9dc02d3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.65.0"
+version = "0.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f6fe1d3e968576f4b60d23f40ee90281f8de2cdf23d2110f3b0296ff420555e"
+checksum = "e09cd158c9a820a4cc14a34076811da225cce1d31dc6d03c5ef85b91aef560b9"
 dependencies = [
  "cranelift-codegen",
  "hashbrown 0.7.2",
@@ -423,11 +455,11 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -468,48 +500,48 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.4.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
 dependencies = [
+ "cfg-if 1.0.0",
  "crossbeam-utils",
- "maybe-uninit",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.7.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
+ "cfg-if 1.0.0",
  "crossbeam-epoch",
  "crossbeam-utils",
- "maybe-uninit",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.8.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
 dependencies = [
- "autocfg 1.0.1",
- "cfg-if",
+ "cfg-if 1.0.0",
+ "const_fn",
  "crossbeam-utils",
  "lazy_static",
- "maybe-uninit",
  "memoffset",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
 dependencies = [
  "autocfg 1.0.1",
- "cfg-if",
+ "cfg-if 1.0.0",
+ "const_fn",
  "lazy_static",
 ]
 
@@ -525,9 +557,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
+checksum = "fc4666154fd004af3fd6f1da2e81a96fd5a81927fe8ddb6ecc79e2aa6e138b54"
 dependencies = [
  "bstr",
  "csv-core",
@@ -596,6 +628,12 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 
+[[package]]
+name = "difference"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -633,13 +671,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d9d8664cf849d7d0f3114a3a387d2f5e4303176d746d5a951aaddc66dfe9240"
 
 [[package]]
-name = "dlib"
-version = "0.4.2"
+name = "doc-comment"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76"
-dependencies = [
- "libloading 0.6.3",
-]
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "downcast-rs"
@@ -749,6 +784,14 @@ dependencies = [
  "libc",
  "redox_syscall",
  "winapi",
+
+[[package]]
+name = "float-cmp"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
+dependencies = [
+ "num-traits",
 ]
 
 [[package]]
@@ -769,7 +812,7 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e1d3b771574f62d0548cee0ad9057857e9fc25d7a3335f140c84f6acd0bf601"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "serde",
 ]
 
@@ -798,7 +841,18 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
+dependencies = [
+ "cfg-if 0.1.10",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
@@ -827,9 +881,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
 
 [[package]]
 name = "glob"
@@ -860,26 +914,19 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf"
 dependencies = [
- "ahash",
+ "ahash 0.3.8",
  "autocfg 1.0.1",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.8.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 dependencies = [
- "ahash",
- "autocfg 1.0.1",
+ "ahash 0.4.6",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7"
-
 [[package]]
 name = "heck"
 version = "0.3.1"
@@ -891,9 +938,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
 dependencies = [
  "libc",
 ]
@@ -926,7 +973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
 dependencies = [
  "autocfg 1.0.1",
- "hashbrown 0.9.0",
+ "hashbrown 0.9.1",
  "serde",
 ]
 
@@ -957,12 +1004,38 @@ dependencies = [
 ]
 
 [[package]]
-name = "instant"
-version = "0.1.7"
+name = "inline-c"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+checksum = "6acf1564e52050c9f7102e87951265c4c8012873181998be24640cb6b5e3f77c"
 dependencies = [
- "cfg-if",
+ "assert_cmd",
+ "cc",
+ "inline-c-macro",
+ "lazy_static",
+ "predicates",
+ "regex",
+ "target-lexicon",
+ "tempfile",
+]
+
+[[package]]
+name = "inline-c-macro"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18417ebfdcd2ffc446b55558a66ce4e1d3a7127af7889a1014288aabc8dcbf2d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
+dependencies = [
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1031,9 +1104,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.77"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
 
 [[package]]
 name = "libffi"
@@ -1070,11 +1143,11 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2443d8f0478b16759158b2f66d525991a05491138bc05814ef52a250148ef4f9"
+checksum = "1090080fe06ec2648d0da3881d9453d97e71a45f00eb179af7fdd7e3f686fdb0"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "winapi",
 ]
 
@@ -1088,7 +1161,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "regex",
- "semver",
+ "semver 0.9.0",
 ]
 
 [[package]]
@@ -1106,7 +1179,7 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -1132,9 +1205,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memmap"
@@ -1157,16 +1230,14 @@ dependencies = [
 
 [[package]]
 name = "minifb"
-version = "0.16.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b18d2987dac6afdd7f6d81101a3b422b7da3e6799d7f11863ad006d8ccd562b2"
+checksum = "2eb411a297b8f714800f085846cbda55fbd2ae17ecd381f1b4652af0e5bebe63"
 dependencies = [
- "cast",
  "cc",
  "orbclient",
  "raw-window-handle",
  "tempfile",
- "time",
  "wayland-client",
  "wayland-cursor",
  "wayland-protocols",
@@ -1178,9 +1249,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9"
+checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
 dependencies = [
  "adler",
  "autocfg 1.0.1",
@@ -1210,7 +1281,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "void",
 ]
@@ -1225,6 +1296,22 @@ dependencies = [
  "version_check 0.1.5",
 ]
 
+[[package]]
+name = "nom"
+version = "5.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+dependencies = [
+ "memchr",
+ "version_check 0.9.2",
+]
+
+[[package]]
+name = "normalize-line-endings"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
+
 [[package]]
 name = "num"
 version = "0.1.42"
@@ -1238,9 +1325,9 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
  "autocfg 1.0.1",
  "num-traits",
@@ -1248,9 +1335,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
+checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
 dependencies = [
  "autocfg 1.0.1",
  "num-integer",
@@ -1259,9 +1346,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg 1.0.1",
 ]
@@ -1278,9 +1365,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.19.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2"
+checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693"
 dependencies = [
  "crc32fast",
  "indexmap",
@@ -1288,15 +1375,15 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.20.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
 
 [[package]]
 name = "once_cell"
-version = "1.4.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
 
 [[package]]
 name = "oorandom"
@@ -1331,7 +1418,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "cloudabi 0.1.0",
  "instant",
  "libc",
@@ -1366,10 +1453,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
-name = "pkg-config"
-version = "0.3.18"
+name = "pest"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
 
 [[package]]
 name = "plain"
@@ -1391,9 +1493,38 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "predicates"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a"
+dependencies = [
+ "difference",
+ "float-cmp",
+ "normalize-line-endings",
+ "predicates-core",
+ "regex",
+]
+
+[[package]]
+name = "predicates-core"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
+
+[[package]]
+name = "predicates-tree"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
+dependencies = [
+ "predicates-core",
+ "treeline",
+]
 
 [[package]]
 name = "proc-macro-error"
@@ -1421,15 +1552,15 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.18"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.21"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
  "unicode-xid",
 ]
@@ -1474,7 +1605,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.15",
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
@@ -1522,7 +1653,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.15",
 ]
 
 [[package]]
@@ -1604,7 +1735,7 @@ checksum = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf"
 dependencies = [
  "bitflags",
  "cc",
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
 [[package]]
@@ -1618,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
  "autocfg 1.0.1",
  "crossbeam-deque",
@@ -1630,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -1675,9 +1806,9 @@ checksum = "d813022b2e00774a48eaf43caaa3c20b45f040ba8cbf398e2e8911a06668dbe6"
 
 [[package]]
 name = "regalloc"
-version = "0.0.26"
+version = "0.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c03092d79e0fd610932d89ed53895a38c0dd3bcd317a0046e69940de32f1d95"
+checksum = "2041c2d34f6ff346d6f428974f03d8bf12679b0c816bb640dc5eb1d48848d8d1"
 dependencies = [
  "log",
  "rustc-hash",
@@ -1686,9 +1817,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1707,9 +1838,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
 
 [[package]]
 name = "region"
@@ -1746,9 +1877,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.16"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
 
 [[package]]
 name = "rustc-hash"
@@ -1762,7 +1893,16 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "semver",
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65c94201b44764d6d1f7e37c15a8289ed55e546c1762c7f1d57f616966e0c181"
+dependencies = [
+ "semver 0.11.0",
 ]
 
 [[package]]
@@ -1792,12 +1932,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -1806,18 +1940,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scroll"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
+checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
 dependencies = [
  "scroll_derive",
 ]
 
 [[package]]
 name = "scroll_derive"
-version = "0.10.2"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9"
+checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1844,7 +1978,7 @@ version = "0.32.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
 ]
 
@@ -1854,7 +1988,16 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser",
+ "semver-parser 0.7.0",
+]
+
+[[package]]
+name = "semver"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
+dependencies = [
+ "semver-parser 0.10.1",
 ]
 
 [[package]]
@@ -1864,10 +2007,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
-name = "serde"
-version = "1.0.116"
+name = "semver-parser"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
+checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
+dependencies = [
+ "pest",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
 dependencies = [
  "serde_derive",
 ]
@@ -1893,9 +2045,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
+checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1904,9 +2056,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.57"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
 dependencies = [
  "itoa",
  "ryu",
@@ -1957,9 +2109,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 
 [[package]]
 name = "structopt"
-version = "0.3.17"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cc388d94ffabf39b5ed5fadddc40147cb21e605f53db6f8f36a625d27489ac5"
+checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8"
 dependencies = [
  "clap",
  "lazy_static",
@@ -1968,9 +2120,9 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f"
+checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -1987,9 +2139,9 @@ checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
 
 [[package]]
 name = "syn"
-version = "1.0.41"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1998,9 +2150,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"
+checksum = "4ee5a98e506fb7231a304c3a1bd7c132a55016cf65001e0282480665870dfcb9"
 
 [[package]]
 name = "tempfile"
@@ -2008,7 +2160,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "rand 0.7.3",
  "redox_syscall",
@@ -2065,18 +2217,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
+checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
+checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2115,21 +2267,22 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "tracing"
-version = "0.1.19"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c"
+checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "log",
+ "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -2147,13 +2300,19 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bcf46c1f1f06aeea2d6b81f3c863d0930a596c86ad1920d4e5bad6dd1d7119a"
+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
 dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "treeline"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
+
 [[package]]
 name = "typenum"
 version = "1.12.0"
@@ -2185,10 +2344,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "unicode-segmentation"
-version = "1.6.0"
+name = "ucd-trie"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae"
 
 [[package]]
 name = "unicode-width"
@@ -2226,6 +2391,15 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "walkdir"
 version = "2.3.1"
@@ -2255,7 +2429,7 @@ version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "wasm-bindgen-macro",
 ]
 
@@ -2305,10 +2479,10 @@ checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
 
 [[package]]
 name = "wasmer"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "anyhow",
- "cfg-if",
+ "cfg-if 0.1.10",
  "indexmap",
  "libc",
  "more-asserts",
@@ -2331,10 +2505,11 @@ dependencies = [
 
 [[package]]
 name = "wasmer-c-api"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "cbindgen",
- "cfg-if",
+ "cfg-if 1.0.0",
+ "inline-c",
  "lazy_static",
  "libc",
  "libffi",
@@ -2358,7 +2533,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-cache"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "blake3",
  "hex",
@@ -2369,12 +2544,12 @@ dependencies = [
 
 [[package]]
 name = "wasmer-cli"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "anyhow",
  "atty",
  "bytesize",
- "cfg-if",
+ "cfg-if 1.0.0",
  "colored 2.0.0",
  "distance",
  "fern",
@@ -2401,10 +2576,10 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "enumset",
- "hashbrown 0.8.2",
+ "hashbrown 0.9.1",
  "raw-cpuid",
  "serde",
  "serde_bytes",
@@ -2418,16 +2593,17 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "cranelift-codegen",
  "cranelift-frontend",
  "gimli 0.21.0",
- "hashbrown 0.8.2",
+ "hashbrown 0.9.1",
  "lazy_static",
  "more-asserts",
  "rayon",
  "serde",
+ "smallvec",
  "target-lexicon",
  "tracing",
  "wasmer-compiler",
@@ -2437,7 +2613,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-llvm"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "byteorder",
  "cc",
@@ -2448,8 +2624,8 @@ dependencies = [
  "libc",
  "rayon",
  "regex",
- "rustc_version",
- "semver",
+ "rustc_version 0.2.3",
+ "semver 0.9.0",
  "smallvec",
  "target-lexicon",
  "wasmer-compiler",
@@ -2459,12 +2635,12 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "byteorder",
  "dynasm",
  "dynasmrt",
- "hashbrown 0.8.2",
+ "hashbrown 0.9.1",
  "lazy_static",
  "more-asserts",
  "rayon",
@@ -2489,10 +2665,10 @@ dependencies = [
 
 [[package]]
 name = "wasmer-emscripten"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "byteorder",
- "getrandom",
+ "getrandom 0.2.0",
  "lazy_static",
  "libc",
  "log",
@@ -2502,7 +2678,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-engine"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "backtrace",
  "bincode",
@@ -2520,7 +2696,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-engine-dummy"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "bincode",
  "serde",
@@ -2533,10 +2709,10 @@ dependencies = [
 
 [[package]]
 name = "wasmer-engine-jit"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
  "region",
  "serde",
  "serde_bytes",
@@ -2549,12 +2725,12 @@ dependencies = [
 
 [[package]]
 name = "wasmer-engine-native"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
  "leb128",
- "libloading 0.6.3",
+ "libloading 0.6.5",
  "serde",
  "tempfile",
  "tracing",
@@ -2568,12 +2744,12 @@ dependencies = [
 
 [[package]]
 name = "wasmer-engine-object-file"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
  "leb128",
- "libloading 0.6.3",
+ "libloading 0.6.5",
  "serde",
  "tempfile",
  "tracing",
@@ -2586,7 +2762,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-integration-tests-cli"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "anyhow",
  "tempfile",
@@ -2594,9 +2770,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-object"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
- "object 0.19.0",
+ "object 0.21.1",
  "thiserror",
  "wasmer-compiler",
  "wasmer-types",
@@ -2604,7 +2780,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -2612,11 +2788,11 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "backtrace",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "indexmap",
  "libc",
  "memoffset",
@@ -2630,12 +2806,12 @@ dependencies = [
 
 [[package]]
 name = "wasmer-wasi"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "bincode",
  "byteorder",
  "generational-arena",
- "getrandom",
+ "getrandom 0.2.0",
  "libc",
  "serde",
  "thiserror",
@@ -2648,7 +2824,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-wasi-experimental-io-devices"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "minifb",
  "ref_thread_local",
@@ -2660,7 +2836,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-wast"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "anyhow",
  "serde",
@@ -2674,16 +2850,16 @@ dependencies = [
 
 [[package]]
 name = "wasmer-workspace"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 dependencies = [
  "anyhow",
  "blake3",
  "build-deps",
- "cfg-if",
+ "cfg-if 1.0.0",
  "criterion",
  "glob",
  "lazy_static",
- "rustc_version",
+ "rustc_version 0.3.0",
  "tempfile",
  "test-generator",
  "wasmer",
@@ -2704,9 +2880,9 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.57.0"
+version = "0.65.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6"
+checksum = "87cc2fe6350834b4e528ba0901e7aa405d78b89dc1fa3145359eb4de0e323fcf"
 
 [[package]]
 name = "wast"
@@ -2719,33 +2895,32 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "24.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff1e3bd3ad0b2ee7784add89c30dc96b89a54b43e5d6d95d774eda1863b3500"
+checksum = "c2c3ef5f6a72dffa44c24d5811123f704e18a1dbc83637d347b1852b41d3835c"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.25"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c0bb2872ae453f98cec6ff1bf1a71cde1da6041fce8b0ac39d51eb033e9ec0"
+checksum = "835cf59c907f67e2bbc20f50157e08f35006fe2a8444d8ec9f5683e22f937045"
 dependencies = [
- "wast 24.0.0",
+ "wast 27.0.0",
 ]
 
 [[package]]
 name = "wayland-client"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42cb608953ec8e132c7f53fde722cca9bfbf8b2071d685dbbb8df2b567fee8b"
+checksum = "ab702fefbcd6d6f67fb5816e3a89a3b5a42a94290abbc015311c9a30d1068ae4"
 dependencies = [
  "bitflags",
  "downcast-rs",
  "libc",
  "nix",
- "scoped-tls",
  "wayland-commons",
  "wayland-scanner",
  "wayland-sys",
@@ -2753,9 +2928,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-commons"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8caa2f106138cf71358c6a9e84468e4406069cec93cbd6dbfce92225fc175932"
+checksum = "e972e9336ad5a9dd861b4e21ff35ad71d3e5c6b4803d65c39913612f851b95f1"
 dependencies = [
  "nix",
  "once_cell",
@@ -2765,19 +2940,20 @@ dependencies = [
 
 [[package]]
 name = "wayland-cursor"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d774f69a6a4a9eac6d1a29cea45a4750ee7f997520421b2068f099a11b4cbba"
+checksum = "539f346e1a3f706f38c8ccbe1196001e2fb1c9b3e6b605c27d665db2f5b60d41"
 dependencies = [
+ "nix",
  "wayland-client",
- "wayland-sys",
+ "xcursor",
 ]
 
 [[package]]
 name = "wayland-protocols"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f784a990d5fa6d846fa93eb8d3bb744ff1e6ec60c7f785b0a0ee2f1a1f20bee9"
+checksum = "f3d6fc54b17b98b5083bc21ae3a30e6d75cb4b01647360e4c3a04648bcf8781d"
 dependencies = [
  "bitflags",
  "wayland-client",
@@ -2787,9 +2963,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f45ddc08a8078f3efa96b5f413268cc9c53b30712891de081fbc1d5846fbc736"
+checksum = "030f56009d932bd9400bb472764fea8109be1b0fc482d9cd75496c943ac30328"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2798,11 +2974,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80f9fc64f9045ad5ff491886a9460437655353e8be73c1b3f29f569342553319"
+checksum = "8bdeffbbb474477dfa2acb45ac7479e5fe8f741c64ab032c5d11b94d07edc269"
 dependencies = [
- "dlib",
+ "pkg-config",
 ]
 
 [[package]]
@@ -2877,6 +3053,15 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "xcursor"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3a481cfdefd35e1c50073ae33a8000d695c98039544659f5dc5dd71311b0d01"
+dependencies = [
+ "nom 5.1.2",
+]
+
 [[package]]
 name = "xkb"
 version = "0.2.1"
diff --git a/Cargo.toml b/Cargo.toml
index e49f41249..ea6780cec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-workspace"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Wasmer workspace"
 authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
 repository = "https://github.com/wasmerio/wasmer"
@@ -10,20 +10,20 @@ publish = false
 autoexamples = false
 
 [dependencies]
-wasmer = { version = "1.0.0-alpha4", path = "lib/api", default-features = false }
-wasmer-compiler = { version = "1.0.0-alpha4", path = "lib/compiler" }
-wasmer-compiler-cranelift = { version = "1.0.0-alpha4", path = "lib/compiler-cranelift", optional = true }
-wasmer-compiler-singlepass = { version = "1.0.0-alpha4", path = "lib/compiler-singlepass", optional = true }
-wasmer-compiler-llvm = { version = "1.0.0-alpha4", path = "lib/compiler-llvm", optional = true }
-wasmer-engine = { version = "1.0.0-alpha4", path = "lib/engine" }
-wasmer-engine-jit = { version = "1.0.0-alpha4", path = "lib/engine-jit", optional = true }
-wasmer-engine-native = { version = "1.0.0-alpha4", path = "lib/engine-native", optional = true }
-wasmer-engine-object-file = { version = "1.0.0-alpha4", path = "lib/engine-object-file", optional = true }
-wasmer-wasi = { version = "1.0.0-alpha4", path = "lib/wasi", optional = true }
-wasmer-wast = { version = "1.0.0-alpha4", path = "tests/lib/wast", optional = true }
-wasmer-cache = { version = "1.0.0-alpha4", path = "lib/cache", optional = true }
-wasmer-types = { version = "1.0.0-alpha4", path = "lib/wasmer-types" }
-cfg-if = "0.1"
+wasmer = { version = "1.0.0-alpha5", path = "lib/api", default-features = false }
+wasmer-compiler = { version = "1.0.0-alpha5", path = "lib/compiler" }
+wasmer-compiler-cranelift = { version = "1.0.0-alpha5", path = "lib/compiler-cranelift", optional = true }
+wasmer-compiler-singlepass = { version = "1.0.0-alpha5", path = "lib/compiler-singlepass", optional = true }
+wasmer-compiler-llvm = { version = "1.0.0-alpha5", path = "lib/compiler-llvm", optional = true }
+wasmer-engine = { version = "1.0.0-alpha5", path = "lib/engine" }
+wasmer-engine-jit = { version = "1.0.0-alpha5", path = "lib/engine-jit", optional = true }
+wasmer-engine-native = { version = "1.0.0-alpha5", path = "lib/engine-native", optional = true }
+wasmer-engine-object-file = { version = "1.0.0-alpha5", path = "lib/engine-object-file", optional = true }
+wasmer-wasi = { version = "1.0.0-alpha5", path = "lib/wasi", optional = true }
+wasmer-wast = { version = "1.0.0-alpha5", path = "tests/lib/wast", optional = true }
+wasmer-cache = { version = "1.0.0-alpha5", path = "lib/cache", optional = true }
+wasmer-types = { version = "1.0.0-alpha5", path = "lib/wasmer-types" }
+cfg-if = "1.0"
 
 [workspace]
 members = [
@@ -58,7 +58,7 @@ test-generator = { path = "tests/lib/test-generator" }
 build-deps = "0.1.4"
 anyhow = "1.0"
 glob = "0.3"
-rustc_version = "0.2"
+rustc_version = "0.3"
 
 [dev-dependencies]
 anyhow = "1.0"
@@ -212,6 +212,11 @@ name = "imported-global"
 path = "examples/imports_global.rs"
 required-features = ["cranelift"]
 
+[[example]]
+name = "tunables-limit-memory"
+path = "examples/tunables_limit_memory.rs"
+required-features = ["cranelift"]
+
 [[example]]
 name = "wasi"
 path = "examples/wasi.rs"
@@ -226,3 +231,18 @@ required-features = ["cranelift"]
 name = "memory"
 path = "examples/memory.rs"
 required-features = ["cranelift"]
+
+[[example]]
+name = "instance"
+path = "examples/instance.rs"
+required-features = ["cranelift"]
+
+[[example]]
+name = "errors"
+path = "examples/errors.rs"
+required-features = ["cranelift"]
+
+[[example]]
+name = "imported-function-env"
+path = "examples/imports_function_env.rs"
+required-features = ["cranelift"]
diff --git a/Makefile b/Makefile
index f6bd2eca4..d9ac0ac69 100644
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,13 @@ ifneq ($(OS), Windows_NT)
 endif
 
 
-$(info Available compilers: $(bold)$(green)${compilers}$(reset))
-
 compiler_features_spaced := $(foreach compiler,$(compilers),$(compiler))
 compiler_features := --features "$(compiler_features_spaced)"
 
+$(info Available compilers: $(bold)$(green)${compilers}$(reset))
+$(info Compilers features: $(bold)$(green)${compiler_features}$(reset))
+$(info Available compilers + engines for test: $(bold)$(green)${test_compilers_engines}$(reset))
+
 
 ############
 # Building #
@@ -89,20 +91,41 @@ build-docs:
 	cargo doc --release $(compiler_features) --document-private-items --no-deps --workspace
 
 build-docs-capi:
-	cd lib/c-api/ && doxygen doxyfile
+	cd lib/c-api/doc/deprecated/ && doxygen doxyfile
+	cargo doc --manifest-path lib/c-api/Cargo.toml --no-deps --features wat,jit,object-file,native,cranelift,wasi
 
 # We use cranelift as the default backend for the capi for now
-build-capi: build-capi-cranelift-jit
+build-capi: build-capi-cranelift
+
+build-capi-singlepass:
+	cargo build --manifest-path lib/c-api/Cargo.toml --release \
+		--no-default-features --features wat,jit,native,object-file,singlepass,wasi
 
 build-capi-singlepass-jit:
 	cargo build --manifest-path lib/c-api/Cargo.toml --release \
-		--no-default-features --features wat,jit,object-file,singlepass,wasi
+		--no-default-features --features wat,jit,singlepass,wasi
+
+build-capi-singlepass-native:
+	cargo build --manifest-path lib/c-api/Cargo.toml --release \
+		--no-default-features --features wat,native,singlepass,wasi
+
+build-capi-singlepass-object-file:
+	cargo build --manifest-path lib/c-api/Cargo.toml --release \
+		--no-default-features --features wat,object-file,singlepass,wasi
+
+build-capi-cranelift:
+	cargo build --manifest-path lib/c-api/Cargo.toml --release \
+		--no-default-features --features wat,jit,native,object-file,cranelift,wasi
 
 build-capi-cranelift-jit:
 	cargo build --manifest-path lib/c-api/Cargo.toml --release \
-		--no-default-features --features wat,jit,object-file,cranelift,wasi
+		--no-default-features --features wat,jit,cranelift,wasi
 
 build-capi-cranelift-native:
+	cargo build --manifest-path lib/c-api/Cargo.toml --release \
+		--no-default-features --features wat,native,cranelift,wasi
+
+build-capi-cranelift-object-file:
 	cargo build --manifest-path lib/c-api/Cargo.toml --release \
 		--no-default-features --features wat,native,object-file,cranelift,wasi
 
@@ -110,13 +133,21 @@ build-capi-cranelift-system-libffi:
 	cargo build --manifest-path lib/c-api/Cargo.toml --release \
 		--no-default-features --features wat,jit,native,object-file,cranelift,wasi,system-libffi
 
+build-capi-llvm:
+	cargo build --manifest-path lib/c-api/Cargo.toml --release \
+		--no-default-features --features wat,jit,native,object-file,llvm,wasi
+
 build-capi-llvm-jit:
 	cargo build --manifest-path lib/c-api/Cargo.toml --release \
-		--no-default-features --features wat,jit,object-file,llvm,wasi
+		--no-default-features --features wat,jit,llvm,wasi
 
 build-capi-llvm-native:
 	cargo build --manifest-path lib/c-api/Cargo.toml --release \
-		--no-default-features --features wat,native,object-file,llvm,wasi
+		--no-default-features --features wat,native,llvm,wasi
+
+build-capi-llvm-object-file:
+	cargo build --manifest-path lib/c-api/Cargo.toml --release \
+		--no-default-features --features wat,object-file,llvm,wasi
 
 ###########
 # Testing #
@@ -163,6 +194,8 @@ test-packages:
 # link the tests against. cargo test doesn't know that the tests will be running
 # cmake + make to build programs whose dependencies cargo isn't aware of.
 
+test-capi: $(foreach compiler_engine,$(test_compilers_engines),test-capi-$(compiler_engine)) #$(if $(findstring cranelift-jit,$(test_compilers_engines)),test-capi-cranelift-jit-system-libffi)
+
 test-capi-singlepass-jit: build-capi-singlepass-jit
 	cargo test --manifest-path lib/c-api/Cargo.toml --release \
 		--no-default-features --features wat,jit,singlepass,wasi -- --nocapture
@@ -187,8 +220,6 @@ test-capi-llvm-native:
 	cargo test --manifest-path lib/c-api/Cargo.toml --release \
 		--no-default-features --features wat,native,llvm,wasi -- --nocapture
 
-test-capi: $(foreach compiler_engine,$(test_compilers_engines),test-capi-$(compiler_engine)) $(if $(findstring cranelift-jit,$(test_compilers_engines)),test-capi-cranelift-jit-system-libffi)
-
 test-wasi-unit:
 	cargo test --manifest-path lib/wasi/Cargo.toml --release
 
diff --git a/README.md b/README.md
index bddeba897..c8224f729 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ qjs >
 [js logo]: ./assets/languages/js.svg
 [js integration]: https://github.com/wasmerio/wasmer-js
 [`@wasmerio` npm packages]: https://www.npmjs.com/org/wasmer
-[js docs]: https://docs.wasmer.io/wasmer-js/wasmer-js
+[js docs]: https://docs.wasmer.io/integrations/js/reference-api
 
 [ruby logo]: ./assets/languages/ruby.svg
 [ruby integration]: https://github.com/wasmerio/wasmer-ruby
diff --git a/docs/deps_dedup.dot b/docs/deps_dedup.dot
new file mode 100644
index 000000000..d4ae34a77
--- /dev/null
+++ b/docs/deps_dedup.dot
@@ -0,0 +1,74 @@
+digraph dependencies {
+        newrank=true;
+
+	n0 [label="wasmer", color=orange];
+	n1 [label="wasmer-compiler", color=orange];
+	n5 [label="wasmer-engine", color=orange];
+	n6 [label="wasmer-engine-jit", color=orange];
+	n7 [label="wasmer-engine-native", color=orange];
+	n8 [label="wasmer-types", color=orange];
+	n9 [label="wasmer-vm", color=orange];
+	n10 [label="wasmer-c-api", color=orange];
+	n11 [label="wasmer-emscripten", color=orange];
+	n12 [label="wasmer-wasi", color=orange];
+	n13 [label="wasmer-cache", color=orange];
+	n14 [label="wasmer-cli", color=orange];
+
+        
+	subgraph cluster_compiler {
+		label="Compilers";
+		color=brown;
+
+		n2 [label="wasmer-compiler-cranelift", color=orange];
+		n3 [label="wasmer-compiler-llvm", color=orange];
+		n4 [label="wasmer-compiler-singlepass", color=orange];
+	}
+
+	subgraph cluster_engine {
+		label="Engines";
+		color=brown;
+
+		n6 [label="wasmer-engine-jit", color=orange];
+		n7 [label="wasmer-engine-native", color=orange];
+	}
+
+        {
+        rank=same;
+        n2;
+        n3;
+        n4;
+        n6;
+        n7;
+        }
+        
+
+	subgraph cluster_abi {
+		label="Provided ABIs";
+		color=brown;
+
+		n12 [label="wasmer-wasi", color=orange];
+		n11 [label="wasmer-emscripten", color=orange];
+	}
+
+	n14 -> n13 [color=orange, style=dashed];
+	n14 -> n12 [color=orange, style=dashed];
+	n14 -> n11 [color=orange, style=dashed];
+	n13 -> n0 [color=orange, style=dashed];
+	n10 -> n11 [color=orange, style=dashed];
+	n10 -> n12 [color=orange, style=dashed];
+	n11 -> n0 [color=orange, style=dashed];
+	n12 -> n0 [color=orange, style=dashed];
+	n0 -> n2 [color=orange, style=dashed];
+	n0 -> n3 [color=orange, style=dashed];
+	n0 -> n4 [color=orange, style=dashed];
+	n0 -> n6 [color=orange, style=dashed];
+	n0 -> n7 [color=orange, style=dashed];
+	n2 -> n1 [color=orange, style=dashed];
+	n3 -> n1 [color=orange, style=dashed];
+	n4 -> n1 [color=orange, style=dashed];
+	n6 -> n5 [color=orange, style=dashed];
+	n7 -> n5 [color=orange, style=dashed];
+	n5 -> n1 [color=orange, style=dashed];
+	n1 -> n9 [color=orange, style=dashed];
+	n9 -> n8 [color=orange, style=dashed];
+}
diff --git a/docs/deps_dedup.svg b/docs/deps_dedup.svg
new file mode 100644
index 000000000..384e010a4
--- /dev/null
+++ b/docs/deps_dedup.svg
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.44.1 (20200629.0846)
+ -->
+<!-- Title: dependencies Pages: 1 -->
+<svg width="1067pt" height="554pt"
+ viewBox="0.00 0.00 1067.00 554.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 550)">
+<title>dependencies</title>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-550 1063,-550 1063,4 -4,4"/>
+<g id="clust1" class="cluster">
+<title>cluster_compiler</title>
+<polygon fill="none" stroke="brown" points="378,-280 378,-355 1051,-355 1051,-280 378,-280"/>
+<text text-anchor="middle" x="714.5" y="-339.8" font-family="Times,serif" font-size="14.00">Compilers</text>
+</g>
+<g id="clust2" class="cluster">
+<title>cluster_engine</title>
+<polygon fill="none" stroke="brown" points="8,-280 8,-355 370,-355 370,-280 8,-280"/>
+<text text-anchor="middle" x="189" y="-339.8" font-family="Times,serif" font-size="14.00">Engines</text>
+</g>
+<g id="clust4" class="cluster">
+<title>cluster_abi</title>
+<polygon fill="none" stroke="brown" points="257,-427 257,-502 568,-502 568,-427 257,-427"/>
+<text text-anchor="middle" x="412.5" y="-486.8" font-family="Times,serif" font-size="14.00">Provided ABIs</text>
+</g>
+<!-- n0 -->
+<g id="node1" class="node">
+<title>n0</title>
+<ellipse fill="none" stroke="orange" cx="479" cy="-381" rx="38.19" ry="18"/>
+<text text-anchor="middle" x="479" y="-377.3" font-family="Times,serif" font-size="14.00">wasmer</text>
+</g>
+<!-- n6 -->
+<g id="node4" class="node">
+<title>n6</title>
+<ellipse fill="none" stroke="orange" cx="287" cy="-306" rx="75.29" ry="18"/>
+<text text-anchor="middle" x="287" y="-302.3" font-family="Times,serif" font-size="14.00">wasmer&#45;engine&#45;jit</text>
+</g>
+<!-- n0&#45;&gt;n6 -->
+<g id="edge12" class="edge">
+<title>n0&#45;&gt;n6</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M443.28,-373.99C422.62,-369.9 396.37,-363.65 374,-355 355.71,-347.93 336.5,-337.67 320.81,-328.45"/>
+<polygon fill="orange" stroke="orange" points="322.38,-325.31 312,-323.18 318.78,-331.32 322.38,-325.31"/>
+</g>
+<!-- n7 -->
+<g id="node5" class="node">
+<title>n7</title>
+<ellipse fill="none" stroke="orange" cx="105" cy="-306" rx="89.08" ry="18"/>
+<text text-anchor="middle" x="105" y="-302.3" font-family="Times,serif" font-size="14.00">wasmer&#45;engine&#45;native</text>
+</g>
+<!-- n0&#45;&gt;n7 -->
+<g id="edge13" class="edge">
+<title>n0&#45;&gt;n7</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M440.26,-380.88C386.12,-381.13 285.24,-378.02 203,-355 181.25,-348.91 158.5,-338.09 140.41,-328.25"/>
+<polygon fill="orange" stroke="orange" points="141.84,-325.04 131.4,-323.23 138.43,-331.16 141.84,-325.04"/>
+</g>
+<!-- n2 -->
+<g id="node13" class="node">
+<title>n2</title>
+<ellipse fill="none" stroke="orange" cx="938" cy="-306" rx="105.08" ry="18"/>
+<text text-anchor="middle" x="938" y="-302.3" font-family="Times,serif" font-size="14.00">wasmer&#45;compiler&#45;cranelift</text>
+</g>
+<!-- n0&#45;&gt;n2 -->
+<g id="edge9" class="edge">
+<title>n0&#45;&gt;n2</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M517.13,-378.78C594.16,-376.05 765.84,-368.62 823,-355 848.67,-348.88 875.98,-337.7 897.54,-327.67"/>
+<polygon fill="orange" stroke="orange" points="899.18,-330.76 906.71,-323.31 896.18,-324.44 899.18,-330.76"/>
+</g>
+<!-- n3 -->
+<g id="node14" class="node">
+<title>n3</title>
+<ellipse fill="none" stroke="orange" cx="479" cy="-306" rx="92.88" ry="18"/>
+<text text-anchor="middle" x="479" y="-302.3" font-family="Times,serif" font-size="14.00">wasmer&#45;compiler&#45;llvm</text>
+</g>
+<!-- n0&#45;&gt;n3 -->
+<g id="edge10" class="edge">
+<title>n0&#45;&gt;n3</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M479,-362.7C479,-354.25 479,-343.87 479,-334.37"/>
+<polygon fill="orange" stroke="orange" points="482.5,-334.18 479,-324.18 475.5,-334.18 482.5,-334.18"/>
+</g>
+<!-- n4 -->
+<g id="node15" class="node">
+<title>n4</title>
+<ellipse fill="none" stroke="orange" cx="702" cy="-306" rx="112.38" ry="18"/>
+<text text-anchor="middle" x="702" y="-302.3" font-family="Times,serif" font-size="14.00">wasmer&#45;compiler&#45;singlepass</text>
+</g>
+<!-- n0&#45;&gt;n4 -->
+<g id="edge11" class="edge">
+<title>n0&#45;&gt;n4</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M513.33,-372.82C533.27,-368.35 558.77,-362.1 581,-355 606.24,-346.94 633.75,-336.2 656.14,-326.91"/>
+<polygon fill="orange" stroke="orange" points="657.53,-330.13 665.41,-323.04 654.83,-323.67 657.53,-330.13"/>
+</g>
+<!-- n1 -->
+<g id="node2" class="node">
+<title>n1</title>
+<ellipse fill="none" stroke="orange" cx="590" cy="-162" rx="73.39" ry="18"/>
+<text text-anchor="middle" x="590" y="-158.3" font-family="Times,serif" font-size="14.00">wasmer&#45;compiler</text>
+</g>
+<!-- n9 -->
+<g id="node7" class="node">
+<title>n9</title>
+<ellipse fill="none" stroke="orange" cx="590" cy="-90" rx="53.09" ry="18"/>
+<text text-anchor="middle" x="590" y="-86.3" font-family="Times,serif" font-size="14.00">wasmer&#45;vm</text>
+</g>
+<!-- n1&#45;&gt;n9 -->
+<g id="edge20" class="edge">
+<title>n1&#45;&gt;n9</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M590,-143.7C590,-135.98 590,-126.71 590,-118.11"/>
+<polygon fill="orange" stroke="orange" points="593.5,-118.1 590,-108.1 586.5,-118.1 593.5,-118.1"/>
+</g>
+<!-- n5 -->
+<g id="node3" class="node">
+<title>n5</title>
+<ellipse fill="none" stroke="orange" cx="287" cy="-234" rx="64.99" ry="18"/>
+<text text-anchor="middle" x="287" y="-230.3" font-family="Times,serif" font-size="14.00">wasmer&#45;engine</text>
+</g>
+<!-- n5&#45;&gt;n1 -->
+<g id="edge19" class="edge">
+<title>n5&#45;&gt;n1</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M335.35,-221.83C387.75,-209.72 471.52,-190.37 528.56,-177.19"/>
+<polygon fill="orange" stroke="orange" points="529.58,-180.55 538.53,-174.89 528,-173.73 529.58,-180.55"/>
+</g>
+<!-- n6&#45;&gt;n5 -->
+<g id="edge17" class="edge">
+<title>n6&#45;&gt;n5</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M287,-287.7C287,-279.98 287,-270.71 287,-262.11"/>
+<polygon fill="orange" stroke="orange" points="290.5,-262.1 287,-252.1 283.5,-262.1 290.5,-262.1"/>
+</g>
+<!-- n7&#45;&gt;n5 -->
+<g id="edge18" class="edge">
+<title>n7&#45;&gt;n5</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M144.49,-289.81C172.98,-278.85 211.51,-264.03 241.33,-252.57"/>
+<polygon fill="orange" stroke="orange" points="242.6,-255.83 250.68,-248.97 240.09,-249.29 242.6,-255.83"/>
+</g>
+<!-- n8 -->
+<g id="node6" class="node">
+<title>n8</title>
+<ellipse fill="none" stroke="orange" cx="590" cy="-18" rx="59.59" ry="18"/>
+<text text-anchor="middle" x="590" y="-14.3" font-family="Times,serif" font-size="14.00">wasmer&#45;types</text>
+</g>
+<!-- n9&#45;&gt;n8 -->
+<g id="edge21" class="edge">
+<title>n9&#45;&gt;n8</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M590,-71.7C590,-63.98 590,-54.71 590,-46.11"/>
+<polygon fill="orange" stroke="orange" points="593.5,-46.1 590,-36.1 586.5,-46.1 593.5,-46.1"/>
+</g>
+<!-- n10 -->
+<g id="node8" class="node">
+<title>n10</title>
+<ellipse fill="none" stroke="orange" cx="338" cy="-528" rx="59.29" ry="18"/>
+<text text-anchor="middle" x="338" y="-524.3" font-family="Times,serif" font-size="14.00">wasmer&#45;c&#45;api</text>
+</g>
+<!-- n11 -->
+<g id="node9" class="node">
+<title>n11</title>
+<ellipse fill="none" stroke="orange" cx="479" cy="-453" rx="80.69" ry="18"/>
+<text text-anchor="middle" x="479" y="-449.3" font-family="Times,serif" font-size="14.00">wasmer&#45;emscripten</text>
+</g>
+<!-- n10&#45;&gt;n11 -->
+<g id="edge5" class="edge">
+<title>n10&#45;&gt;n11</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M368.64,-512.56C375.69,-509.16 383.13,-505.5 390,-502 407,-493.34 425.6,-483.38 441.39,-474.79"/>
+<polygon fill="orange" stroke="orange" points="443.22,-477.77 450.32,-469.91 439.87,-471.63 443.22,-477.77"/>
+</g>
+<!-- n12 -->
+<g id="node10" class="node">
+<title>n12</title>
+<ellipse fill="none" stroke="orange" cx="323" cy="-453" rx="57.69" ry="18"/>
+<text text-anchor="middle" x="323" y="-449.3" font-family="Times,serif" font-size="14.00">wasmer&#45;wasi</text>
+</g>
+<!-- n10&#45;&gt;n12 -->
+<g id="edge6" class="edge">
+<title>n10&#45;&gt;n12</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M334.45,-509.7C332.69,-501.15 330.53,-490.65 328.56,-481.07"/>
+<polygon fill="orange" stroke="orange" points="331.97,-480.27 326.53,-471.18 325.11,-481.68 331.97,-480.27"/>
+</g>
+<!-- n11&#45;&gt;n0 -->
+<g id="edge7" class="edge">
+<title>n11&#45;&gt;n0</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M479,-434.7C479,-426.98 479,-417.71 479,-409.11"/>
+<polygon fill="orange" stroke="orange" points="482.5,-409.1 479,-399.1 475.5,-409.1 482.5,-409.1"/>
+</g>
+<!-- n12&#45;&gt;n0 -->
+<g id="edge8" class="edge">
+<title>n12&#45;&gt;n0</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M354.57,-437.83C380.1,-426.38 416.07,-410.24 442.77,-398.26"/>
+<polygon fill="orange" stroke="orange" points="444.46,-401.33 452.15,-394.05 441.6,-394.95 444.46,-401.33"/>
+</g>
+<!-- n13 -->
+<g id="node11" class="node">
+<title>n13</title>
+<ellipse fill="none" stroke="orange" cx="639" cy="-453" rx="61.99" ry="18"/>
+<text text-anchor="middle" x="639" y="-449.3" font-family="Times,serif" font-size="14.00">wasmer&#45;cache</text>
+</g>
+<!-- n13&#45;&gt;n0 -->
+<g id="edge4" class="edge">
+<title>n13&#45;&gt;n0</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M606.24,-437.67C579.82,-426.11 542.7,-409.87 515.37,-397.91"/>
+<polygon fill="orange" stroke="orange" points="516.71,-394.68 506.14,-393.87 513.9,-401.09 516.71,-394.68"/>
+</g>
+<!-- n14 -->
+<g id="node12" class="node">
+<title>n14</title>
+<ellipse fill="none" stroke="orange" cx="479" cy="-528" rx="50.09" ry="18"/>
+<text text-anchor="middle" x="479" y="-524.3" font-family="Times,serif" font-size="14.00">wasmer&#45;cli</text>
+</g>
+<!-- n14&#45;&gt;n11 -->
+<g id="edge3" class="edge">
+<title>n14&#45;&gt;n11</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M479,-509.7C479,-501.25 479,-490.87 479,-481.37"/>
+<polygon fill="orange" stroke="orange" points="482.5,-481.18 479,-471.18 475.5,-481.18 482.5,-481.18"/>
+</g>
+<!-- n14&#45;&gt;n12 -->
+<g id="edge2" class="edge">
+<title>n14&#45;&gt;n12</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M436.19,-518.44C420.87,-514.52 403.75,-509.12 389,-502 375.04,-495.26 360.95,-485.51 349.4,-476.55"/>
+<polygon fill="orange" stroke="orange" points="351.47,-473.73 341.47,-470.23 347.11,-479.2 351.47,-473.73"/>
+</g>
+<!-- n14&#45;&gt;n13 -->
+<g id="edge1" class="edge">
+<title>n14&#45;&gt;n13</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M522.27,-518.78C538.34,-514.85 556.44,-509.37 572,-502 586.15,-495.3 600.45,-485.56 612.18,-476.6"/>
+<polygon fill="orange" stroke="orange" points="614.53,-479.2 620.23,-470.26 610.21,-473.7 614.53,-479.2"/>
+</g>
+<!-- n2&#45;&gt;n1 -->
+<g id="edge14" class="edge">
+<title>n2&#45;&gt;n1</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M899.09,-289.12C834.21,-262.65 704.27,-209.63 635.35,-181.5"/>
+<polygon fill="orange" stroke="orange" points="636.62,-178.24 626.04,-177.71 633.98,-184.72 636.62,-178.24"/>
+</g>
+<!-- n3&#45;&gt;n1 -->
+<g id="edge15" class="edge">
+<title>n3&#45;&gt;n1</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M492.17,-288.15C511.61,-263.28 548.12,-216.57 570.62,-187.79"/>
+<polygon fill="orange" stroke="orange" points="573.45,-189.86 576.85,-179.82 567.93,-185.55 573.45,-189.86"/>
+</g>
+<!-- n4&#45;&gt;n1 -->
+<g id="edge16" class="edge">
+<title>n4&#45;&gt;n1</title>
+<path fill="none" stroke="orange" stroke-dasharray="5,2" d="M688.49,-287.87C668.79,-262.9 632.08,-216.35 609.46,-187.68"/>
+<polygon fill="orange" stroke="orange" points="612.15,-185.43 603.21,-179.75 606.65,-189.77 612.15,-185.43"/>
+</g>
+</g>
+</svg>
diff --git a/docs/migration_to_1.0.0.md b/docs/migration_to_1.0.0.md
new file mode 100644
index 000000000..ba59eae49
--- /dev/null
+++ b/docs/migration_to_1.0.0.md
@@ -0,0 +1,346 @@
+# Migrating from Wasmer 0.x to Wasmer 1.0.0
+
+Wasmer 1.0.0 is currently in alpha and is our primary focus. This document will
+describe the differences between Wasmer 0.x and Wasmer 1.0.0 and provide examples
+to make migrating to the new API as simple as possible.
+
+Some features are still under development during the alpha of Wasmer 1.0.0. This document
+will aim to make clear what these features are.
+
+## Table of Contents
+
+- [Rationale for changes in 1.0.0](#rationale-for-changes-in-100)
+- [How to use Wasmer 1.0.0](#how-to-use-wasmer-100)
+  - [Installing Wasmer CLI](#installing-wamser-cli)
+  - [Using Wasmer 1.0.0](#using-wamser-100)
+- [Project structure](#project-structure)
+- [Differences](#differences)
+  - [Instantiating modules](#instantiating-modules)
+  - [Passing host functions](#passing-host-functions)
+  - [Accessing the environment as a host function](#accessing-the-environment-as-a-host-function)
+  - [Error handling](#error-handling)
+  - [Caching modules](#caching-modules)
+
+## Rationale for changes in 1.0.0
+
+Wasmer 0.x was great but as the WASM community and standards evolve we felt the need to make Wasmer also follow these 
+changes.
+
+Wasmer 1.x is what we think a necessary rewrite of a big part of the project to make it more future-proof. 
+
+This version introduces many new features and makes using Wasmer more natural. We did a hard work making it as close 
+to the standard API as possible while always providing good performances, flexibility and stability. 
+
+The rewrite of the Wasmer Runtime also comes with a rewrite of the languages integrations to achieve the same goals: 
+providing a clearer API and improving the feature set.
+
+In this document you will discover the major changes between Wasmer 0.x and Wasmer 1.x by highlighting how to use the 
+new Rust API.
+
+## How to use Wasmer 1.0.0
+
+### Installing Wasmer CLI
+
+See [wasmer.io] for installation instructions.
+
+If you already have wasmer installed, run `wasmer self-update`.
+
+Install the latest versions of Wasmer with [wasmer-nightly] or by following the steps described in the 
+documentation: [Getting Started][getting-started].
+
+### Using Wasmer 1.0.0
+
+The CLI interface for Wasmer 1.0.0 is mostly the same as it was in Wasmer 0.x.
+
+One difference is that rather than specifying the compiler with `--backend=cranelift`,
+in Wasmer 1.0.0 we prefer using the name of the backend as a flag directly,
+for example: `--cranelift`.
+
+The top-level crates that users will usually interface with are:
+
+- [wasmer] - Wasmer's core runtime API
+- [wasmer-wasi] - Wasmer's WASI implementation
+- [wasmer-emscripten] - Wasmer's Emscripten implementation
+- TODO:
+
+See the [examples] to find out how to do specific things in Wasmer 1.0.0.
+
+## Project Structure
+
+![Wasmer dependencies graph](./deps_dedup.svg)
+
+The figure above shows the core Wasmer crates and their dependencies with transitive dependencies deduplicated.
+
+Wasmer 1.0.0 has two core architectural abstractions: engines and compilers.
+
+An engine is a system that processes WASM with a compiler and prepares it to be executed.
+
+A compiler is a system that translates WASM into a format that can be understood
+more directly by a real computer: machine code.
+
+For example, in the [examples] you'll see that we are using the JIT engine and the Cranelift compiler. The JIT engine 
+will generate machine code at runtime, using Cranelift, and then execute it.  
+
+For most uses, users will primarily use the [wasmer] crate directly, perhaps with one of our
+provided ABIs such as [wasmer-wasi]. However, for users that need finer grained control over
+the behavior of wasmer, other crates such as [wasmer-compiler] and [wasmer-engine] may be used
+to implement custom compilers and engines respectively.
+
+## Differences
+
+### Instantiating modules
+
+With Wasmer 0.x, instantiating a module was a matter of calling `wasmer::compiler::compile` and then calling 
+`instanciate` on the compiled module.
+
+While simple, this did not give you full-control over Wasmer's configuration. For example, choosing another compiler
+was not straightforward.
+
+With Wasmer 1.x, we changed this part and made the API look more like how Wasmer works internally to give you more 
+control:
+
+```diff
+- let module = compile(&wasm_bytes[..])?; 
++ let engine = JIT::new(&Cranelift::default()).engine();
++ let store = Store::new(&engine);
++ let module = Module::new(&store, wasm_bytes)?;
+- let instance = module.instantiate(&imports)?;
++ let instance = Instance::new(&module, &import_object)?;
+```
+
+Note that we did not cover how to create the import object here. This is because this part works the same as it used to 
+with Wasmer 0.x.
+
+To get more information on how instantiation now works, have a look at the [dedicated example][instance-example]
+
+### Passing host functions
+
+With Wasmer 0.x passing host functions to the guest was primarily done using the `func!` macro or by directly using 
+`Func::new` or `DynamicFunc::new`.
+
+Given we have a function like:
+
+```rust
+fn sum(a: i32, b: i32) -> i32 {
+    a + b
+}
+```
+
+We want to import this function in the guest module, let's have a look at how it differs between Wasmer 0.x and 
+Wasmer 1.x:
+
+```diff
+let import_object = imports! {
+    "env" => {
+-         "sum" => func!(sum),
++         "sum" => Function::new_native(&store, sum),
+    }
+}
+```
+
+The above example illustrates how to import what we call "native functions". There were already available in Wasmer 
+0.x through the `func!` macro or with `Func::new`.
+
+There is a second flavor for imported functions: dynamic functions. With Wasmer 0;x you would have created such a 
+function using `DynamicFunc::new`, here is how it's done with Wasmer 1.x:
+
+```rust
+let sum_signature = FunctionType::new(vec![Type::I32, Type::I32], vec![Type::I32]);
+let sum = Function::new(&store, &sum_signature, |args| {
+    let result = args[0].unwrap_I32() + args[1].unwrap_i32();
+    
+    Ok(vec![Value::I32(result)])
+});
+```
+
+Both examples address different needs and have their own pros and cons. We encourage you to have a look at the 
+dedicated example: [Exposing host functions][host-functions-example].
+
+Note that having this API for functions now looks more like the other entities APIs: globals, memories, tables. Here is 
+a quick example introducing each of them: [Imports & Exports][imports-exports-example]
+
+### Accessing the environment as a host function
+
+With Wasmer 0.x each function had its own `vm::Ctx`. This was your entrypoint to the module internals and allowed
+access to the context of the currently running instance.
+
+With Wasmer 1.0.0 this was changed to provide a simpler yet powerful API.
+
+Let's see an example where we want to have access to the module memory. Here is how we would have done that with Wasmer 
+0.x:
+
+```diff
+- let get_at = |ctx: &mut vm::Ctx, idx: i32, len: i32| {
+-     let mem_desc = ctx.memory(0);
+-     let mem = mem_desc.deref();
+- 
+-     println!("Memory: {:?}", mem);
+- 
+-     let view: MemoryView<u8> = mem.view();
+-     let bytes = view[idx as usize..len as usize].iter().map(Cell::get).collect();
+- 
+-     println!("string: {}", String::from_utf8(bytes).unwrap());
+- };
+
+- let import_object = imports! {
+-     "env" => {
+-         "get_at" => func!(get_at),
+-     }
+- };
++ let import_object = imports! {};
+
+- let instance = instantiate(wasm_bytes, &import_object)?;
++ let instance = Instance::new(&wasm_bytes, &import_object)?;
+
++ let memory = instance.exports.get_memory("mem")?;
++ let get = instance
++     .exports
++     .get_native_function::<(), (WasmPtr<u8, Array>, i32)>("get")?;
++ let (ptr, length) = get.call()?;
++ let str = ptr.get_utf8_string(memory, length as u32)?;
+```
+
+Here we have a module which provides one exported function: `get`. Each time we call this function it will in turn 
+call our imported function `get_at`.
+
+The `get_at` function is responsible for reading the guest module-s memory through the `vm::Ctx`.
+
+With Wasmer 1.0.0 (where the `vm::Ctx` does not exist anymore) we can achieve the same result with something more 
+natural: we only use imports and exports to read from the memory and write to it.
+
+Take a look at the following examples to get more details:
+* [Interacting with memory][memory]
+* [Using memory pointers][memory-pointers]
+
+The other thing where `vm::Ctx` was useful was to pass data from and to host functions. This has also been made simpler
+with Wasmer 1.x:
+
+```rust
+let shared_counter: Arc<RefCell<i32>> = Arc::new(RefCell::new(0));
+
+struct Env {
+    counter: Arc<RefCell<i32>>,
+}
+
+fn get_counter(env: &mut Env) -> i32 {
+    *env.counter.borrow()
+}
+
+let get_counter_func = Function::new_native_with_env(
+    &store, 
+    Env { counter: shared_counter.clone() }, 
+    get_counter
+);
+```
+
+A dedicated example describes how to use this feature: [Exposing host functions][host-functions].
+
+### Error handling
+
+Handling errors with Wasmer 0.x was a bit hard, especially, the `wasmer_runtime::error::RuntimeError`. It was rather 
+complex: it had many variants that you had to handle when pattern matching results. This has been made way simpler with 
+Wasmer 1.0.0:
+
+```diff
+// Retrieve the `get` function from module's exports and then call it
+let result = get.call(0, 13);
+
+match result {
+-     Err(RuntimeError::InvokeError(InvokeError::TrapCode { .. })) => {
+-         // ...
+-     }
+-     Err(RuntimeError::InvokeError(InvokeError::FailedWithNoError)) => {
+-         // ...
+-     }
+-     Err(RuntimeError::InvokeError(InvokeError::UnknownTrap { .. })) => {
+-         // ...
+-     }
+-     Err(RuntimeError::InvokeError(InvokeError::UnknownTrapCode { .. })) => {
+-         // ...
+-     }
+-     Err(RuntimeError::InvokeError(InvokeError::EarlyTrap(_))) => {
+-         // ...
+-     }
+-     Err(RuntimeError::InvokeError(InvokeError::Breakpoint(_))) => {
+-         // ...
+-     }
+-     Err(RuntimeError::Metering(_)) => {
+-         // ...
+-     }
+-     Err(RuntimeError::InstanceImage(_)) => {
+-         // ...
+-     }
+-     Err(RuntimeError::User(_)) => {
+-         // ...
+-     }
++     Error(e) => {
++         println!("Error caught from `div_by_zero`: {}", e.message());
++          
++         let frames = e.trace();
++         let frames_len = frames.len();
++         
++         // ...
++     }
+    Ok(_) => {
+        // ...
+    },
+}
+``` 
+
+As you can see here, handling errors is really easy now! You may find the following examples useful to get more familiar
+with this topic:
+* [Handling Errors][errors]
+* [Interrupting Execution][exit-early]
+
+Note than with Wasmer 1.0.0, each function that is part of the API has its own kind of error. For example:
+* Instantiating a module may return `InstantiationError`s;
+* Getting exports from the guest module may return `ExportError`s;
+* Calling a exported function may return `RuntimeError`s;
+* ...
+
+### Caching modules
+
+You may be aware Wasmer, since 0.x, allows you to cache compiled module so that further executions of your program
+will be faster.
+
+Because caching may bring a significant boost when running Wasm modules we wanted to make it easier to use with 
+Wasmer 1.0.0.
+
+With Wasmer 0.x you had to handle the whole caching process inside your program's code. With Wasmer 1.0.0
+you'll be able to delegate most of the work to Wasmer:
+
+```diff
+- let artifact = module.cache().unwrap();
+- let bytes = artifact.serialize().unwrap();
+- 
+- let path = "module_cached.so";
+- fs::write(path, bytes).unwrap();
++ module.serialize_to_file(path)?;
+
+- let mut file = File::open(path).unwrap();
+- let cached_bytes = &mut vec![];
+- file.read_to_end(cached_bytes);
+- drop(file);
+- 
+- let cached_artifact = Artifact::deserialize(&cached_bytes).unwrap();
+- let cached_module = unsafe { load_cache_with(cached_artifact, &default_compiler()) }.unwrap();
++ let cached_module = unsafe { Module::deserialize_from_file(&store, path) }?;
+``` 
+
+[examples]: https://docs.wasmer.io/integrations/examples
+[wasmer]: https://crates.io/crates/wasmer/1.0.0-alpha3
+[wasmer-wasi]: https://crates.io/crates/wasmer-wasi/1.0.0-alpha3
+[wasmer-emscripten]: https://crates.io/crates/wasmer-emscripten/1.0.0-alpha3
+[wasmer-engine]: https://crates.io/crates/wasmer-engine/1.0.0-alpha3
+[wasmer-compiler]: https://crates.io/crates/wasmer-compiler/1.0.0-alpha3
+[wasmer.io]: https://wasmer.io
+[wasmer-nightly]: https://github.com/wasmerio/wasmer-nightly/
+[getting-started]: https://docs.wasmer.io/ecosystem/wasmer/getting-started
+[instance-example]: https://docs.wasmer.io/integrations/examples/instance
+[imports-exports-example]: https://docs.wasmer.io/integrations/examples/imports-and-exports
+[host-functions-example]: https://docs.wasmer.io/integrations/examples/host-functions
+[memory]: https://docs.wasmer.io/integrations/examples/memory
+[memory-pointers]: https://docs.wasmer.io/integrations/examples/memory-pointers
+[host-functions]: https://docs.wasmer.io/integrations/examples/host-functions
+[errors]: https://docs.wasmer.io/integrations/examples/errors
+[exit-early]: https://docs.wasmer.io/integrations/examples/exit-early
\ No newline at end of file
diff --git a/examples/README.md b/examples/README.md
index 1f57e3bcd..ab5df2842 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -37,6 +37,173 @@ The examples are written in a difficulty/discovery order. Concepts that
 are explained in an example is not necessarily re-explained in a next
 example.
 
+### Basics
+
+1. [**Instantiating a module**][instance], explains the basics of using Wasmer
+   and how to create an instance out of a Wasm module.
+   
+   _Keywords_: instance, module.
+   
+   <details>
+    <summary><em>Execute the example</em></summary>
+
+    ```shell
+    $ cargo run --example instance --release --features "cranelift"
+    ```
+
+   </details>
+
+2. [**Handling errors**][errors], explains the basics of interacting with
+   Wasm module memory.
+   
+   _Keywords_: memory, module.
+   
+   <details>
+    <summary><em>Execute the example</em></summary>
+
+    ```shell
+    $ cargo run --example memory --release --features "cranelift"
+    ```
+
+   </details>
+
+3. [**Interacting with memory**][memory], explains the basics of interacting with
+   Wasm module memory.
+   
+   _Keywords_: memory, module.
+   
+   <details>
+    <summary><em>Execute the example</em></summary>
+
+    ```shell
+    $ cargo run --example memory --release --features "cranelift"
+    ```
+
+   </details>
+
+### Exports
+
+1. [**Exported global**][exported-global], explains how to work with
+   exported globals: get/set their value, have information about their 
+   type.
+   
+   _Keywords_: export, global.
+
+   <details>
+   <summary><em>Execute the example</em></summary>
+
+   ```shell
+   $ cargo run --example exported-globals --release --features "cranelift"
+   ```
+
+   </details>
+   
+2. [**Exported function**][exported-function], explains how to get and
+   how to call an exported function. They come in 2 flavors: dynamic,
+   and “static”/native. The pros and cons are discussed briefly.
+   
+   _Keywords_: export, function, dynamic, static, native.
+
+   <details>
+   <summary><em>Execute the example</em></summary>
+
+   ```shell
+   $ cargo run --example exported-function --release --features "cranelift"
+   ```
+
+   </details>
+
+
+3. [**Exported memory**][exported-memory], explains how to read from 
+    and write to exported memory.
+   
+   _Keywords_: export, memory.
+
+   <details>
+   <summary><em>Execute the example</em></summary>
+
+   ```shell
+   $ cargo run --example exported-memory --release --features "cranelift"
+   ```
+
+   </details>
+
+### Imports
+
+1. [**Imported global**][imported-global], explains how to work with
+   imported globals: create globals, import them, get/set their value.
+   
+   _Keywords_: import, global.
+
+   <details>
+   <summary><em>Execute the example</em></summary>
+
+   ```shell
+   $ cargo run --example imported-globals --release --features "cranelift"
+   ```
+
+   </details>
+
+2. [**Imported function**][imported-function], explains how to define 
+   an imported function. They come in 2 flavors: dynamic,
+   and “static”/native.
+   
+   _Keywords_: import, function, dynamic, static, native.
+
+   <details>
+   <summary><em>Execute the example</em></summary>
+
+   ```shell
+   $ cargo run --example imported-function --release --features "cranelift"
+   ```
+
+   </details>
+
+### Externs
+
+1. [**Table**][table], explains how to use Wasm Tables from the Wasmer API.
+
+   _Keywords_: basic, table, call_indirect
+
+   <details>
+   <summary><em>Execute the example</em></summary>
+
+   ```shell
+   $ cargo run --example table --release --features "cranelift"
+   ```
+
+   </details>
+   
+2. [**Memory**][memory], explains how to use Wasm Memories from
+   the Wasmer API.  Memory example is a work in progress.
+
+   _Keywords_: basic, memory
+
+   <details>
+   <summary><em>Execute the example</em></summary>
+
+   ```shell
+   $ cargo run --example memory --release --features "cranelift"
+   ```
+
+   </details>
+
+### Tunables
+
+1. **Limit memory**, explains how to use Tunables to limit the
+   size of an exported Wasm memory
+
+   _Keywords_: basic, tunables, memory
+
+   <details>
+   <summary><em>Execute the example</em></summary>
+
+   ```shell
+   $ cargo run --example tunables-limit-memory --release --features "cranelift"
+   ```
+
+   </details>
+
 ### Engines
 
 1. [**JIT engine**][engine-jit], explains what an engine is, what the
@@ -107,7 +274,7 @@ example.
 
 ### Compilers
 
-5. [**Singlepass compiler**][compiler-singlepass], explains how to use
+1. [**Singlepass compiler**][compiler-singlepass], explains how to use
    the [`wasmer-compiler-singlepass`] compiler.
    
    _Keywords_: compiler, singlepass.
@@ -121,7 +288,7 @@ example.
 
    </details>
 
-6. [**Cranelift compiler**][compiler-cranelift], explains how to use
+2. [**Cranelift compiler**][compiler-cranelift], explains how to use
    the [`wasmer-compiler-cranelift`] compiler.
    
    _Keywords_: compiler, cranelift.
@@ -135,7 +302,7 @@ example.
 
    </details>
 
-7. [**LLVM compiler**][compiler-llvm], explains how to use the
+3. [**LLVM compiler**][compiler-llvm], explains how to use the
    [`wasmer-compiler-llvm`] compiler.
    
    _Keywords_: compiler, llvm.
@@ -149,116 +316,9 @@ example.
 
    </details>
 
-### Exports
-
-8. [**Exported global**][exported-global], explains how to work with
-   exported globals: get/set their value, have information about their 
-   type.
-   
-   _Keywords_: export, global.
-
-   <details>
-   <summary><em>Execute the example</em></summary>
-
-   ```shell
-   $ cargo run --example exported-globals --release --features "cranelift"
-   ```
-
-   </details>
-   
-9. [**Exported function**][exported-function], explains how to get and
-   how to call an exported function. They come in 2 flavors: dynamic,
-   and “static”/native. The pros and cons are discussed briefly.
-   
-   _Keywords_: export, function, dynamic, static, native.
-
-   <details>
-   <summary><em>Execute the example</em></summary>
-
-   ```shell
-   $ cargo run --example exported-function --release --features "cranelift"
-   ```
-
-   </details>
-
-
-10. [**Exported memory**][exported-memory], explains how to read from 
-    and write to exported memory.
-   
-   _Keywords_: export, memory.
-
-   <details>
-   <summary><em>Execute the example</em></summary>
-
-   ```shell
-   $ cargo run --example exported-memory --release --features "cranelift"
-   ```
-
-   </details>
-
-### Imports
-
-11. [**Imported global**][imported-global], explains how to work with
-   imported globals: create globals, import them, get/set their value.
-   
-   _Keywords_: import, global.
-
-   <details>
-   <summary><em>Execute the example</em></summary>
-
-   ```shell
-   $ cargo run --example imported-globals --release --features "cranelift"
-   ```
-
-   </details>
-
-12. [**Imported function**][imported-function], explains how to define 
-   an imported function. They come in 2 flavors: dynamic,
-   and “static”/native.
-   
-   _Keywords_: import, function, dynamic, static, native.
-
-   <details>
-   <summary><em>Execute the example</em></summary>
-
-   ```shell
-   $ cargo run --example imported-function --release --features "cranelift"
-   ```
-
-   </details>
-
-### Externs
-
-13. [**Table**][table], explains how to use Wasm Tables from the Wasmer API.
-
-   _Keywords_: basic, table, call_indirect
-
-   <details>
-   <summary><em>Execute the example</em></summary>
-
-   ```shell
-   $ cargo run --example table --release --features "cranelift"
-   ```
-
-   </details>
-   
-14. [**Memory**][memory], explains how to use Wasm Memories from
-    the Wasmer API.  Memory example is a work in progress.
-
-   _Keywords_: basic, memory
-
-   <details>
-   <summary><em>Execute the example</em></summary>
-
-   ```shell
-   $ cargo run --example memory --release --features "cranelift"
-   ```
-
-   </details>
-
 ### Integrations
 
-15. [**WASI**][wasi], explains how to use the [WebAssembly System
+1. [**WASI**][wasi], explains how to use the [WebAssembly System
    Interface][WASI] (WASI), i.e. the [`wasmer-wasi`] crate.
    
    _Keywords_: wasi, system, interface
@@ -284,6 +344,7 @@ example.
 [exported-memory]: ./exports_memory.rs
 [imported-global]: ./imports_global.rs
 [imported-function]: ./imports_function.rs
+[instance]: ./instance.rs
 [wasi]: ./wasi.rs
 [table]: ./table.rs
 [memory]: ./memory.rs
diff --git a/examples/early_exit.rs b/examples/early_exit.rs
index 814ab01ff..911fd3d60 100644
--- a/examples/early_exit.rs
+++ b/examples/early_exit.rs
@@ -1,5 +1,18 @@
-//! This example shows how the host can terminate execution of Wasm early from
-//! inside a host function called by the Wasm.
+//! There are cases where you may want to interrupt this synchronous execution of the WASM module
+//! while the it is calling a host function. This can be useful for saving resources, and not
+//! returning back to the guest WASM for execution, when you already know the WASM execution will
+//! fail, or no longer be needed.
+//!
+//! In this example, we will run a WASM module that calls the imported host function
+//! interrupt_execution. This host function will immediately stop executing the WebAssembly module.
+//!
+//! You can run the example directly by executing in Wasmer root:
+//!
+//! ```shell
+//! cargo run --example early-exit --release --features "cranelift"
+//! ```
+//!
+//! Ready?
 
 use anyhow::bail;
 use std::fmt;
@@ -21,12 +34,6 @@ impl fmt::Display for ExitCode {
 // And then we implement `std::error::Error`.
 impl std::error::Error for ExitCode {}
 
-// The host function that we'll use to terminate execution.
-fn early_exit() {
-    // This is where it happens.
-    RuntimeError::raise(Box::new(ExitCode(1)));
-}
-
 fn main() -> anyhow::Result<()> {
     // Let's declare the Wasm module with the text representation.
     let wasm_bytes = wat2wasm(
@@ -44,21 +51,40 @@ fn main() -> anyhow::Result<()> {
 "#,
     )?;
 
+    // Create a Store.
+    // Note that we don't need to specify the engine/compiler if we want to use
+    // the default provided by Wasmer.
+    // You can use `Store::default()` for that.
     let store = Store::new(&JIT::new(&Cranelift::default()).engine());
+
+    println!("Compiling module...");
+    // Let's compile the Wasm module.
     let module = Module::new(&store, wasm_bytes)?;
 
+    // We declare the host function that we'll use to terminate execution.
+    fn early_exit() {
+        // This is where it happens.
+        RuntimeError::raise(Box::new(ExitCode(1)));
+    }
+
+    // Create an import object.
     let import_object = imports! {
         "env" => {
             "early_exit" => Function::new_native(&store, early_exit),
         }
     };
+
+    println!("Instantiating module...");
+    // Let's instantiate the Wasm module.
     let instance = Instance::new(&module, &import_object)?;
 
+    // Here we go.
+    //
     // Get the `run` function which we'll use as our entrypoint.
-    let run_func: NativeFunc<(i32, i32), i32> =
-        instance.exports.get_native_function("run").unwrap();
+    println!("Calling `run` function...");
+    let run_func: NativeFunc<(i32, i32), i32> = instance.exports.get_native_function("run")?;
 
-    // When we call a function it can either succeed or fail.
+    // When we call a function it can either succeed or fail. We expect it to fail.
     match run_func.call(1, 7) {
         Ok(result) => {
             bail!(
@@ -66,12 +92,13 @@ fn main() -> anyhow::Result<()> {
                 result
             );
         }
-        // We're expecting it to fail.
-        // We attempt to downcast the error into the error type that we were expecting.
+        // In case of a failure, which we expect, we attempt to downcast the error into the error
+        // type that we were expecting.
         Err(e) => match e.downcast::<ExitCode>() {
             // We found the exit code used to terminate execution.
             Ok(exit_code) => {
                 println!("Exited early with exit code: {}", exit_code);
+
                 Ok(())
             }
             Err(e) => {
diff --git a/examples/errors.rs b/examples/errors.rs
new file mode 100644
index 000000000..fef46c26f
--- /dev/null
+++ b/examples/errors.rs
@@ -0,0 +1,103 @@
+//! A Wasm module can sometimes be invalid or trigger traps, and in those case we will get
+//! an error back from the API.
+//!
+//! In this example we'll see how to handle such errors in the most
+//! basic way. To do that we'll use a Wasm module that we know will
+//! produce an error.
+//!
+//! You can run the example directly by executing in Wasmer root:
+//!
+//! ```shell
+//! cargo run --example errors --release --features "cranelift"
+//! ```
+//!
+//! Ready?
+
+use wasmer::{imports, wat2wasm, Instance, Module, Store};
+use wasmer_compiler_cranelift::Cranelift;
+use wasmer_engine_jit::JIT;
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // Let's declare the Wasm module with the text representation.
+    let wasm_bytes = wat2wasm(
+        br#"
+(module
+  (type $do_div_by_zero_t (func (result i32)))
+  (func $do_div_by_zero_f (type $do_div_by_zero_t) (result i32)
+    i32.const 4
+    i32.const 0
+    i32.div_s)
+
+  (type $div_by_zero_t (func (result i32)))
+  (func $div_by_zero_f (type $div_by_zero_t) (result i32)
+    call $do_div_by_zero_f)
+  (export "div_by_zero" (func $div_by_zero_f)))
+"#,
+    )?;
+
+    // Create a Store.
+    // Note that we don't need to specify the engine/compiler if we want to use
+    // the default provided by Wasmer.
+    // You can use `Store::default()` for that.
+    let store = Store::new(&JIT::new(&Cranelift::default()).engine());
+
+    println!("Compiling module...");
+    // Let's compile the Wasm module.
+    let module = Module::new(&store, wasm_bytes)?;
+
+    // Create an import object.
+    let import_object = imports! {};
+
+    println!("Instantiating module...");
+    // Let's instantiate the Wasm module.
+    let instance = Instance::new(&module, &import_object)?;
+
+    // Here we go.
+    //
+    // The Wasm module exports a function called `div_by_zero`. As its name
+    // implies, this function will try to do a division by zero and thus
+    // produce an error.
+    //
+    // Let's get it.
+    let div_by_zero = instance
+        .exports
+        .get_function("div_by_zero")?
+        .native::<(), i32>()?;
+
+    println!("Calling `div_by_zero` function...");
+    // Let's call the `div_by_zero` exported function.
+    let result = div_by_zero.call();
+
+    // When we call a function it can either succeed or fail. We expect it to fail.
+    match result {
+        Ok(_) => {
+            // This should have thrown an error, return an error
+            panic!("div_by_zero did not error");
+        }
+        Err(e) => {
+            // Log the error
+            println!("Error caught from `div_by_zero`: {}", e.message());
+
+            // Errors come with a trace we can inspect to get more
+            // information on the execution flow.
+            let frames = e.trace();
+            let frames_len = frames.len();
+
+            for i in 0..frames_len {
+                println!(
+                    "  Frame #{}: {:?}::{:?}",
+                    frames_len - i,
+                    frames[i].module_name(),
+                    frames[i].function_name().or(Some("<func>")).unwrap()
+                );
+            }
+        }
+    }
+
+    Ok(())
+}
+
+#[test]
+fn test_exported_function() -> Result<(), Box<dyn std::error::Error>> {
+    main()
+}
diff --git a/examples/exports_function.rs b/examples/exports_function.rs
index 941733847..853f36998 100644
--- a/examples/exports_function.rs
+++ b/examples/exports_function.rs
@@ -72,10 +72,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("Calling `sum` function...");
     // Let's call the `sum` exported function. The parameters are a
     // slice of `Value`s. The results are a boxed slice of `Value`s.
-    let results = sum.call(&[Value::I32(1), Value::I32(2)])?;
+    let args = [Value::I32(1), Value::I32(2)];
+    let result = sum.call(&args)?;
 
-    println!("Results: {:?}", results);
-    assert_eq!(results.to_vec(), vec![Value::I32(3)]);
+    println!("Results: {:?}", result);
+    assert_eq!(result.to_vec(), vec![Value::I32(3)]);
 
     // That was fun. But what if we can get rid of the `Value`s? Well,
     // that's possible with the `NativeFunction` API. The function
@@ -85,16 +86,16 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // `Rets`, respectively for the parameters and the results. If
     // those values don't match the exported function signature, an
     // error will be raised.
-    let sum = sum.native::<(i32, i32), i32>()?;
+    let sum_native = sum.native::<(i32, i32), i32>()?;
 
     println!("Calling `sum` function (natively)...");
     // Let's call the `sum` exported function. The parameters are
     // statically typed Rust values of type `i32` and `i32`. The
     // result, in this case particular case, in a unit of type `i32`.
-    let result = sum.call(1, 2)?;
+    let result = sum_native.call(3, 4)?;
 
     println!("Results: {:?}", result);
-    assert_eq!(result, 3);
+    assert_eq!(result, 7);
 
     // Much nicer, isn't it?
     //
diff --git a/examples/exports_global.rs b/examples/exports_global.rs
index 0ad1e9b65..8884a1406 100644
--- a/examples/exports_global.rs
+++ b/examples/exports_global.rs
@@ -68,16 +68,16 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let one = instance.exports.get_global("one")?;
     let some = instance.exports.get_global("some")?;
 
-    println!("Getting global type informations...");
+    println!("Getting globals types information...");
     // Let's get the globals types. The results are `GlobalType`s.
     let one_type = one.ty();
     let some_type = some.ty();
 
-    println!("one type: {:?} {:?}", one_type.mutability, one_type.ty);
+    println!("`one` type: {:?} {:?}", one_type.mutability, one_type.ty);
     assert_eq!(one_type.mutability, Mutability::Const);
     assert_eq!(one_type.ty, Type::F32);
 
-    println!("some type: {:?} {:?}", some_type.mutability, some_type.ty);
+    println!("`some` type: {:?} {:?}", some_type.mutability, some_type.ty);
     assert_eq!(some_type.mutability, Mutability::Var);
     assert_eq!(some_type.ty, Type::F32);
 
@@ -93,14 +93,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .get_function("get_one")?
         .native::<(), f32>()?;
 
-    let one_result = get_one.call()?;
-    let some_result = some.get();
+    let one_value = get_one.call()?;
+    let some_value = some.get();
 
-    println!("one value: {:?}", one_result);
-    assert_eq!(one_result, 1.0);
+    println!("`one` value: {:?}", one_value);
+    assert_eq!(one_value, 1.0);
 
-    println!("some value: {:?}", some_result);
-    assert_eq!(some_result, Value::F32(0.0));
+    println!("`some` value: {:?}", some_value);
+    assert_eq!(some_value, Value::F32(0.0));
 
     println!("Setting global values...");
     // Trying to set the value of a immutable global (`const`)
@@ -112,7 +112,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     let one_result = one.get();
-    println!("one value after `set`: {:?}", one_result);
+    println!("`one` value after `set`: {:?}", one_result);
     assert_eq!(one_result, Value::F32(1.0));
 
     // Setting the values of globals can be done in two ways:
@@ -126,12 +126,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .native::<f32, ()>()?;
     set_some.call(21.0)?;
     let some_result = some.get();
-    println!("some value after `set_some`: {:?}", some_result);
+    println!("`some` value after `set_some`: {:?}", some_result);
     assert_eq!(some_result, Value::F32(21.0));
 
     some.set(Value::F32(42.0))?;
     let some_result = some.get();
-    println!("some value after `set`: {:?}", some_result);
+    println!("`some` value after `set`: {:?}", some_result);
     assert_eq!(some_result, Value::F32(42.0));
 
     Ok(())
diff --git a/examples/imports_function.rs b/examples/imports_function.rs
index 7007b2f4f..56496fefe 100644
--- a/examples/imports_function.rs
+++ b/examples/imports_function.rs
@@ -70,7 +70,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
     let multiply_native = Function::new_native(&store, multiply);
 
-    // Create an empty import object.
+    // Create an import object.
     let import_object = imports! {
         "env" => {
             "multiply_dynamic" => multiply_dynamic,
diff --git a/examples/imports_function_env.rs b/examples/imports_function_env.rs
new file mode 100644
index 000000000..88caf3c6e
--- /dev/null
+++ b/examples/imports_function_env.rs
@@ -0,0 +1,129 @@
+//! A Wasm module can import entities, like functions, memories,
+//! globals and tables.
+//!
+//! In this example, we'll create a system for getting and adjusting a counter value. However, host
+//! functions are not limited to storing data outside of WASM, they're normal host functions and
+//! can do anything that the host can do.
+//!
+//!   1. There will be a `get_counter` function that will return an i32 of
+//!      the current global counter,
+//!   2. There will be an `add_to_counter` function will add the passed
+//!      i32 value to the counter, and return an i32 of the current
+//!      global counter.
+//!
+//! You can run the example directly by executing in Wasmer root:
+//!
+//! ```shell
+//! cargo run --example imported-function-env --release --features "cranelift"
+//! ```
+//!
+//! Ready?
+
+use std::cell::RefCell;
+use std::sync::Arc;
+use wasmer::{imports, wat2wasm, Function, Instance, Module, Store};
+use wasmer_compiler_cranelift::Cranelift;
+use wasmer_engine_jit::JIT;
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // Let's declare the Wasm module with the text representation.
+    let wasm_bytes = wat2wasm(
+        br#"
+(module
+  (func $get_counter (import "env" "get_counter") (result i32))
+  (func $add_to_counter (import "env" "add_to_counter") (param i32) (result i32))
+
+  (type $increment_t (func (param i32) (result i32)))
+  (func $increment_f (type $increment_t) (param $x i32) (result i32)
+    (block
+      (loop
+        (call $add_to_counter (i32.const 1))
+        (set_local $x (i32.sub (get_local $x) (i32.const 1)))
+        (br_if 1 (i32.eq (get_local $x) (i32.const 0)))
+        (br 0)))
+    call $get_counter)
+  (export "increment_counter_loop" (func $increment_f)))
+"#,
+    )?;
+
+    // Create a Store.
+    // Note that we don't need to specify the engine/compiler if we want to use
+    // the default provided by Wasmer.
+    // You can use `Store::default()` for that.
+    let store = Store::new(&JIT::new(&Cranelift::default()).engine());
+
+    println!("Compiling module...");
+    // Let's compile the Wasm module.
+    let module = Module::new(&store, wasm_bytes)?;
+
+    // We create some shared data here, `Arc` is required because we may
+    // move our WebAssembly instance to another thread to run it. RefCell
+    // lets us get shared mutabilty which is fine because we know we won't
+    // run host calls concurrently.  If concurrency is a possibilty, we'd have
+    // to use a `Mutex`.
+    let shared_counter: Arc<RefCell<i32>> = Arc::new(RefCell::new(0));
+
+    // Once we have our counter we'll wrap it inside en `Env` which we'll pass
+    // to our imported functions.
+    //
+    // This struct may have been anything. The only constraint is it must be
+    // possible to know the size of the `Env` at compile time (i.e it has to
+    // implement the `Sized` trait).
+    struct Env {
+        counter: Arc<RefCell<i32>>,
+    }
+
+    // Create the functions
+    fn get_counter(env: &mut Env) -> i32 {
+        *env.counter.borrow()
+    }
+    fn add_to_counter(env: &mut Env, add: i32) -> i32 {
+        let mut counter_ref = env.counter.borrow_mut();
+
+        *counter_ref += add;
+        *counter_ref
+    }
+
+    // Create an import object.
+    let import_object = imports! {
+        "env" => {
+            "get_counter" => Function::new_native_with_env(&store, Env { counter: shared_counter.clone() }, get_counter),
+            "add_to_counter" => Function::new_native_with_env(&store, Env { counter: shared_counter.clone() }, add_to_counter),
+        }
+    };
+
+    println!("Instantiating module...");
+    // Let's instantiate the Wasm module.
+    let instance = Instance::new(&module, &import_object)?;
+
+    // Here we go.
+    //
+    // The Wasm module exports a function called `increment_counter_loop`. Let's get it.
+    let increment_counter_loop = instance
+        .exports
+        .get_function("increment_counter_loop")?
+        .native::<i32, i32>()?;
+
+    let counter_value: i32 = *shared_counter.borrow();
+    println!("Initial ounter value: {:?}", counter_value);
+
+    println!("Calling `increment_counter_loop` function...");
+    // Let's call the `increment_counter_loop` exported function.
+    //
+    // It will loop five times thus incrementing our counter five times.
+    let result = increment_counter_loop.call(5)?;
+
+    let counter_value: i32 = *shared_counter.borrow();
+    println!("New counter value (host): {:?}", counter_value);
+    assert_eq!(counter_value, 5);
+
+    println!("New counter value (guest): {:?}", counter_value);
+    assert_eq!(result, 5);
+
+    Ok(())
+}
+
+#[test]
+fn test_imported_function_env() -> Result<(), Box<dyn std::error::Error>> {
+    main()
+}
diff --git a/examples/instance.rs b/examples/instance.rs
new file mode 100644
index 000000000..9adc7910c
--- /dev/null
+++ b/examples/instance.rs
@@ -0,0 +1,80 @@
+//! Wasmer will let you easily run Wasm module in a Rust host.
+//!
+//! This example illustrates the basics of using Wasmer through a "Hello World"-like project:
+//!
+//!   1. How to load a Wasm modules as bytes
+//!   2. How to compile the module
+//!   3. How to create an instance of the module
+//!
+//! You can run the example directly by executing in Wasmer root:
+//!
+//! ```shell
+//! cargo run --example instance --release --features "cranelift"
+//! ```
+//!
+//! Ready?
+
+use wasmer::{imports, wat2wasm, Instance, Module, Store};
+use wasmer_compiler_cranelift::Cranelift;
+use wasmer_engine_jit::JIT;
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // Let's declare the Wasm module.
+    //
+    // We are using the text representation of the module here but you can also load `.wasm`
+    // files using the `include_bytes!` macro.
+    let wasm_bytes = wat2wasm(
+        br#"
+(module
+  (type $add_one_t (func (param i32) (result i32)))
+  (func $add_one_f (type $add_one_t) (param $value i32) (result i32)
+    local.get $value
+    i32.const 1
+    i32.add)
+  (export "add_one" (func $add_one_f)))
+"#,
+    )?;
+
+    // Create a Store.
+    // Note that we don't need to specify the engine/compiler if we want to use
+    // the default provided by Wasmer.
+    // You can use `Store::default()` for that.
+    let store = Store::new(&JIT::new(&Cranelift::default()).engine());
+
+    println!("Compiling module...");
+    // Let's compile the Wasm module.
+    let module = Module::new(&store, wasm_bytes)?;
+
+    // Create an empty import object.
+    let import_object = imports! {};
+
+    println!("Instantiating module...");
+    // Let's instantiate the Wasm module.
+    let instance = Instance::new(&module, &import_object)?;
+
+    // We now have an instance ready to be used.
+    //
+    // From an `Instance` we can retrieve any exported entities.
+    // Each of these entities is covered in others examples.
+    //
+    // Here we are retrieving the exported function. We won't go into details here
+    // as the main focus of this example is to show how to create an instance out
+    // of a Wasm module and have basic interactions with it.
+    let add_one = instance
+        .exports
+        .get_function("add_one")?
+        .native::<i32, i32>()?;
+
+    println!("Calling `add_one` function...");
+    let result = add_one.call(1)?;
+
+    println!("Results of `add_one`: {:?}", result);
+    assert_eq!(result, 2);
+
+    Ok(())
+}
+
+#[test]
+fn test_exported_function() -> Result<(), Box<dyn std::error::Error>> {
+    main()
+}
diff --git a/examples/memory.rs b/examples/memory.rs
index 21b978de9..d78b6dda5 100644
--- a/examples/memory.rs
+++ b/examples/memory.rs
@@ -1,7 +1,21 @@
-use wasmer::{
-    imports, wat2wasm, Extern, Function, Instance, Memory, MemoryType, Module, NativeFunc, Pages,
-    Store, Table, TableType, Type, Value,
-};
+//! With Wasmer you'll be able to interact with guest module memory.
+//!
+//! This example illustrates the basics of interacting with Wasm module memory.:
+//!
+//!   1. How to load a Wasm modules as bytes
+//!   2. How to compile the module
+//!   3. How to create an instance of the module
+//!
+//! You can run the example directly by executing in Wasmer root:
+//!
+//! ```shell
+//! cargo run --example memory --release --features "cranelift"
+//! ```
+//!
+//! Ready?
+
+use std::mem;
+use wasmer::{imports, wat2wasm, Bytes, Instance, Module, NativeFunc, Pages, Store};
 use wasmer_compiler_cranelift::Cranelift;
 use wasmer_engine_jit::JIT;
 
@@ -9,6 +23,10 @@ use wasmer_engine_jit::JIT;
 // TODO: clean it up and comment it https://github.com/wasmerio/wasmer/issues/1749
 
 fn main() -> anyhow::Result<()> {
+    // Let's declare the Wasm module.
+    //
+    // We are using the text representation of the module here but you can also load `.wasm`
+    // files using the `include_bytes!` macro.
     let wasm_bytes = wat2wasm(
         r#"
 (module
@@ -35,47 +53,87 @@ fn main() -> anyhow::Result<()> {
         .as_bytes(),
     )?;
 
-    // We set up our store with an engine and a compiler.
+    // Create a Store.
+    // Note that we don't need to specify the engine/compiler if we want to use
+    // the default provided by Wasmer.
+    // You can use `Store::default()` for that.
     let store = Store::new(&JIT::new(&Cranelift::default()).engine());
-    // Then compile our Wasm.
+
+    println!("Compiling module...");
+    // Let's compile the Wasm module.
     let module = Module::new(&store, wasm_bytes)?;
+
+    // Create an empty import object.
     let import_object = imports! {};
-    // And instantiate it with no imports.
+
+    println!("Instantiating module...");
+    // Let's instantiate the Wasm module.
     let instance = Instance::new(&module, &import_object)?;
 
+    // The module exports some utility functions, let's get them.
+    //
+    // These function will be used later in this example.
     let mem_size: NativeFunc<(), i32> = instance.exports.get_native_function("mem_size")?;
     let get_at: NativeFunc<i32, i32> = instance.exports.get_native_function("get_at")?;
     let set_at: NativeFunc<(i32, i32), ()> = instance.exports.get_native_function("set_at")?;
     let memory = instance.exports.get_memory("memory")?;
 
-    let mem_addr = 0x2220;
-    let val = 0xFEFEFFE;
-
+    // We now have an instance ready to be used.
+    //
+    // We will start by querying the most intersting information
+    // about the memory: its size. There are mainly two ways of getting
+    // this:
+    // * the size as a number of `Page`s
+    // * the size as a number of bytes
+    //
+    // The size in bytes can be found either by querying its pages or by
+    // querying the memory directly.
+    println!("Querying memory size...");
     assert_eq!(memory.size(), Pages::from(1));
+    assert_eq!(memory.size().bytes(), Bytes::from(65536 as usize));
+    assert_eq!(memory.data_size(), 65536);
+
+    // Sometimes, the guest module may also export a function to let you
+    // query the memory. Here we have a `mem_size` function, let's try it:
+    let result = mem_size.call()?;
+    println!("Memory size: {:?}", result);
+    assert_eq!(Pages::from(result as u32), memory.size());
+
+    // Now that we know the size of our memory, it's time to see how wa
+    // can change this.
+    //
+    // A memory can be grown to allow storing more things into it. Let's
+    // see how we can do that:
+    println!("Growing memory...");
+    // Here we are requesting two more pages for our memory.
     memory.grow(2)?;
     assert_eq!(memory.size(), Pages::from(3));
-    let result = mem_size.call()?;
-    assert_eq!(result, 3);
+    assert_eq!(memory.data_size(), 65536 * 3);
 
-    // -------------
+    // Now that we know how to query and adjust the size of the memory,
+    // let's see how wa can write to it or read from it.
+    //
+    // We'll only focus on how to do this using exported functions, the goal
+    // is to show how to work with memory addresses. Here we'll use absolute
+    // addresses to write and read a value.
+    let mem_addr = 0x2220;
+    let val = 0xFEFEFFE;
     set_at.call(mem_addr, val)?;
-    // -------------
 
-    let page_size = 0x1_0000;
-    let result = get_at.call(page_size * 3 - 4)?;
-    memory.grow(1025)?;
-    assert_eq!(memory.size(), Pages::from(1028));
-    set_at.call(page_size * 1027 - 4, 123456)?;
-    let result = get_at.call(page_size * 1027 - 4)?;
-    assert_eq!(result, 123456);
-    set_at.call(1024, 123456)?;
-    let result = get_at.call(1024)?;
-    assert_eq!(result, 123456);
-
-    // -------------
     let result = get_at.call(mem_addr)?;
+    println!("Value at {:#x?}: {:?}", mem_addr, result);
+    assert_eq!(result, val);
+
+    // Now instead of using hard coded memory addresses, let's try to write
+    // something at the end of the second memory page and read it.
+    let page_size = 0x1_0000;
+    let mem_addr = (page_size * 2) - mem::size_of_val(&val) as i32;
+    let val = 0xFEA09;
+    set_at.call(mem_addr, val)?;
+
+    let result = get_at.call(mem_addr)?;
+    println!("Value at {:#x?}: {:?}", mem_addr, result);
     assert_eq!(result, val);
-    // -------------
 
     Ok(())
 }
diff --git a/examples/tunables_limit_memory.rs b/examples/tunables_limit_memory.rs
new file mode 100644
index 000000000..c87f371bc
--- /dev/null
+++ b/examples/tunables_limit_memory.rs
@@ -0,0 +1,184 @@
+use std::ptr::NonNull;
+use std::sync::Arc;
+
+use wasmer::{
+    imports,
+    vm::{self, MemoryError, MemoryStyle, TableStyle, VMMemoryDefinition, VMTableDefinition},
+    wat2wasm, Instance, Memory, MemoryType, Module, Pages, Store, TableType, Target,
+    Tunables as ReferenceTunables,
+};
+use wasmer_compiler_cranelift::Cranelift;
+use wasmer_engine::Tunables;
+use wasmer_engine_jit::JIT;
+
+/// A custom tunables that allows you to set a memory limit.
+///
+/// After adjusting the memory limits, it delegates all other logic
+/// to the base tunables.
+pub struct LimitingTunables<T: Tunables> {
+    /// The maximum a linear memory is allowed to be (in Wasm pages, 64 KiB each).
+    /// Since Wasmer ensures there is only none or one memory, this is practically
+    /// an upper limit for the guest memory.
+    limit: Pages,
+    /// The base implementation we delegate all the logic to
+    base: T,
+}
+
+impl<T: Tunables> LimitingTunables<T> {
+    pub fn new(base: T, limit: Pages) -> Self {
+        Self { limit, base }
+    }
+
+    /// Takes in input memory type as requested by the guest and sets
+    /// a maximum if missing. The resulting memory type is final if
+    /// valid. However, this can produce invalid types, such that
+    /// validate_memory must be called before creating the memory.
+    fn adjust_memory(&self, requested: &MemoryType) -> MemoryType {
+        let mut adjusted = requested.clone();
+        if requested.maximum.is_none() {
+            adjusted.maximum = Some(self.limit);
+        }
+        adjusted
+    }
+
+    /// Ensures the a given memory type does not exceed the memory limit.
+    /// Call this after adjusting the memory.
+    fn validate_memory(&self, ty: &MemoryType) -> Result<(), MemoryError> {
+        if ty.minimum > self.limit {
+            return Err(MemoryError::Generic(
+                "Minimum exceeds the allowed memory limit".to_string(),
+            ));
+        }
+
+        if let Some(max) = ty.maximum {
+            if max > self.limit {
+                return Err(MemoryError::Generic(
+                    "Maximum exceeds the allowed memory limit".to_string(),
+                ));
+            }
+        } else {
+            return Err(MemoryError::Generic("Maximum unset".to_string()));
+        }
+
+        Ok(())
+    }
+}
+
+impl<T: Tunables> Tunables for LimitingTunables<T> {
+    /// Construct a `MemoryStyle` for the provided `MemoryType`
+    ///
+    /// Delegated to base.
+    fn memory_style(&self, memory: &MemoryType) -> MemoryStyle {
+        let adjusted = self.adjust_memory(memory);
+        self.base.memory_style(&adjusted)
+    }
+
+    /// Construct a `TableStyle` for the provided `TableType`
+    ///
+    /// Delegated to base.
+    fn table_style(&self, table: &TableType) -> TableStyle {
+        self.base.table_style(table)
+    }
+
+    /// Create a memory owned by the host given a [`MemoryType`] and a [`MemoryStyle`].
+    ///
+    /// The requested memory type is validated, adjusted to the limited and then passed to base.
+    fn create_host_memory(
+        &self,
+        ty: &MemoryType,
+        style: &MemoryStyle,
+    ) -> Result<Arc<dyn vm::Memory>, MemoryError> {
+        let adjusted = self.adjust_memory(ty);
+        self.validate_memory(&adjusted)?;
+        self.base.create_host_memory(&adjusted, style)
+    }
+
+    /// Create a memory owned by the VM given a [`MemoryType`] and a [`MemoryStyle`].
+    ///
+    /// Delegated to base.
+    unsafe fn create_vm_memory(
+        &self,
+        ty: &MemoryType,
+        style: &MemoryStyle,
+        vm_definition_location: NonNull<VMMemoryDefinition>,
+    ) -> Result<Arc<dyn vm::Memory>, MemoryError> {
+        let adjusted = self.adjust_memory(ty);
+        self.validate_memory(&adjusted)?;
+        self.base
+            .create_vm_memory(&adjusted, style, vm_definition_location)
+    }
+
+    /// Create a table owned by the host given a [`TableType`] and a [`TableStyle`].
+    ///
+    /// Delegated to base.
+    fn create_host_table(
+        &self,
+        ty: &TableType,
+        style: &TableStyle,
+    ) -> Result<Arc<dyn vm::Table>, String> {
+        self.base.create_host_table(ty, style)
+    }
+
+    /// Create a table owned by the VM given a [`TableType`] and a [`TableStyle`].
+    ///
+    /// Delegated to base.
+    unsafe fn create_vm_table(
+        &self,
+        ty: &TableType,
+        style: &TableStyle,
+        vm_definition_location: NonNull<VMTableDefinition>,
+    ) -> Result<Arc<dyn vm::Table>, String> {
+        self.base.create_vm_table(ty, style, vm_definition_location)
+    }
+}
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // A Wasm module with one exported memory (min: 7 pages, max: unset)
+    let wat = br#"(module (memory 7) (export "memory" (memory 0)))"#;
+
+    // Alternatively: A Wasm module with one exported memory (min: 7 pages, max: 80 pages)
+    // let wat = br#"(module (memory 7 80) (export "memory" (memory 0)))"#;
+
+    let wasm_bytes = wat2wasm(wat)?;
+
+    // Any compiler and any engine do the job here
+    let compiler = Cranelift::default();
+    let engine = JIT::new(&compiler).engine();
+
+    // Here is where the fun begins
+
+    let base = ReferenceTunables::for_target(&Target::default());
+    let tunables = LimitingTunables::new(base, Pages(24));
+
+    // Create a store, that holds the engine and our custom tunables
+    let store = Store::new_with_tunables(&engine, tunables);
+
+    println!("Compiling module...");
+    let module = Module::new(&store, wasm_bytes)?;
+
+    println!("Instantiating module...");
+    let import_object = imports! {};
+
+    // Now at this point, our custom tunables are used
+    let instance = Instance::new(&module, &import_object)?;
+
+    // Check what happened
+    let mut memories: Vec<Memory> = instance
+        .exports
+        .iter()
+        .memories()
+        .map(|pair| pair.1.clone())
+        .collect();
+    assert_eq!(memories.len(), 1);
+
+    let first_memory = memories.pop().unwrap();
+    println!("Memory of this instance: {:?}", first_memory);
+    assert_eq!(first_memory.ty().maximum.unwrap(), Pages(24));
+
+    Ok(())
+}
+
+#[test]
+fn test_tunables_limit_memory() -> Result<(), Box<dyn std::error::Error>> {
+    main()
+}
diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml
index d2e059947..11634c35f 100644
--- a/lib/api/Cargo.toml
+++ b/lib/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "High-performant WebAssembly runtime"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "runtime", "vm"]
@@ -11,29 +11,29 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
-wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.0-alpha4", optional = true }
-wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.0-alpha4", optional = true }
-wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.0-alpha4", optional = true }
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4" }
-wasmer-derive = { path = "../derive", version = "1.0.0-alpha4" }
-wasmer-engine = { path = "../engine", version = "1.0.0-alpha4" }
-wasmer-engine-jit = { path = "../engine-jit", version = "1.0.0-alpha4", optional = true }
-wasmer-engine-native = { path = "../engine-native", version = "1.0.0-alpha4", optional = true }
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha5" }
+wasmer-compiler-singlepass = { path = "../compiler-singlepass", version = "1.0.0-alpha5", optional = true }
+wasmer-compiler-cranelift = { path = "../compiler-cranelift", version = "1.0.0-alpha5", optional = true }
+wasmer-compiler-llvm = { path = "../compiler-llvm", version = "1.0.0-alpha5", optional = true }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5" }
+wasmer-derive = { path = "../derive", version = "1.0.0-alpha5" }
+wasmer-engine = { path = "../engine", version = "1.0.0-alpha5" }
+wasmer-engine-jit = { path = "../engine-jit", version = "1.0.0-alpha5", optional = true }
+wasmer-engine-native = { path = "../engine-native", version = "1.0.0-alpha5", optional = true }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5" }
 indexmap = { version = "1.4", features = ["serde-1"] }
 cfg-if = "0.1"
 wat = { version = "1.0", optional = true }
 thiserror = "1.0"
 more-asserts = "0.2"
-target-lexicon = { version = "0.10", default-features = false }
+target-lexicon = { version = "0.11", default-features = false }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = "0.3"
 
 [dev-dependencies]
 # for the binary wasmer.rs
-libc = { version = "^0.2.69", default-features = false }
+libc = { version = "^0.2", default-features = false }
 wat = "1.0"
 tempfile = "3.1"
 anyhow = "1.0"
diff --git a/lib/api/src/externals/function.rs b/lib/api/src/externals/function.rs
index 9dcbf6f86..a86753b81 100644
--- a/lib/api/src/externals/function.rs
+++ b/lib/api/src/externals/function.rs
@@ -12,8 +12,8 @@ use std::cmp::max;
 use std::fmt;
 use wasmer_vm::{
     raise_user_trap, resume_panic, wasmer_call_trampoline, Export, ExportFunction,
-    VMCallerCheckedAnyfunc, VMContext, VMDynamicFunctionContext, VMFunctionBody, VMFunctionKind,
-    VMTrampoline,
+    VMCallerCheckedAnyfunc, VMDynamicFunctionContext, VMFunctionBody, VMFunctionEnvironment,
+    VMFunctionKind, VMTrampoline,
 };
 
 /// A function defined in the Wasm module
@@ -86,7 +86,9 @@ impl Function {
         // The engine linker will replace the address with one pointing to a
         // generated dynamic trampoline.
         let address = std::ptr::null() as *const VMFunctionBody;
-        let vmctx = Box::into_raw(Box::new(dynamic_ctx)) as *mut VMContext;
+        let vmctx = VMFunctionEnvironment {
+            host_env: Box::into_raw(Box::new(dynamic_ctx)) as *mut _,
+        };
 
         Self {
             store: store.clone(),
@@ -138,7 +140,9 @@ impl Function {
         // The engine linker will replace the address with one pointing to a
         // generated dynamic trampoline.
         let address = std::ptr::null() as *const VMFunctionBody;
-        let vmctx = Box::into_raw(Box::new(dynamic_ctx)) as *mut VMContext;
+        let vmctx = VMFunctionEnvironment {
+            host_env: Box::into_raw(Box::new(dynamic_ctx)) as *mut _,
+        };
         // TODO: look into removing transmute by changing API type signatures
         let function_ptr = Some(unsafe {
             std::mem::transmute::<fn(_, _) -> Result<(), _>, fn(_, _) -> Result<(), _>>(Env::finish)
@@ -184,7 +188,9 @@ impl Function {
     {
         let function = inner::Function::<Args, Rets>::new(func);
         let address = function.address() as *const VMFunctionBody;
-        let vmctx = std::ptr::null_mut() as *mut VMContext;
+        let vmctx = VMFunctionEnvironment {
+            host_env: std::ptr::null_mut() as *mut _,
+        };
         let signature = function.ty();
 
         Self {
@@ -242,7 +248,9 @@ impl Function {
         // In the case of Host-defined functions `VMContext` is whatever environment
         // the user want to attach to the function.
         let box_env = Box::new(env);
-        let vmctx = Box::into_raw(box_env) as *mut VMContext;
+        let vmctx = VMFunctionEnvironment {
+            host_env: Box::into_raw(box_env) as *mut _,
+        };
         // TODO: look into removing transmute by changing API type signatures
         let function_ptr = Some(unsafe {
             std::mem::transmute::<fn(_, _) -> Result<(), _>, fn(_, _) -> Result<(), _>>(Env::finish)
diff --git a/lib/api/src/externals/memory.rs b/lib/api/src/externals/memory.rs
index 38c7e237a..32583c82f 100644
--- a/lib/api/src/externals/memory.rs
+++ b/lib/api/src/externals/memory.rs
@@ -87,21 +87,26 @@ impl Memory {
         &self.store
     }
 
-    /// TODO: document this function.
+    /// Retrieve a slice of the memory contents.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
+    /// Until the returned slice is dropped, it is undefined behaviour to
+    /// modify the memory contents in any way including by calling a wasm
+    /// function that writes to the memory or by resizing the memory.
     pub unsafe fn data_unchecked(&self) -> &[u8] {
         self.data_unchecked_mut()
     }
 
-    /// TODO: document this function, it's trivial to cause UB/break soundness with this
-    /// method.
+    /// Retrieve a mutable slice of the memory contents.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
+    /// This method provides interior mutability without an UnsafeCell. Until
+    /// the returned value is dropped, it is undefined behaviour to read or
+    /// write to the pointed-to memory in any way except through this slice,
+    /// including by calling a wasm function that reads the memory contents or
+    /// by resizing this Memory.
     #[allow(clippy::mut_from_ref)]
     pub unsafe fn data_unchecked_mut(&self) -> &mut [u8] {
         let definition = self.memory.vmmemory();
diff --git a/lib/api/src/lib.rs b/lib/api/src/lib.rs
index 7bf193bcf..9d7cc828f 100644
--- a/lib/api/src/lib.rs
+++ b/lib/api/src/lib.rs
@@ -83,7 +83,17 @@ pub use wasmer_types::{
     Atomically, Bytes, GlobalInit, LocalFunctionIndex, MemoryView, Pages, ValueType,
     WASM_MAX_PAGES, WASM_MIN_PAGES, WASM_PAGE_SIZE,
 };
+
+// TODO: should those be moved into wasmer::vm as well?
 pub use wasmer_vm::{raise_user_trap, Export, MemoryError};
+pub mod vm {
+    //! We use the vm module for re-exporting wasmer-vm types
+
+    pub use wasmer_vm::{
+        Memory, MemoryError, MemoryStyle, Table, TableStyle, VMMemoryDefinition, VMTableDefinition,
+    };
+}
+
 #[cfg(feature = "wat")]
 pub use wat::parse_bytes as wat2wasm;
 
diff --git a/lib/api/src/native.rs b/lib/api/src/native.rs
index b8f6c291d..8e82e41e2 100644
--- a/lib/api/src/native.rs
+++ b/lib/api/src/native.rs
@@ -17,7 +17,7 @@ use crate::{FromToNativeWasmType, Function, FunctionType, RuntimeError, Store, W
 use std::panic::{catch_unwind, AssertUnwindSafe};
 use wasmer_types::NativeWasmType;
 use wasmer_vm::{
-    ExportFunction, VMContext, VMDynamicFunctionContext, VMFunctionBody, VMFunctionKind,
+    ExportFunction, VMDynamicFunctionContext, VMFunctionBody, VMFunctionEnvironment, VMFunctionKind,
 };
 
 /// A WebAssembly function that can be called natively
@@ -26,7 +26,7 @@ pub struct NativeFunc<Args = (), Rets = ()> {
     definition: FunctionDefinition,
     store: Store,
     address: *const VMFunctionBody,
-    vmctx: *mut VMContext,
+    vmctx: VMFunctionEnvironment,
     arg_kind: VMFunctionKind,
     // exported: ExportFunction,
     _phantom: PhantomData<(Args, Rets)>,
@@ -42,7 +42,7 @@ where
     pub(crate) fn new(
         store: Store,
         address: *const VMFunctionBody,
-        vmctx: *mut VMContext,
+        vmctx: VMFunctionEnvironment,
         arg_kind: VMFunctionKind,
         definition: FunctionDefinition,
     ) -> Self {
@@ -169,7 +169,7 @@ macro_rules! impl_native_traits {
                         match self.arg_kind {
                             VMFunctionKind::Static => {
                                 let results = catch_unwind(AssertUnwindSafe(|| unsafe {
-                                    let f = std::mem::transmute::<_, unsafe extern "C" fn( *mut VMContext, $( $x, )*) -> Rets::CStruct>(self.address);
+                                    let f = std::mem::transmute::<_, unsafe extern "C" fn( VMFunctionEnvironment, $( $x, )*) -> Rets::CStruct>(self.address);
                                     // We always pass the vmctx
                                     f( self.vmctx, $( $x, )* )
                                 })).map_err(|e| RuntimeError::new(format!("{:?}", e)))?;
@@ -179,12 +179,16 @@ macro_rules! impl_native_traits {
                                 let params_list = [ $( $x.to_native().to_value() ),* ];
                                 let results = if !has_env {
                                     type VMContextWithoutEnv = VMDynamicFunctionContext<VMDynamicFunctionWithoutEnv>;
-                                    let ctx = self.vmctx as *mut VMContextWithoutEnv;
-                                    unsafe { (*ctx).ctx.call(&params_list)? }
+                                    unsafe {
+                                        let ctx = self.vmctx.host_env as *mut VMContextWithoutEnv;
+                                        (*ctx).ctx.call(&params_list)?
+                                    }
                                 } else {
                                     type VMContextWithEnv = VMDynamicFunctionContext<VMDynamicFunctionWithEnv<std::ffi::c_void>>;
-                                    let ctx = self.vmctx as *mut VMContextWithEnv;
-                                    unsafe { (*ctx).ctx.call(&params_list)? }
+                                    unsafe {
+                                        let ctx = self.vmctx.host_env as *mut VMContextWithEnv;
+                                        (*ctx).ctx.call(&params_list)?
+                                    }
                                 };
                                 let mut rets_list_array = Rets::empty_array();
                                 let mut_rets = rets_list_array.as_mut() as *mut [i128] as *mut i128;
diff --git a/lib/api/src/tunables.rs b/lib/api/src/tunables.rs
index e24ccabe2..d83d794f8 100644
--- a/lib/api/src/tunables.rs
+++ b/lib/api/src/tunables.rs
@@ -71,6 +71,7 @@ impl BaseTunables for Tunables {
         let maximum = memory.maximum.unwrap_or_else(Pages::max_value);
         if maximum <= self.static_memory_bound {
             MemoryStyle::Static {
+                // Bound can be larger than the maximum for performance reasons
                 bound: self.static_memory_bound,
                 offset_guard_size: self.static_memory_offset_guard_size,
             }
@@ -140,3 +141,47 @@ impl BaseTunables for Tunables {
         )?))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn memory_style() {
+        let tunables = Tunables {
+            static_memory_bound: Pages(2048),
+            static_memory_offset_guard_size: 128,
+            dynamic_memory_offset_guard_size: 256,
+        };
+
+        // No maximum
+        let requested = MemoryType::new(3, None, true);
+        let style = tunables.memory_style(&requested);
+        match style {
+            MemoryStyle::Dynamic { offset_guard_size } => assert_eq!(offset_guard_size, 256),
+            s => panic!("Unexpected memory style: {:?}", s),
+        }
+
+        // Large maximum
+        let requested = MemoryType::new(3, Some(5_000_000), true);
+        let style = tunables.memory_style(&requested);
+        match style {
+            MemoryStyle::Dynamic { offset_guard_size } => assert_eq!(offset_guard_size, 256),
+            s => panic!("Unexpected memory style: {:?}", s),
+        }
+
+        // Small maximum
+        let requested = MemoryType::new(3, Some(16), true);
+        let style = tunables.memory_style(&requested);
+        match style {
+            MemoryStyle::Static {
+                bound,
+                offset_guard_size,
+            } => {
+                assert_eq!(bound, Pages(2048));
+                assert_eq!(offset_guard_size, 128);
+            }
+            s => panic!("Unexpected memory style: {:?}", s),
+        }
+    }
+}
diff --git a/lib/api/src/types.rs b/lib/api/src/types.rs
index f55bfc42a..5839b8f77 100644
--- a/lib/api/src/types.rs
+++ b/lib/api/src/types.rs
@@ -56,7 +56,9 @@ impl ValFuncRef for Val {
             Self::ExternRef(ExternRef::Null) => wasmer_vm::VMCallerCheckedAnyfunc {
                 func_ptr: ptr::null(),
                 type_index: wasmer_vm::VMSharedSignatureIndex::default(),
-                vmctx: ptr::null_mut(),
+                vmctx: wasmer_vm::VMFunctionEnvironment {
+                    host_env: ptr::null_mut(),
+                },
             },
             Self::FuncRef(f) => f.checked_anyfunc(),
             _ => return Err(RuntimeError::new("val is not funcref")),
diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml
index 312900c9f..3e37ffa52 100644
--- a/lib/c-api/Cargo.toml
+++ b/lib/c-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-c-api"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Wasmer C API library"
 categories = ["wasm", "api-bindings"]
 keywords = ["wasm", "webassembly", "runtime"]
@@ -15,21 +15,21 @@ edition = "2018"
 crate-type = ["cdylib", "rlib", "staticlib"]
 
 [dependencies]
-wasmer = { version = "1.0.0-alpha4", path = "../api", default-features = false }
-wasmer-compiler = { version = "1.0.0-alpha4", path = "../compiler" }
-wasmer-compiler-cranelift = { version = "1.0.0-alpha4", path = "../compiler-cranelift", optional = true }
-wasmer-compiler-singlepass = { version = "1.0.0-alpha4", path = "../compiler-singlepass", optional = true }
-wasmer-compiler-llvm = { version = "1.0.0-alpha4", path = "../compiler-llvm", optional = true }
-wasmer-emscripten = { version = "1.0.0-alpha4", path = "../emscripten", optional = true }
-wasmer-engine = { version = "1.0.0-alpha4", path = "../engine" }
-wasmer-engine-jit = { version = "1.0.0-alpha4", path = "../engine-jit", optional = true }
-wasmer-engine-native = { version = "1.0.0-alpha4", path = "../engine-native", optional = true }
-wasmer-engine-object-file = { version = "1.0.0-alpha4", path = "../engine-object-file", optional = true }
-wasmer-wasi = { version = "1.0.0-alpha4", path = "../wasi", optional = true }
-wasmer-types = { version = "1.0.0-alpha4", path = "../wasmer-types" }
-cfg-if = "0.1"
+wasmer = { version = "1.0.0-alpha5", path = "../api", default-features = false }
+wasmer-compiler = { version = "1.0.0-alpha5", path = "../compiler" }
+wasmer-compiler-cranelift = { version = "1.0.0-alpha5", path = "../compiler-cranelift", optional = true }
+wasmer-compiler-singlepass = { version = "1.0.0-alpha5", path = "../compiler-singlepass", optional = true }
+wasmer-compiler-llvm = { version = "1.0.0-alpha5", path = "../compiler-llvm", optional = true }
+wasmer-emscripten = { version = "1.0.0-alpha5", path = "../emscripten", optional = true }
+wasmer-engine = { version = "1.0.0-alpha5", path = "../engine" }
+wasmer-engine-jit = { version = "1.0.0-alpha5", path = "../engine-jit", optional = true }
+wasmer-engine-native = { version = "1.0.0-alpha5", path = "../engine-native", optional = true }
+wasmer-engine-object-file = { version = "1.0.0-alpha5", path = "../engine-object-file", optional = true }
+wasmer-wasi = { version = "1.0.0-alpha5", path = "../wasi", optional = true }
+wasmer-types = { version = "1.0.0-alpha5", path = "../wasmer-types" }
+cfg-if = "1.0"
 lazy_static = "1"
-libc = { version = "^0.2.69", default-features = false }
+libc = { version = "^0.2", default-features = false }
 libffi = { version = "0.9" }
 serde = { version = "1", optional = true, features = ["derive"] }
 thiserror = "1"
@@ -37,7 +37,10 @@ typetag = { version = "0.1", optional = true }
 paste = "0.1"
 # for generating code in the same way thot the wasm-c-api does
 # Commented out for now until we can find a solution to the exported function problem
-# wasmer-wasm-c-api = { version = "1.0.0-alpha4", path = "crates/wasm-c-api" }
+# wasmer-wasm-c-api = { version = "1.0.0-alpha5", path = "crates/wasm-c-api" }
+
+[dev-dependencies]
+inline-c = "0.1.2"
 
 [features]
 default = [
@@ -89,4 +92,4 @@ cranelift-backend = ["cranelift"]
 llvm-backend = ["llvm"]
 
 [build-dependencies]
-cbindgen = "0.15"
+cbindgen = "0.15"
\ No newline at end of file
diff --git a/lib/c-api/build.rs b/lib/c-api/build.rs
index d0147057f..f2a57aa28 100644
--- a/lib/c-api/build.rs
+++ b/lib/c-api/build.rs
@@ -61,6 +61,7 @@ fn main() {
 
     build_wasm_c_api_headers(&crate_dir, &out_dir);
     build_wasmer_headers(&crate_dir, &out_dir);
+    build_inline_c_env_vars();
 }
 
 /// Build the header files for the `wasm_c_api` API.
@@ -389,3 +390,44 @@ fn exclude_items_from_wasm_c_api(builder: Builder) -> Builder {
         .exclude_item("wasmer_engine_t")
         .exclude_item("wat2wasm")
 }
+
+fn build_inline_c_env_vars() {
+    use std::ffi::OsStr;
+
+    let mut shared_object_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+
+    assert_eq!(shared_object_dir.file_name(), Some(OsStr::new("c-api")));
+    shared_object_dir.pop();
+
+    assert_eq!(shared_object_dir.file_name(), Some(OsStr::new("lib")));
+    shared_object_dir.pop();
+
+    shared_object_dir.push("target");
+    shared_object_dir.push(env::var("PROFILE").unwrap());
+
+    let shared_object_dir = shared_object_dir.as_path().to_string_lossy();
+    let include_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+
+    // The following options mean:
+    //
+    // * `-I`, add `include_dir` to include search path,
+    // * `-L`, add `shared_object_dir` to library search path,
+    // * `-D_DEBUG`, enable debug mode to enable `assert.h`.
+    println!(
+        "cargo:rustc-env=INLINE_C_RS_CFLAGS=-I{I} -L{L} -D_DEBUG",
+        I = include_dir,
+        L = shared_object_dir.clone(),
+    );
+
+    println!(
+        "cargo:rustc-env=INLINE_C_RS_LDFLAGS={shared_object_dir}/{lib}",
+        shared_object_dir = shared_object_dir,
+        lib = if cfg!(target_os = "windows") {
+            "wasmer_c_api.dll".to_string()
+        } else if cfg!(target_os = "macos") {
+            "libwasmer_c_api.dylib".to_string()
+        } else {
+            "libwasmer_c_api.so".to_string()
+        }
+    );
+}
diff --git a/lib/c-api/doc/deprecated/doxyfile b/lib/c-api/doc/deprecated/doxyfile
index fa289b1e6..8e4ea8759 100644
--- a/lib/c-api/doc/deprecated/doxyfile
+++ b/lib/c-api/doc/deprecated/doxyfile
@@ -1,20 +1,131 @@
-# Doxyfile 1.8.17
+# Doxyfile 1.8.18
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
 DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
 PROJECT_NAME           = "wasmer-c-api"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
 PROJECT_NUMBER         =
-PROJECT_BRIEF          = 
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
 PROJECT_LOGO           = ../../../../assets/logo.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
 OUTPUT_DIRECTORY       = .
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
 CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
 ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
 OUTPUT_LANGUAGE        = English
+
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
 OUTPUT_TEXT_DIRECTION  = None
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
 BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
 REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
 ABBREVIATE_BRIEF       = "The $name class" \
                          "The $name widget" \
                          "The $name file" \
@@ -26,313 +137,2373 @@ ABBREVIATE_BRIEF       = "The $name class" \
                          a \
                          an \
                          the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
 ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
 INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
 FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
 STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
 STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
 SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
 JAVADOC_AUTOBRIEF      = NO
+
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
 JAVADOC_BANNER         = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
 QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
 MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
 INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
 SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
 TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
+
 ALIASES                =
-TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
 OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_SLICE  = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
 EXTENSION_MAPPING      = dox=md
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
 MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
 TOC_INCLUDE_HEADINGS   = 5
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
 AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
 BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
 CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
 SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
 IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
 DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
 GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
 SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
 INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
 INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
 TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
 LOOKUP_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
 EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
 EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
 EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
 EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
 EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
 EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
 EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
 EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
 HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
 HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
+# The default value is: NO.
+
 HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
 HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
 INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# (including Cygwin) ands Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
 CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
 HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
 HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
 SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
 SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
 FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
 INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
 SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
 SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
 SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
 SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
 SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
 STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
 GENERATE_TODOLIST      = NO
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
 GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
 GENERATE_BUGLIST       = NO
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
 GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
 ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
 MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
 SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
 SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
 SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
 FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
 LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
 CITE_BIB_FILES         =
+
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
 QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
 WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
 WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
 WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# The default value is: NO.
+
 WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
 WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
 WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
 WARN_LOGFILE           =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = index.md
-INPUT                 += ../../wasmer.h
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = index.md \
+                         ../../wasmer.h
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
 INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
+
 FILE_PATTERNS          = *.h \
                          *.hh
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
 RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
 EXCLUDE                = doc
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
 EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
 EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
 EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
 EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
 EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
 EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
 IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
 INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
 FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
 FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
 FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
 USE_MDFILE_AS_MAINPAGE = index.md
+
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
 SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
 INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
 STRIP_CODE_COMMENTS    = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# entity all documented functions referencing it will be listed.
+# The default value is: NO.
+
 REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
 REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
 REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
 SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
 USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
 VERBATIM_HEADERS       = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
 ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
 COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
 IGNORE_PREFIX          =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
 GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_HEADER            = theme/header.html
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_FOOTER            = theme/footer.html
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_EXTRA_STYLESHEET  = theme/css/wasmer.css
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: https://developer.apple.com/xcode/), introduced with OSX
+# 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
 DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
 DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
 DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
 QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
 QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
 QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
 QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
 QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
 QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
 QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
 ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 DISABLE_INDEX          = YES
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 EXT_LINKS_IN_WINDOW    = NO
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 FORMULA_TRANSPARENT    = YES
+
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
 FORMULA_MACROFILE      =
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
 MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
 MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
 MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
 MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using JavaScript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
 SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
 EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
 SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
 SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
 EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
 EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
 GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_CMD_NAME         =
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 MAKEINDEX_CMD_NAME     = makeindex
+
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_MAKEINDEX_CMD    = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
 GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_SOURCE_CODE        = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
 GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
 MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
 MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
 MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
 MAN_LINKS              = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the XML output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
 GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
 XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
 XML_PROGRAMLISTING     = YES
+
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
 XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
 GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
 DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
 DOCBOOK_PROGRAMLISTING = NO
+
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
 GENERATE_AUTOGEN_DEF   = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
 GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
 PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
 PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
 PERLMOD_MAKEVAR_PREFIX =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
 ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
 INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 SKIP_FUNCTION_MACROS   = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to external references
 #---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
 TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
 GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
 ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
 EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
 EXTERNAL_PAGES         = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
 CLASS_DIAGRAMS         = YES
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
 DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
 HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
 HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_IMAGE_FORMAT       = svg
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 INTERACTIVE_SVG        = YES
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_PATH               = ${DOXYGEN_DOT_PATH}
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
 MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
 DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
 PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
 PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
 PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_CLEANUP            = YES
diff --git a/lib/c-api/doc/wasm_c_api/.empty b/lib/c-api/doc/wasm_c_api/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/c-api/src/wasm_c_api/DEVELOPMENT.md b/lib/c-api/src/wasm_c_api/DEVELOPMENT.md
new file mode 100644
index 000000000..7545796cc
--- /dev/null
+++ b/lib/c-api/src/wasm_c_api/DEVELOPMENT.md
@@ -0,0 +1,132 @@
+# Development Notes
+
+## Ownerships
+
+The [`wasm.h`] header thankfully defines the [`own`] “annotation”. It
+specifies _who_ owns _what_. For example, in the following code:
+
+```c
+WASM_API_EXTERN own wasm_importtype_t* wasm_importtype_new(
+  own wasm_name_t* module, own wasm_name_t* name, own wasm_externtype_t*);
+```
+
+We must read that `wasm_importtype_new` takes the ownership of all its
+three arguments. This function is then responsible to free those
+data. We must also read that the returned value is owned by the caller
+of this function.
+
+### Rust Pattern
+
+This ownership property translates well in Rust. We have decided to
+use the `Box<T>` type to represent an owned pointer. `Box<T>` drops
+its content when it's dropped.
+
+Consequently, apart from other patterns, the code above can be written
+as follows in Rust:
+
+```rust
+#[no_mangle]
+pub extern "C" fn wasm_importtype_new(
+    module: Box<wasm_name_t>,
+    name: Box<wasm_name_t>,
+    extern_type: Box<wasm_externtype_t>,
+) -> Box<wasm_importtype_t> {
+    …
+}
+```
+
+By reading the code, it is clear that `wasm_importtype_new` takes the
+ownership for `module`, `name`, and `extern_type`, and that the result
+is owned by the caller.
+
+## `const *T`
+
+A constant pointer can be interpreted in C as an immutable
+pointer. Without the [`own`] annotation, it means the ownership is not
+transfered anywhere (see [the Ownerships Section][#ownerships]).
+
+### Rust Pattern
+
+`const *T` translates to Rust as `&T`, it's a reference.
+
+## Null Pointer
+
+The [`wasm.h`] header does not say anything about null pointer. The
+behavior we agreed on in that passing a null pointer where it is not
+expected (i.e. everywhere) will make the function to return null too
+with no error.
+
+### Rust Pattern
+
+A nice type property in Rust is that it is possible to write
+`Option<NonNull<T>>` to nicely handle null pointer of kind `T`. For an
+argument, it translates as follows:
+
+* When the given pointer is null, the argument holds `None`,
+* When the given pointer is not null, the arguments holds
+  `Some(NonNull<T>)`.
+
+Considering [the Ownerships Section][#ownerships], if the pointer is
+owned, we can also write `Option<Box<T>>`. This pattern is largely
+used in this codebase to represent a “nullable” owned
+pointer. Consequently, a code like:
+
+```c
+WASM_API_EXTERN own wasm_importtype_t* wasm_importtype_new(
+  own wasm_name_t* module, own wasm_name_t* name, own wasm_externtype_t*);
+```
+
+translates into Rust as:
+
+```rust
+#[no_mangle]
+pub extern "C" fn wasm_importtype_new(
+    module: Option<Box<wasm_name_t>>,
+    name: Option<Box<wasm_name_t>>,
+    extern_type: Option<Box<wasm_externtype_t>>,
+) -> Option<Box<wasm_importtype_t>> {
+    Some(Box::new(wasm_importtype_t {
+        name: name?,
+        module: module?,
+        extern_type: extern_type?,
+    }))
+}
+```
+
+What `name?` (and others) means? It is basically [the `Try` trait
+implemented for
+`Option`](https://doc.rust-lang.org/std/ops/trait.Try.html#impl-Try):
+It returns `None` if the value is `None`, otherwise it unwraps the
+`Option`.
+
+Because the function returns `Option<Box<T>>`, `None` represents a
+null pointer.
+
+Considering [the `const *T` Section][#const-t], if the pointer is not
+owned, we can either write `Option<NonNull<T>>` or `Option<&T>`. It
+has been decided to use the second pattern in all the codebase.
+
+## Destructors
+
+The [`wasm.h`] defines `wasm_*_delete` functions. It represents destructors.
+
+## Rust Pattern
+
+The destructors in Rust translate as follow:
+
+```rust
+#[no_mangle]
+pub unsafe extern "C" fn wasm_*_delete(_: Option<Box<wasm_*_t>>) {}
+```
+
+`Box<T>` will take the ownership of the value. It means that Rust will
+drop it automatically as soon as it goes out of the
+scope. Consequently, the “C destructors” really are the “Rust
+destructors”.
+
+The `Option` is here to handle the situation where a null pointer is
+passed to the destructor.
+
+
+[`own`](https://github.com/wasmerio/wasmer/blob/f548f268f2335693b97ad7ca08af72c320daf59a/lib/c-api/tests/wasm_c_api/wasm-c-api/include/wasm.h#L46-L65)
+[`wasm.h`](https://github.com/wasmerio/wasmer/blob/f548f268f2335693b97ad7ca08af72c320daf59a/lib/c-api/tests/wasm_c_api/wasm-c-api/include/wasm.h)
diff --git a/lib/c-api/src/wasm_c_api/engine.rs b/lib/c-api/src/wasm_c_api/engine.rs
index 1a72355eb..40ea16243 100644
--- a/lib/c-api/src/wasm_c_api/engine.rs
+++ b/lib/c-api/src/wasm_c_api/engine.rs
@@ -1,3 +1,4 @@
+use crate::error::{update_last_error, CApiError};
 use cfg_if::cfg_if;
 use std::sync::Arc;
 use wasmer::Engine;
@@ -8,7 +9,10 @@ use wasmer_engine_native::Native;
 #[cfg(feature = "object-file")]
 use wasmer_engine_object_file::ObjectFile;
 
-/// this can be a wasmer-specific type with wasmer-specific functions for manipulating it
+/// Kind of compilers that can be used by the engines.
+///
+/// This is a Wasmer-specific type with Wasmer-specific functions for
+/// manipulating it.
 #[derive(Debug, Copy, Clone)]
 #[repr(C)]
 pub enum wasmer_compiler_t {
@@ -33,6 +37,10 @@ impl Default for wasmer_compiler_t {
     }
 }
 
+/// Kind of engines that can be used by the store.
+///
+/// This is a Wasmer-specific type with Wasmer-specific functions for
+/// manipulating it.
 #[derive(Debug, Copy, Clone)]
 #[repr(C)]
 #[allow(non_camel_case_types)]
@@ -58,8 +66,9 @@ impl Default for wasmer_engine_t {
     }
 }
 
+/// A configuration holds the compiler and the engine used by the store.
+///
 /// cbindgen:ignore
-/// this can be a wasmer-specific type with wasmer-specific functions for manipulating it
 #[derive(Debug, Default)]
 #[repr(C)]
 pub struct wasm_config_t {
@@ -67,12 +76,15 @@ pub struct wasm_config_t {
     engine: wasmer_engine_t,
 }
 
+/// Create a new Wasmer configuration.
+///
 /// cbindgen:ignore
 #[no_mangle]
 pub extern "C" fn wasm_config_new() -> Box<wasm_config_t> {
     Box::new(wasm_config_t::default())
 }
 
+/// Configure the compiler to use.
 #[no_mangle]
 pub extern "C" fn wasm_config_set_compiler(
     config: &mut wasm_config_t,
@@ -81,13 +93,17 @@ pub extern "C" fn wasm_config_set_compiler(
     config.compiler = compiler;
 }
 
+/// Configure the engine to use.
 #[no_mangle]
 pub extern "C" fn wasm_config_set_engine(config: &mut wasm_config_t, engine: wasmer_engine_t) {
     config.engine = engine;
 }
 
+/// An engine is used by the store to drive the compilation and the
+/// execution of a WebAssembly module.
+///
 /// cbindgen:ignore
-#[allow(non_camel_case_types)]
+#[repr(C)]
 pub struct wasm_engine_t {
     pub(crate) inner: Arc<dyn Engine + Send + Sync>,
 }
@@ -112,6 +128,7 @@ fn get_default_compiler_config() -> Box<dyn CompilerConfig> {
 
 cfg_if! {
     if #[cfg(all(feature = "jit", feature = "compiler"))] {
+        /// cbindgen:ignore
         #[no_mangle]
         pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
             let compiler_config: Box<dyn CompilerConfig> = get_default_compiler_config();
@@ -121,6 +138,7 @@ cfg_if! {
     }
     else if #[cfg(feature = "jit")] {
         // Headless JIT
+        /// cbindgen:ignore
         #[no_mangle]
         pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
             let engine: Arc<dyn Engine + Send + Sync> = Arc::new(JIT::headless().engine());
@@ -128,6 +146,7 @@ cfg_if! {
         }
     }
     else if #[cfg(all(feature = "native", feature = "compiler"))] {
+        /// cbindgen:ignore
         #[no_mangle]
         pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
             let mut compiler_config: Box<dyn CompilerConfig> = get_default_compiler_config();
@@ -136,6 +155,7 @@ cfg_if! {
         }
     }
     else if #[cfg(feature = "native")] {
+        /// cbindgen:ignore
         #[no_mangle]
         pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
             let engine: Arc<dyn Engine + Send + Sync> = Arc::new(Native::headless().engine());
@@ -145,6 +165,7 @@ cfg_if! {
     // There are currently no uses of the object-file engine + compiler from the C API.
     // So if we get here, we default to headless mode regardless of if `compiler` is enabled.
     else if #[cfg(feature = "object-file")] {
+        /// cbindgen:ignore
         #[no_mangle]
         pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
             let engine: Arc<dyn Engine + Send + Sync> = Arc::new(ObjectFile::headless().engine());
@@ -152,6 +173,7 @@ cfg_if! {
         }
     }
     else {
+        /// cbindgen:ignore
         #[no_mangle]
         pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
             unimplemented!("The JITEngine is not attached; You might want to recompile `wasmer_c_api` with `--feature jit`");
@@ -161,14 +183,24 @@ cfg_if! {
 
 /// cbindgen:ignore
 #[no_mangle]
-pub unsafe extern "C" fn wasm_engine_delete(_wasm_engine_address: Option<Box<wasm_engine_t>>) {}
+pub unsafe extern "C" fn wasm_engine_delete(_engine: Option<Box<wasm_engine_t>>) {}
 
 /// cbindgen:ignore
 #[no_mangle]
 pub extern "C" fn wasm_engine_new_with_config(
     config: Box<wasm_config_t>,
 ) -> Option<Box<wasm_engine_t>> {
-    // TODO: return useful error messages in failure branches
+    fn return_with_error<M>(msg: M) -> Option<Box<wasm_engine_t>>
+    where
+        M: ToString,
+    {
+        update_last_error(CApiError {
+            msg: msg.to_string(),
+        });
+
+        return None;
+    };
+
     cfg_if! {
         if #[cfg(feature = "compiler")] {
             #[allow(unused_mut)]
@@ -178,7 +210,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "cranelift")] {
                             Box::new(wasmer_compiler_cranelift::Cranelift::default())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `cranelift` feature.");
                         }
                     }
                 },
@@ -187,7 +219,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "llvm")] {
                             Box::new(wasmer_compiler_llvm::LLVM::default())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `llvm` feature.");
                         }
                     }
                 },
@@ -196,7 +228,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "singlepass")] {
                             Box::new(wasmer_compiler_singlepass::Singlepass::default())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `singlepass` feature.");
                         }
                     }
                 },
@@ -208,7 +240,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "jit")] {
                             Arc::new(JIT::new(&*compiler_config).engine())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `jit` feature.");
                         }
                     }
                 },
@@ -217,7 +249,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "native")] {
                             Arc::new(Native::new(&mut *compiler_config).engine())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `native` feature.");
                         }
                     }
                 },
@@ -228,7 +260,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "object-file")] {
                             Arc::new(ObjectFile::headless().engine())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `object-file` feature.");
                         }
                     }
                 },
@@ -241,7 +273,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "jit")] {
                             Arc::new(JIT::headless().engine())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `jit` feature.");
                         }
                     }
                 },
@@ -250,7 +282,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "native")] {
                             Arc::new(Native::headless().engine())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `native` feature.");
                         }
                     }
                 },
@@ -259,7 +291,7 @@ pub extern "C" fn wasm_engine_new_with_config(
                         if #[cfg(feature = "object-file")] {
                             Arc::new(ObjectFile::headless().engine())
                         } else {
-                            return None;
+                            return return_with_error("Wasmer has not been compiled with the `object-file` feature.");
                         }
                     }
                 },
diff --git a/lib/c-api/src/wasm_c_api/externals/function.rs b/lib/c-api/src/wasm_c_api/externals/function.rs
index b694ceb35..fe6f58b41 100644
--- a/lib/c-api/src/wasm_c_api/externals/function.rs
+++ b/lib/c-api/src/wasm_c_api/externals/function.rs
@@ -7,6 +7,7 @@ use std::ffi::c_void;
 use std::sync::Arc;
 use wasmer::{Function, Instance, RuntimeError, Val};
 
+#[derive(Debug)]
 #[allow(non_camel_case_types)]
 pub struct wasm_func_t {
     pub(crate) inner: Function,
@@ -32,12 +33,15 @@ pub type wasm_env_finalizer_t = unsafe extern "C" fn(c_void);
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_func_new(
-    store: &wasm_store_t,
-    ft: &wasm_functype_t,
-    callback: wasm_func_callback_t,
+    store: Option<&wasm_store_t>,
+    function_type: Option<&wasm_functype_t>,
+    callback: Option<wasm_func_callback_t>,
 ) -> Option<Box<wasm_func_t>> {
-    // TODO: handle null pointers?
-    let func_sig = ft.sig();
+    let store = store?;
+    let function_type = function_type?;
+    let callback = callback?;
+
+    let func_sig = &function_type.inner().function_type;
     let num_rets = func_sig.results().len();
     let inner_callback = move |args: &[Val]| -> Result<Vec<Val>, RuntimeError> {
         let processed_args: wasm_val_vec_t = args
@@ -84,14 +88,17 @@ pub unsafe extern "C" fn wasm_func_new(
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_func_new_with_env(
-    store: &wasm_store_t,
-    ft: &wasm_functype_t,
-    callback: wasm_func_callback_with_env_t,
+    store: Option<&wasm_store_t>,
+    function_type: Option<&wasm_functype_t>,
+    callback: Option<wasm_func_callback_with_env_t>,
     env: *mut c_void,
     finalizer: wasm_env_finalizer_t,
 ) -> Option<Box<wasm_func_t>> {
-    // TODO: handle null pointers?
-    let func_sig = ft.sig();
+    let store = store?;
+    let function_type = function_type?;
+    let callback = callback?;
+
+    let func_sig = &function_type.inner().function_type;
     let num_rets = func_sig.results().len();
 
     #[repr(transparent)]
@@ -154,10 +161,13 @@ pub unsafe extern "C" fn wasm_func_delete(_func: Option<Box<wasm_func_t>>) {}
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_func_call(
-    func: &wasm_func_t,
-    args: &wasm_val_vec_t,
+    func: Option<&wasm_func_t>,
+    args: Option<&wasm_val_vec_t>,
     results: &mut wasm_val_vec_t,
 ) -> Option<Box<wasm_trap_t>> {
+    let func = func?;
+    let args = args?;
+
     let params = args
         .into_slice()
         .map(|slice| {
@@ -165,18 +175,34 @@ pub unsafe extern "C" fn wasm_func_call(
                 .into_iter()
                 .map(TryInto::try_into)
                 .collect::<Result<Vec<Val>, _>>()
-                .expect("Argument conversion failed")
+                .expect("Arguments conversion failed")
         })
         .unwrap_or_default();
 
     match func.inner.call(&params) {
         Ok(wasm_results) => {
-            *results = wasm_results
+            let vals = wasm_results
                 .into_iter()
                 .map(TryInto::try_into)
                 .collect::<Result<Vec<wasm_val_t>, _>>()
-                .expect("Argument conversion failed")
-                .into();
+                .expect("Results conversion failed");
+
+            // `results` is an uninitialized vector. Set a new value.
+            if results.is_uninitialized() {
+                *results = vals.into();
+            }
+            // `results` is an initialized but empty vector. Fill it
+            // item per item.
+            else {
+                let slice = results
+                    .into_slice_mut()
+                    .expect("`wasm_func_call`, results' size is greater than 0 but data is NULL");
+
+                for (result, value) in slice.iter_mut().zip(vals.iter()) {
+                    (*result).kind = value.kind;
+                    (*result).of = value.of;
+                }
+            }
 
             None
         }
@@ -195,6 +221,8 @@ pub unsafe extern "C" fn wasm_func_result_arity(func: &wasm_func_t) -> usize {
 }
 
 #[no_mangle]
-pub extern "C" fn wasm_func_type(func: &wasm_func_t) -> Box<wasm_functype_t> {
-    Box::new(wasm_functype_t::new(func.inner.ty().clone()))
+pub extern "C" fn wasm_func_type(func: Option<&wasm_func_t>) -> Option<Box<wasm_functype_t>> {
+    let func = func?;
+
+    Some(Box::new(wasm_functype_t::new(func.inner.ty().clone())))
 }
diff --git a/lib/c-api/src/wasm_c_api/externals/global.rs b/lib/c-api/src/wasm_c_api/externals/global.rs
index bf0837bd3..1908e36c0 100644
--- a/lib/c-api/src/wasm_c_api/externals/global.rs
+++ b/lib/c-api/src/wasm_c_api/externals/global.rs
@@ -1,6 +1,7 @@
 use super::super::store::wasm_store_t;
 use super::super::types::wasm_globaltype_t;
 use super::super::value::wasm_val_t;
+use crate::error::update_last_error;
 use std::convert::TryInto;
 use wasmer::{Global, Val};
 
@@ -12,14 +13,18 @@ pub struct wasm_global_t {
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_global_new(
-    store: &wasm_store_t,
-    gt: &wasm_globaltype_t,
-    val: &wasm_val_t,
+    store: Option<&wasm_store_t>,
+    global_type: Option<&wasm_globaltype_t>,
+    val: Option<&wasm_val_t>,
 ) -> Option<Box<wasm_global_t>> {
-    let gt = gt.as_globaltype();
+    let store = store?;
+    let global_type = global_type?;
+    let val = val?;
+
+    let global_type = &global_type.inner().global_type;
     let wasm_val = val.try_into().ok()?;
     let store = &store.inner;
-    let global = if gt.mutability.is_mutable() {
+    let global = if global_type.mutability.is_mutable() {
         Global::new_mut(store, wasm_val)
     } else {
         Global::new(store, wasm_val)
@@ -33,23 +38,32 @@ pub unsafe extern "C" fn wasm_global_delete(_global: Option<Box<wasm_global_t>>)
 
 // TODO: figure out if these should be deep or shallow copies
 #[no_mangle]
-pub unsafe extern "C" fn wasm_global_copy(wasm_global: &wasm_global_t) -> Box<wasm_global_t> {
+pub unsafe extern "C" fn wasm_global_copy(global: &wasm_global_t) -> Box<wasm_global_t> {
     // do shallow copy
     Box::new(wasm_global_t {
-        inner: wasm_global.inner.clone(),
+        inner: global.inner.clone(),
     })
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_global_get(wasm_global: &wasm_global_t, out: &mut wasm_val_t) {
-    let value = wasm_global.inner.get();
+pub unsafe extern "C" fn wasm_global_get(
+    global: &wasm_global_t,
+    // own
+    out: &mut wasm_val_t,
+) {
+    let value = global.inner.get();
     *out = value.try_into().unwrap();
 }
 
+/// Note: This function returns nothing by design but it can raise an
+/// error if setting a new value fails.
 #[no_mangle]
-pub unsafe extern "C" fn wasm_global_set(wasm_global: &mut wasm_global_t, val: &wasm_val_t) {
+pub unsafe extern "C" fn wasm_global_set(global: &mut wasm_global_t, val: &wasm_val_t) {
     let value: Val = val.try_into().unwrap();
-    wasm_global.inner.set(value);
+
+    if let Err(e) = global.inner.set(value) {
+        update_last_error(e);
+    }
 }
 
 #[no_mangle]
@@ -61,6 +75,6 @@ pub unsafe extern "C" fn wasm_global_same(
 }
 
 #[no_mangle]
-pub extern "C" fn wasm_global_type(wasm_global: &wasm_global_t) -> Box<wasm_globaltype_t> {
-    Box::new(wasm_globaltype_t::new(wasm_global.inner.ty().clone()))
+pub extern "C" fn wasm_global_type(global: &wasm_global_t) -> Box<wasm_globaltype_t> {
+    Box::new(wasm_globaltype_t::new(global.inner.ty().clone()))
 }
diff --git a/lib/c-api/src/wasm_c_api/externals/memory.rs b/lib/c-api/src/wasm_c_api/externals/memory.rs
index e89828669..e43db12ee 100644
--- a/lib/c-api/src/wasm_c_api/externals/memory.rs
+++ b/lib/c-api/src/wasm_c_api/externals/memory.rs
@@ -11,11 +11,14 @@ pub struct wasm_memory_t {
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_memory_new(
-    store: &wasm_store_t,
-    mt: &wasm_memorytype_t,
+    store: Option<&wasm_store_t>,
+    memory_type: Option<&wasm_memorytype_t>,
 ) -> Option<Box<wasm_memory_t>> {
-    let md = mt.as_memorytype().clone();
-    let memory = c_try!(Memory::new(&store.inner, md));
+    let store = store?;
+    let memory_type = memory_type?;
+
+    let memory_type = memory_type.inner().memory_type.clone();
+    let memory = c_try!(Memory::new(&store.inner, memory_type));
 
     Some(Box::new(wasm_memory_t { inner: memory }))
 }
@@ -33,8 +36,12 @@ pub unsafe extern "C" fn wasm_memory_copy(memory: &wasm_memory_t) -> Box<wasm_me
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_memory_type(memory: &wasm_memory_t) -> Box<wasm_memorytype_t> {
-    Box::new(wasm_memorytype_t::new(memory.inner.ty().clone()))
+pub unsafe extern "C" fn wasm_memory_type(
+    memory: Option<&wasm_memory_t>,
+) -> Option<Box<wasm_memorytype_t>> {
+    let memory = memory?;
+
+    Some(Box::new(wasm_memorytype_t::new(memory.inner.ty().clone())))
 }
 
 // get a raw pointer into bytes
diff --git a/lib/c-api/src/wasm_c_api/externals/mod.rs b/lib/c-api/src/wasm_c_api/externals/mod.rs
index 1fd931c5b..aae406712 100644
--- a/lib/c-api/src/wasm_c_api/externals/mod.rs
+++ b/lib/c-api/src/wasm_c_api/externals/mod.rs
@@ -6,7 +6,6 @@ mod table;
 pub use function::*;
 pub use global::*;
 pub use memory::*;
-use std::ptr::NonNull;
 use std::sync::Arc;
 pub use table::*;
 use wasmer::{Extern, Instance};
@@ -22,10 +21,9 @@ wasm_declare_boxed_vec!(extern);
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_func_as_extern(
-    func_ptr: Option<NonNull<wasm_func_t>>,
+    func: Option<&wasm_func_t>,
 ) -> Option<Box<wasm_extern_t>> {
-    let func_ptr = func_ptr?;
-    let func = func_ptr.as_ref();
+    let func = func?;
 
     Some(Box::new(wasm_extern_t {
         instance: func.instance.clone(),
@@ -35,13 +33,12 @@ pub unsafe extern "C" fn wasm_func_as_extern(
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_global_as_extern(
-    global_ptr: Option<NonNull<wasm_global_t>>,
+    global: Option<&wasm_global_t>,
 ) -> Option<Box<wasm_extern_t>> {
-    let global_ptr = global_ptr?;
-    let global = global_ptr.as_ref();
+    let global = global?;
 
     Some(Box::new(wasm_extern_t {
-        // update this if global does hold onto an `instance`
+        // TODO: update this if global does hold onto an `instance`
         instance: None,
         inner: Extern::Global(global.inner.clone()),
     }))
@@ -49,13 +46,12 @@ pub unsafe extern "C" fn wasm_global_as_extern(
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_memory_as_extern(
-    memory_ptr: Option<NonNull<wasm_memory_t>>,
+    memory: Option<&wasm_memory_t>,
 ) -> Option<Box<wasm_extern_t>> {
-    let memory_ptr = memory_ptr?;
-    let memory = memory_ptr.as_ref();
+    let memory = memory?;
 
     Some(Box::new(wasm_extern_t {
-        // update this if global does hold onto an `instance`
+        // TODO: update this if global does hold onto an `instance`
         instance: None,
         inner: Extern::Memory(memory.inner.clone()),
     }))
@@ -63,13 +59,12 @@ pub unsafe extern "C" fn wasm_memory_as_extern(
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_table_as_extern(
-    table_ptr: Option<NonNull<wasm_table_t>>,
+    table: Option<&wasm_table_t>,
 ) -> Option<Box<wasm_extern_t>> {
-    let table_ptr = table_ptr?;
-    let table = table_ptr.as_ref();
+    let table = table?;
 
     Some(Box::new(wasm_extern_t {
-        // update this if global does hold onto an `instance`
+        // TODO: update this if global does hold onto an `instance`
         instance: None,
         inner: Extern::Table(table.inner.clone()),
     }))
@@ -77,10 +72,10 @@ pub unsafe extern "C" fn wasm_table_as_extern(
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_extern_as_func(
-    extern_ptr: Option<NonNull<wasm_extern_t>>,
+    r#extern: Option<&wasm_extern_t>,
 ) -> Option<Box<wasm_func_t>> {
-    let extern_ptr = extern_ptr?;
-    let r#extern = extern_ptr.as_ref();
+    let r#extern = r#extern?;
+
     if let Extern::Function(f) = &r#extern.inner {
         Some(Box::new(wasm_func_t {
             inner: f.clone(),
@@ -93,10 +88,10 @@ pub unsafe extern "C" fn wasm_extern_as_func(
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_extern_as_global(
-    extern_ptr: Option<NonNull<wasm_extern_t>>,
+    r#extern: Option<&wasm_extern_t>,
 ) -> Option<Box<wasm_global_t>> {
-    let extern_ptr = extern_ptr?;
-    let r#extern = extern_ptr.as_ref();
+    let r#extern = r#extern?;
+
     if let Extern::Global(g) = &r#extern.inner {
         Some(Box::new(wasm_global_t { inner: g.clone() }))
     } else {
@@ -106,10 +101,10 @@ pub unsafe extern "C" fn wasm_extern_as_global(
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_extern_as_memory(
-    extern_ptr: Option<NonNull<wasm_extern_t>>,
+    r#extern: Option<&wasm_extern_t>,
 ) -> Option<Box<wasm_memory_t>> {
-    let extern_ptr = extern_ptr?;
-    let r#extern = extern_ptr.as_ref();
+    let r#extern = r#extern?;
+
     if let Extern::Memory(m) = &r#extern.inner {
         Some(Box::new(wasm_memory_t { inner: m.clone() }))
     } else {
@@ -119,10 +114,10 @@ pub unsafe extern "C" fn wasm_extern_as_memory(
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_extern_as_table(
-    extern_ptr: Option<NonNull<wasm_extern_t>>,
+    r#extern: Option<&wasm_extern_t>,
 ) -> Option<Box<wasm_table_t>> {
-    let extern_ptr = extern_ptr?;
-    let r#extern = extern_ptr.as_ref();
+    let r#extern = r#extern?;
+
     if let Extern::Table(t) = &r#extern.inner {
         Some(Box::new(wasm_table_t { inner: t.clone() }))
     } else {
diff --git a/lib/c-api/src/wasm_c_api/externals/table.rs b/lib/c-api/src/wasm_c_api/externals/table.rs
index 526c36b2c..d2b23f5fa 100644
--- a/lib/c-api/src/wasm_c_api/externals/table.rs
+++ b/lib/c-api/src/wasm_c_api/externals/table.rs
@@ -10,44 +10,46 @@ pub struct wasm_table_t {
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_table_new(
-    store: &wasm_store_t,
-    tt: &wasm_tabletype_t,
+    store: Option<&wasm_store_t>,
+    table_type: Option<&wasm_tabletype_t>,
     init: *const wasm_ref_t,
 ) -> Option<Box<wasm_table_t>> {
-    let tt = tt.as_tabletype().clone();
+    let store = store?;
+    let table_type = table_type?;
+
+    let table_type = table_type.inner().table_type.clone();
     let init_val = todo!("get val from init somehow");
-    let table = c_try!(Table::new(&store.inner, tt, init_val));
+    /*
+    let table = c_try!(Table::new(&store.inner, table_type, init_val));
 
     Some(Box::new(wasm_table_t { inner: table }))
+    */
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_table_delete(_table: Option<Box<wasm_table_t>>) {}
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_table_copy(wasm_table: &wasm_table_t) -> Box<wasm_table_t> {
+pub unsafe extern "C" fn wasm_table_copy(table: &wasm_table_t) -> Box<wasm_table_t> {
     // do shallow copy
     Box::new(wasm_table_t {
-        inner: wasm_table.inner.clone(),
+        inner: table.inner.clone(),
     })
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_table_same(
-    wasm_table1: &wasm_table_t,
-    wasm_table2: &wasm_table_t,
-) -> bool {
-    wasm_table1.inner.same(&wasm_table2.inner)
+pub unsafe extern "C" fn wasm_table_same(table1: &wasm_table_t, table2: &wasm_table_t) -> bool {
+    table1.inner.same(&table2.inner)
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_table_size(wasm_table: &wasm_table_t) -> usize {
-    wasm_table.inner.size() as _
+pub unsafe extern "C" fn wasm_table_size(table: &wasm_table_t) -> usize {
+    table.inner.size() as _
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_table_grow(
-    _wasm_table: &mut wasm_table_t,
+    _table: &mut wasm_table_t,
     _delta: wasm_table_size_t,
     _init: *mut wasm_ref_t,
 ) -> bool {
diff --git a/lib/c-api/src/wasm_c_api/instance.rs b/lib/c-api/src/wasm_c_api/instance.rs
index 3b16e1eef..84437b04f 100644
--- a/lib/c-api/src/wasm_c_api/instance.rs
+++ b/lib/c-api/src/wasm_c_api/instance.rs
@@ -5,7 +5,7 @@ use super::trap::wasm_trap_t;
 use crate::ordered_resolver::OrderedResolver;
 use std::mem;
 use std::sync::Arc;
-use wasmer::{Extern, Instance};
+use wasmer::{Extern, Instance, InstantiationError};
 
 #[allow(non_camel_case_types)]
 pub struct wasm_instance_t {
@@ -14,12 +14,14 @@ pub struct wasm_instance_t {
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_instance_new(
-    _store: &wasm_store_t,
-    module: &wasm_module_t,
-    imports: &wasm_extern_vec_t,
-    // own
-    _traps: *mut *mut wasm_trap_t,
+    _store: Option<&wasm_store_t>,
+    module: Option<&wasm_module_t>,
+    imports: Option<&wasm_extern_vec_t>,
+    traps: *mut *mut wasm_trap_t,
 ) -> Option<Box<wasm_instance_t>> {
+    let module = module?;
+    let imports = imports?;
+
     let wasm_module = &module.inner;
     let module_imports = wasm_module.imports();
     let module_import_count = module_imports.len();
@@ -32,7 +34,23 @@ pub unsafe extern "C" fn wasm_instance_new(
         .cloned()
         .collect();
 
-    let instance = Arc::new(c_try!(Instance::new(wasm_module, &resolver)));
+    let instance = match Instance::new(wasm_module, &resolver) {
+        Ok(instance) => Arc::new(instance),
+
+        Err(InstantiationError::Link(link_error)) => {
+            crate::error::update_last_error(link_error);
+
+            return None;
+        }
+
+        Err(InstantiationError::Start(runtime_error)) => {
+            let trap: Box<wasm_trap_t> = Box::new(runtime_error.into());
+            *traps = Box::into_raw(trap);
+
+            return None;
+        }
+    };
+
     Some(Box::new(wasm_instance_t { inner: instance }))
 }
 
@@ -42,7 +60,7 @@ pub unsafe extern "C" fn wasm_instance_delete(_instance: Option<Box<wasm_instanc
 #[no_mangle]
 pub unsafe extern "C" fn wasm_instance_exports(
     instance: &wasm_instance_t,
-    // TODO: review types on wasm_declare_vec, handle the optional pointer part properly
+    // own
     out: &mut wasm_extern_vec_t,
 ) {
     let instance = &instance.inner;
@@ -55,6 +73,7 @@ pub unsafe extern "C" fn wasm_instance_exports(
             } else {
                 None
             };
+
             Box::into_raw(Box::new(wasm_extern_t {
                 instance: Some(Arc::clone(instance)),
                 inner: r#extern.clone(),
@@ -65,6 +84,6 @@ pub unsafe extern "C" fn wasm_instance_exports(
 
     out.size = extern_vec.len();
     out.data = extern_vec.as_mut_ptr();
-    // TODO: double check that the destructor will work correctly here
+
     mem::forget(extern_vec);
 }
diff --git a/lib/c-api/src/wasm_c_api/macros.rs b/lib/c-api/src/wasm_c_api/macros.rs
index afa81957d..ffd95b701 100644
--- a/lib/c-api/src/wasm_c_api/macros.rs
+++ b/lib/c-api/src/wasm_c_api/macros.rs
@@ -17,6 +17,7 @@ macro_rules! wasm_declare_vec_inner {
 macro_rules! wasm_declare_vec {
     ($name:ident) => {
         paste::item! {
+            #[derive(Debug)]
             #[repr(C)]
             pub struct [<wasm_ $name _vec_t>] {
                 pub size: usize,
@@ -56,12 +57,24 @@ macro_rules! wasm_declare_vec {
 
             impl [<wasm_ $name _vec_t>] {
                 pub unsafe fn into_slice(&self) -> Option<&[[<wasm_ $name _t>]]>{
-                    if self.data.is_null() {
+                    if self.is_uninitialized() {
                         return None;
                     }
 
                     Some(::std::slice::from_raw_parts(self.data, self.size))
                 }
+
+                pub unsafe fn into_slice_mut(&mut self) -> Option<&mut [[<wasm_ $name _t>]]>{
+                    if self.is_uninitialized() {
+                        return None;
+                    }
+
+                    Some(::std::slice::from_raw_parts_mut(self.data, self.size))
+                }
+
+                pub fn is_uninitialized(&self) -> bool {
+                    self.data.is_null()
+                }
             }
 
             // TODO: investigate possible memory leak on `init` (owned pointer)
@@ -108,6 +121,7 @@ macro_rules! wasm_declare_vec {
 macro_rules! wasm_declare_boxed_vec {
     ($name:ident) => {
         paste::item! {
+            #[derive(Debug)]
             #[repr(C)]
             pub struct [<wasm_ $name _vec_t>] {
                 pub size: usize,
@@ -170,7 +184,7 @@ macro_rules! wasm_declare_boxed_vec {
                 let vec = &mut *ptr;
                 if !vec.data.is_null() {
                     let data: Vec<*mut [<wasm_ $name _t>]> = Vec::from_raw_parts(vec.data, vec.size, vec.size);
-                    let data: Vec<Box<[<wasm_ $name _t>]>> = ::std::mem::transmute(data);
+                    let _data: Vec<Box<[<wasm_ $name _t>]>> = ::std::mem::transmute(data);
                     vec.data = ::std::ptr::null_mut();
                     vec.size = 0;
                 }
diff --git a/lib/c-api/src/wasm_c_api/module.rs b/lib/c-api/src/wasm_c_api/module.rs
index dca2d6e3f..e5f811dd8 100644
--- a/lib/c-api/src/wasm_c_api/module.rs
+++ b/lib/c-api/src/wasm_c_api/module.rs
@@ -3,9 +3,8 @@ use super::types::{
     wasm_byte_vec_t, wasm_exporttype_t, wasm_exporttype_vec_t, wasm_importtype_t,
     wasm_importtype_vec_t,
 };
-use crate::error::update_last_error;
+use crate::error::{update_last_error, CApiError};
 use std::ptr::NonNull;
-use std::slice;
 use std::sync::Arc;
 use wasmer::Module;
 
@@ -14,14 +13,58 @@ pub struct wasm_module_t {
     pub(crate) inner: Arc<Module>,
 }
 
+/// A WebAssembly module contains stateless WebAssembly code that has
+/// already been compiled and can be instantiated multiple times.
+///
+/// Creates a new WebAssembly Module given the configuration
+/// in the store.
+///
+/// ## Security
+///
+/// Before the code is compiled, it will be validated using the store
+/// features.
+///
+/// # Examples
+///
+/// ```rust
+/// # use inline_c::assert_c;
+/// # fn main() {
+/// #    (assert_c! {
+/// # #include "tests/wasmer_wasm.h"
+/// #
+/// int main() {
+///     wasm_engine_t* engine = wasm_engine_new();
+///     wasm_store_t* store = wasm_store_new(engine);
+///    
+///     wasm_byte_vec_t wat;
+///     wasmer_byte_vec_new_from_string(&wat, "(module)");
+///     wasm_byte_vec_t* wasm = wat2wasm(&wat);
+///    
+///     wasm_module_t* module = wasm_module_new(store, wasm);
+///     assert(module);
+///    
+///     wasm_byte_vec_delete(wasm);
+///     wasm_byte_vec_delete(&wat);
+///     wasm_module_delete(module);
+///     wasm_store_delete(store);
+///     wasm_engine_delete(engine);
+///    
+///     return 0;
+/// }
+/// #    })
+/// #    .success();
+/// # }
+/// ```
 #[no_mangle]
 pub unsafe extern "C" fn wasm_module_new(
-    store: &wasm_store_t,
-    bytes: &wasm_byte_vec_t,
+    store: Option<&wasm_store_t>,
+    bytes: Option<&wasm_byte_vec_t>,
 ) -> Option<Box<wasm_module_t>> {
-    // TODO: review lifetime of byte slice
-    let wasm_byte_slice: &[u8] = slice::from_raw_parts_mut(bytes.data, bytes.size);
-    let module = c_try!(Module::from_binary(&store.inner, wasm_byte_slice));
+    let store = store?;
+    let bytes = bytes?;
+
+    let bytes = bytes.into_slice()?;
+    let module = c_try!(Module::from_binary(&store.inner, bytes));
 
     Some(Box::new(wasm_module_t {
         inner: Arc::new(module),
@@ -33,13 +76,24 @@ pub unsafe extern "C" fn wasm_module_delete(_module: Option<Box<wasm_module_t>>)
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_module_validate(
-    store: &wasm_store_t,
-    bytes: &wasm_byte_vec_t,
+    store: Option<&wasm_store_t>,
+    bytes: Option<&wasm_byte_vec_t>,
 ) -> bool {
-    // TODO: review lifetime of byte slice.
-    let wasm_byte_slice: &[u8] = slice::from_raw_parts(bytes.data, bytes.size);
+    let store = match store {
+        Some(store) => store,
+        None => return false,
+    };
+    let bytes = match bytes {
+        Some(bytes) => bytes,
+        None => return false,
+    };
 
-    if let Err(error) = Module::validate(&store.inner, wasm_byte_slice) {
+    let bytes = match bytes.into_slice() {
+        Some(bytes) => bytes,
+        None => return false,
+    };
+
+    if let Err(error) = Module::validate(&store.inner, bytes) {
         update_last_error(error);
 
         false
@@ -51,6 +105,7 @@ pub unsafe extern "C" fn wasm_module_validate(
 #[no_mangle]
 pub unsafe extern "C" fn wasm_module_exports(
     module: &wasm_module_t,
+    // own
     out: &mut wasm_exporttype_vec_t,
 ) {
     let exports = module
@@ -66,6 +121,7 @@ pub unsafe extern "C" fn wasm_module_exports(
 #[no_mangle]
 pub unsafe extern "C" fn wasm_module_imports(
     module: &wasm_module_t,
+    // own
     out: &mut wasm_importtype_vec_t,
 ) {
     let imports = module
@@ -86,7 +142,10 @@ pub unsafe extern "C" fn wasm_module_deserialize(
     // TODO: read config from store and use that to decide which compiler to use
 
     let byte_slice = if bytes.is_null() || (&*bytes).into_slice().is_none() {
-        // TODO: error handling here
+        update_last_error(CApiError {
+            msg: "`bytes` is null or represents an empty slice".to_string(),
+        });
+
         return None;
     } else {
         (&*bytes).into_slice().unwrap()
@@ -115,3 +174,364 @@ pub unsafe extern "C" fn wasm_module_serialize(
     };
     *out_ptr = byte_vec.into();
 }
+
+#[cfg(test)]
+mod tests {
+    use inline_c::assert_c;
+
+    #[test]
+    fn test_module_validate() {
+        (assert_c! {
+            #include "tests/wasmer_wasm.h"
+
+            int main() {
+                wasm_engine_t* engine = wasm_engine_new();
+                wasm_store_t* store = wasm_store_new(engine);
+
+                wasm_byte_vec_t wat;
+                wasmer_byte_vec_new_from_string(&wat, "(module)");
+                wasm_byte_vec_t* wasm = wat2wasm(&wat);
+
+                assert(wasm_module_validate(store, wasm));
+
+                wasm_byte_vec_delete(wasm);
+                wasm_byte_vec_delete(&wat);
+                wasm_store_delete(store);
+                wasm_engine_delete(engine);
+
+                return 0;
+            }
+        })
+        .success();
+    }
+
+    #[test]
+    fn test_module_new() {
+        (assert_c! {
+            #include "tests/wasmer_wasm.h"
+
+            int main() {
+                wasm_engine_t* engine = wasm_engine_new();
+                wasm_store_t* store = wasm_store_new(engine);
+
+                wasm_byte_vec_t wat;
+                wasmer_byte_vec_new_from_string(&wat, "(module)");
+                wasm_byte_vec_t* wasm = wat2wasm(&wat);
+
+                wasm_module_t* module = wasm_module_new(store, wasm);
+                assert(module);
+
+                wasm_byte_vec_delete(wasm);
+                wasm_byte_vec_delete(&wat);
+                wasm_module_delete(module);
+                wasm_store_delete(store);
+                wasm_engine_delete(engine);
+
+                return 0;
+            }
+        })
+        .success();
+    }
+
+    #[test]
+    fn test_module_exports() {
+        (assert_c! {
+            #include "tests/wasmer_wasm.h"
+
+            int main() {
+                wasm_engine_t* engine = wasm_engine_new();
+                wasm_store_t* store = wasm_store_new(engine);
+
+                wasm_byte_vec_t wat;
+                wasmer_byte_vec_new_from_string(
+                    &wat,
+                    "(module\n"
+                    "  (func (export \"function\") (param i32 i64))\n"
+                    "  (global (export \"global\") i32 (i32.const 7))\n"
+                    "  (table (export \"table\") 0 funcref)\n"
+                    "  (memory (export \"memory\") 1))"
+                );
+                wasm_byte_vec_t* wasm = wat2wasm(&wat);
+
+                wasm_module_t* module = wasm_module_new(store, wasm);
+                assert(module);
+
+                wasm_exporttype_vec_t export_types;
+                wasm_module_exports(module, &export_types);
+
+                assert(export_types.size == 4);
+
+                {
+                    wasm_exporttype_t* export_type = export_types.data[0];
+
+                    const wasm_name_t* export_name = wasm_exporttype_name(export_type);
+                    wasmer_assert_name(export_name, "function");
+
+                    const wasm_externtype_t* extern_type = wasm_exporttype_type(export_type);
+                    assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_FUNC);
+
+                    const wasm_functype_t* func_type = wasm_externtype_as_functype_const(extern_type);
+
+                    const wasm_valtype_vec_t* func_params = wasm_functype_params(func_type);
+                    assert(func_params && func_params->size == 2);
+                    assert(wasm_valtype_kind(func_params->data[0]) == WASM_I32);
+                    assert(wasm_valtype_kind(func_params->data[1]) == WASM_I64);
+
+                    const wasm_valtype_vec_t* func_results = wasm_functype_results(func_type);
+                    assert(func_results && func_results->size == 0);
+                }
+
+                {
+                    wasm_exporttype_t* export_type = export_types.data[1];
+
+                    const wasm_name_t* export_name = wasm_exporttype_name(export_type);
+                    wasmer_assert_name(export_name, "global");
+
+                    const wasm_externtype_t* extern_type = wasm_exporttype_type(export_type);
+                    assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_GLOBAL);
+
+                    const wasm_globaltype_t* global_type = wasm_externtype_as_globaltype_const(extern_type);
+                    assert(wasm_valtype_kind(wasm_globaltype_content(global_type)) == WASM_I32);
+                    assert(wasm_globaltype_mutability(global_type) == WASM_CONST);
+                }
+
+                {
+                    wasm_exporttype_t* export_type = export_types.data[2];
+
+                    const wasm_name_t* export_name = wasm_exporttype_name(export_type);
+                    wasmer_assert_name(export_name, "table");
+
+                    const wasm_externtype_t* extern_type = wasm_exporttype_type(export_type);
+                    assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_TABLE);
+
+                    const wasm_tabletype_t* table_type = wasm_externtype_as_tabletype_const(extern_type);
+                    assert(wasm_valtype_kind(wasm_tabletype_element(table_type)) == WASM_FUNCREF);
+
+                    const wasm_limits_t* table_limits = wasm_tabletype_limits(table_type);
+                    assert(table_limits->min == 0);
+                    assert(table_limits->max == wasm_limits_max_default);
+                }
+
+                {
+                    wasm_exporttype_t* export_type = export_types.data[3];
+
+                    const wasm_name_t* export_name = wasm_exporttype_name(export_type);
+                    wasmer_assert_name(export_name, "memory");
+
+                    const wasm_externtype_t* extern_type = wasm_exporttype_type(export_type);
+                    assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_MEMORY);
+
+                    const wasm_memorytype_t* memory_type = wasm_externtype_as_memorytype_const(extern_type);
+                    const wasm_limits_t* memory_limits = wasm_memorytype_limits(memory_type);
+                    assert(memory_limits->min == 1);
+                    assert(memory_limits->max == wasm_limits_max_default);
+                }
+
+                wasm_exporttype_vec_delete(&export_types);
+                wasm_byte_vec_delete(wasm);
+                wasm_byte_vec_delete(&wat);
+                wasm_module_delete(module);
+                wasm_store_delete(store);
+                wasm_engine_delete(engine);
+            }
+        })
+        .success();
+    }
+
+    #[test]
+    fn test_module_imports() {
+        (assert_c! {
+            #include "tests/wasmer_wasm.h"
+
+            int main() {
+                wasm_engine_t* engine = wasm_engine_new();
+                wasm_store_t* store = wasm_store_new(engine);
+
+                wasm_byte_vec_t wat;
+                wasmer_byte_vec_new_from_string(
+                    &wat,
+                    "(module\n"
+                    "  (import \"ns\" \"function\" (func))\n"
+                    "  (import \"ns\" \"global\" (global f32))\n"
+                    "  (import \"ns\" \"table\" (table 1 2 anyfunc))\n"
+                    "  (import \"ns\" \"memory\" (memory 3 4)))"
+                );
+                wasm_byte_vec_t* wasm = wat2wasm(&wat);
+
+                wasm_module_t* module = wasm_module_new(store, wasm);
+                assert(module);
+
+                wasm_importtype_vec_t import_types;
+                wasm_module_imports(module, &import_types);
+
+                assert(import_types.size == 4);
+
+                {
+                    const wasm_importtype_t* import_type = import_types.data[0];
+
+                    const wasm_name_t* import_module = wasm_importtype_module(import_type);
+                    wasmer_assert_name(import_module, "ns");
+
+                    const wasm_name_t* import_name = wasm_importtype_name(import_type);
+                    wasmer_assert_name(import_name, "function");
+
+                    const wasm_externtype_t* extern_type = wasm_importtype_type(import_type);
+                    assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_FUNC);
+
+                    const wasm_functype_t* func_type = wasm_externtype_as_functype_const(extern_type);
+
+                    const wasm_valtype_vec_t* func_params = wasm_functype_params(func_type);
+                    assert(func_params && func_params->size == 0);
+
+                    const wasm_valtype_vec_t* func_results = wasm_functype_results(func_type);
+                    assert(func_results && func_results->size == 0);
+                }
+
+                {
+                    const wasm_importtype_t* import_type = import_types.data[1];
+
+                    const wasm_name_t* import_module = wasm_importtype_module(import_type);
+                    wasmer_assert_name(import_module, "ns");
+
+                    const wasm_name_t* import_name = wasm_importtype_name(import_type);
+                    wasmer_assert_name(import_name, "global");
+
+                    const wasm_externtype_t* extern_type = wasm_importtype_type(import_type);
+                    assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_GLOBAL);
+
+                    const wasm_globaltype_t* global_type = wasm_externtype_as_globaltype_const(extern_type);
+                    assert(wasm_valtype_kind(wasm_globaltype_content(global_type)) == WASM_F32);
+                    assert(wasm_globaltype_mutability(global_type) == WASM_CONST);
+                }
+
+                {
+                    const wasm_importtype_t* import_type = import_types.data[2];
+
+                    const wasm_name_t* import_module = wasm_importtype_module(import_type);
+                    wasmer_assert_name(import_module, "ns");
+
+                    const wasm_name_t* import_name = wasm_importtype_name(import_type);
+                    wasmer_assert_name(import_name, "table");
+
+                    const wasm_externtype_t* extern_type = wasm_importtype_type(import_type);
+                    assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_TABLE);
+
+                    const wasm_tabletype_t* table_type = wasm_externtype_as_tabletype_const(extern_type);
+                    assert(wasm_valtype_kind(wasm_tabletype_element(table_type)) == WASM_FUNCREF);
+
+                    const wasm_limits_t* table_limits = wasm_tabletype_limits(table_type);
+                    assert(table_limits->min == 1);
+                    assert(table_limits->max == 2);
+                }
+
+                {
+                    const wasm_importtype_t* import_type = import_types.data[3];
+
+                    const wasm_name_t* import_module = wasm_importtype_module(import_type);
+                    wasmer_assert_name(import_module, "ns");
+
+                    const wasm_name_t* import_name = wasm_importtype_name(import_type);
+                    wasmer_assert_name(import_name, "memory");
+
+                    const wasm_externtype_t* extern_type = wasm_importtype_type(import_type);
+                    assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_MEMORY);
+
+                    const wasm_memorytype_t* memory_type = wasm_externtype_as_memorytype_const(extern_type);
+                    const wasm_limits_t* memory_limits = wasm_memorytype_limits(memory_type);
+                    assert(memory_limits->min == 3);
+                    assert(memory_limits->max == 4);
+                }
+
+                wasm_importtype_vec_delete(&import_types);
+                wasm_module_delete(module);
+                wasm_byte_vec_delete(wasm);
+                wasm_byte_vec_delete(&wat);
+                wasm_store_delete(store);
+                wasm_engine_delete(engine);
+            }
+        })
+        .success();
+    }
+
+    #[test]
+    fn test_module_serialize() {
+        (assert_c! {
+            #include "tests/wasmer_wasm.h"
+
+            int main() {
+                wasm_engine_t* engine = wasm_engine_new();
+                wasm_store_t* store = wasm_store_new(engine);
+
+                wasm_byte_vec_t wat;
+                wasmer_byte_vec_new_from_string(&wat, "(module)");
+                wasm_byte_vec_t* wasm = wat2wasm(&wat);
+
+                wasm_module_t* module = wasm_module_new(store, wasm);
+                assert(module);
+
+                wasm_byte_vec_t serialized_module;
+                wasm_module_serialize(module, &serialized_module);
+                assert(serialized_module.size > 0);
+
+                wasm_module_delete(module);
+                wasm_byte_vec_delete(&serialized_module);
+                wasm_byte_vec_delete(wasm);
+                wasm_byte_vec_delete(&wat);
+                wasm_store_delete(store);
+                wasm_engine_delete(engine);
+            }
+        })
+        .success();
+    }
+
+    #[test]
+    fn test_module_serialize_and_deserialize() {
+        (assert_c! {
+            #include "tests/wasmer_wasm.h"
+
+            int main() {
+                wasm_engine_t* engine = wasm_engine_new();
+                wasm_store_t* store = wasm_store_new(engine);
+
+                wasm_byte_vec_t wat;
+                wasmer_byte_vec_new_from_string(
+                    &wat,
+                    "(module\n"
+                    "  (func (export \"function\") (param i32 i64))\n"
+                    "  (global (export \"global\") i32 (i32.const 7))\n"
+                    "  (table (export \"table\") 0 funcref)\n"
+                    "  (memory (export \"memory\") 1))"
+                );
+                wasm_byte_vec_t* wasm = wat2wasm(&wat);
+
+                wasm_module_t* module = wasm_module_new(store, wasm);
+                assert(module);
+
+                wasm_byte_vec_t serialized_module;
+                wasm_module_serialize(module, &serialized_module);
+                assert(serialized_module.size > 0);
+
+                wasm_module_delete(module);
+                wasm_module_t* deserialized_module = wasm_module_deserialize(
+                    store,
+                    &serialized_module
+                );
+                wasm_byte_vec_delete(&serialized_module);
+                assert(deserialized_module);
+
+                wasm_exporttype_vec_t export_types;
+                wasm_module_exports(deserialized_module, &export_types);
+
+                assert(export_types.size == 4);
+
+                wasm_exporttype_vec_delete(&export_types);
+                wasm_module_delete(deserialized_module);
+                wasm_byte_vec_delete(wasm);
+                wasm_byte_vec_delete(&wat);
+                wasm_store_delete(store);
+                wasm_engine_delete(engine);
+            }
+        })
+        .success();
+    }
+}
diff --git a/lib/c-api/src/wasm_c_api/store.rs b/lib/c-api/src/wasm_c_api/store.rs
index 3a379ce9a..47945a96e 100644
--- a/lib/c-api/src/wasm_c_api/store.rs
+++ b/lib/c-api/src/wasm_c_api/store.rs
@@ -1,5 +1,4 @@
 use super::engine::wasm_engine_t;
-use std::ptr::NonNull;
 use wasmer::Store;
 
 /// Opaque wrapper around `Store`
@@ -10,11 +9,10 @@ pub struct wasm_store_t {
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_store_new(
-    wasm_engine_ptr: Option<NonNull<wasm_engine_t>>,
+    engine: Option<&wasm_engine_t>,
 ) -> Option<Box<wasm_store_t>> {
-    let wasm_engine_ptr = wasm_engine_ptr?;
-    let wasm_engine = wasm_engine_ptr.as_ref();
-    let store = Store::new(&*wasm_engine.inner);
+    let engine = engine?;
+    let store = Store::new(&*engine.inner);
 
     Some(Box::new(wasm_store_t { inner: store }))
 }
diff --git a/lib/c-api/src/wasm_c_api/trap.rs b/lib/c-api/src/wasm_c_api/trap.rs
index 4bea90090..756b1c0e3 100644
--- a/lib/c-api/src/wasm_c_api/trap.rs
+++ b/lib/c-api/src/wasm_c_api/trap.rs
@@ -1,5 +1,6 @@
 use super::store::wasm_store_t;
 use super::types::{wasm_byte_vec_t, wasm_frame_t, wasm_frame_vec_t, wasm_message_t};
+use std::str;
 use wasmer::RuntimeError;
 
 // opaque type which is a `RuntimeError`
@@ -19,8 +20,8 @@ pub unsafe extern "C" fn wasm_trap_new(
     _store: &mut wasm_store_t,
     message: &wasm_message_t,
 ) -> Option<Box<wasm_trap_t>> {
-    let message_bytes: &[u8] = message.into_slice()?;
-    let message_str = c_try!(std::str::from_utf8(message_bytes));
+    let message_bytes = message.into_slice()?;
+    let message_str = c_try!(str::from_utf8(message_bytes));
     let runtime_error = RuntimeError::new(message_str);
     let trap = runtime_error.into();
 
@@ -31,11 +32,16 @@ pub unsafe extern "C" fn wasm_trap_new(
 pub unsafe extern "C" fn wasm_trap_delete(_trap: Option<Box<wasm_trap_t>>) {}
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_trap_message(trap: &wasm_trap_t, out_ptr: &mut wasm_byte_vec_t) {
+pub unsafe extern "C" fn wasm_trap_message(
+    trap: &wasm_trap_t,
+    // own
+    out: &mut wasm_byte_vec_t,
+) {
     let message = trap.inner.message();
     let byte_vec: wasm_byte_vec_t = message.into_bytes().into();
-    out_ptr.size = byte_vec.size;
-    out_ptr.data = byte_vec.data;
+
+    out.size = byte_vec.size;
+    out.data = byte_vec.data;
 }
 
 #[no_mangle]
@@ -44,10 +50,14 @@ pub unsafe extern "C" fn wasm_trap_origin(trap: &wasm_trap_t) -> Option<Box<wasm
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_trap_trace(trap: &wasm_trap_t, out_ptr: &mut wasm_frame_vec_t) {
+pub unsafe extern "C" fn wasm_trap_trace(
+    trap: &wasm_trap_t,
+    // own
+    out: &mut wasm_frame_vec_t,
+) {
     let frames = trap.inner.trace();
     let frame_vec: wasm_frame_vec_t = frames.into();
 
-    out_ptr.size = frame_vec.size;
-    out_ptr.data = frame_vec.data;
+    out.size = frame_vec.size;
+    out.data = frame_vec.data;
 }
diff --git a/lib/c-api/src/wasm_c_api/types/export.rs b/lib/c-api/src/wasm_c_api/types/export.rs
index 1476ecb5b..26c6a5bb3 100644
--- a/lib/c-api/src/wasm_c_api/types/export.rs
+++ b/lib/c-api/src/wasm_c_api/types/export.rs
@@ -1,59 +1,37 @@
 use super::{wasm_externtype_t, wasm_name_t};
-use std::ptr::NonNull;
 use wasmer::ExportType;
 
 #[allow(non_camel_case_types)]
 pub struct wasm_exporttype_t {
-    name: NonNull<wasm_name_t>,
-    extern_type: NonNull<wasm_externtype_t>,
-
-    /// If `true`, `name` and `extern_type` will be dropped by
-    /// `wasm_exporttype_t::drop`.
-    owns_fields: bool,
+    name: Box<wasm_name_t>,
+    extern_type: Box<wasm_externtype_t>,
 }
 
 wasm_declare_boxed_vec!(exporttype);
 
 #[no_mangle]
 pub extern "C" fn wasm_exporttype_new(
-    name: NonNull<wasm_name_t>,
-    extern_type: NonNull<wasm_externtype_t>,
-) -> Box<wasm_exporttype_t> {
-    Box::new(wasm_exporttype_t {
-        name,
-        extern_type,
-        owns_fields: false,
-    })
+    name: Option<Box<wasm_name_t>>,
+    extern_type: Option<Box<wasm_externtype_t>>,
+) -> Option<Box<wasm_exporttype_t>> {
+    Some(Box::new(wasm_exporttype_t {
+        name: name?,
+        extern_type: extern_type?,
+    }))
 }
 
 #[no_mangle]
-pub extern "C" fn wasm_exporttype_name(et: &'static wasm_exporttype_t) -> &'static wasm_name_t {
-    unsafe { et.name.as_ref() }
+pub extern "C" fn wasm_exporttype_name(export_type: &wasm_exporttype_t) -> &wasm_name_t {
+    export_type.name.as_ref()
 }
 
 #[no_mangle]
-pub extern "C" fn wasm_exporttype_type(
-    et: &'static wasm_exporttype_t,
-) -> &'static wasm_externtype_t {
-    unsafe { et.extern_type.as_ref() }
+pub extern "C" fn wasm_exporttype_type(export_type: &wasm_exporttype_t) -> &wasm_externtype_t {
+    export_type.extern_type.as_ref()
 }
 
 #[no_mangle]
-pub extern "C" fn wasm_exporttype_delete(_exporttype: Option<Box<wasm_exporttype_t>>) {}
-
-impl Drop for wasm_exporttype_t {
-    fn drop(&mut self) {
-        if self.owns_fields {
-            // SAFETY: `owns_fields` is set to `true` only in
-            // `wasm_exporttype_t::from(&ExportType)`, where the data
-            // are leaked properly and won't be freed somewhere else.
-            unsafe {
-                let _ = Box::from_raw(self.name.as_ptr());
-                let _ = Box::from_raw(self.extern_type.as_ptr());
-            }
-        }
-    }
-}
+pub extern "C" fn wasm_exporttype_delete(_export_type: Option<Box<wasm_exporttype_t>>) {}
 
 impl From<ExportType> for wasm_exporttype_t {
     fn from(other: ExportType) -> Self {
@@ -63,7 +41,6 @@ impl From<ExportType> for wasm_exporttype_t {
 
 impl From<&ExportType> for wasm_exporttype_t {
     fn from(other: &ExportType) -> Self {
-        // TODO: double check that freeing String as `Vec<u8>` is valid
         let name = {
             let mut heap_str: Box<str> = other.name().to_string().into_boxed_str();
             let char_ptr = heap_str.as_mut_ptr();
@@ -73,18 +50,12 @@ impl From<&ExportType> for wasm_exporttype_t {
                 data: char_ptr,
             };
             Box::leak(heap_str);
-            unsafe { NonNull::new_unchecked(Box::into_raw(Box::new(name_inner))) }
+
+            Box::new(name_inner)
         };
 
-        let extern_type = {
-            let extern_type: wasm_externtype_t = other.ty().into();
-            unsafe { NonNull::new_unchecked(Box::into_raw(Box::new(extern_type))) }
-        };
+        let extern_type = Box::new(other.ty().into());
 
-        wasm_exporttype_t {
-            name,
-            extern_type,
-            owns_fields: true,
-        }
+        wasm_exporttype_t { name, extern_type }
     }
 }
diff --git a/lib/c-api/src/wasm_c_api/types/extern_.rs b/lib/c-api/src/wasm_c_api/types/extern_.rs
index 3f78ad11f..4ef1f8cb6 100644
--- a/lib/c-api/src/wasm_c_api/types/extern_.rs
+++ b/lib/c-api/src/wasm_c_api/types/extern_.rs
@@ -1,47 +1,13 @@
 use super::super::externals::wasm_extern_t;
-use super::{wasm_functype_t, wasm_globaltype_t, wasm_memorytype_t, wasm_tabletype_t};
+use super::{
+    wasm_functype_t, wasm_globaltype_t, wasm_memorytype_t, wasm_tabletype_t, WasmFunctionType,
+    WasmGlobalType, WasmMemoryType, WasmTableType,
+};
 use std::convert::{TryFrom, TryInto};
 use std::mem;
 use thiserror::Error;
 use wasmer::ExternType;
 
-#[allow(non_camel_case_types)]
-#[derive(Clone, Debug)]
-pub struct wasm_externtype_t {
-    pub(crate) inner: ExternType,
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasm_extern_type(e: &wasm_extern_t) -> Box<wasm_externtype_t> {
-    Box::new(wasm_externtype_t {
-        inner: e.inner.ty(),
-    })
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasm_externtype_delete(_et: Option<Box<wasm_externtype_t>>) {}
-
-#[no_mangle]
-pub extern "C" fn wasm_externtype_copy(
-    wasm_externtype: &wasm_externtype_t,
-) -> Box<wasm_externtype_t> {
-    Box::new(wasm_externtype_t {
-        inner: wasm_externtype.inner.clone(),
-    })
-}
-
-impl From<ExternType> for wasm_externtype_t {
-    fn from(other: ExternType) -> Self {
-        Self { inner: other }
-    }
-}
-
-impl From<&ExternType> for wasm_externtype_t {
-    fn from(other: &ExternType) -> Self {
-        other.clone().into()
-    }
-}
-
 #[allow(non_camel_case_types)]
 type wasm_externkind_t = u8;
 
@@ -54,11 +20,6 @@ pub enum wasm_externkind_enum {
     WASM_EXTERN_MEMORY = 3,
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn wasm_extern_kind(e: &wasm_extern_t) -> wasm_externkind_t {
-    wasm_externkind_enum::from(e.inner.ty()) as wasm_externkind_t
-}
-
 impl From<ExternType> for wasm_externkind_enum {
     fn from(other: ExternType) -> Self {
         (&other).into()
@@ -75,9 +36,81 @@ impl From<&ExternType> for wasm_externkind_enum {
     }
 }
 
+#[derive(Debug, Clone)]
+pub(crate) enum WasmExternType {
+    Function(WasmFunctionType),
+    Global(WasmGlobalType),
+    Table(WasmTableType),
+    Memory(WasmMemoryType),
+}
+
+#[allow(non_camel_case_types)]
+#[derive(Debug, Clone)]
+pub struct wasm_externtype_t {
+    pub(crate) inner: WasmExternType,
+}
+
+impl wasm_externtype_t {
+    pub(crate) fn new(extern_type: ExternType) -> Self {
+        Self {
+            inner: match extern_type {
+                ExternType::Function(function_type) => {
+                    WasmExternType::Function(WasmFunctionType::new(function_type))
+                }
+                ExternType::Global(global_type) => {
+                    WasmExternType::Global(WasmGlobalType::new(global_type))
+                }
+                ExternType::Table(table_type) => {
+                    WasmExternType::Table(WasmTableType::new(table_type))
+                }
+                ExternType::Memory(memory_type) => {
+                    WasmExternType::Memory(WasmMemoryType::new(memory_type))
+                }
+            },
+        }
+    }
+}
+
+impl From<ExternType> for wasm_externtype_t {
+    fn from(extern_type: ExternType) -> Self {
+        Self::new(extern_type)
+    }
+}
+
+impl From<&ExternType> for wasm_externtype_t {
+    fn from(other: &ExternType) -> Self {
+        other.clone().into()
+    }
+}
+
 #[no_mangle]
-pub unsafe extern "C" fn wasm_externtype_kind(et: &wasm_externtype_t) -> wasm_externkind_t {
-    wasm_externkind_enum::from(&et.inner) as wasm_externkind_t
+pub unsafe extern "C" fn wasm_extern_type(r#extern: &wasm_extern_t) -> Box<wasm_externtype_t> {
+    Box::new(wasm_externtype_t::new(r#extern.inner.ty()))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_extern_kind(r#extern: &wasm_extern_t) -> wasm_externkind_t {
+    wasm_externkind_enum::from(r#extern.inner.ty()) as wasm_externkind_t
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_externtype_delete(_extern_type: Option<Box<wasm_externtype_t>>) {}
+
+#[no_mangle]
+pub extern "C" fn wasm_externtype_copy(extern_type: &wasm_externtype_t) -> Box<wasm_externtype_t> {
+    Box::new(extern_type.clone())
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_externtype_kind(
+    extern_type: &wasm_externtype_t,
+) -> wasm_externkind_t {
+    (match extern_type.inner {
+        WasmExternType::Function(_) => wasm_externkind_enum::WASM_EXTERN_FUNC,
+        WasmExternType::Global(_) => wasm_externkind_enum::WASM_EXTERN_GLOBAL,
+        WasmExternType::Table(_) => wasm_externkind_enum::WASM_EXTERN_TABLE,
+        WasmExternType::Memory(_) => wasm_externkind_enum::WASM_EXTERN_MEMORY,
+    }) as wasm_externkind_t
 }
 
 #[derive(Debug, Clone, Error)]
@@ -94,7 +127,7 @@ impl TryFrom<&'static wasm_externtype_t> for &'static wasm_functype_t {
     type Error = ExternTypeConversionError;
 
     fn try_from(other: &'static wasm_externtype_t) -> Result<Self, Self::Error> {
-        if let ExternType::Function(_) = other.inner {
+        if let WasmExternType::Function(_) = other.inner {
             Ok(unsafe { mem::transmute::<&'static wasm_externtype_t, Self>(other) })
         } else {
             Err(ExternTypeConversionError("Wrong type: expected function"))
@@ -106,7 +139,7 @@ impl TryFrom<&'static wasm_externtype_t> for &'static wasm_globaltype_t {
     type Error = ExternTypeConversionError;
 
     fn try_from(other: &'static wasm_externtype_t) -> Result<Self, Self::Error> {
-        if let ExternType::Global(_) = other.inner {
+        if let WasmExternType::Global(_) = other.inner {
             Ok(unsafe { mem::transmute::<&'static wasm_externtype_t, Self>(other) })
         } else {
             Err(ExternTypeConversionError("Wrong type: expected global"))
@@ -114,23 +147,11 @@ impl TryFrom<&'static wasm_externtype_t> for &'static wasm_globaltype_t {
     }
 }
 
-impl TryFrom<&'static wasm_externtype_t> for &'static wasm_memorytype_t {
-    type Error = ExternTypeConversionError;
-
-    fn try_from(other: &'static wasm_externtype_t) -> Result<Self, Self::Error> {
-        if let ExternType::Memory(_) = other.inner {
-            Ok(unsafe { mem::transmute::<&'static wasm_externtype_t, Self>(other) })
-        } else {
-            Err(ExternTypeConversionError("Wrong type: expected memory"))
-        }
-    }
-}
-
 impl TryFrom<&'static wasm_externtype_t> for &'static wasm_tabletype_t {
     type Error = ExternTypeConversionError;
 
     fn try_from(other: &'static wasm_externtype_t) -> Result<Self, Self::Error> {
-        if let ExternType::Table(_) = other.inner {
+        if let WasmExternType::Table(_) = other.inner {
             Ok(unsafe { mem::transmute::<&'static wasm_externtype_t, Self>(other) })
         } else {
             Err(ExternTypeConversionError("Wrong type: expected table"))
@@ -138,114 +159,126 @@ impl TryFrom<&'static wasm_externtype_t> for &'static wasm_tabletype_t {
     }
 }
 
+impl TryFrom<&'static wasm_externtype_t> for &'static wasm_memorytype_t {
+    type Error = ExternTypeConversionError;
+
+    fn try_from(other: &'static wasm_externtype_t) -> Result<Self, Self::Error> {
+        if let WasmExternType::Memory(_) = other.inner {
+            Ok(unsafe { mem::transmute::<&'static wasm_externtype_t, Self>(other) })
+        } else {
+            Err(ExternTypeConversionError("Wrong type: expected memory"))
+        }
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn wasm_externtype_as_functype_const(
-    et: &'static wasm_externtype_t,
+    extern_type: &'static wasm_externtype_t,
 ) -> Option<&'static wasm_functype_t> {
-    Some(c_try!(et.try_into()))
+    Some(c_try!(extern_type.try_into()))
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_externtype_as_functype(
-    et: &'static wasm_externtype_t,
+    extern_type: &'static wasm_externtype_t,
 ) -> Option<&'static wasm_functype_t> {
-    Some(c_try!(et.try_into()))
+    Some(c_try!(extern_type.try_into()))
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_functype_as_externtype_const(
-    ft: &'static wasm_functype_t,
+    function_type: &'static wasm_functype_t,
 ) -> &'static wasm_externtype_t {
-    &ft.extern_
+    &function_type.extern_type
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_functype_as_externtype(
-    ft: &'static wasm_functype_t,
+    function_type: &'static wasm_functype_t,
 ) -> &'static wasm_externtype_t {
-    &ft.extern_
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasm_externtype_as_memorytype_const(
-    et: &'static wasm_externtype_t,
-) -> Option<&'static wasm_memorytype_t> {
-    Some(c_try!(et.try_into()))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasm_externtype_as_memorytype(
-    et: &'static wasm_externtype_t,
-) -> Option<&'static wasm_memorytype_t> {
-    Some(c_try!(et.try_into()))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasm_memorytype_as_externtype_const(
-    mt: &'static wasm_memorytype_t,
-) -> &'static wasm_externtype_t {
-    &mt.extern_
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasm_memorytype_as_externtype(
-    mt: &'static wasm_memorytype_t,
-) -> &'static wasm_externtype_t {
-    &mt.extern_
+    &function_type.extern_type
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_externtype_as_globaltype_const(
-    et: &'static wasm_externtype_t,
+    extern_type: &'static wasm_externtype_t,
 ) -> Option<&'static wasm_globaltype_t> {
-    Some(c_try!(et.try_into()))
+    Some(c_try!(extern_type.try_into()))
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_externtype_as_globaltype(
-    et: &'static wasm_externtype_t,
+    extern_type: &'static wasm_externtype_t,
 ) -> Option<&'static wasm_globaltype_t> {
-    Some(c_try!(et.try_into()))
+    Some(c_try!(extern_type.try_into()))
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_globaltype_as_externtype_const(
-    gt: &'static wasm_globaltype_t,
+    global_type: &'static wasm_globaltype_t,
 ) -> &'static wasm_externtype_t {
-    &gt.extern_
+    &global_type.extern_type
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_globaltype_as_externtype(
-    gt: &'static wasm_globaltype_t,
+    global_type: &'static wasm_globaltype_t,
 ) -> &'static wasm_externtype_t {
-    &gt.extern_
+    &global_type.extern_type
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_externtype_as_tabletype_const(
-    et: &'static wasm_externtype_t,
+    extern_type: &'static wasm_externtype_t,
 ) -> Option<&'static wasm_tabletype_t> {
-    Some(c_try!(et.try_into()))
+    Some(c_try!(extern_type.try_into()))
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_externtype_as_tabletype(
-    et: &'static wasm_externtype_t,
+    extern_type: &'static wasm_externtype_t,
 ) -> Option<&'static wasm_tabletype_t> {
-    Some(c_try!(et.try_into()))
+    Some(c_try!(extern_type.try_into()))
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_tabletype_as_externtype_const(
-    tt: &'static wasm_tabletype_t,
+    table_type: &'static wasm_tabletype_t,
 ) -> &'static wasm_externtype_t {
-    &tt.extern_
+    &table_type.extern_type
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_tabletype_as_externtype(
-    tt: &'static wasm_tabletype_t,
+    table_type: &'static wasm_tabletype_t,
 ) -> &'static wasm_externtype_t {
-    &tt.extern_
+    &table_type.extern_type
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_externtype_as_memorytype_const(
+    extern_type: &'static wasm_externtype_t,
+) -> Option<&'static wasm_memorytype_t> {
+    Some(c_try!(extern_type.try_into()))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_externtype_as_memorytype(
+    extern_type: &'static wasm_externtype_t,
+) -> Option<&'static wasm_memorytype_t> {
+    Some(c_try!(extern_type.try_into()))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_memorytype_as_externtype_const(
+    memory_type: &'static wasm_memorytype_t,
+) -> &'static wasm_externtype_t {
+    &memory_type.extern_type
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_memorytype_as_externtype(
+    memory_type: &'static wasm_memorytype_t,
+) -> &'static wasm_externtype_t {
+    &memory_type.extern_type
 }
diff --git a/lib/c-api/src/wasm_c_api/types/function.rs b/lib/c-api/src/wasm_c_api/types/function.rs
index 69f630986..35b845481 100644
--- a/lib/c-api/src/wasm_c_api/types/function.rs
+++ b/lib/c-api/src/wasm_c_api/types/function.rs
@@ -1,28 +1,91 @@
-use super::{wasm_externtype_t, wasm_valtype_t, wasm_valtype_vec_t};
+use super::{
+    wasm_externtype_t, wasm_valtype_t, wasm_valtype_vec_delete, wasm_valtype_vec_t, WasmExternType,
+};
 use std::mem;
-use std::ptr::NonNull;
 use wasmer::{ExternType, FunctionType, ValType};
 
+#[derive(Debug)]
+pub(crate) struct WasmFunctionType {
+    pub(crate) function_type: FunctionType,
+    params: Box<wasm_valtype_vec_t>,
+    results: Box<wasm_valtype_vec_t>,
+}
+
+impl WasmFunctionType {
+    pub(crate) fn new(function_type: FunctionType) -> Self {
+        let params = {
+            let mut valtypes = function_type
+                .params()
+                .iter()
+                .cloned()
+                .map(Into::into)
+                .map(Box::new)
+                .map(Box::into_raw)
+                .collect::<Vec<*mut wasm_valtype_t>>();
+
+            let valtypes_vec = Box::new(wasm_valtype_vec_t {
+                size: valtypes.len(),
+                data: valtypes.as_mut_ptr(),
+            });
+
+            mem::forget(valtypes);
+
+            valtypes_vec
+        };
+        let results = {
+            let mut valtypes = function_type
+                .results()
+                .iter()
+                .cloned()
+                .map(Into::into)
+                .map(Box::new)
+                .map(Box::into_raw)
+                .collect::<Vec<*mut wasm_valtype_t>>();
+
+            let valtypes_vec = Box::new(wasm_valtype_vec_t {
+                size: valtypes.len(),
+                data: valtypes.as_mut_ptr(),
+            });
+
+            mem::forget(valtypes);
+
+            valtypes_vec
+        };
+
+        Self {
+            function_type,
+            params,
+            results,
+        }
+    }
+}
+
+impl Clone for WasmFunctionType {
+    fn clone(&self) -> Self {
+        Self::new(self.function_type.clone())
+    }
+}
+
 #[allow(non_camel_case_types)]
-#[derive(Clone, Debug)]
+#[derive(Debug)]
+#[repr(transparent)]
 pub struct wasm_functype_t {
-    pub(crate) extern_: wasm_externtype_t,
+    pub(crate) extern_type: wasm_externtype_t,
 }
 
 impl wasm_functype_t {
-    pub(crate) fn sig(&self) -> &FunctionType {
-        if let ExternType::Function(ref f) = self.extern_.inner {
-            f
-        } else {
-            unreachable!("data corruption: `wasm_functype_t` does not contain a function")
+    pub(crate) fn new(function_type: FunctionType) -> Self {
+        Self {
+            extern_type: wasm_externtype_t::new(ExternType::Function(function_type)),
         }
     }
 
-    pub(crate) fn new(function_type: FunctionType) -> Self {
-        Self {
-            extern_: wasm_externtype_t {
-                inner: ExternType::Function(function_type),
-            },
+    pub(crate) fn inner(&self) -> &WasmFunctionType {
+        match &self.extern_type.inner {
+            WasmExternType::Function(wasm_function_type) => &wasm_function_type,
+            _ => {
+                unreachable!("Data corruption: `wasm_functype_t` does not contain a function type")
+            }
         }
     }
 }
@@ -31,88 +94,60 @@ wasm_declare_vec!(functype);
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_functype_new(
-    // own
-    params: Option<NonNull<wasm_valtype_vec_t>>,
-    // own
-    results: Option<NonNull<wasm_valtype_vec_t>>,
+    params: Option<Box<wasm_valtype_vec_t>>,
+    results: Option<Box<wasm_valtype_vec_t>>,
 ) -> Option<Box<wasm_functype_t>> {
-    wasm_functype_new_inner(params?, results?)
-}
+    let params = params?;
+    let results = results?;
 
-unsafe fn wasm_functype_new_inner(
-    // own
-    params: NonNull<wasm_valtype_vec_t>,
-    // own
-    results: NonNull<wasm_valtype_vec_t>,
-) -> Option<Box<wasm_functype_t>> {
-    let params = params.as_ref();
-    let results = results.as_ref();
-    let params: Vec<ValType> = params
+    let params_as_valtype: Vec<ValType> = params
+        .into_slice()?
+        .into_iter()
+        .map(|val| val.as_ref().into())
+        .collect::<Vec<_>>();
+    let results_as_valtype: Vec<ValType> = results
         .into_slice()?
         .iter()
-        .map(|ptr| **ptr)
-        .map(Into::into)
-        .collect::<Vec<_>>();
-    let results: Vec<ValType> = results
-        .into_slice()?
-        .iter()
-        .map(|ptr| **ptr)
-        .map(Into::into)
+        .map(|val| val.as_ref().into())
         .collect::<Vec<_>>();
 
+    wasm_valtype_vec_delete(Box::into_raw(params));
+    wasm_valtype_vec_delete(Box::into_raw(results));
+
     Some(Box::new(wasm_functype_t::new(FunctionType::new(
-        params, results,
+        params_as_valtype,
+        results_as_valtype,
     ))))
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_functype_delete(_ft: Option<Box<wasm_functype_t>>) {}
+pub unsafe extern "C" fn wasm_functype_delete(_function_type: Option<Box<wasm_functype_t>>) {}
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_functype_copy(
-    arg: Option<NonNull<wasm_functype_t>>,
+    function_type: Option<&wasm_functype_t>,
 ) -> Option<Box<wasm_functype_t>> {
-    let arg = arg?;
-    let funcsig = arg.as_ref();
-    Some(Box::new(funcsig.clone()))
+    let function_type = function_type?;
+
+    Some(Box::new(wasm_functype_t::new(
+        function_type.inner().function_type.clone(),
+    )))
 }
 
-// TODO: fix memory leak
 #[no_mangle]
-pub unsafe extern "C" fn wasm_functype_params(ft: &wasm_functype_t) -> *const wasm_valtype_vec_t {
-    let mut valtypes = ft
-        .sig()
-        .params()
-        .iter()
-        .cloned()
-        .map(Into::into)
-        .map(Box::new)
-        .map(Box::into_raw)
-        .collect::<Vec<*mut wasm_valtype_t>>();
-    let out = Box::into_raw(Box::new(wasm_valtype_vec_t {
-        size: valtypes.len(),
-        data: valtypes.as_mut_ptr(),
-    }));
-    mem::forget(valtypes);
-    out as *const _
+pub unsafe extern "C" fn wasm_functype_params(
+    function_type: Option<&wasm_functype_t>,
+) -> Option<&wasm_valtype_vec_t> {
+    let function_type = function_type?;
+
+    Some(function_type.inner().params.as_ref())
 }
 
-// TODO: fix memory leak
 #[no_mangle]
-pub unsafe extern "C" fn wasm_functype_results(ft: &wasm_functype_t) -> *const wasm_valtype_vec_t {
-    let mut valtypes = ft
-        .sig()
-        .results()
-        .iter()
-        .cloned()
-        .map(Into::into)
-        .map(Box::new)
-        .map(Box::into_raw)
-        .collect::<Vec<*mut wasm_valtype_t>>();
-    let out = Box::into_raw(Box::new(wasm_valtype_vec_t {
-        size: valtypes.len(),
-        data: valtypes.as_mut_ptr(),
-    }));
-    mem::forget(valtypes);
-    out as *const _
+pub unsafe extern "C" fn wasm_functype_results(
+    function_type: Option<&wasm_functype_t>,
+) -> Option<&wasm_valtype_vec_t> {
+    let function_type = function_type?;
+
+    Some(function_type.inner().results.as_ref())
 }
diff --git a/lib/c-api/src/wasm_c_api/types/global.rs b/lib/c-api/src/wasm_c_api/types/global.rs
index ee259650e..219593333 100644
--- a/lib/c-api/src/wasm_c_api/types/global.rs
+++ b/lib/c-api/src/wasm_c_api/types/global.rs
@@ -1,31 +1,47 @@
 use super::{
-    wasm_externtype_t, wasm_mutability_enum, wasm_mutability_t, wasm_valtype_delete, wasm_valtype_t,
+    wasm_externtype_t, wasm_mutability_enum, wasm_mutability_t, wasm_valtype_delete,
+    wasm_valtype_t, WasmExternType,
 };
 use std::convert::TryInto;
 use wasmer::{ExternType, GlobalType};
 
+#[derive(Debug, Clone)]
+pub(crate) struct WasmGlobalType {
+    pub(crate) global_type: GlobalType,
+    content: Box<wasm_valtype_t>,
+}
+
+impl WasmGlobalType {
+    pub(crate) fn new(global_type: GlobalType) -> Self {
+        let content = Box::new(global_type.ty.into());
+
+        Self {
+            global_type,
+            content,
+        }
+    }
+}
+
 #[allow(non_camel_case_types)]
-#[derive(Clone, Debug)]
+#[derive(Debug)]
+#[repr(transparent)]
 pub struct wasm_globaltype_t {
-    pub(crate) extern_: wasm_externtype_t,
+    pub(crate) extern_type: wasm_externtype_t,
 }
 
 impl wasm_globaltype_t {
-    pub(crate) fn as_globaltype(&self) -> &GlobalType {
-        if let ExternType::Global(ref g) = self.extern_.inner {
-            g
-        } else {
-            unreachable!(
-                "Data corruption detected: `wasm_globaltype_t` does not contain a `GlobalType`"
-            );
+    pub(crate) fn new(global_type: GlobalType) -> Self {
+        Self {
+            extern_type: wasm_externtype_t::new(ExternType::Global(global_type)),
         }
     }
 
-    pub(crate) fn new(global_type: GlobalType) -> Self {
-        Self {
-            extern_: wasm_externtype_t {
-                inner: ExternType::Global(global_type),
-            },
+    pub(crate) fn inner(&self) -> &WasmGlobalType {
+        match &self.extern_type.inner {
+            WasmExternType::Global(wasm_global_type) => &wasm_global_type,
+            _ => {
+                unreachable!("Data corruption: `wasm_globaltype_t` does not contain a global type")
+            }
         }
     }
 }
@@ -34,45 +50,34 @@ wasm_declare_vec!(globaltype);
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_globaltype_new(
-    // own
     valtype: Option<Box<wasm_valtype_t>>,
     mutability: wasm_mutability_t,
 ) -> Option<Box<wasm_globaltype_t>> {
-    wasm_globaltype_new_inner(valtype?, mutability)
+    let valtype = valtype?;
+    let mutability: wasm_mutability_enum = mutability.try_into().ok()?;
+    let global_type = Box::new(wasm_globaltype_t::new(GlobalType::new(
+        (*valtype).into(),
+        mutability.into(),
+    )));
+
+    wasm_valtype_delete(Some(valtype));
+
+    Some(global_type)
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_globaltype_delete(_globaltype: Option<Box<wasm_globaltype_t>>) {}
-
-unsafe fn wasm_globaltype_new_inner(
-    // own
-    valtype: Box<wasm_valtype_t>,
-    mutability: wasm_mutability_t,
-) -> Option<Box<wasm_globaltype_t>> {
-    let me: wasm_mutability_enum = mutability.try_into().ok()?;
-    let gd = Box::new(wasm_globaltype_t::new(GlobalType::new(
-        (*valtype).into(),
-        me.into(),
-    )));
-    wasm_valtype_delete(Some(valtype));
-
-    Some(gd)
-}
+pub unsafe extern "C" fn wasm_globaltype_delete(_global_type: Option<Box<wasm_globaltype_t>>) {}
 
 #[no_mangle]
 pub unsafe extern "C" fn wasm_globaltype_mutability(
-    globaltype: &wasm_globaltype_t,
+    global_type: &wasm_globaltype_t,
 ) -> wasm_mutability_t {
-    let gt = globaltype.as_globaltype();
-    wasm_mutability_enum::from(gt.mutability).into()
+    wasm_mutability_enum::from(global_type.inner().global_type.mutability).into()
 }
 
-// TODO: fix memory leak
-// this function leaks memory because the returned limits pointer is not owned
 #[no_mangle]
 pub unsafe extern "C" fn wasm_globaltype_content(
-    globaltype: &wasm_globaltype_t,
-) -> *const wasm_valtype_t {
-    let gt = globaltype.as_globaltype();
-    Box::into_raw(Box::new(gt.ty.into()))
+    global_type: &wasm_globaltype_t,
+) -> &wasm_valtype_t {
+    global_type.inner().content.as_ref()
 }
diff --git a/lib/c-api/src/wasm_c_api/types/import.rs b/lib/c-api/src/wasm_c_api/types/import.rs
index 23efd73c2..4d3b2fe72 100644
--- a/lib/c-api/src/wasm_c_api/types/import.rs
+++ b/lib/c-api/src/wasm_c_api/types/import.rs
@@ -1,49 +1,45 @@
 use super::{wasm_externtype_t, wasm_name_t};
-use std::ptr::NonNull;
 use wasmer::ImportType;
 
-// TODO: improve ownership in `importtype_t` (can we safely use `Box<wasm_name_t>` here?)
 #[allow(non_camel_case_types)]
 pub struct wasm_importtype_t {
-    pub(crate) module: NonNull<wasm_name_t>,
-    pub(crate) name: NonNull<wasm_name_t>,
-    pub(crate) extern_type: NonNull<wasm_externtype_t>,
+    module: Box<wasm_name_t>,
+    name: Box<wasm_name_t>,
+    extern_type: Box<wasm_externtype_t>,
 }
 
 wasm_declare_boxed_vec!(importtype);
 
 #[no_mangle]
 pub extern "C" fn wasm_importtype_new(
-    module: NonNull<wasm_name_t>,
-    name: NonNull<wasm_name_t>,
-    extern_type: NonNull<wasm_externtype_t>,
-) -> Box<wasm_importtype_t> {
-    Box::new(wasm_importtype_t {
-        name,
-        module,
-        extern_type,
-    })
+    module: Option<Box<wasm_name_t>>,
+    name: Option<Box<wasm_name_t>>,
+    extern_type: Option<Box<wasm_externtype_t>>,
+) -> Option<Box<wasm_importtype_t>> {
+    Some(Box::new(wasm_importtype_t {
+        name: name?,
+        module: module?,
+        extern_type: extern_type?,
+    }))
 }
 
 #[no_mangle]
-pub extern "C" fn wasm_importtype_module(et: &'static wasm_importtype_t) -> &'static wasm_name_t {
-    unsafe { et.module.as_ref() }
+pub extern "C" fn wasm_importtype_module(import_type: &wasm_importtype_t) -> &wasm_name_t {
+    import_type.module.as_ref()
 }
 
 #[no_mangle]
-pub extern "C" fn wasm_importtype_name(et: &'static wasm_importtype_t) -> &'static wasm_name_t {
-    unsafe { et.name.as_ref() }
+pub extern "C" fn wasm_importtype_name(import_type: &wasm_importtype_t) -> &wasm_name_t {
+    import_type.name.as_ref()
 }
 
 #[no_mangle]
-pub extern "C" fn wasm_importtype_type(
-    et: &'static wasm_importtype_t,
-) -> &'static wasm_externtype_t {
-    unsafe { et.extern_type.as_ref() }
+pub extern "C" fn wasm_importtype_type(import_type: &wasm_importtype_t) -> &wasm_externtype_t {
+    import_type.extern_type.as_ref()
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_importtype_delete(_importtype: Option<Box<wasm_importtype_t>>) {}
+pub unsafe extern "C" fn wasm_importtype_delete(_import_type: Option<Box<wasm_importtype_t>>) {}
 
 impl From<ImportType> for wasm_importtype_t {
     fn from(other: ImportType) -> Self {
@@ -53,7 +49,19 @@ impl From<ImportType> for wasm_importtype_t {
 
 impl From<&ImportType> for wasm_importtype_t {
     fn from(other: &ImportType) -> Self {
-        // TODO: double check that freeing String as `Vec<u8>` is valid
+        let module = {
+            let mut heap_str: Box<str> = other.module().to_string().into_boxed_str();
+            let char_ptr = heap_str.as_mut_ptr();
+            let str_len = heap_str.bytes().len();
+            let module_inner = wasm_name_t {
+                size: str_len,
+                data: char_ptr,
+            };
+            Box::leak(heap_str);
+
+            Box::new(module_inner)
+        };
+
         let name = {
             let mut heap_str: Box<str> = other.name().to_string().into_boxed_str();
             let char_ptr = heap_str.as_mut_ptr();
@@ -63,26 +71,11 @@ impl From<&ImportType> for wasm_importtype_t {
                 data: char_ptr,
             };
             Box::leak(heap_str);
-            unsafe { NonNull::new_unchecked(Box::into_raw(Box::new(name_inner))) }
+
+            Box::new(name_inner)
         };
 
-        // TODO: double check that freeing String as `Vec<u8>` is valid
-        let module = {
-            let mut heap_str: Box<str> = other.module().to_string().into_boxed_str();
-            let char_ptr = heap_str.as_mut_ptr();
-            let str_len = heap_str.bytes().len();
-            let name_inner = wasm_name_t {
-                size: str_len,
-                data: char_ptr,
-            };
-            Box::leak(heap_str);
-            unsafe { NonNull::new_unchecked(Box::into_raw(Box::new(name_inner))) }
-        };
-
-        let extern_type = {
-            let extern_type: wasm_externtype_t = other.ty().into();
-            unsafe { NonNull::new_unchecked(Box::into_raw(Box::new(extern_type))) }
-        };
+        let extern_type = Box::new(other.ty().into());
 
         wasm_importtype_t {
             name,
diff --git a/lib/c-api/src/wasm_c_api/types/memory.rs b/lib/c-api/src/wasm_c_api/types/memory.rs
index 43211ca9d..d38385b88 100644
--- a/lib/c-api/src/wasm_c_api/types/memory.rs
+++ b/lib/c-api/src/wasm_c_api/types/memory.rs
@@ -1,49 +1,58 @@
-use super::wasm_externtype_t;
+use super::{wasm_externtype_t, WasmExternType};
 use wasmer::{ExternType, MemoryType, Pages};
 
-// opaque type wrapping `MemoryType`
+#[derive(Debug, Clone)]
+pub(crate) struct WasmMemoryType {
+    pub(crate) memory_type: MemoryType,
+    limits: Box<wasm_limits_t>,
+}
+
+impl WasmMemoryType {
+    pub(crate) fn new(memory_type: MemoryType) -> Self {
+        let limits = Box::new(wasm_limits_t {
+            min: memory_type.minimum.0 as _,
+            max: memory_type
+                .maximum
+                .map(|max| max.0 as _)
+                .unwrap_or(LIMITS_MAX_SENTINEL),
+        });
+
+        Self {
+            memory_type,
+            limits,
+        }
+    }
+}
+
 #[allow(non_camel_case_types)]
-#[derive(Clone, Debug)]
+#[derive(Debug)]
+#[repr(transparent)]
 pub struct wasm_memorytype_t {
-    pub(crate) extern_: wasm_externtype_t,
+    pub(crate) extern_type: wasm_externtype_t,
 }
 
 impl wasm_memorytype_t {
-    pub(crate) fn as_memorytype(&self) -> &MemoryType {
-        if let ExternType::Memory(ref mt) = self.extern_.inner {
-            mt
-        } else {
-            unreachable!(
-                "Data corruption detected: `wasm_memorytype_t` does not contain a `MemoryType`"
-            );
+    pub(crate) fn new(memory_type: MemoryType) -> Self {
+        Self {
+            extern_type: wasm_externtype_t::new(ExternType::Memory(memory_type)),
         }
     }
 
-    pub(crate) fn new(memory_type: MemoryType) -> Self {
-        Self {
-            extern_: wasm_externtype_t {
-                inner: ExternType::Memory(memory_type),
-            },
+    pub(crate) fn inner(&self) -> &WasmMemoryType {
+        match &self.extern_type.inner {
+            WasmExternType::Memory(wasm_memory_type) => &wasm_memory_type,
+            _ => {
+                unreachable!("Data corruption: `wasm_memorytype_t` does not contain a memory type")
+            }
         }
     }
 }
 
 wasm_declare_vec!(memorytype);
 
-#[allow(non_camel_case_types)]
-#[derive(Copy, Clone, Debug)]
-#[repr(C)]
-pub struct wasm_limits_t {
-    pub(crate) min: u32,
-    pub(crate) max: u32,
-}
-
-const LIMITS_MAX_SENTINEL: u32 = u32::max_value();
-
 #[no_mangle]
 pub unsafe extern "C" fn wasm_memorytype_new(limits: &wasm_limits_t) -> Box<wasm_memorytype_t> {
     let min_pages = Pages(limits.min as _);
-    // u32::max_value() is a sentinel value for no max specified
     let max_pages = if limits.max == LIMITS_MAX_SENTINEL {
         None
     } else {
@@ -56,19 +65,19 @@ pub unsafe extern "C" fn wasm_memorytype_new(limits: &wasm_limits_t) -> Box<wasm
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_memorytype_delete(_memorytype: Option<Box<wasm_memorytype_t>>) {}
+pub unsafe extern "C" fn wasm_memorytype_delete(_memory_type: Option<Box<wasm_memorytype_t>>) {}
 
-// TODO: fix memory leak
-// this function leaks memory because the returned limits pointer is not owned
-#[no_mangle]
-pub unsafe extern "C" fn wasm_memorytype_limits(mt: &wasm_memorytype_t) -> *const wasm_limits_t {
-    let md = mt.as_memorytype();
-
-    Box::into_raw(Box::new(wasm_limits_t {
-        min: md.minimum.0 as _,
-        max: md
-            .maximum
-            .map(|max| max.0 as _)
-            .unwrap_or(LIMITS_MAX_SENTINEL),
-    }))
+#[allow(non_camel_case_types)]
+#[derive(Copy, Clone, Debug)]
+#[repr(C)]
+pub struct wasm_limits_t {
+    pub(crate) min: u32,
+    pub(crate) max: u32,
+}
+
+const LIMITS_MAX_SENTINEL: u32 = u32::max_value();
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_memorytype_limits(memory_type: &wasm_memorytype_t) -> &wasm_limits_t {
+    memory_type.inner().limits.as_ref()
 }
diff --git a/lib/c-api/src/wasm_c_api/types/table.rs b/lib/c-api/src/wasm_c_api/types/table.rs
index e8973772e..31e2525ed 100644
--- a/lib/c-api/src/wasm_c_api/types/table.rs
+++ b/lib/c-api/src/wasm_c_api/types/table.rs
@@ -1,79 +1,91 @@
-use super::{wasm_externtype_t, wasm_limits_t, wasm_valtype_delete, wasm_valtype_t};
+use super::{
+    wasm_externtype_t, wasm_limits_t, wasm_valtype_delete, wasm_valtype_t, WasmExternType,
+};
 use wasmer::{ExternType, TableType};
 
 #[allow(non_camel_case_types)]
 pub type wasm_table_size_t = u32;
 
-#[allow(non_camel_case_types)]
-#[derive(Clone, Debug)]
-#[repr(C)]
-pub struct wasm_tabletype_t {
-    pub(crate) extern_: wasm_externtype_t,
+const LIMITS_MAX_SENTINEL: u32 = u32::max_value();
+
+#[derive(Debug, Clone)]
+pub(crate) struct WasmTableType {
+    pub(crate) table_type: TableType,
+    limits: Box<wasm_limits_t>,
+    content: Box<wasm_valtype_t>,
 }
 
-wasm_declare_vec!(tabletype);
+impl WasmTableType {
+    pub(crate) fn new(table_type: TableType) -> Self {
+        let limits = Box::new(wasm_limits_t {
+            min: table_type.minimum as _,
+            max: table_type.maximum.unwrap_or(LIMITS_MAX_SENTINEL),
+        });
+        let content = Box::new(table_type.ty.into());
 
-impl wasm_tabletype_t {
-    pub(crate) fn as_tabletype(&self) -> &TableType {
-        if let ExternType::Table(ref t) = self.extern_.inner {
-            t
-        } else {
-            unreachable!(
-                "Data corruption detected: `wasm_tabletype_t` does not contain a `TableType`"
-            );
+        Self {
+            table_type,
+            limits,
+            content,
         }
     }
 }
 
+#[allow(non_camel_case_types)]
+#[derive(Debug)]
+#[repr(transparent)]
+pub struct wasm_tabletype_t {
+    pub(crate) extern_type: wasm_externtype_t,
+}
+
+impl wasm_tabletype_t {
+    pub(crate) fn new(table_type: TableType) -> Self {
+        Self {
+            extern_type: wasm_externtype_t::new(ExternType::Table(table_type)),
+        }
+    }
+
+    pub(crate) fn inner(&self) -> &WasmTableType {
+        match &self.extern_type.inner {
+            WasmExternType::Table(wasm_table_type) => &wasm_table_type,
+            _ => unreachable!("Data corruption: `wasm_tabletype_t` does not contain a table type"),
+        }
+    }
+}
+
+wasm_declare_vec!(tabletype);
+
 #[no_mangle]
 pub unsafe extern "C" fn wasm_tabletype_new(
-    // own
-    valtype: Box<wasm_valtype_t>,
+    valtype: Option<Box<wasm_valtype_t>>,
     limits: &wasm_limits_t,
-) -> Box<wasm_tabletype_t> {
-    // TODO: investigate if `0` is in fact a sentinel value here
-    let max_elements = if limits.max == 0 {
+) -> Option<Box<wasm_tabletype_t>> {
+    let valtype = valtype?;
+    let max_elements = if limits.max == LIMITS_MAX_SENTINEL {
         None
     } else {
         Some(limits.max as _)
     };
-    let out = Box::new(wasm_tabletype_t {
-        extern_: wasm_externtype_t {
-            inner: ExternType::Table(TableType::new(
-                (*valtype).into(),
-                limits.min as _,
-                max_elements,
-            )),
-        },
-    });
+    let table_type = Box::new(wasm_tabletype_t::new(TableType::new(
+        (*valtype).into(),
+        limits.min as _,
+        max_elements,
+    )));
+
     wasm_valtype_delete(Some(valtype));
 
-    out
-}
-
-// TODO: fix memory leak
-// this function leaks memory because the returned limits pointer is not owned
-#[no_mangle]
-pub unsafe extern "C" fn wasm_tabletype_limits(
-    tabletype: &wasm_tabletype_t,
-) -> *const wasm_limits_t {
-    let tt = tabletype.as_tabletype();
-    Box::into_raw(Box::new(wasm_limits_t {
-        min: tt.minimum as _,
-        max: tt.maximum.unwrap_or(0),
-    }))
-}
-
-// TODO: fix memory leak
-// this function leaks memory because the returned limits pointer is not owned
-#[no_mangle]
-pub unsafe extern "C" fn wasm_tabletype_element(
-    tabletype: &wasm_tabletype_t,
-) -> *const wasm_valtype_t {
-    let tt = tabletype.as_tabletype();
-
-    Box::into_raw(Box::new(tt.ty.into()))
+    Some(table_type)
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_tabletype_delete(_tabletype: Option<Box<wasm_tabletype_t>>) {}
+pub unsafe extern "C" fn wasm_tabletype_limits(table_type: &wasm_tabletype_t) -> &wasm_limits_t {
+    table_type.inner().limits.as_ref()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_tabletype_element(table_type: &wasm_tabletype_t) -> &wasm_valtype_t {
+    table_type.inner().content.as_ref()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasm_tabletype_delete(_table_type: Option<Box<wasm_tabletype_t>>) {}
diff --git a/lib/c-api/src/wasm_c_api/types/value.rs b/lib/c-api/src/wasm_c_api/types/value.rs
index dbb4b3a4d..647956175 100644
--- a/lib/c-api/src/wasm_c_api/types/value.rs
+++ b/lib/c-api/src/wasm_c_api/types/value.rs
@@ -60,6 +60,12 @@ wasm_declare_boxed_vec!(valtype);
 
 impl From<wasm_valtype_t> for ValType {
     fn from(other: wasm_valtype_t) -> Self {
+        (&other).into()
+    }
+}
+
+impl From<&wasm_valtype_t> for ValType {
+    fn from(other: &wasm_valtype_t) -> Self {
         other.valkind.into()
     }
 }
@@ -76,6 +82,7 @@ impl From<ValType> for wasm_valtype_t {
 pub extern "C" fn wasm_valtype_new(kind: wasm_valkind_t) -> Option<Box<wasm_valtype_t>> {
     let kind_enum = kind.try_into().ok()?;
     let valtype = wasm_valtype_t { valkind: kind_enum };
+
     Some(Box::new(valtype))
 }
 
diff --git a/lib/c-api/src/wasm_c_api/value.rs b/lib/c-api/src/wasm_c_api/value.rs
index 5ae7c449f..545944564 100644
--- a/lib/c-api/src/wasm_c_api/value.rs
+++ b/lib/c-api/src/wasm_c_api/value.rs
@@ -1,6 +1,6 @@
 use super::types::{wasm_ref_t, wasm_valkind_enum};
+use crate::error::{update_last_error, CApiError};
 use std::convert::{TryFrom, TryInto};
-use std::ptr::NonNull;
 use wasmer::Val;
 
 #[allow(non_camel_case_types)]
@@ -35,25 +35,43 @@ impl Clone for wasm_val_t {
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_val_copy(out_ptr: *mut wasm_val_t, val: &wasm_val_t) {
-    (*out_ptr).kind = val.kind;
-    (*out_ptr).of =
-        // TODO: handle this error
-        match val.kind.try_into().unwrap() {
-            wasm_valkind_enum::WASM_I32 => wasm_val_inner { int32_t: val.of.int32_t },
-            wasm_valkind_enum::WASM_I64 => wasm_val_inner { int64_t: val.of.int64_t },
-            wasm_valkind_enum::WASM_F32 => wasm_val_inner { float32_t: val.of.float32_t },
-            wasm_valkind_enum::WASM_F64 => wasm_val_inner { float64_t: val.of.float64_t },
+pub unsafe extern "C" fn wasm_val_copy(
+    // own
+    out: &mut wasm_val_t,
+    val: &wasm_val_t,
+) {
+    out.kind = val.kind;
+    out.of = match val.kind.try_into() {
+        Ok(kind) => match kind {
+            wasm_valkind_enum::WASM_I32 => wasm_val_inner {
+                int32_t: val.of.int32_t,
+            },
+            wasm_valkind_enum::WASM_I64 => wasm_val_inner {
+                int64_t: val.of.int64_t,
+            },
+            wasm_valkind_enum::WASM_F32 => wasm_val_inner {
+                float32_t: val.of.float32_t,
+            },
+            wasm_valkind_enum::WASM_F64 => wasm_val_inner {
+                float64_t: val.of.float64_t,
+            },
             wasm_valkind_enum::WASM_ANYREF => wasm_val_inner { wref: val.of.wref },
             wasm_valkind_enum::WASM_FUNCREF => wasm_val_inner { wref: val.of.wref },
-        };
+        },
+
+        Err(e) => {
+            update_last_error(CApiError { msg: e.to_string() });
+
+            return;
+        }
+    };
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_val_delete(val: Option<NonNull<wasm_val_t>>) {
-    if let Some(v_inner) = val {
+pub unsafe extern "C" fn wasm_val_delete(val: Option<Box<wasm_val_t>>) {
+    if let Some(val) = val {
         // TODO: figure out where wasm_val is allocated first...
-        let _ = Box::from_raw(v_inner.as_ptr());
+        let _ = val;
     }
 }
 
diff --git a/lib/c-api/src/wasm_c_api/wasmer.rs b/lib/c-api/src/wasm_c_api/wasmer.rs
index 3dda54cb2..8dc9755aa 100644
--- a/lib/c-api/src/wasm_c_api/wasmer.rs
+++ b/lib/c-api/src/wasm_c_api/wasmer.rs
@@ -6,7 +6,11 @@ use std::str;
 use std::sync::Arc;
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_module_name(module: &wasm_module_t, out: &mut wasm_name_t) {
+pub unsafe extern "C" fn wasm_module_name(
+    module: &wasm_module_t,
+    // own
+    out: &mut wasm_name_t,
+) {
     let name = match module.inner.name() {
         Some(name) => name,
         None => return,
@@ -18,7 +22,8 @@ pub unsafe extern "C" fn wasm_module_name(module: &wasm_module_t, out: &mut wasm
 #[no_mangle]
 pub unsafe extern "C" fn wasm_module_set_name(
     module: &mut wasm_module_t,
-    name: &wasm_name_t,
+    // own
+    name: Box<wasm_name_t>,
 ) -> bool {
     let name = match name.into_slice() {
         Some(name) => match str::from_utf8(name) {
diff --git a/lib/c-api/src/wasm_c_api/wat.rs b/lib/c-api/src/wasm_c_api/wat.rs
index 0ff73d69c..185b61e91 100644
--- a/lib/c-api/src/wasm_c_api/wat.rs
+++ b/lib/c-api/src/wasm_c_api/wat.rs
@@ -12,3 +12,71 @@ pub unsafe extern "C" fn wat2wasm(wat: &wasm_byte_vec_t) -> Option<Box<wasm_byte
 
     Some(Box::new(result))
 }
+
+#[cfg(test)]
+mod tests {
+    use inline_c::assert_c;
+
+    #[test]
+    fn test_wat2wasm() {
+        (assert_c! {
+            #include "tests/wasmer_wasm.h"
+
+            int main() {
+                wasm_engine_t* engine = wasm_engine_new();
+                wasm_store_t* store = wasm_store_new(engine);
+
+                wasm_byte_vec_t wat;
+                wasmer_byte_vec_new_from_string(&wat, "(module)");
+                wasm_byte_vec_t* wasm = wat2wasm(&wat);
+
+                assert(wasm);
+                assert(wasm->size == 8);
+                assert(
+                    wasm->data[0] == 0 &&
+                        wasm->data[1] == 'a' &&
+                        wasm->data[2] == 's' &&
+                        wasm->data[3] == 'm' &&
+                        wasm->data[4] == 1 &&
+                        wasm->data[5] == 0 &&
+                        wasm->data[6] == 0 &&
+                        wasm->data[7] == 0
+                );
+
+                wasm_byte_vec_delete(wasm);
+                wasm_byte_vec_delete(&wat);
+                wasm_store_delete(store);
+                wasm_engine_delete(engine);
+
+                return 0;
+            }
+        })
+        .success();
+    }
+
+    #[test]
+    fn test_wat2wasm_failed() {
+        (assert_c! {
+            #include "tests/wasmer_wasm.h"
+
+            int main() {
+                wasm_engine_t* engine = wasm_engine_new();
+                wasm_store_t* store = wasm_store_new(engine);
+
+                wasm_byte_vec_t wat;
+                wasmer_byte_vec_new_from_string(&wat, "(module");
+                wasm_byte_vec_t* wasm = wat2wasm(&wat);
+
+                assert(!wasm);
+                assert(wasmer_last_error_length() > 0);
+
+                wasm_byte_vec_delete(&wat);
+                wasm_store_delete(store);
+                wasm_engine_delete(engine);
+
+                return 0;
+            }
+        })
+        .success();
+    }
+}
diff --git a/lib/c-api/tests/wasm_c_api/CMakeLists.txt b/lib/c-api/tests/wasm_c_api/CMakeLists.txt
index 1ac9b3eaf..98c39b49f 100644
--- a/lib/c-api/tests/wasm_c_api/CMakeLists.txt
+++ b/lib/c-api/tests/wasm_c_api/CMakeLists.txt
@@ -4,14 +4,14 @@ project (WasmerWasmCApiTests)
 # Examples as tests from the `wasm-c-api` repository.
 add_executable(wasm-c-api-callback wasm-c-api/example/callback.c)
 #add_executable(wasm-c-api-finalize wasm-c-api/example/finalize.c)
-#add_executable(wasm-c-api-global wasm-c-api/example/global.c)
+add_executable(wasm-c-api-global wasm-c-api/example/global.c)
 add_executable(wasm-c-api-hello wasm-c-api/example/hello.c)
 #add_executable(wasm-c-api-hostref wasm-c-api/example/hostref.c)
-#add_executable(wasm-c-api-memory wasm-c-api/example/memory.c)
+add_executable(wasm-c-api-memory wasm-c-api/example/memory.c)
 #add_executable(wasm-c-api-multi wasm-c-api/example/multi.c)
 add_executable(wasm-c-api-reflect wasm-c-api/example/reflect.c)
 add_executable(wasm-c-api-serialize wasm-c-api/example/serialize.c)
-#add_executable(wasm-c-api-start wasm-c-api/example/start.c)
+add_executable(wasm-c-api-start wasm-c-api/example/start.c)
 #add_executable(wasm-c-api-table wasm-c-api/example/table.c)
 #add_executable(wasm-c-api-threads wasm-c-api/example/threads.c)
 add_executable(wasm-c-api-trap wasm-c-api/example/trap.c)
@@ -57,12 +57,12 @@ add_test(NAME wasm-c-api-callback
 #         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
 #)
 
-#target_link_libraries(wasm-c-api-global general ${WASMER_LIB})
-#target_compile_options(wasm-c-api-global PRIVATE ${COMPILER_OPTIONS})
-#add_test(NAME wasm-c-api-global
-#         COMMAND wasm-c-api-global
-#         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
-#)
+target_link_libraries(wasm-c-api-global general ${WASMER_LIB})
+target_compile_options(wasm-c-api-global PRIVATE ${COMPILER_OPTIONS})
+add_test(NAME wasm-c-api-global
+         COMMAND wasm-c-api-global
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
+)
 
 target_link_libraries(wasm-c-api-hello general ${WASMER_LIB})
 target_compile_options(wasm-c-api-hello PRIVATE ${COMPILER_OPTIONS})
@@ -78,12 +78,12 @@ add_test(NAME wasm-c-api-hello
 #         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
 #)
 
-#target_link_libraries(wasm-c-api-memory general ${WASMER_LIB})
-#target_compile_options(wasm-c-api-memory PRIVATE ${COMPILER_OPTIONS})
-#add_test(NAME wasm-c-api-memory
-#         COMMAND wasm-c-api-memory
-#         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
-#)
+target_link_libraries(wasm-c-api-memory general ${WASMER_LIB})
+target_compile_options(wasm-c-api-memory PRIVATE ${COMPILER_OPTIONS})
+add_test(NAME wasm-c-api-memory
+         COMMAND wasm-c-api-memory
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
+)
 
 #target_link_libraries(wasm-c-api-multi general ${WASMER_LIB})
 #target_compile_options(wasm-c-api-multi PRIVATE ${COMPILER_OPTIONS})
@@ -106,12 +106,12 @@ add_test(NAME wasm-c-api-serialize
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
 )
 
-#target_link_libraries(wasm-c-api-start general ${WASMER_LIB})
-#target_compile_options(wasm-c-api-start PRIVATE ${COMPILER_OPTIONS})
-#add_test(NAME wasm-c-api-start
-#         COMMAND wasm-c-api-start
-#         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
-#)
+target_link_libraries(wasm-c-api-start general ${WASMER_LIB})
+target_compile_options(wasm-c-api-start PRIVATE ${COMPILER_OPTIONS})
+add_test(NAME wasm-c-api-start
+         COMMAND wasm-c-api-start
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/example/
+)
 
 #target_link_libraries(wasm-c-api-table general ${WASMER_LIB})
 #target_compile_options(wasm-c-api-table PRIVATE ${COMPILER_OPTIONS})
diff --git a/lib/c-api/tests/wasmer_wasm.h b/lib/c-api/tests/wasmer_wasm.h
new file mode 100644
index 000000000..e5de0c748
--- /dev/null
+++ b/lib/c-api/tests/wasmer_wasm.h
@@ -0,0 +1,24 @@
+// This header file is used only for test purposes! It is used by unit
+// test inside the `src/` directory for the moment.
+
+#ifndef TEST_WASMER_WASM
+#define TEST_WASMER_WASM
+
+#include "../wasmer_wasm.h"
+#include <stdio.h>
+#include <string.h>
+
+// Assert that a `wasm_name_t` equals something.
+void wasmer_assert_name(const wasm_name_t *name, const char *expected) {
+  assert(name->size == strlen(expected) &&
+         strncmp(name->data, expected, name->size) == 0);
+}
+
+// Helper to quickly create a `wasm_byte_vec_t` from a string, à la
+// `wasm_name_new_from_string`.
+static inline void wasmer_byte_vec_new_from_string(wasm_byte_vec_t *out,
+                                                   const char *s) {
+  wasm_byte_vec_new(out, strlen(s), s);
+}
+
+#endif /* TEST_WASMER_WASM */
diff --git a/lib/c-api/wasmer_wasm.h b/lib/c-api/wasmer_wasm.h
index eb61710af..4bc65f62d 100644
--- a/lib/c-api/wasmer_wasm.h
+++ b/lib/c-api/wasmer_wasm.h
@@ -29,6 +29,9 @@
 #  define DEPRECATED(message) __declspec(deprecated(message))
 #endif
 
+// The `jit` feature has been enabled for this build.
+#define WASMER_JIT_ENABLED
+
 // The `compiler` feature has been enabled for this build.
 #define WASMER_COMPILER_ENABLED
 
@@ -53,7 +56,10 @@
 #include "wasm.h"
 
 /**
- * this can be a wasmer-specific type with wasmer-specific functions for manipulating it
+ * Kind of compilers that can be used by the engines.
+ *
+ * This is a Wasmer-specific type with Wasmer-specific functions for
+ * manipulating it.
  */
 typedef enum {
   CRANELIFT = 0,
@@ -61,6 +67,12 @@ typedef enum {
   SINGLEPASS = 2,
 } wasmer_compiler_t;
 
+/**
+ * Kind of engines that can be used by the store.
+ *
+ * This is a Wasmer-specific type with Wasmer-specific functions for
+ * manipulating it.
+ */
 typedef enum {
   JIT = 0,
   NATIVE = 1,
@@ -156,13 +168,19 @@ wasm_func_t *wasi_get_start_function(wasm_instance_t *instance);
 wasi_version_t wasi_get_wasi_version(const wasm_module_t *module);
 #endif
 
+/**
+ * Configure the compiler to use.
+ */
 void wasm_config_set_compiler(wasm_config_t *config, wasmer_compiler_t compiler);
 
+/**
+ * Configure the engine to use.
+ */
 void wasm_config_set_engine(wasm_config_t *config, wasmer_engine_t engine);
 
 void wasm_module_name(const wasm_module_t *module, wasm_name_t *out);
 
-bool wasm_module_set_name(wasm_module_t *module, const wasm_name_t *name);
+bool wasm_module_set_name(wasm_module_t *module, wasm_name_t *name);
 
 /**
  * Gets the length in bytes of the last error if any.
diff --git a/lib/cache/Cargo.toml b/lib/cache/Cargo.toml
index 584460397..394d87ca9 100644
--- a/lib/cache/Cargo.toml
+++ b/lib/cache/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-cache"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Cache system for Wasmer WebAssembly runtime"
 categories = ["wasm", "caching"]
 keywords = ["wasm", "webassembly", "cache"]
@@ -11,7 +11,7 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer = { path = "../api", version = "1.0.0-alpha4", default-features = false }
+wasmer = { path = "../api", version = "1.0.0-alpha5", default-features = false }
 memmap = "0.7"
 hex = "0.4"
 thiserror = "1"
diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
index 9ec6f6f68..ccdc773ff 100644
--- a/lib/cli/Cargo.toml
+++ b/lib/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-cli"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Wasmer CLI"
 categories = ["wasm", "command-line-interface"]
 keywords = ["wasm", "webassembly", "cli"]
@@ -17,22 +17,22 @@ path = "src/bin/wasmer.rs"
 doc = false
 
 [dependencies]
-wasmer = { version = "1.0.0-alpha4", path = "../api", default-features = false }
-wasmer-compiler = { version = "1.0.0-alpha4", path = "../compiler" }
-wasmer-compiler-cranelift = { version = "1.0.0-alpha4", path = "../compiler-cranelift", optional = true }
-wasmer-compiler-singlepass = { version = "1.0.0-alpha4", path = "../compiler-singlepass", optional = true }
-wasmer-compiler-llvm = { version = "1.0.0-alpha4", path = "../compiler-llvm", optional = true }
-wasmer-emscripten = { version = "1.0.0-alpha4", path = "../emscripten", optional = true }
-wasmer-engine = { version = "1.0.0-alpha4", path = "../engine" }
-wasmer-engine-jit = { version = "1.0.0-alpha4", path = "../engine-jit", optional = true }
-wasmer-engine-native = { version = "1.0.0-alpha4", path = "../engine-native", optional = true }
-wasmer-engine-object-file = { version = "1.0.0-alpha4", path = "../engine-object-file", optional = true }
-wasmer-vm = { version = "1.0.0-alpha4", path = "../vm" }
-wasmer-wasi = { version = "1.0.0-alpha4", path = "../wasi", optional = true }
-wasmer-wasi-experimental-io-devices = { version = "1.0.0-alpha4", path = "../wasi-experimental-io-devices", optional = true }
-wasmer-wast = { version = "1.0.0-alpha4", path = "../../tests/lib/wast", optional = true }
-wasmer-cache = { version = "1.0.0-alpha4", path = "../cache", optional = true }
-wasmer-types = { version = "1.0.0-alpha4", path = "../wasmer-types" }
+wasmer = { version = "1.0.0-alpha5", path = "../api", default-features = false }
+wasmer-compiler = { version = "1.0.0-alpha5", path = "../compiler" }
+wasmer-compiler-cranelift = { version = "1.0.0-alpha5", path = "../compiler-cranelift", optional = true }
+wasmer-compiler-singlepass = { version = "1.0.0-alpha5", path = "../compiler-singlepass", optional = true }
+wasmer-compiler-llvm = { version = "1.0.0-alpha5", path = "../compiler-llvm", optional = true }
+wasmer-emscripten = { version = "1.0.0-alpha5", path = "../emscripten", optional = true }
+wasmer-engine = { version = "1.0.0-alpha5", path = "../engine" }
+wasmer-engine-jit = { version = "1.0.0-alpha5", path = "../engine-jit", optional = true }
+wasmer-engine-native = { version = "1.0.0-alpha5", path = "../engine-native", optional = true }
+wasmer-engine-object-file = { version = "1.0.0-alpha5", path = "../engine-object-file", optional = true }
+wasmer-vm = { version = "1.0.0-alpha5", path = "../vm" }
+wasmer-wasi = { version = "1.0.0-alpha5", path = "../wasi", optional = true }
+wasmer-wasi-experimental-io-devices = { version = "1.0.0-alpha5", path = "../wasi-experimental-io-devices", optional = true }
+wasmer-wast = { version = "1.0.0-alpha5", path = "../../tests/lib/wast", optional = true }
+wasmer-cache = { version = "1.0.0-alpha5", path = "../cache", optional = true }
+wasmer-types = { version = "1.0.0-alpha5", path = "../wasmer-types" }
 atty = "0.2"
 colored = "2.0"
 anyhow = "1.0"
@@ -41,7 +41,7 @@ structopt = { version = "0.3", features = ["suggestions"] }
 distance = "0.4"
 # For the inspect subcommand
 bytesize = "1.0"
-cfg-if = "0.1"
+cfg-if = "1.0"
 # For debug feature
 fern = { version = "0.6", features = ["colored"], optional = true }
 log = { version = "0.4", optional = true }
diff --git a/lib/compiler-cranelift/Cargo.toml b/lib/compiler-cranelift/Cargo.toml
index 0633afa46..a32658c91 100644
--- a/lib/compiler-cranelift/Cargo.toml
+++ b/lib/compiler-cranelift/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-compiler-cranelift"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Cranelift compiler for Wasmer WebAssembly runtime"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "compiler", "cranelift"]
@@ -12,21 +12,22 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4", features = ["translator"], default-features = false }
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4", default-features = false, features = ["std"] }
-cranelift-codegen = { version = "0.65", default-features = false, features = ["x86", "arm64"] }
-cranelift-frontend = { version = "0.65", default-features = false }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5", features = ["translator"], default-features = false }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha5" }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5", default-features = false, features = ["std"] }
+cranelift-codegen = { version = "0.67", default-features = false, features = ["x86", "arm64"] }
+cranelift-frontend = { version = "0.67", default-features = false }
 tracing = "0.1"
-hashbrown = { version = "0.8", optional = true }
-rayon = "1.3"
+hashbrown = { version = "0.9", optional = true }
+rayon = "1.5"
 serde = { version = "1.0", features = ["derive"] }
 more-asserts = "0.2"
 gimli = { version = "0.21", optional = true }
+smallvec = "1.0.0"
 
 [dev-dependencies]
-target-lexicon = { version = "0.10", default-features = false }
-cranelift-codegen = { version = "0.65", features = ["enable-serde", "all-arch"] }
+target-lexicon = { version = "0.11", default-features = false }
+cranelift-codegen = { version = "0.67", features = ["enable-serde", "all-arch"] }
 lazy_static = "1.4"
 
 [badges]
@@ -35,6 +36,6 @@ maintenance = { status = "actively-developed" }
 [features]
 default = ["std", "enable-serde", "unwind"]
 unwind = ["cranelift-codegen/unwind", "gimli"]
-enable-serde = ["wasmer-compiler/enable-serde", "cranelift-codegen/enable-serde", "wasmer-types/enable-serde"]
+enable-serde = ["wasmer-compiler/enable-serde", "wasmer-types/enable-serde"]
 std = ["cranelift-codegen/std", "cranelift-frontend/std", "wasmer-compiler/std", "wasmer-types/std"]
 core = ["hashbrown", "cranelift-codegen/core", "cranelift-frontend/core"]
diff --git a/lib/compiler-cranelift/src/compiler.rs b/lib/compiler-cranelift/src/compiler.rs
index 08c7d5803..265aa5ac1 100644
--- a/lib/compiler-cranelift/src/compiler.rs
+++ b/lib/compiler-cranelift/src/compiler.rs
@@ -95,7 +95,7 @@ impl Compiler for CraneliftCompiler {
         };
 
         let functions = function_body_inputs
-            .into_iter()
+            .iter()
             .collect::<Vec<(LocalFunctionIndex, &FunctionBodyData<'_>)>>()
             .par_iter()
             .map_init(FuncTranslator::new, |func_translator, (i, input)| {
@@ -127,7 +127,7 @@ impl Compiler for CraneliftCompiler {
                 let mut code_buf: Vec<u8> = Vec::new();
                 let mut reloc_sink = RelocSink::new(module, func_index);
                 let mut trap_sink = TrapSink::new();
-                let mut stackmap_sink = binemit::NullStackmapSink {};
+                let mut stackmap_sink = binemit::NullStackMapSink {};
                 context
                     .compile_and_emit(
                         &*isa,
diff --git a/lib/compiler-cranelift/src/func_environ.rs b/lib/compiler-cranelift/src/func_environ.rs
index dc4dfe74e..9d9161d2c 100644
--- a/lib/compiler-cranelift/src/func_environ.rs
+++ b/lib/compiler-cranelift/src/func_environ.rs
@@ -11,7 +11,9 @@ use cranelift_codegen::ir::immediates::{Offset32, Uimm64};
 use cranelift_codegen::ir::types::*;
 use cranelift_codegen::ir::{AbiParam, ArgumentPurpose, Function, InstBuilder, Signature};
 use cranelift_codegen::isa::TargetFrontendConfig;
+use cranelift_frontend::FunctionBuilder;
 use std::convert::TryFrom;
+use wasmer_compiler::wasmparser::Type;
 use wasmer_compiler::{WasmError, WasmResult};
 use wasmer_types::entity::EntityRef;
 use wasmer_types::entity::PrimaryMap;
@@ -538,10 +540,11 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
 
     fn translate_table_grow(
         &mut self,
-        _: cranelift_codegen::cursor::FuncCursor<'_>,
-        _: TableIndex,
-        _: ir::Value,
-        _: ir::Value,
+        mut _pos: cranelift_codegen::cursor::FuncCursor<'_>,
+        _table_index: TableIndex,
+        _table: ir::Table,
+        _delta: ir::Value,
+        _init_value: ir::Value,
     ) -> WasmResult<ir::Value> {
         Err(WasmError::Unsupported(
             "the `table.grow` instruction is not supported yet".into(),
@@ -550,9 +553,10 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
 
     fn translate_table_get(
         &mut self,
-        _: cranelift_codegen::cursor::FuncCursor<'_>,
-        _: TableIndex,
-        _: ir::Value,
+        _builder: &mut FunctionBuilder,
+        _table_index: TableIndex,
+        _table: ir::Table,
+        _index: ir::Value,
     ) -> WasmResult<ir::Value> {
         Err(WasmError::Unsupported(
             "the `table.get` instruction is not supported yet".into(),
@@ -561,10 +565,11 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
 
     fn translate_table_set(
         &mut self,
-        _: cranelift_codegen::cursor::FuncCursor<'_>,
-        _: TableIndex,
-        _: ir::Value,
-        _: ir::Value,
+        _builder: &mut FunctionBuilder,
+        _table_index: TableIndex,
+        _table: ir::Table,
+        _value: ir::Value,
+        _index: ir::Value,
     ) -> WasmResult<()> {
         Err(WasmError::Unsupported(
             "the `table.set` instruction is not supported yet".into(),
@@ -573,21 +578,56 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
 
     fn translate_table_fill(
         &mut self,
-        _: cranelift_codegen::cursor::FuncCursor<'_>,
-        _: TableIndex,
-        _: ir::Value,
-        _: ir::Value,
-        _: ir::Value,
+        mut _pos: cranelift_codegen::cursor::FuncCursor<'_>,
+        _table_index: TableIndex,
+        _dst: ir::Value,
+        _val: ir::Value,
+        _len: ir::Value,
     ) -> WasmResult<()> {
         Err(WasmError::Unsupported(
             "the `table.fill` instruction is not supported yet".into(),
         ))
     }
 
+    fn translate_ref_null(
+        &mut self,
+        mut pos: cranelift_codegen::cursor::FuncCursor,
+        ty: Type,
+    ) -> WasmResult<ir::Value> {
+        Ok(match ty {
+            Type::FuncRef => pos.ins().iconst(self.pointer_type(), 0),
+            // Type::ExternRef => pos.ins().null(self.reference_type(ty)),
+            _ => {
+                return Err(WasmError::Unsupported(
+                    "`ref.null T` that is not a `funcref`".into(),
+                ));
+            }
+        })
+    }
+
+    fn translate_ref_is_null(
+        &mut self,
+        mut pos: cranelift_codegen::cursor::FuncCursor,
+        value: ir::Value,
+    ) -> WasmResult<ir::Value> {
+        let bool_is_null = match pos.func.dfg.value_type(value) {
+            // `externref`
+            ty if ty.is_ref() => pos.ins().is_null(value),
+            // `funcref`
+            ty if ty == self.pointer_type() => {
+                pos.ins()
+                    .icmp_imm(cranelift_codegen::ir::condcodes::IntCC::Equal, value, 0)
+            }
+            _ => unreachable!(),
+        };
+
+        Ok(pos.ins().bint(ir::types::I32, bool_is_null))
+    }
+
     fn translate_ref_func(
         &mut self,
-        _: cranelift_codegen::cursor::FuncCursor<'_>,
-        _: u32,
+        mut _pos: cranelift_codegen::cursor::FuncCursor<'_>,
+        _func_index: FunctionIndex,
     ) -> WasmResult<ir::Value> {
         Err(WasmError::Unsupported(
             "the `ref.func` instruction is not supported yet".into(),
@@ -596,17 +636,17 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
 
     fn translate_custom_global_get(
         &mut self,
-        _: cranelift_codegen::cursor::FuncCursor<'_>,
-        _: GlobalIndex,
+        mut _pos: cranelift_codegen::cursor::FuncCursor<'_>,
+        _index: GlobalIndex,
     ) -> WasmResult<ir::Value> {
         unreachable!("we don't make any custom globals")
     }
 
     fn translate_custom_global_set(
         &mut self,
-        _: cranelift_codegen::cursor::FuncCursor<'_>,
-        _: GlobalIndex,
-        _: ir::Value,
+        mut _pos: cranelift_codegen::cursor::FuncCursor<'_>,
+        _index: GlobalIndex,
+        _value: ir::Value,
     ) -> WasmResult<()> {
         unreachable!("we don't make any custom globals")
     }
@@ -771,7 +811,7 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
         match self.table_styles[table_index] {
             TableStyle::CallerChecksSignature => {
                 let sig_id_size = self.offsets.size_of_vmshared_signature_index();
-                let sig_id_type = Type::int(u16::from(sig_id_size) * 8).unwrap();
+                let sig_id_type = ir::Type::int(u16::from(sig_id_size) * 8).unwrap();
                 let vmctx = self.vmctx(pos.func);
                 let base = pos.ins().global_value(pointer_type, vmctx);
                 let offset =
@@ -897,24 +937,22 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
     fn translate_memory_copy(
         &mut self,
         mut pos: FuncCursor,
-        memory_index: MemoryIndex,
-        _heap: ir::Heap,
+        src_index: MemoryIndex,
+        _src_heap: ir::Heap,
+        _dst_index: MemoryIndex,
+        _dst_heap: ir::Heap,
         dst: ir::Value,
         src: ir::Value,
         len: ir::Value,
     ) -> WasmResult<()> {
-        let (func_sig, memory_index, func_idx) =
-            self.get_memory_copy_func(&mut pos.func, memory_index);
+        let (func_sig, src_index, func_idx) = self.get_memory_copy_func(&mut pos.func, src_index);
 
-        let memory_index_arg = pos.ins().iconst(I32, memory_index as i64);
+        let src_index_arg = pos.ins().iconst(I32, src_index as i64);
 
         let (vmctx, func_addr) = self.translate_load_builtin_function_address(&mut pos, func_idx);
 
-        pos.ins().call_indirect(
-            func_sig,
-            func_addr,
-            &[vmctx, memory_index_arg, dst, src, len],
-        );
+        pos.ins()
+            .call_indirect(func_sig, func_addr, &[vmctx, src_index_arg, dst, src, len]);
 
         Ok(())
     }
@@ -981,8 +1019,8 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
 
     fn translate_table_size(
         &mut self,
-        _pos: FuncCursor,
-        _index: TableIndex,
+        mut _pos: FuncCursor,
+        _table_index: TableIndex,
         _table: ir::Table,
     ) -> WasmResult<ir::Value> {
         Err(WasmError::Unsupported(
@@ -1064,4 +1102,31 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
 
         Ok(())
     }
+
+    fn translate_atomic_wait(
+        &mut self,
+        _pos: FuncCursor,
+        _index: MemoryIndex,
+        _heap: ir::Heap,
+        _addr: ir::Value,
+        _expected: ir::Value,
+        _timeout: ir::Value,
+    ) -> WasmResult<ir::Value> {
+        Err(WasmError::Unsupported(
+            "wasm atomics (fn translate_atomic_wait)".to_string(),
+        ))
+    }
+
+    fn translate_atomic_notify(
+        &mut self,
+        _pos: FuncCursor,
+        _index: MemoryIndex,
+        _heap: ir::Heap,
+        _addr: ir::Value,
+        _count: ir::Value,
+    ) -> WasmResult<ir::Value> {
+        Err(WasmError::Unsupported(
+            "wasm atomics (fn translate_atomic_notify)".to_string(),
+        ))
+    }
 }
diff --git a/lib/compiler-cranelift/src/sink.rs b/lib/compiler-cranelift/src/sink.rs
index 41ef8dd56..c96ef41af 100644
--- a/lib/compiler-cranelift/src/sink.rs
+++ b/lib/compiler-cranelift/src/sink.rs
@@ -3,7 +3,7 @@
 use crate::translator::{irlibcall_to_libcall, irreloc_to_relocationkind};
 use cranelift_codegen::binemit;
 use cranelift_codegen::ir::{self, ExternalName};
-use wasmer_compiler::{JumpTable, Relocation, RelocationTarget, SourceLoc, TrapInformation};
+use wasmer_compiler::{JumpTable, Relocation, RelocationTarget, TrapInformation};
 use wasmer_types::entity::EntityRef;
 use wasmer_types::{FunctionIndex, LocalFunctionIndex};
 use wasmer_vm::{ModuleInfo, TrapCode};
@@ -108,12 +108,11 @@ impl binemit::TrapSink for TrapSink {
     fn trap(
         &mut self,
         code_offset: binemit::CodeOffset,
-        source_loc: ir::SourceLoc,
+        _source_loc: ir::SourceLoc,
         trap_code: ir::TrapCode,
     ) {
         self.traps.push(TrapInformation {
             code_offset,
-            source_loc: SourceLoc::new(source_loc.bits()),
             // TODO: Translate properly environment Trapcode into cranelift IR
             trap_code: translate_ir_trapcode(trap_code),
         });
@@ -125,6 +124,7 @@ fn translate_ir_trapcode(trap: ir::TrapCode) -> TrapCode {
     match trap {
         ir::TrapCode::StackOverflow => TrapCode::StackOverflow,
         ir::TrapCode::HeapOutOfBounds => TrapCode::HeapAccessOutOfBounds,
+        ir::TrapCode::HeapMisaligned => TrapCode::HeapMisaligned,
         ir::TrapCode::TableOutOfBounds => TrapCode::TableAccessOutOfBounds,
         ir::TrapCode::IndirectCallToNull => TrapCode::IndirectCallToNull,
         ir::TrapCode::BadSignature => TrapCode::BadSignature,
diff --git a/lib/compiler-cranelift/src/trampoline/dynamic_function.rs b/lib/compiler-cranelift/src/trampoline/dynamic_function.rs
index e350ae16a..db9d4633b 100644
--- a/lib/compiler-cranelift/src/trampoline/dynamic_function.rs
+++ b/lib/compiler-cranelift/src/trampoline/dynamic_function.rs
@@ -110,7 +110,7 @@ pub fn make_trampoline_dynamic_function(
     let mut code_buf = Vec::new();
     let mut reloc_sink = TrampolineRelocSink {};
     let mut trap_sink = binemit::NullTrapSink {};
-    let mut stackmap_sink = binemit::NullStackmapSink {};
+    let mut stackmap_sink = binemit::NullStackMapSink {};
     context
         .compile_and_emit(
             isa,
diff --git a/lib/compiler-cranelift/src/trampoline/function_call.rs b/lib/compiler-cranelift/src/trampoline/function_call.rs
index bb39860ce..876bc8612 100644
--- a/lib/compiler-cranelift/src/trampoline/function_call.rs
+++ b/lib/compiler-cranelift/src/trampoline/function_call.rs
@@ -108,7 +108,7 @@ pub fn make_trampoline_function_call(
     let mut code_buf = Vec::new();
     let mut reloc_sink = TrampolineRelocSink {};
     let mut trap_sink = binemit::NullTrapSink {};
-    let mut stackmap_sink = binemit::NullStackmapSink {};
+    let mut stackmap_sink = binemit::NullStackMapSink {};
 
     context
         .compile_and_emit(
diff --git a/lib/compiler-cranelift/src/trampoline/mod.rs b/lib/compiler-cranelift/src/trampoline/mod.rs
index 6b1481594..98b8bbae0 100644
--- a/lib/compiler-cranelift/src/trampoline/mod.rs
+++ b/lib/compiler-cranelift/src/trampoline/mod.rs
@@ -6,19 +6,13 @@ mod function_call;
 pub use self::dynamic_function::make_trampoline_dynamic_function;
 pub use self::function_call::make_trampoline_function_call;
 
-// TODO: Delete
-pub mod ir {
-    pub use cranelift_codegen::ir::{
-        ExternalName, Function, InstBuilder, MemFlags, StackSlotData, StackSlotKind,
-    };
-}
 pub use cranelift_codegen::print_errors::pretty_error;
 pub use cranelift_codegen::Context;
 pub use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext};
 
 pub mod binemit {
     pub use cranelift_codegen::binemit::NullTrapSink;
-    pub use cranelift_codegen::binemit::{CodeOffset, NullStackmapSink, TrapSink};
+    pub use cranelift_codegen::binemit::{CodeOffset, NullStackMapSink, TrapSink};
 
     use cranelift_codegen::{binemit, ir};
 
diff --git a/lib/compiler-cranelift/src/translator/code_translator.rs b/lib/compiler-cranelift/src/translator/code_translator.rs
index 6d3e98670..b52d34e0b 100644
--- a/lib/compiler-cranelift/src/translator/code_translator.rs
+++ b/lib/compiler-cranelift/src/translator/code_translator.rs
@@ -37,17 +37,19 @@ use cranelift_codegen::ir::condcodes::{FloatCC, IntCC};
 use cranelift_codegen::ir::immediates::Offset32;
 use cranelift_codegen::ir::types::*;
 use cranelift_codegen::ir::{
-    self, ConstantData, InstBuilder, JumpTableData, MemFlags, Value, ValueLabel,
+    self, AtomicRmwOp, ConstantData, InstBuilder, JumpTableData, MemFlags, Value, ValueLabel,
 };
 use cranelift_codegen::packed_option::ReservedValue;
 use cranelift_frontend::{FunctionBuilder, Variable};
+use smallvec::SmallVec;
 use std::vec::Vec;
+
 use wasmer_compiler::wasmparser::{MemoryImmediate, Operator};
 use wasmer_compiler::{to_wasm_error, WasmResult};
 use wasmer_compiler::{wasm_unsupported, ModuleTranslationState};
 use wasmer_types::{FunctionIndex, GlobalIndex, MemoryIndex, SignatureIndex, TableIndex};
 
-// Clippy warns about "flags: _" but its important to document that the flags field is ignored
+// Clippy warns about "align: _" but its important to document that the align field is ignored
 #[cfg_attr(
     feature = "cargo-clippy",
     allow(clippy::unneeded_field_pattern, clippy::cognitive_complexity)
@@ -190,7 +192,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let (params, results) = module_translation_state.blocktype_params_results(*ty)?;
             let loop_body = block_with_params(builder, params, environ)?;
             let next = block_with_params(builder, results, environ)?;
-            builder.ins().jump(loop_body, state.peekn(params.len()));
+            canonicalise_then_jump(builder, loop_body, state.peekn(params.len()));
             state.push_loop(loop_body, next, params.len(), results.len());
 
             // Pop the initial `Block` actuals and replace them with the `Block`'s
@@ -214,25 +216,22 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                 // destination block following the whole `if...end`. If we do end
                 // up discovering an `else`, then we will allocate a block for it
                 // and go back and patch the jump.
-                let destination = block_with_params(builder, results, environ)?;
-                let branch_inst = builder
-                    .ins()
-                    .brz(val, destination, state.peekn(params.len()));
+                let destination = block_with_params(builder, results.clone(), environ)?;
+                let branch_inst =
+                    canonicalise_then_brz(builder, val, destination, state.peekn(params.len()));
                 (destination, ElseData::NoElse { branch_inst })
             } else {
                 // The `if` type signature is not valid without an `else` block,
                 // so we eagerly allocate the `else` block here.
-                let destination = block_with_params(builder, results, environ)?;
-                let else_block = block_with_params(builder, params, environ)?;
-                builder
-                    .ins()
-                    .brz(val, else_block, state.peekn(params.len()));
+                let destination = block_with_params(builder, results.clone(), environ)?;
+                let else_block = block_with_params(builder, params.clone(), environ)?;
+                canonicalise_then_brz(builder, val, else_block, state.peekn(params.len()));
                 builder.seal_block(else_block);
                 (destination, ElseData::WithElse { else_block })
             };
 
             let next_block = builder.create_block();
-            builder.ins().jump(next_block, &[]);
+            canonicalise_then_jump(builder, next_block, &[]);
             builder.seal_block(next_block); // Only predecessor is the current block.
             builder.switch_to_block(next_block);
 
@@ -272,8 +271,13 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                                 let (params, _results) =
                                     module_translation_state.blocktype_params_results(blocktype)?;
                                 debug_assert_eq!(params.len(), num_return_values);
-                                let else_block = block_with_params(builder, params, environ)?;
-                                builder.ins().jump(destination, state.peekn(params.len()));
+                                let else_block =
+                                    block_with_params(builder, params.clone(), environ)?;
+                                canonicalise_then_jump(
+                                    builder,
+                                    destination,
+                                    state.peekn(params.len()),
+                                );
                                 state.popn(params.len());
 
                                 builder.change_jump_destination(branch_inst, else_block);
@@ -281,9 +285,11 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                                 else_block
                             }
                             ElseData::WithElse { else_block } => {
-                                builder
-                                    .ins()
-                                    .jump(destination, state.peekn(num_return_values));
+                                canonicalise_then_jump(
+                                    builder,
+                                    destination,
+                                    state.peekn(num_return_values),
+                                );
                                 state.popn(num_return_values);
                                 else_block
                             }
@@ -315,9 +321,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             if !builder.is_unreachable() || !builder.is_pristine() {
                 let return_count = frame.num_return_values();
                 let return_args = state.peekn_mut(return_count);
-                let next_block_types = builder.func.dfg.block_param_types(next_block);
-                bitcast_arguments(return_args, &next_block_types, builder);
-                builder.ins().jump(frame.following_code(), return_args);
+                canonicalise_then_jump(builder, frame.following_code(), return_args);
                 // You might expect that if we just finished an `if` block that
                 // didn't have a corresponding `else` block, then we would clean
                 // up our duplicate set of parameters that we pushed earlier
@@ -325,13 +329,16 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                 // since we truncate the stack back to the original height
                 // below.
             }
+
             builder.switch_to_block(next_block);
             builder.seal_block(next_block);
+
             // If it is a loop we also have to seal the body loop block
             if let ControlStackFrame::Loop { header, .. } = frame {
                 builder.seal_block(header)
             }
-            state.stack.truncate(frame.original_stack_size());
+
+            frame.truncate_value_stack_to_original_size(&mut state.stack);
             state
                 .stack
                 .extend_from_slice(builder.block_params(next_block));
@@ -370,25 +377,20 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                 };
                 (return_count, frame.br_destination())
             };
-
-            // Bitcast any vector arguments to their default type, I8X16, before jumping.
             let destination_args = state.peekn_mut(return_count);
-            let destination_types = builder.func.dfg.block_param_types(br_destination);
-            bitcast_arguments(
-                destination_args,
-                &destination_types[..return_count],
-                builder,
-            );
-
-            builder.ins().jump(br_destination, destination_args);
+            canonicalise_then_jump(builder, br_destination, destination_args);
             state.popn(return_count);
             state.reachable = false;
         }
         Operator::BrIf { relative_depth } => translate_br_if(*relative_depth, builder, state),
         Operator::BrTable { table } => {
-            let (depths, default) = table.read_table().map_err(to_wasm_error)?;
+            let mut depths = table
+                .targets()
+                .collect::<Result<Vec<_>, _>>()
+                .map_err(to_wasm_error)?;
+            let default = depths.pop().unwrap().0;
             let mut min_depth = default;
-            for depth in &*depths {
+            for (depth, _) in depths.iter() {
                 if *depth < min_depth {
                     min_depth = *depth;
                 }
@@ -397,7 +399,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                 let i = state.control_stack.len() - 1 - (min_depth as usize);
                 let min_depth_frame = &state.control_stack[i];
                 if min_depth_frame.is_loop() {
-                    0
+                    min_depth_frame.num_param_values()
                 } else {
                     min_depth_frame.num_return_values()
                 }
@@ -406,7 +408,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let mut data = JumpTableData::with_capacity(depths.len());
             if jump_args_count == 0 {
                 // No jump arguments
-                for depth in &*depths {
+                for (depth, _) in depths.iter() {
                     let block = {
                         let i = state.control_stack.len() - 1 - (*depth as usize);
                         let frame = &mut state.control_stack[i];
@@ -429,7 +431,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                 let return_count = jump_args_count;
                 let mut dest_block_sequence = vec![];
                 let mut dest_block_map = HashMap::new();
-                for depth in &*depths {
+                for (depth, _) in depths.iter() {
                     let branch_block = match dest_block_map.entry(*depth as usize) {
                         hash_map::Entry::Occupied(entry) => *entry.get(),
                         hash_map::Entry::Vacant(entry) => {
@@ -459,17 +461,8 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                         frame.set_branched_to_exit();
                         frame.br_destination()
                     };
-
-                    // Bitcast any vector arguments to their default type, I8X16, before jumping.
                     let destination_args = state.peekn_mut(return_count);
-                    let destination_types = builder.func.dfg.block_param_types(real_dest_block);
-                    bitcast_arguments(
-                        destination_args,
-                        &destination_types[..return_count],
-                        builder,
-                    );
-
-                    builder.ins().jump(real_dest_block, destination_args);
+                    canonicalise_then_jump(builder, real_dest_block, destination_args);
                 }
                 state.popn(return_count);
             }
@@ -491,7 +484,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
                 match environ.return_mode() {
                     ReturnMode::NormalReturns => builder.ins().return_(return_args),
                     ReturnMode::FallthroughReturn => {
-                        builder.ins().jump(br_destination, return_args)
+                        canonicalise_then_jump(builder, br_destination, return_args)
                     }
                 };
             }
@@ -536,7 +529,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             // `index` is the index of the function's signature and `table_index` is the index of
             // the table to search the function in.
             let (sigref, num_args) = state.get_indirect_sig(builder.func, *index, environ)?;
-            let table = state.get_table(builder.func, *table_index, environ)?;
+            let table = state.get_or_create_table(builder.func, *table_index, environ)?;
             let callee = state.pop1();
 
             // Bitcast any vector arguments to their default type, I8X16, before calling.
@@ -569,137 +562,95 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
          * Memory management is handled by environment. It is usually translated into calls to
          * special functions.
          ************************************************************************************/
-        Operator::MemoryGrow { reserved } => {
+        Operator::MemoryGrow { mem, mem_byte: _ } => {
             // The WebAssembly MVP only supports one linear memory, but we expect the reserved
             // argument to be a memory index.
-            let heap_index = MemoryIndex::from_u32(*reserved);
-            let heap = state.get_heap(builder.func, *reserved, environ)?;
+            let heap_index = MemoryIndex::from_u32(*mem);
+            let heap = state.get_heap(builder.func, *mem, environ)?;
             let val = state.pop1();
             state.push1(environ.translate_memory_grow(builder.cursor(), heap_index, heap, val)?)
         }
-        Operator::MemorySize { reserved } => {
-            let heap_index = MemoryIndex::from_u32(*reserved);
-            let heap = state.get_heap(builder.func, *reserved, environ)?;
+        Operator::MemorySize { mem, mem_byte: _ } => {
+            let heap_index = MemoryIndex::from_u32(*mem);
+            let heap = state.get_heap(builder.func, *mem, environ)?;
             state.push1(environ.translate_memory_size(builder.cursor(), heap_index, heap)?);
         }
         /******************************* Load instructions ***********************************
          * Wasm specifies an integer alignment flag but we drop it in Cranelift.
          * The memory base address is provided by the environment.
          ************************************************************************************/
-        Operator::I32Load8U {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Uload8, I32, builder, state, environ)?;
+        Operator::I32Load8U { memarg } => {
+            translate_load(memarg, ir::Opcode::Uload8, I32, builder, state, environ)?;
         }
-        Operator::I32Load16U {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Uload16, I32, builder, state, environ)?;
+        Operator::I32Load16U { memarg } => {
+            translate_load(memarg, ir::Opcode::Uload16, I32, builder, state, environ)?;
         }
-        Operator::I32Load8S {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Sload8, I32, builder, state, environ)?;
+        Operator::I32Load8S { memarg } => {
+            translate_load(memarg, ir::Opcode::Sload8, I32, builder, state, environ)?;
         }
-        Operator::I32Load16S {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Sload16, I32, builder, state, environ)?;
+        Operator::I32Load16S { memarg } => {
+            translate_load(memarg, ir::Opcode::Sload16, I32, builder, state, environ)?;
         }
-        Operator::I64Load8U {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Uload8, I64, builder, state, environ)?;
+        Operator::I64Load8U { memarg } => {
+            translate_load(memarg, ir::Opcode::Uload8, I64, builder, state, environ)?;
         }
-        Operator::I64Load16U {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Uload16, I64, builder, state, environ)?;
+        Operator::I64Load16U { memarg } => {
+            translate_load(memarg, ir::Opcode::Uload16, I64, builder, state, environ)?;
         }
-        Operator::I64Load8S {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Sload8, I64, builder, state, environ)?;
+        Operator::I64Load8S { memarg } => {
+            translate_load(memarg, ir::Opcode::Sload8, I64, builder, state, environ)?;
         }
-        Operator::I64Load16S {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Sload16, I64, builder, state, environ)?;
+        Operator::I64Load16S { memarg } => {
+            translate_load(memarg, ir::Opcode::Sload16, I64, builder, state, environ)?;
         }
-        Operator::I64Load32S {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Sload32, I64, builder, state, environ)?;
+        Operator::I64Load32S { memarg } => {
+            translate_load(memarg, ir::Opcode::Sload32, I64, builder, state, environ)?;
         }
-        Operator::I64Load32U {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Uload32, I64, builder, state, environ)?;
+        Operator::I64Load32U { memarg } => {
+            translate_load(memarg, ir::Opcode::Uload32, I64, builder, state, environ)?;
         }
-        Operator::I32Load {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Load, I32, builder, state, environ)?;
+        Operator::I32Load { memarg } => {
+            translate_load(memarg, ir::Opcode::Load, I32, builder, state, environ)?;
         }
-        Operator::F32Load {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Load, F32, builder, state, environ)?;
+        Operator::F32Load { memarg } => {
+            translate_load(memarg, ir::Opcode::Load, F32, builder, state, environ)?;
         }
-        Operator::I64Load {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Load, I64, builder, state, environ)?;
+        Operator::I64Load { memarg } => {
+            translate_load(memarg, ir::Opcode::Load, I64, builder, state, environ)?;
         }
-        Operator::F64Load {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Load, F64, builder, state, environ)?;
+        Operator::F64Load { memarg } => {
+            translate_load(memarg, ir::Opcode::Load, F64, builder, state, environ)?;
         }
-        Operator::V128Load {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_load(*offset, ir::Opcode::Load, I8X16, builder, state, environ)?;
+        Operator::V128Load { memarg } => {
+            translate_load(memarg, ir::Opcode::Load, I8X16, builder, state, environ)?;
         }
-        Operator::I16x8Load8x8S {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            let (flags, base, offset) = prepare_load(*offset, 8, builder, state, environ)?;
+        Operator::V128Load8x8S { memarg } => {
+            let (flags, base, offset) = prepare_load(memarg, 8, builder, state, environ)?;
             let loaded = builder.ins().sload8x8(flags, base, offset);
             state.push1(loaded);
         }
-        Operator::I16x8Load8x8U {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            let (flags, base, offset) = prepare_load(*offset, 8, builder, state, environ)?;
+        Operator::V128Load8x8U { memarg } => {
+            let (flags, base, offset) = prepare_load(memarg, 8, builder, state, environ)?;
             let loaded = builder.ins().uload8x8(flags, base, offset);
             state.push1(loaded);
         }
-        Operator::I32x4Load16x4S {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            let (flags, base, offset) = prepare_load(*offset, 8, builder, state, environ)?;
+        Operator::V128Load16x4S { memarg } => {
+            let (flags, base, offset) = prepare_load(memarg, 8, builder, state, environ)?;
             let loaded = builder.ins().sload16x4(flags, base, offset);
             state.push1(loaded);
         }
-        Operator::I32x4Load16x4U {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            let (flags, base, offset) = prepare_load(*offset, 8, builder, state, environ)?;
+        Operator::V128Load16x4U { memarg } => {
+            let (flags, base, offset) = prepare_load(memarg, 8, builder, state, environ)?;
             let loaded = builder.ins().uload16x4(flags, base, offset);
             state.push1(loaded);
         }
-        Operator::I64x2Load32x2S {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            let (flags, base, offset) = prepare_load(*offset, 8, builder, state, environ)?;
+        Operator::V128Load32x2S { memarg } => {
+            let (flags, base, offset) = prepare_load(memarg, 8, builder, state, environ)?;
             let loaded = builder.ins().sload32x2(flags, base, offset);
             state.push1(loaded);
         }
-        Operator::I64x2Load32x2U {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            let (flags, base, offset) = prepare_load(*offset, 8, builder, state, environ)?;
+        Operator::V128Load32x2U { memarg } => {
+            let (flags, base, offset) = prepare_load(memarg, 8, builder, state, environ)?;
             let loaded = builder.ins().uload32x2(flags, base, offset);
             state.push1(loaded);
         }
@@ -707,45 +658,23 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
          * Wasm specifies an integer alignment flag but we drop it in Cranelift.
          * The memory base address is provided by the environment.
          ************************************************************************************/
-        Operator::I32Store {
-            memarg: MemoryImmediate { flags: _, offset },
+        Operator::I32Store { memarg }
+        | Operator::I64Store { memarg }
+        | Operator::F32Store { memarg }
+        | Operator::F64Store { memarg } => {
+            translate_store(memarg, ir::Opcode::Store, builder, state, environ)?;
         }
-        | Operator::I64Store {
-            memarg: MemoryImmediate { flags: _, offset },
+        Operator::I32Store8 { memarg } | Operator::I64Store8 { memarg } => {
+            translate_store(memarg, ir::Opcode::Istore8, builder, state, environ)?;
         }
-        | Operator::F32Store {
-            memarg: MemoryImmediate { flags: _, offset },
+        Operator::I32Store16 { memarg } | Operator::I64Store16 { memarg } => {
+            translate_store(memarg, ir::Opcode::Istore16, builder, state, environ)?;
         }
-        | Operator::F64Store {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_store(*offset, ir::Opcode::Store, builder, state, environ)?;
+        Operator::I64Store32 { memarg } => {
+            translate_store(memarg, ir::Opcode::Istore32, builder, state, environ)?;
         }
-        Operator::I32Store8 {
-            memarg: MemoryImmediate { flags: _, offset },
-        }
-        | Operator::I64Store8 {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_store(*offset, ir::Opcode::Istore8, builder, state, environ)?;
-        }
-        Operator::I32Store16 {
-            memarg: MemoryImmediate { flags: _, offset },
-        }
-        | Operator::I64Store16 {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_store(*offset, ir::Opcode::Istore16, builder, state, environ)?;
-        }
-        Operator::I64Store32 {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_store(*offset, ir::Opcode::Istore32, builder, state, environ)?;
-        }
-        Operator::V128Store {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            translate_store(*offset, ir::Opcode::Store, builder, state, environ)?;
+        Operator::V128Store { memarg } => {
+            translate_store(memarg, ir::Opcode::Store, builder, state, environ)?;
         }
         /****************************** Nullary Operators ************************************/
         Operator::I32Const { value } => state.push1(builder.ins().iconst(I32, i64::from(*value))),
@@ -1042,113 +971,282 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
         Operator::F32Le | Operator::F64Le => {
             translate_fcmp(FloatCC::LessThanOrEqual, builder, state)
         }
-        Operator::RefNull { ty: _ } => state.push1(builder.ins().null(environ.reference_type())),
-        Operator::RefIsNull { ty: _ } => {
-            let arg = state.pop1();
-            let val = builder.ins().is_null(arg);
-            let val_int = builder.ins().bint(I32, val);
-            state.push1(val_int);
+        Operator::RefNull { ty } => state.push1(environ.translate_ref_null(builder.cursor(), *ty)?),
+        Operator::RefIsNull => {
+            let value = state.pop1();
+            state.push1(environ.translate_ref_is_null(builder.cursor(), value)?);
         }
         Operator::RefFunc { function_index } => {
-            state.push1(environ.translate_ref_func(builder.cursor(), *function_index)?);
+            let index = FunctionIndex::from_u32(*function_index);
+            state.push1(environ.translate_ref_func(builder.cursor(), index)?);
         }
-        Operator::AtomicNotify { .. }
-        | Operator::I32AtomicWait { .. }
-        | Operator::I64AtomicWait { .. }
-        | Operator::I32AtomicLoad { .. }
-        | Operator::I64AtomicLoad { .. }
-        | Operator::I32AtomicLoad8U { .. }
-        | Operator::I32AtomicLoad16U { .. }
-        | Operator::I64AtomicLoad8U { .. }
-        | Operator::I64AtomicLoad16U { .. }
-        | Operator::I64AtomicLoad32U { .. }
-        | Operator::I32AtomicStore { .. }
-        | Operator::I64AtomicStore { .. }
-        | Operator::I32AtomicStore8 { .. }
-        | Operator::I32AtomicStore16 { .. }
-        | Operator::I64AtomicStore8 { .. }
-        | Operator::I64AtomicStore16 { .. }
-        | Operator::I64AtomicStore32 { .. }
-        | Operator::I32AtomicRmwAdd { .. }
-        | Operator::I64AtomicRmwAdd { .. }
-        | Operator::I32AtomicRmw8AddU { .. }
-        | Operator::I32AtomicRmw16AddU { .. }
-        | Operator::I64AtomicRmw8AddU { .. }
-        | Operator::I64AtomicRmw16AddU { .. }
-        | Operator::I64AtomicRmw32AddU { .. }
-        | Operator::I32AtomicRmwSub { .. }
-        | Operator::I64AtomicRmwSub { .. }
-        | Operator::I32AtomicRmw8SubU { .. }
-        | Operator::I32AtomicRmw16SubU { .. }
-        | Operator::I64AtomicRmw8SubU { .. }
-        | Operator::I64AtomicRmw16SubU { .. }
-        | Operator::I64AtomicRmw32SubU { .. }
-        | Operator::I32AtomicRmwAnd { .. }
-        | Operator::I64AtomicRmwAnd { .. }
-        | Operator::I32AtomicRmw8AndU { .. }
-        | Operator::I32AtomicRmw16AndU { .. }
-        | Operator::I64AtomicRmw8AndU { .. }
-        | Operator::I64AtomicRmw16AndU { .. }
-        | Operator::I64AtomicRmw32AndU { .. }
-        | Operator::I32AtomicRmwOr { .. }
-        | Operator::I64AtomicRmwOr { .. }
-        | Operator::I32AtomicRmw8OrU { .. }
-        | Operator::I32AtomicRmw16OrU { .. }
-        | Operator::I64AtomicRmw8OrU { .. }
-        | Operator::I64AtomicRmw16OrU { .. }
-        | Operator::I64AtomicRmw32OrU { .. }
-        | Operator::I32AtomicRmwXor { .. }
-        | Operator::I64AtomicRmwXor { .. }
-        | Operator::I32AtomicRmw8XorU { .. }
-        | Operator::I32AtomicRmw16XorU { .. }
-        | Operator::I64AtomicRmw8XorU { .. }
-        | Operator::I64AtomicRmw16XorU { .. }
-        | Operator::I64AtomicRmw32XorU { .. }
-        | Operator::I32AtomicRmwXchg { .. }
-        | Operator::I64AtomicRmwXchg { .. }
-        | Operator::I32AtomicRmw8XchgU { .. }
-        | Operator::I32AtomicRmw16XchgU { .. }
-        | Operator::I64AtomicRmw8XchgU { .. }
-        | Operator::I64AtomicRmw16XchgU { .. }
-        | Operator::I64AtomicRmw32XchgU { .. }
-        | Operator::I32AtomicRmwCmpxchg { .. }
-        | Operator::I64AtomicRmwCmpxchg { .. }
-        | Operator::I32AtomicRmw8CmpxchgU { .. }
-        | Operator::I32AtomicRmw16CmpxchgU { .. }
-        | Operator::I64AtomicRmw8CmpxchgU { .. }
-        | Operator::I64AtomicRmw16CmpxchgU { .. }
-        | Operator::I64AtomicRmw32CmpxchgU { .. }
-        | Operator::AtomicFence { .. } => {
-            return Err(wasm_unsupported!("proposed thread operator {:?}", op));
-        }
-        Operator::MemoryCopy => {
+        Operator::MemoryAtomicWait32 { memarg } | Operator::MemoryAtomicWait64 { memarg } => {
             // The WebAssembly MVP only supports one linear memory and
             // wasmparser will ensure that the memory indices specified are
             // zero.
-            let heap_index = MemoryIndex::from_u32(0);
-            let heap = state.get_heap(builder.func, 0, environ)?;
-            let len = state.pop1();
-            let src = state.pop1();
-            let dest = state.pop1();
-            environ.translate_memory_copy(builder.cursor(), heap_index, heap, dest, src, len)?;
+            let implied_ty = match op {
+                Operator::MemoryAtomicWait64 { .. } => I64,
+                Operator::MemoryAtomicWait32 { .. } => I32,
+                _ => unreachable!(),
+            };
+            let heap_index = MemoryIndex::from_u32(memarg.memory);
+            let heap = state.get_heap(builder.func, memarg.memory, environ)?;
+            let timeout = state.pop1(); // 64 (fixed)
+            let expected = state.pop1(); // 32 or 64 (per the `Ixx` in `IxxAtomicWait`)
+            let addr = state.pop1(); // 32 (fixed)
+            assert!(builder.func.dfg.value_type(expected) == implied_ty);
+            // `fn translate_atomic_wait` can inspect the type of `expected` to figure out what
+            // code it needs to generate, if it wants.
+            let res = environ.translate_atomic_wait(
+                builder.cursor(),
+                heap_index,
+                heap,
+                addr,
+                expected,
+                timeout,
+            )?;
+            state.push1(res);
         }
-        Operator::MemoryFill => {
-            // The WebAssembly MVP only supports one linear memory and
-            // wasmparser will ensure that the memory index specified is
-            // zero.
-            let heap_index = MemoryIndex::from_u32(0);
-            let heap = state.get_heap(builder.func, 0, environ)?;
+        Operator::MemoryAtomicNotify { memarg } => {
+            let heap_index = MemoryIndex::from_u32(memarg.memory);
+            let heap = state.get_heap(builder.func, memarg.memory, environ)?;
+            let count = state.pop1(); // 32 (fixed)
+            let addr = state.pop1(); // 32 (fixed)
+            let res =
+                environ.translate_atomic_notify(builder.cursor(), heap_index, heap, addr, count)?;
+            state.push1(res);
+        }
+        Operator::I32AtomicLoad { memarg } => {
+            translate_atomic_load(I32, I32, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicLoad { memarg } => {
+            translate_atomic_load(I64, I64, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicLoad8U { memarg } => {
+            translate_atomic_load(I32, I8, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicLoad16U { memarg } => {
+            translate_atomic_load(I32, I16, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicLoad8U { memarg } => {
+            translate_atomic_load(I64, I8, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicLoad16U { memarg } => {
+            translate_atomic_load(I64, I16, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicLoad32U { memarg } => {
+            translate_atomic_load(I64, I32, memarg, builder, state, environ)?
+        }
+
+        Operator::I32AtomicStore { memarg } => {
+            translate_atomic_store(I32, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicStore { memarg } => {
+            translate_atomic_store(I64, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicStore8 { memarg } => {
+            translate_atomic_store(I8, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicStore16 { memarg } => {
+            translate_atomic_store(I16, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicStore8 { memarg } => {
+            translate_atomic_store(I8, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicStore16 { memarg } => {
+            translate_atomic_store(I16, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicStore32 { memarg } => {
+            translate_atomic_store(I32, memarg, builder, state, environ)?
+        }
+
+        Operator::I32AtomicRmwAdd { memarg } => {
+            translate_atomic_rmw(I32, I32, AtomicRmwOp::Add, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmwAdd { memarg } => {
+            translate_atomic_rmw(I64, I64, AtomicRmwOp::Add, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw8AddU { memarg } => {
+            translate_atomic_rmw(I32, I8, AtomicRmwOp::Add, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw16AddU { memarg } => {
+            translate_atomic_rmw(I32, I16, AtomicRmwOp::Add, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw8AddU { memarg } => {
+            translate_atomic_rmw(I64, I8, AtomicRmwOp::Add, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw16AddU { memarg } => {
+            translate_atomic_rmw(I64, I16, AtomicRmwOp::Add, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw32AddU { memarg } => {
+            translate_atomic_rmw(I64, I32, AtomicRmwOp::Add, memarg, builder, state, environ)?
+        }
+
+        Operator::I32AtomicRmwSub { memarg } => {
+            translate_atomic_rmw(I32, I32, AtomicRmwOp::Sub, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmwSub { memarg } => {
+            translate_atomic_rmw(I64, I64, AtomicRmwOp::Sub, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw8SubU { memarg } => {
+            translate_atomic_rmw(I32, I8, AtomicRmwOp::Sub, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw16SubU { memarg } => {
+            translate_atomic_rmw(I32, I16, AtomicRmwOp::Sub, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw8SubU { memarg } => {
+            translate_atomic_rmw(I64, I8, AtomicRmwOp::Sub, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw16SubU { memarg } => {
+            translate_atomic_rmw(I64, I16, AtomicRmwOp::Sub, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw32SubU { memarg } => {
+            translate_atomic_rmw(I64, I32, AtomicRmwOp::Sub, memarg, builder, state, environ)?
+        }
+
+        Operator::I32AtomicRmwAnd { memarg } => {
+            translate_atomic_rmw(I32, I32, AtomicRmwOp::And, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmwAnd { memarg } => {
+            translate_atomic_rmw(I64, I64, AtomicRmwOp::And, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw8AndU { memarg } => {
+            translate_atomic_rmw(I32, I8, AtomicRmwOp::And, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw16AndU { memarg } => {
+            translate_atomic_rmw(I32, I16, AtomicRmwOp::And, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw8AndU { memarg } => {
+            translate_atomic_rmw(I64, I8, AtomicRmwOp::And, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw16AndU { memarg } => {
+            translate_atomic_rmw(I64, I16, AtomicRmwOp::And, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw32AndU { memarg } => {
+            translate_atomic_rmw(I64, I32, AtomicRmwOp::And, memarg, builder, state, environ)?
+        }
+
+        Operator::I32AtomicRmwOr { memarg } => {
+            translate_atomic_rmw(I32, I32, AtomicRmwOp::Or, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmwOr { memarg } => {
+            translate_atomic_rmw(I64, I64, AtomicRmwOp::Or, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw8OrU { memarg } => {
+            translate_atomic_rmw(I32, I8, AtomicRmwOp::Or, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw16OrU { memarg } => {
+            translate_atomic_rmw(I32, I16, AtomicRmwOp::Or, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw8OrU { memarg } => {
+            translate_atomic_rmw(I64, I8, AtomicRmwOp::Or, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw16OrU { memarg } => {
+            translate_atomic_rmw(I64, I16, AtomicRmwOp::Or, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw32OrU { memarg } => {
+            translate_atomic_rmw(I64, I32, AtomicRmwOp::Or, memarg, builder, state, environ)?
+        }
+
+        Operator::I32AtomicRmwXor { memarg } => {
+            translate_atomic_rmw(I32, I32, AtomicRmwOp::Xor, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmwXor { memarg } => {
+            translate_atomic_rmw(I64, I64, AtomicRmwOp::Xor, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw8XorU { memarg } => {
+            translate_atomic_rmw(I32, I8, AtomicRmwOp::Xor, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw16XorU { memarg } => {
+            translate_atomic_rmw(I32, I16, AtomicRmwOp::Xor, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw8XorU { memarg } => {
+            translate_atomic_rmw(I64, I8, AtomicRmwOp::Xor, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw16XorU { memarg } => {
+            translate_atomic_rmw(I64, I16, AtomicRmwOp::Xor, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw32XorU { memarg } => {
+            translate_atomic_rmw(I64, I32, AtomicRmwOp::Xor, memarg, builder, state, environ)?
+        }
+
+        Operator::I32AtomicRmwXchg { memarg } => {
+            translate_atomic_rmw(I32, I32, AtomicRmwOp::Xchg, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmwXchg { memarg } => {
+            translate_atomic_rmw(I64, I64, AtomicRmwOp::Xchg, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw8XchgU { memarg } => {
+            translate_atomic_rmw(I32, I8, AtomicRmwOp::Xchg, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw16XchgU { memarg } => {
+            translate_atomic_rmw(I32, I16, AtomicRmwOp::Xchg, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw8XchgU { memarg } => {
+            translate_atomic_rmw(I64, I8, AtomicRmwOp::Xchg, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw16XchgU { memarg } => {
+            translate_atomic_rmw(I64, I16, AtomicRmwOp::Xchg, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw32XchgU { memarg } => {
+            translate_atomic_rmw(I64, I32, AtomicRmwOp::Xchg, memarg, builder, state, environ)?
+        }
+
+        Operator::I32AtomicRmwCmpxchg { memarg } => {
+            translate_atomic_cas(I32, I32, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmwCmpxchg { memarg } => {
+            translate_atomic_cas(I64, I64, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw8CmpxchgU { memarg } => {
+            translate_atomic_cas(I32, I8, memarg, builder, state, environ)?
+        }
+        Operator::I32AtomicRmw16CmpxchgU { memarg } => {
+            translate_atomic_cas(I32, I16, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw8CmpxchgU { memarg } => {
+            translate_atomic_cas(I64, I8, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw16CmpxchgU { memarg } => {
+            translate_atomic_cas(I64, I16, memarg, builder, state, environ)?
+        }
+        Operator::I64AtomicRmw32CmpxchgU { memarg } => {
+            translate_atomic_cas(I64, I32, memarg, builder, state, environ)?
+        }
+
+        Operator::AtomicFence { .. } => {
+            builder.ins().fence();
+        }
+        Operator::MemoryCopy { src, dst } => {
+            let src_index = MemoryIndex::from_u32(*src);
+            let dst_index = MemoryIndex::from_u32(*dst);
+            let src_heap = state.get_heap(builder.func, *src, environ)?;
+            let dst_heap = state.get_heap(builder.func, *dst, environ)?;
+            let len = state.pop1();
+            let src_pos = state.pop1();
+            let dst_pos = state.pop1();
+            environ.translate_memory_copy(
+                builder.cursor(),
+                src_index,
+                src_heap,
+                dst_index,
+                dst_heap,
+                dst_pos,
+                src_pos,
+                len,
+            )?;
+        }
+        Operator::MemoryFill { mem } => {
+            let heap_index = MemoryIndex::from_u32(*mem);
+            let heap = state.get_heap(builder.func, *mem, environ)?;
             let len = state.pop1();
             let val = state.pop1();
             let dest = state.pop1();
             environ.translate_memory_fill(builder.cursor(), heap_index, heap, dest, val, len)?;
         }
-        Operator::MemoryInit { segment } => {
-            // The WebAssembly MVP only supports one linear memory and
-            // wasmparser will ensure that the memory index specified is
-            // zero.
-            let heap_index = MemoryIndex::from_u32(0);
-            let heap = state.get_heap(builder.func, 0, environ)?;
+        Operator::MemoryInit { segment, mem } => {
+            let heap_index = MemoryIndex::from_u32(*mem);
+            let heap = state.get_heap(builder.func, *mem, environ)?;
             let len = state.pop1();
             let src = state.pop1();
             let dest = state.pop1();
@@ -1166,41 +1264,45 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             environ.translate_data_drop(builder.cursor(), *segment)?;
         }
         Operator::TableSize { table: index } => {
-            let table = state.get_table(builder.func, *index, environ)?;
+            let table = state.get_or_create_table(builder.func, *index, environ)?;
             state.push1(environ.translate_table_size(
                 builder.cursor(),
                 TableIndex::from_u32(*index),
                 table,
             )?);
         }
-        Operator::TableGrow { table } => {
-            let table_index = TableIndex::from_u32(*table);
+        Operator::TableGrow { table: index } => {
+            let table_index = TableIndex::from_u32(*index);
+            let table = state.get_or_create_table(builder.func, *index, environ)?;
             let delta = state.pop1();
             let init_value = state.pop1();
             state.push1(environ.translate_table_grow(
                 builder.cursor(),
                 table_index,
+                table,
                 delta,
                 init_value,
             )?);
         }
-        Operator::TableGet { table } => {
-            let table_index = TableIndex::from_u32(*table);
+        Operator::TableGet { table: index } => {
+            let table_index = TableIndex::from_u32(*index);
+            let table = state.get_or_create_table(builder.func, *index, environ)?;
             let index = state.pop1();
-            state.push1(environ.translate_table_get(builder.cursor(), table_index, index)?);
+            state.push1(environ.translate_table_get(builder, table_index, table, index)?);
         }
-        Operator::TableSet { table } => {
-            let table_index = TableIndex::from_u32(*table);
+        Operator::TableSet { table: index } => {
+            let table_index = TableIndex::from_u32(*index);
+            let table = state.get_or_create_table(builder.func, *index, environ)?;
             let value = state.pop1();
             let index = state.pop1();
-            environ.translate_table_set(builder.cursor(), table_index, value, index)?;
+            environ.translate_table_set(builder, table_index, table, value, index)?;
         }
         Operator::TableCopy {
             dst_table: dst_table_index,
             src_table: src_table_index,
         } => {
-            let dst_table = state.get_table(builder.func, *dst_table_index, environ)?;
-            let src_table = state.get_table(builder.func, *src_table_index, environ)?;
+            let dst_table = state.get_or_create_table(builder.func, *dst_table_index, environ)?;
+            let src_table = state.get_or_create_table(builder.func, *src_table_index, environ)?;
             let len = state.pop1();
             let src = state.pop1();
             let dest = state.pop1();
@@ -1226,7 +1328,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             segment,
             table: table_index,
         } => {
-            let table = state.get_table(builder.func, *table_index, environ)?;
+            let table = state.get_or_create_table(builder.func, *table_index, environ)?;
             let len = state.pop1();
             let src = state.pop1();
             let dest = state.pop1();
@@ -1247,7 +1349,8 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let data = value.bytes().to_vec().into();
             let handle = builder.func.dfg.constants.insert(data);
             let value = builder.ins().vconst(I8X16, handle);
-            // the v128.const is typed in CLIF as a I8x16 but raw_bitcast to a different type before use
+            // the v128.const is typed in CLIF as a I8x16 but raw_bitcast to a different type
+            // before use
             state.push1(value)
         }
         Operator::I8x16Splat | Operator::I16x8Splat => {
@@ -1262,23 +1365,14 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let splatted = builder.ins().splat(type_of(op), state.pop1());
             state.push1(splatted)
         }
-        Operator::V8x16LoadSplat {
-            memarg: MemoryImmediate { flags: _, offset },
-        }
-        | Operator::V16x8LoadSplat {
-            memarg: MemoryImmediate { flags: _, offset },
-        }
-        | Operator::V32x4LoadSplat {
-            memarg: MemoryImmediate { flags: _, offset },
-        }
-        | Operator::V64x2LoadSplat {
-            memarg: MemoryImmediate { flags: _, offset },
-        } => {
-            // TODO: For spec compliance, this is initially implemented as a combination of `load +
-            // splat` but could be implemented eventually as a single instruction (`load_splat`).
-            // See https://github.com/bytecodealliance/wasmtime/issues/1175.
+        Operator::V128Load8Splat { memarg }
+        | Operator::V128Load16Splat { memarg }
+        | Operator::V128Load32Splat { memarg }
+        | Operator::V128Load64Splat { memarg } => {
+            // TODO: remove this in favor of the single instruction LoadSplat code above
+            // which is not yet available in Cranelift 0.67
             translate_load(
-                *offset,
+                memarg,
                 ir::Opcode::Load,
                 type_of(op).lane_type(),
                 builder,
@@ -1287,15 +1381,27 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             )?;
             let splatted = builder.ins().splat(type_of(op), state.pop1());
             state.push1(splatted)
+
+            // let opcode = ir::Opcode::LoadSplat;
+            // let result_ty = type_of(op);
+            // let (flags, base, offset) = prepare_load(
+            //     memarg,
+            //     mem_op_size(opcode, result_ty.lane_type()),
+            //     builder,
+            //     state,
+            //     environ,
+            // )?;
+            // let (load, dfg) = builder.ins().Load(opcode, result_ty, flags, offset, base);
+            // state.push1(dfg.first_result(load))
         }
         Operator::I8x16ExtractLaneS { lane } | Operator::I16x8ExtractLaneS { lane } => {
             let vector = pop1_with_bitcast(state, type_of(op), builder);
-            let extracted = builder.ins().extractlane(vector, *lane);
+            let extracted = builder.ins().extractlane(vector, lane.clone());
             state.push1(builder.ins().sextend(I32, extracted))
         }
         Operator::I8x16ExtractLaneU { lane } | Operator::I16x8ExtractLaneU { lane } => {
             let vector = pop1_with_bitcast(state, type_of(op), builder);
-            let extracted = builder.ins().extractlane(vector, *lane);
+            let extracted = builder.ins().extractlane(vector, lane.clone());
             state.push1(builder.ins().uextend(I32, extracted));
             // On x86, PEXTRB zeroes the upper bits of the destination register of extractlane so
             // uextend could be elided; for now, uextend is needed for Cranelift's type checks to
@@ -1306,7 +1412,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
         | Operator::F32x4ExtractLane { lane }
         | Operator::F64x2ExtractLane { lane } => {
             let vector = pop1_with_bitcast(state, type_of(op), builder);
-            state.push1(builder.ins().extractlane(vector, *lane))
+            state.push1(builder.ins().extractlane(vector, lane.clone()))
         }
         Operator::I8x16ReplaceLane { lane } | Operator::I16x8ReplaceLane { lane } => {
             let (vector, replacement) = state.pop2();
@@ -1323,7 +1429,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let vector = optionally_bitcast_vector(vector, type_of(op), builder);
             state.push1(builder.ins().insertlane(vector, replacement, *lane))
         }
-        Operator::V8x16Shuffle { lanes, .. } => {
+        Operator::I8x16Shuffle { lanes, .. } => {
             let (a, b) = pop2_with_bitcast(state, I8X16, builder);
             let lanes = ConstantData::from(lanes.as_ref());
             let mask = builder.func.dfg.immediates.push(lanes);
@@ -1334,7 +1440,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             // to WASM using the less specific v128 type for certain operations and more specific
             // types (e.g. i8x16) for others.
         }
-        Operator::V8x16Swizzle => {
+        Operator::I8x16Swizzle => {
             let (a, b) = pop2_with_bitcast(state, I8X16, builder);
             state.push1(builder.ins().swizzle(I8X16, a, b))
         }
@@ -1342,11 +1448,11 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().iadd(a, b))
         }
-        Operator::I8x16AddSaturateS | Operator::I16x8AddSaturateS => {
+        Operator::I8x16AddSatS | Operator::I16x8AddSatS => {
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().sadd_sat(a, b))
         }
-        Operator::I8x16AddSaturateU | Operator::I16x8AddSaturateU => {
+        Operator::I8x16AddSatU | Operator::I16x8AddSatU => {
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().uadd_sat(a, b))
         }
@@ -1354,11 +1460,11 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().isub(a, b))
         }
-        Operator::I8x16SubSaturateS | Operator::I16x8SubSaturateS => {
+        Operator::I8x16SubSatS | Operator::I16x8SubSatS => {
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().ssub_sat(a, b))
         }
-        Operator::I8x16SubSaturateU | Operator::I16x8SubSaturateU => {
+        Operator::I8x16SubSatU | Operator::I16x8SubSatU => {
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().usub_sat(a, b))
         }
@@ -1386,6 +1492,10 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let a = pop1_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().ineg(a))
         }
+        Operator::I8x16Abs | Operator::I16x8Abs | Operator::I32x4Abs => {
+            let a = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().iabs(a))
+        }
         Operator::I16x8Mul | Operator::I32x4Mul | Operator::I64x2Mul => {
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().imul(a, b))
@@ -1456,6 +1566,11 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let bool_result = builder.ins().vall_true(a);
             state.push1(builder.ins().bint(I32, bool_result))
         }
+        Operator::I8x16Bitmask | Operator::I16x8Bitmask | Operator::I32x4Bitmask => {
+            unimplemented!("SIMD Operator {:?} not yet implemented", op);
+            // let a = pop1_with_bitcast(state, type_of(op), builder);
+            // state.push1(builder.ins().vhigh_bits(I32, a));
+        }
         Operator::I8x16Eq | Operator::I16x8Eq | Operator::I32x4Eq => {
             translate_vector_icmp(IntCC::Equal, type_of(op), builder, state)
         }
@@ -1531,6 +1646,21 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().fmin(a, b))
         }
+        Operator::F32x4PMax | Operator::F64x2PMax => {
+            unimplemented!("SIMD Operator {:?} not yet implemented", op);
+            // let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
+            // state.push1(builder.ins().fmax_pseudo(a, b))
+        }
+        Operator::F32x4PMin | Operator::F64x2PMin => {
+            unimplemented!("SIMD Operator {:?} not yet implemented", op);
+            // let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
+            // state.push1(builder.ins().fmin_pseudo(a, b))
+        }
+        Operator::I32x4DotI16x8S
+        | Operator::V128Load32Zero { .. }
+        | Operator::V128Load64Zero { .. } => {
+            unimplemented!("SIMD Operator {:?} not yet implemented", op);
+        }
         Operator::F32x4Sqrt | Operator::F64x2Sqrt => {
             let a = pop1_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().sqrt(a))
@@ -1551,24 +1681,81 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
             let a = pop1_with_bitcast(state, I32X4, builder);
             state.push1(builder.ins().fcvt_from_uint(F32X4, a))
         }
-        Operator::I32x4TruncSatF32x4S
-        | Operator::I32x4TruncSatF32x4U
-        | Operator::I8x16Abs
-        | Operator::I16x8Abs
-        | Operator::I32x4Abs
-        | Operator::I8x16NarrowI16x8S { .. }
-        | Operator::I8x16NarrowI16x8U { .. }
-        | Operator::I16x8NarrowI32x4S { .. }
-        | Operator::I16x8NarrowI32x4U { .. }
-        | Operator::I16x8WidenLowI8x16S { .. }
-        | Operator::I16x8WidenHighI8x16S { .. }
-        | Operator::I16x8WidenLowI8x16U { .. }
-        | Operator::I16x8WidenHighI8x16U { .. }
-        | Operator::I32x4WidenLowI16x8S { .. }
-        | Operator::I32x4WidenHighI16x8S { .. }
-        | Operator::I32x4WidenLowI16x8U { .. }
-        | Operator::I32x4WidenHighI16x8U { .. } => {
-            return Err(wasm_unsupported!("proposed SIMD operator {:?}", op));
+        Operator::I32x4TruncSatF32x4S => {
+            let a = pop1_with_bitcast(state, F32X4, builder);
+            state.push1(builder.ins().fcvt_to_sint_sat(I32X4, a))
+        }
+        Operator::I32x4TruncSatF32x4U => {
+            let a = pop1_with_bitcast(state, F32X4, builder);
+            state.push1(builder.ins().fcvt_to_uint_sat(I32X4, a))
+        }
+        Operator::I8x16NarrowI16x8S => {
+            let (a, b) = pop2_with_bitcast(state, I16X8, builder);
+            state.push1(builder.ins().snarrow(a, b))
+        }
+        Operator::I16x8NarrowI32x4S => {
+            let (a, b) = pop2_with_bitcast(state, I32X4, builder);
+            state.push1(builder.ins().snarrow(a, b))
+        }
+        Operator::I8x16NarrowI16x8U => {
+            let (a, b) = pop2_with_bitcast(state, I16X8, builder);
+            state.push1(builder.ins().unarrow(a, b))
+        }
+        Operator::I16x8NarrowI32x4U => {
+            let (a, b) = pop2_with_bitcast(state, I32X4, builder);
+            state.push1(builder.ins().unarrow(a, b))
+        }
+        Operator::I16x8WidenLowI8x16S => {
+            let a = pop1_with_bitcast(state, I8X16, builder);
+            state.push1(builder.ins().swiden_low(a))
+        }
+        Operator::I16x8WidenHighI8x16S => {
+            let a = pop1_with_bitcast(state, I8X16, builder);
+            state.push1(builder.ins().swiden_high(a))
+        }
+        Operator::I16x8WidenLowI8x16U => {
+            let a = pop1_with_bitcast(state, I8X16, builder);
+            state.push1(builder.ins().uwiden_low(a))
+        }
+        Operator::I16x8WidenHighI8x16U => {
+            let a = pop1_with_bitcast(state, I8X16, builder);
+            state.push1(builder.ins().uwiden_high(a))
+        }
+        Operator::I32x4WidenLowI16x8S => {
+            let a = pop1_with_bitcast(state, I16X8, builder);
+            state.push1(builder.ins().swiden_low(a))
+        }
+        Operator::I32x4WidenHighI16x8S => {
+            let a = pop1_with_bitcast(state, I16X8, builder);
+            state.push1(builder.ins().swiden_high(a))
+        }
+        Operator::I32x4WidenLowI16x8U => {
+            let a = pop1_with_bitcast(state, I16X8, builder);
+            state.push1(builder.ins().uwiden_low(a))
+        }
+        Operator::I32x4WidenHighI16x8U => {
+            let a = pop1_with_bitcast(state, I16X8, builder);
+            state.push1(builder.ins().uwiden_high(a))
+        }
+
+        Operator::F32x4Ceil | Operator::F64x2Ceil => {
+            // This is something of a misuse of `type_of`, because that produces the return type
+            // of `op`.  In this case we want the arg type, but we know it's the same as the
+            // return type.  Same for the 3 cases below.
+            let arg = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().ceil(arg));
+        }
+        Operator::F32x4Floor | Operator::F64x2Floor => {
+            let arg = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().floor(arg));
+        }
+        Operator::F32x4Trunc | Operator::F64x2Trunc => {
+            let arg = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().trunc(arg));
+        }
+        Operator::F32x4Nearest | Operator::F64x2Nearest => {
+            let arg = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().nearest(arg));
         }
 
         Operator::ReturnCall { .. } | Operator::ReturnCallIndirect { .. } => {
@@ -1630,13 +1817,19 @@ fn translate_unreachable_operator<FE: FuncEnvironment + ?Sized>(
                                 let (params, _results) =
                                     module_translation_state.blocktype_params_results(blocktype)?;
                                 let else_block = block_with_params(builder, params, environ)?;
+                                let frame = state.control_stack.last().unwrap();
+                                frame.truncate_value_stack_to_else_params(&mut state.stack);
 
                                 // We change the target of the branch instruction.
                                 builder.change_jump_destination(branch_inst, else_block);
                                 builder.seal_block(else_block);
                                 else_block
                             }
-                            ElseData::WithElse { else_block } => else_block,
+                            ElseData::WithElse { else_block } => {
+                                let frame = state.control_stack.last().unwrap();
+                                frame.truncate_value_stack_to_else_params(&mut state.stack);
+                                else_block
+                            }
                         };
 
                         builder.switch_to_block(else_block);
@@ -1655,9 +1848,8 @@ fn translate_unreachable_operator<FE: FuncEnvironment + ?Sized>(
             let control_stack = &mut state.control_stack;
             let frame = control_stack.pop().unwrap();
 
-            // Now we have to split off the stack the values not used
-            // by unreachable code that hasn't been translated
-            stack.truncate(frame.original_stack_size());
+            // Pop unused parameters from stack.
+            frame.truncate_value_stack_to_original_size(stack);
 
             let reachable_anyway = match frame {
                 // If it is a loop we also have to seal the body loop block
@@ -1790,7 +1982,7 @@ fn get_heap_addr(
 
 /// Prepare for a load; factors out common functionality between load and load_extend operations.
 fn prepare_load<FE: FuncEnvironment + ?Sized>(
-    offset: u32,
+    memarg: &MemoryImmediate,
     loaded_bytes: u32,
     builder: &mut FunctionBuilder,
     state: &mut FuncTranslationState,
@@ -1798,12 +1990,11 @@ fn prepare_load<FE: FuncEnvironment + ?Sized>(
 ) -> WasmResult<(MemFlags, Value, Offset32)> {
     let addr32 = state.pop1();
 
-    // We don't yet support multiple linear memories.
-    let heap = state.get_heap(builder.func, 0, environ)?;
+    let heap = state.get_heap(builder.func, memarg.memory, environ)?;
     let (base, offset) = get_heap_addr(
         heap,
         addr32,
-        offset,
+        memarg.offset,
         loaded_bytes,
         environ.pointer_type(),
         builder,
@@ -1819,7 +2010,7 @@ fn prepare_load<FE: FuncEnvironment + ?Sized>(
 
 /// Translate a load instruction.
 fn translate_load<FE: FuncEnvironment + ?Sized>(
-    offset: u32,
+    memarg: &MemoryImmediate,
     opcode: ir::Opcode,
     result_ty: Type,
     builder: &mut FunctionBuilder,
@@ -1827,7 +2018,7 @@ fn translate_load<FE: FuncEnvironment + ?Sized>(
     environ: &mut FE,
 ) -> WasmResult<()> {
     let (flags, base, offset) = prepare_load(
-        offset,
+        memarg,
         mem_op_size(opcode, result_ty),
         builder,
         state,
@@ -1840,7 +2031,7 @@ fn translate_load<FE: FuncEnvironment + ?Sized>(
 
 /// Translate a store instruction.
 fn translate_store<FE: FuncEnvironment + ?Sized>(
-    offset: u32,
+    memarg: &MemoryImmediate,
     opcode: ir::Opcode,
     builder: &mut FunctionBuilder,
     state: &mut FuncTranslationState,
@@ -1849,17 +2040,16 @@ fn translate_store<FE: FuncEnvironment + ?Sized>(
     let (addr32, val) = state.pop2();
     let val_ty = builder.func.dfg.value_type(val);
 
-    // We don't yet support multiple linear memories.
-    let heap = state.get_heap(builder.func, 0, environ)?;
+    let heap = state.get_heap(builder.func, memarg.memory, environ)?;
     let (base, offset) = get_heap_addr(
         heap,
         addr32,
-        offset,
+        memarg.offset,
         mem_op_size(opcode, val_ty),
         environ.pointer_type(),
         builder,
     );
-    // See the comments in `translate_load` about the flags.
+    // See the comments in `prepare_load` about the flags.
     let flags = MemFlags::new();
     builder
         .ins()
@@ -1872,7 +2062,7 @@ fn mem_op_size(opcode: ir::Opcode, ty: Type) -> u32 {
         ir::Opcode::Istore8 | ir::Opcode::Sload8 | ir::Opcode::Uload8 => 1,
         ir::Opcode::Istore16 | ir::Opcode::Sload16 | ir::Opcode::Uload16 => 2,
         ir::Opcode::Istore32 | ir::Opcode::Sload32 | ir::Opcode::Uload32 => 4,
-        ir::Opcode::Store | ir::Opcode::Load => ty.bytes(),
+        ir::Opcode::Store | ir::Opcode::Load /* | ir::Opcode::LoadSplat */=> ty.bytes(),
         _ => panic!("unknown size of mem op for {:?}", opcode),
     }
 }
@@ -1883,6 +2073,235 @@ fn translate_icmp(cc: IntCC, builder: &mut FunctionBuilder, state: &mut FuncTran
     state.push1(builder.ins().bint(I32, val));
 }
 
+// For an atomic memory operation, emit an alignment check for the linear memory address,
+// and then compute the final effective address.
+fn finalise_atomic_mem_addr<FE: FuncEnvironment + ?Sized>(
+    linear_mem_addr: Value,
+    memarg: &MemoryImmediate,
+    access_ty: Type,
+    builder: &mut FunctionBuilder,
+    state: &mut FuncTranslationState,
+    environ: &mut FE,
+) -> WasmResult<Value> {
+    // Check the alignment of `linear_mem_addr`.
+    let access_ty_bytes = access_ty.bytes();
+    let final_lma = builder
+        .ins()
+        .iadd_imm(linear_mem_addr, i64::from(memarg.offset));
+    if access_ty_bytes != 1 {
+        assert!(access_ty_bytes == 2 || access_ty_bytes == 4 || access_ty_bytes == 8);
+        let final_lma_misalignment = builder
+            .ins()
+            .band_imm(final_lma, i64::from(access_ty_bytes - 1));
+        let f = builder
+            .ins()
+            .ifcmp_imm(final_lma_misalignment, i64::from(0));
+        builder
+            .ins()
+            .trapif(IntCC::NotEqual, f, ir::TrapCode::HeapMisaligned);
+    }
+
+    // Compute the final effective address.
+    let heap = state.get_heap(builder.func, memarg.memory, environ)?;
+    let (base, offset) = get_heap_addr(
+        heap,
+        final_lma,
+        /*offset=*/ 0,
+        access_ty.bytes(),
+        environ.pointer_type(),
+        builder,
+    );
+
+    let final_effective_address = builder.ins().iadd_imm(base, i64::from(offset));
+    Ok(final_effective_address)
+}
+
+fn translate_atomic_rmw<FE: FuncEnvironment + ?Sized>(
+    widened_ty: Type,
+    access_ty: Type,
+    op: AtomicRmwOp,
+    memarg: &MemoryImmediate,
+    builder: &mut FunctionBuilder,
+    state: &mut FuncTranslationState,
+    environ: &mut FE,
+) -> WasmResult<()> {
+    let (linear_mem_addr, mut arg2) = state.pop2();
+    let arg2_ty = builder.func.dfg.value_type(arg2);
+
+    // The operation is performed at type `access_ty`, and the old value is zero-extended
+    // to type `widened_ty`.
+    match access_ty {
+        I8 | I16 | I32 | I64 => {}
+        _ => {
+            return Err(wasm_unsupported!(
+                "atomic_rmw: unsupported access type {:?}",
+                access_ty
+            ))
+        }
+    };
+    let w_ty_ok = match widened_ty {
+        I32 | I64 => true,
+        _ => false,
+    };
+    assert!(w_ty_ok && widened_ty.bytes() >= access_ty.bytes());
+
+    assert!(arg2_ty.bytes() >= access_ty.bytes());
+    if arg2_ty.bytes() > access_ty.bytes() {
+        arg2 = builder.ins().ireduce(access_ty, arg2);
+    }
+
+    let final_effective_address =
+        finalise_atomic_mem_addr(linear_mem_addr, memarg, access_ty, builder, state, environ)?;
+
+    // See the comments in `prepare_load` about the flags.
+    let flags = MemFlags::new();
+    let mut res = builder
+        .ins()
+        .atomic_rmw(access_ty, flags, op, final_effective_address, arg2);
+    if access_ty != widened_ty {
+        res = builder.ins().uextend(widened_ty, res);
+    }
+    state.push1(res);
+    Ok(())
+}
+
+fn translate_atomic_cas<FE: FuncEnvironment + ?Sized>(
+    widened_ty: Type,
+    access_ty: Type,
+    memarg: &MemoryImmediate,
+    builder: &mut FunctionBuilder,
+    state: &mut FuncTranslationState,
+    environ: &mut FE,
+) -> WasmResult<()> {
+    let (linear_mem_addr, mut expected, mut replacement) = state.pop3();
+    let expected_ty = builder.func.dfg.value_type(expected);
+    let replacement_ty = builder.func.dfg.value_type(replacement);
+
+    // The compare-and-swap is performed at type `access_ty`, and the old value is zero-extended
+    // to type `widened_ty`.
+    match access_ty {
+        I8 | I16 | I32 | I64 => {}
+        _ => {
+            return Err(wasm_unsupported!(
+                "atomic_cas: unsupported access type {:?}",
+                access_ty
+            ))
+        }
+    };
+    let w_ty_ok = match widened_ty {
+        I32 | I64 => true,
+        _ => false,
+    };
+    assert!(w_ty_ok && widened_ty.bytes() >= access_ty.bytes());
+
+    assert!(expected_ty.bytes() >= access_ty.bytes());
+    if expected_ty.bytes() > access_ty.bytes() {
+        expected = builder.ins().ireduce(access_ty, expected);
+    }
+    assert!(replacement_ty.bytes() >= access_ty.bytes());
+    if replacement_ty.bytes() > access_ty.bytes() {
+        replacement = builder.ins().ireduce(access_ty, replacement);
+    }
+
+    let final_effective_address =
+        finalise_atomic_mem_addr(linear_mem_addr, memarg, access_ty, builder, state, environ)?;
+
+    // See the comments in `prepare_load` about the flags.
+    let flags = MemFlags::new();
+    let mut res = builder
+        .ins()
+        .atomic_cas(flags, final_effective_address, expected, replacement);
+    if access_ty != widened_ty {
+        res = builder.ins().uextend(widened_ty, res);
+    }
+    state.push1(res);
+    Ok(())
+}
+
+fn translate_atomic_load<FE: FuncEnvironment + ?Sized>(
+    widened_ty: Type,
+    access_ty: Type,
+    memarg: &MemoryImmediate,
+    builder: &mut FunctionBuilder,
+    state: &mut FuncTranslationState,
+    environ: &mut FE,
+) -> WasmResult<()> {
+    let linear_mem_addr = state.pop1();
+
+    // The load is performed at type `access_ty`, and the loaded value is zero extended
+    // to `widened_ty`.
+    match access_ty {
+        I8 | I16 | I32 | I64 => {}
+        _ => {
+            return Err(wasm_unsupported!(
+                "atomic_load: unsupported access type {:?}",
+                access_ty
+            ))
+        }
+    };
+    let w_ty_ok = match widened_ty {
+        I32 | I64 => true,
+        _ => false,
+    };
+    assert!(w_ty_ok && widened_ty.bytes() >= access_ty.bytes());
+
+    let final_effective_address =
+        finalise_atomic_mem_addr(linear_mem_addr, memarg, access_ty, builder, state, environ)?;
+
+    // See the comments in `prepare_load` about the flags.
+    let flags = MemFlags::new();
+    let mut res = builder
+        .ins()
+        .atomic_load(access_ty, flags, final_effective_address);
+    if access_ty != widened_ty {
+        res = builder.ins().uextend(widened_ty, res);
+    }
+    state.push1(res);
+    Ok(())
+}
+
+fn translate_atomic_store<FE: FuncEnvironment + ?Sized>(
+    access_ty: Type,
+    memarg: &MemoryImmediate,
+    builder: &mut FunctionBuilder,
+    state: &mut FuncTranslationState,
+    environ: &mut FE,
+) -> WasmResult<()> {
+    let (linear_mem_addr, mut data) = state.pop2();
+    let data_ty = builder.func.dfg.value_type(data);
+
+    // The operation is performed at type `access_ty`, and the data to be stored may first
+    // need to be narrowed accordingly.
+    match access_ty {
+        I8 | I16 | I32 | I64 => {}
+        _ => {
+            return Err(wasm_unsupported!(
+                "atomic_store: unsupported access type {:?}",
+                access_ty
+            ))
+        }
+    };
+    let d_ty_ok = match data_ty {
+        I32 | I64 => true,
+        _ => false,
+    };
+    assert!(d_ty_ok && data_ty.bytes() >= access_ty.bytes());
+
+    if data_ty.bytes() > access_ty.bytes() {
+        data = builder.ins().ireduce(access_ty, data);
+    }
+
+    let final_effective_address =
+        finalise_atomic_mem_addr(linear_mem_addr, memarg, access_ty, builder, state, environ)?;
+
+    // See the comments in `prepare_load` about the flags.
+    let flags = MemFlags::new();
+    builder
+        .ins()
+        .atomic_store(flags, data, final_effective_address);
+    Ok(())
+}
+
 fn translate_vector_icmp(
     cc: IntCC,
     needed_type: Type,
@@ -1920,15 +2339,10 @@ fn translate_br_if(
 ) {
     let val = state.pop1();
     let (br_destination, inputs) = translate_br_if_args(relative_depth, state);
-
-    // Bitcast any vector arguments to their default type, I8X16, before jumping.
-    let destination_types = builder.func.dfg.block_param_types(br_destination);
-    bitcast_arguments(inputs, &destination_types[..inputs.len()], builder);
-
-    builder.ins().brnz(val, br_destination, inputs);
+    canonicalise_then_brnz(builder, val, br_destination, inputs);
 
     let next_block = builder.create_block();
-    builder.ins().jump(next_block, &[]);
+    canonicalise_then_jump(builder, next_block, &[]);
     builder.seal_block(next_block); // The only predecessor is the current block.
     builder.switch_to_block(next_block);
 }
@@ -1967,9 +2381,9 @@ fn type_of(operator: &Operator) -> Type {
         | Operator::V128Xor
         | Operator::V128Bitselect => I8X16, // default type representing V128
 
-        Operator::V8x16Shuffle { .. }
+        Operator::I8x16Shuffle { .. }
         | Operator::I8x16Splat
-        | Operator::V8x16LoadSplat { .. }
+        | Operator::V128Load8Splat { .. }
         | Operator::I8x16ExtractLaneS { .. }
         | Operator::I8x16ExtractLaneU { .. }
         | Operator::I8x16ReplaceLane { .. }
@@ -1984,25 +2398,27 @@ fn type_of(operator: &Operator) -> Type {
         | Operator::I8x16GeS
         | Operator::I8x16GeU
         | Operator::I8x16Neg
+        | Operator::I8x16Abs
         | Operator::I8x16AnyTrue
         | Operator::I8x16AllTrue
         | Operator::I8x16Shl
         | Operator::I8x16ShrS
         | Operator::I8x16ShrU
         | Operator::I8x16Add
-        | Operator::I8x16AddSaturateS
-        | Operator::I8x16AddSaturateU
+        | Operator::I8x16AddSatS
+        | Operator::I8x16AddSatU
         | Operator::I8x16Sub
-        | Operator::I8x16SubSaturateS
-        | Operator::I8x16SubSaturateU
+        | Operator::I8x16SubSatS
+        | Operator::I8x16SubSatU
         | Operator::I8x16MinS
         | Operator::I8x16MinU
         | Operator::I8x16MaxS
         | Operator::I8x16MaxU
-        | Operator::I8x16RoundingAverageU => I8X16,
+        | Operator::I8x16RoundingAverageU
+        | Operator::I8x16Bitmask => I8X16,
 
         Operator::I16x8Splat
-        | Operator::V16x8LoadSplat { .. }
+        | Operator::V128Load16Splat { .. }
         | Operator::I16x8ExtractLaneS { .. }
         | Operator::I16x8ExtractLaneU { .. }
         | Operator::I16x8ReplaceLane { .. }
@@ -2017,26 +2433,28 @@ fn type_of(operator: &Operator) -> Type {
         | Operator::I16x8GeS
         | Operator::I16x8GeU
         | Operator::I16x8Neg
+        | Operator::I16x8Abs
         | Operator::I16x8AnyTrue
         | Operator::I16x8AllTrue
         | Operator::I16x8Shl
         | Operator::I16x8ShrS
         | Operator::I16x8ShrU
         | Operator::I16x8Add
-        | Operator::I16x8AddSaturateS
-        | Operator::I16x8AddSaturateU
+        | Operator::I16x8AddSatS
+        | Operator::I16x8AddSatU
         | Operator::I16x8Sub
-        | Operator::I16x8SubSaturateS
-        | Operator::I16x8SubSaturateU
+        | Operator::I16x8SubSatS
+        | Operator::I16x8SubSatU
         | Operator::I16x8MinS
         | Operator::I16x8MinU
         | Operator::I16x8MaxS
         | Operator::I16x8MaxU
         | Operator::I16x8RoundingAverageU
-        | Operator::I16x8Mul => I16X8,
+        | Operator::I16x8Mul
+        | Operator::I16x8Bitmask => I16X8,
 
         Operator::I32x4Splat
-        | Operator::V32x4LoadSplat { .. }
+        | Operator::V128Load32Splat { .. }
         | Operator::I32x4ExtractLane { .. }
         | Operator::I32x4ReplaceLane { .. }
         | Operator::I32x4Eq
@@ -2050,6 +2468,7 @@ fn type_of(operator: &Operator) -> Type {
         | Operator::I32x4GeS
         | Operator::I32x4GeU
         | Operator::I32x4Neg
+        | Operator::I32x4Abs
         | Operator::I32x4AnyTrue
         | Operator::I32x4AllTrue
         | Operator::I32x4Shl
@@ -2063,10 +2482,11 @@ fn type_of(operator: &Operator) -> Type {
         | Operator::I32x4MaxS
         | Operator::I32x4MaxU
         | Operator::F32x4ConvertI32x4S
-        | Operator::F32x4ConvertI32x4U => I32X4,
+        | Operator::F32x4ConvertI32x4U
+        | Operator::I32x4Bitmask => I32X4,
 
         Operator::I64x2Splat
-        | Operator::V64x2LoadSplat { .. }
+        | Operator::V128Load64Splat { .. }
         | Operator::I64x2ExtractLane { .. }
         | Operator::I64x2ReplaceLane { .. }
         | Operator::I64x2Neg
@@ -2095,8 +2515,14 @@ fn type_of(operator: &Operator) -> Type {
         | Operator::F32x4Div
         | Operator::F32x4Min
         | Operator::F32x4Max
+        | Operator::F32x4PMin
+        | Operator::F32x4PMax
         | Operator::I32x4TruncSatF32x4S
-        | Operator::I32x4TruncSatF32x4U => F32X4,
+        | Operator::I32x4TruncSatF32x4U
+        | Operator::F32x4Ceil
+        | Operator::F32x4Floor
+        | Operator::F32x4Trunc
+        | Operator::F32x4Nearest => F32X4,
 
         Operator::F64x2Splat
         | Operator::F64x2ExtractLane { .. }
@@ -2115,7 +2541,13 @@ fn type_of(operator: &Operator) -> Type {
         | Operator::F64x2Mul
         | Operator::F64x2Div
         | Operator::F64x2Min
-        | Operator::F64x2Max => F64X2,
+        | Operator::F64x2Max
+        | Operator::F64x2PMin
+        | Operator::F64x2PMax
+        | Operator::F64x2Ceil
+        | Operator::F64x2Floor
+        | Operator::F64x2Trunc
+        | Operator::F64x2Nearest => F64X2,
 
         _ => unimplemented!(
             "Currently only SIMD instructions are mapped to their return type; the \
@@ -2127,7 +2559,7 @@ fn type_of(operator: &Operator) -> Type {
 
 /// Some SIMD operations only operate on I8X16 in CLIF; this will convert them to that type by
 /// adding a raw_bitcast if necessary.
-pub fn optionally_bitcast_vector(
+fn optionally_bitcast_vector(
     value: Value,
     needed_type: Type,
     builder: &mut FunctionBuilder,
@@ -2139,6 +2571,80 @@ pub fn optionally_bitcast_vector(
     }
 }
 
+#[inline(always)]
+fn is_non_canonical_v128(ty: ir::Type) -> bool {
+    matches!(
+        ty,
+        B8X16 | B16X8 | B32X4 | B64X2 | I64X2 | I32X4 | I16X8 | F32X4 | F64X2
+    )
+}
+
+/// Cast to I8X16, any vector values in `values` that are of "non-canonical" type (meaning, not
+/// I8X16), and return them in a slice.  A pre-scan is made to determine whether any casts are
+/// actually necessary, and if not, the original slice is returned.  Otherwise the cast values
+/// are returned in a slice that belongs to the caller-supplied `SmallVec`.
+fn canonicalise_v128_values<'a>(
+    tmp_canonicalised: &'a mut SmallVec<[ir::Value; 16]>,
+    builder: &mut FunctionBuilder,
+    values: &'a [ir::Value],
+) -> &'a [ir::Value] {
+    debug_assert!(tmp_canonicalised.is_empty());
+    // First figure out if any of the parameters need to be cast.  Mostly they don't need to be.
+    let any_non_canonical = values
+        .iter()
+        .any(|v| is_non_canonical_v128(builder.func.dfg.value_type(*v)));
+    // Hopefully we take this exit most of the time, hence doing no heap allocation.
+    if !any_non_canonical {
+        return values;
+    }
+    // Otherwise we'll have to cast, and push the resulting `Value`s into `canonicalised`.
+    for v in values {
+        tmp_canonicalised.push(if is_non_canonical_v128(builder.func.dfg.value_type(*v)) {
+            builder.ins().raw_bitcast(I8X16, *v)
+        } else {
+            *v
+        });
+    }
+    tmp_canonicalised.as_slice()
+}
+
+/// Generate a `jump` instruction, but first cast all 128-bit vector values to I8X16 if they
+/// don't have that type.  This is done in somewhat roundabout way so as to ensure that we
+/// almost never have to do any heap allocation.
+fn canonicalise_then_jump(
+    builder: &mut FunctionBuilder,
+    destination: ir::Block,
+    params: &[ir::Value],
+) -> ir::Inst {
+    let mut tmp_canonicalised = SmallVec::<[ir::Value; 16]>::new();
+    let canonicalised = canonicalise_v128_values(&mut tmp_canonicalised, builder, params);
+    builder.ins().jump(destination, canonicalised)
+}
+
+/// The same but for a `brz` instruction.
+fn canonicalise_then_brz(
+    builder: &mut FunctionBuilder,
+    cond: ir::Value,
+    destination: ir::Block,
+    params: &[Value],
+) -> ir::Inst {
+    let mut tmp_canonicalised = SmallVec::<[ir::Value; 16]>::new();
+    let canonicalised = canonicalise_v128_values(&mut tmp_canonicalised, builder, params);
+    builder.ins().brz(cond, destination, canonicalised)
+}
+
+/// The same but for a `brnz` instruction.
+fn canonicalise_then_brnz(
+    builder: &mut FunctionBuilder,
+    cond: ir::Value,
+    destination: ir::Block,
+    params: &[Value],
+) -> ir::Inst {
+    let mut tmp_canonicalised = SmallVec::<[ir::Value; 16]>::new();
+    let canonicalised = canonicalise_v128_values(&mut tmp_canonicalised, builder, params);
+    builder.ins().brnz(cond, destination, canonicalised)
+}
+
 /// A helper for popping and bitcasting a single value; since SIMD values can lose their type by
 /// using v128 (i.e. CLIF's I8x16) we must re-type the values using a bitcast to avoid CLIF
 /// typing issues.
diff --git a/lib/compiler-cranelift/src/translator/func_environ.rs b/lib/compiler-cranelift/src/translator/func_environ.rs
index cfc07b388..efdcb0699 100644
--- a/lib/compiler-cranelift/src/translator/func_environ.rs
+++ b/lib/compiler-cranelift/src/translator/func_environ.rs
@@ -12,7 +12,7 @@ use cranelift_codegen::ir::immediates::Offset32;
 use cranelift_codegen::ir::{self, InstBuilder};
 use cranelift_codegen::isa::TargetFrontendConfig;
 use cranelift_frontend::FunctionBuilder;
-use wasmer_compiler::wasmparser::Operator;
+use wasmer_compiler::wasmparser::{Operator, Type};
 use wasmer_compiler::WasmResult;
 use wasmer_types::{FunctionIndex, GlobalIndex, MemoryIndex, SignatureIndex, TableIndex};
 
@@ -229,8 +229,10 @@ pub trait FuncEnvironment: TargetEnvironment {
     fn translate_memory_copy(
         &mut self,
         pos: FuncCursor,
-        index: MemoryIndex,
-        heap: ir::Heap,
+        src_index: MemoryIndex,
+        src_heap: ir::Heap,
+        dst_index: MemoryIndex,
+        dst_heap: ir::Heap,
         dst: ir::Value,
         src: ir::Value,
         len: ir::Value,
@@ -283,6 +285,7 @@ pub trait FuncEnvironment: TargetEnvironment {
         &mut self,
         pos: FuncCursor,
         table_index: TableIndex,
+        table: ir::Table,
         delta: ir::Value,
         init_value: ir::Value,
     ) -> WasmResult<ir::Value>;
@@ -290,16 +293,18 @@ pub trait FuncEnvironment: TargetEnvironment {
     /// Translate a `table.get` WebAssembly instruction.
     fn translate_table_get(
         &mut self,
-        pos: FuncCursor,
+        builder: &mut FunctionBuilder,
         table_index: TableIndex,
+        table: ir::Table,
         index: ir::Value,
     ) -> WasmResult<ir::Value>;
 
     /// Translate a `table.set` WebAssembly instruction.
     fn translate_table_set(
         &mut self,
-        pos: FuncCursor,
+        builder: &mut FunctionBuilder,
         table_index: TableIndex,
+        table: ir::Table,
         value: ir::Value,
         index: ir::Value,
     ) -> WasmResult<()>;
@@ -344,8 +349,44 @@ pub trait FuncEnvironment: TargetEnvironment {
     /// Translate a `elem.drop` WebAssembly instruction.
     fn translate_elem_drop(&mut self, pos: FuncCursor, seg_index: u32) -> WasmResult<()>;
 
+    /// Translate a `ref.null T` WebAssembly instruction.
+    ///
+    /// By default, translates into a null reference type.
+    ///
+    /// Override this if you don't use Cranelift reference types for all Wasm
+    /// reference types (e.g. you use a raw pointer for `funcref`s) or if the
+    /// null sentinel is not a null reference type pointer for your type. If you
+    /// override this method, then you should also override
+    /// `translate_ref_is_null` as well.
+    fn translate_ref_null(&mut self, pos: FuncCursor, ty: Type) -> WasmResult<ir::Value>;
+    // {
+    //     let _ = ty;
+    //     Ok(pos.ins().null(self.reference_type(ty)))
+    // }
+
+    /// Translate a `ref.is_null` WebAssembly instruction.
+    ///
+    /// By default, assumes that `value` is a Cranelift reference type, and that
+    /// a null Cranelift reference type is the null value for all Wasm reference
+    /// types.
+    ///
+    /// If you override this method, you probably also want to override
+    /// `translate_ref_null` as well.
+    fn translate_ref_is_null(
+        &mut self,
+        mut pos: FuncCursor,
+        value: ir::Value,
+    ) -> WasmResult<ir::Value> {
+        let is_null = pos.ins().is_null(value);
+        Ok(pos.ins().bint(ir::types::I32, is_null))
+    }
+
     /// Translate a `ref.func` WebAssembly instruction.
-    fn translate_ref_func(&mut self, pos: FuncCursor, func_index: u32) -> WasmResult<ir::Value>;
+    fn translate_ref_func(
+        &mut self,
+        pos: FuncCursor,
+        func_index: FunctionIndex,
+    ) -> WasmResult<ir::Value>;
 
     /// Translate a `global.get` WebAssembly instruction at `pos` for a global
     /// that is custom.
@@ -364,6 +405,38 @@ pub trait FuncEnvironment: TargetEnvironment {
         val: ir::Value,
     ) -> WasmResult<()>;
 
+    /// Translate an `i32.atomic.wait` or `i64.atomic.wait` WebAssembly instruction.
+    /// The `index` provided identifies the linear memory containing the value
+    /// to wait on, and `heap` is the heap reference returned by `make_heap`
+    /// for the same index.  Whether the waited-on value is 32- or 64-bit can be
+    /// determined by examining the type of `expected`, which must be only I32 or I64.
+    ///
+    /// Returns an i32, which is negative if the helper call failed.
+    fn translate_atomic_wait(
+        &mut self,
+        pos: FuncCursor,
+        index: MemoryIndex,
+        heap: ir::Heap,
+        addr: ir::Value,
+        expected: ir::Value,
+        timeout: ir::Value,
+    ) -> WasmResult<ir::Value>;
+
+    /// Translate an `atomic.notify` WebAssembly instruction.
+    /// The `index` provided identifies the linear memory containing the value
+    /// to wait on, and `heap` is the heap reference returned by `make_heap`
+    /// for the same index.
+    ///
+    /// Returns an i64, which is negative if the helper call failed.
+    fn translate_atomic_notify(
+        &mut self,
+        pos: FuncCursor,
+        index: MemoryIndex,
+        heap: ir::Heap,
+        addr: ir::Value,
+        count: ir::Value,
+    ) -> WasmResult<ir::Value>;
+
     /// Emit code at the beginning of every wasm loop.
     ///
     /// This can be used to insert explicit interrupt or safepoint checking at
diff --git a/lib/compiler-cranelift/src/translator/func_state.rs b/lib/compiler-cranelift/src/translator/func_state.rs
index a9af4b181..1cd8db9bd 100644
--- a/lib/compiler-cranelift/src/translator/func_state.rs
+++ b/lib/compiler-cranelift/src/translator/func_state.rs
@@ -132,7 +132,9 @@ impl ControlStackFrame {
             Self::Loop { header, .. } => header,
         }
     }
-    pub fn original_stack_size(&self) -> usize {
+    /// Private helper. Use `truncate_value_stack_to_else_params()` or
+    /// `truncate_value_stack_to_original_size()` to restore value-stack state.
+    fn original_stack_size(&self) -> usize {
         match *self {
             Self::If {
                 original_stack_size,
@@ -182,6 +184,33 @@ impl ControlStackFrame {
             Self::Loop { .. } => {}
         }
     }
+
+    /// Pop values from the value stack so that it is left at the
+    /// input-parameters to an else-block.
+    pub fn truncate_value_stack_to_else_params(&self, stack: &mut Vec<Value>) {
+        debug_assert!(matches!(self, &ControlStackFrame::If { .. }));
+        stack.truncate(self.original_stack_size());
+    }
+
+    /// Pop values from the value stack so that it is left at the state it was
+    /// before this control-flow frame.
+    pub fn truncate_value_stack_to_original_size(&self, stack: &mut Vec<Value>) {
+        // The "If" frame pushes its parameters twice, so they're available to the else block
+        // (see also `FuncTranslationState::push_if`).
+        // Yet, the original_stack_size member accounts for them only once, so that the else
+        // block can see the same number of parameters as the consequent block. As a matter of
+        // fact, we need to substract an extra number of parameter values for if blocks.
+        let num_duplicated_params = match self {
+            &ControlStackFrame::If {
+                num_param_values, ..
+            } => {
+                debug_assert!(num_param_values <= self.original_stack_size());
+                num_param_values
+            }
+            _ => 0,
+        };
+        stack.truncate(self.original_stack_size() - num_duplicated_params);
+    }
 }
 
 /// Contains information passed along during a function's translation and that records:
@@ -219,6 +248,16 @@ pub struct FuncTranslationState {
     functions: HashMap<FunctionIndex, (ir::FuncRef, usize)>,
 }
 
+// Public methods that are exposed to non-`cranelift_wasm` API consumers.
+impl FuncTranslationState {
+    /// True if the current translation state expresses reachable code, false if it is unreachable.
+    #[inline]
+    #[allow(dead_code)]
+    pub fn reachable(&self) -> bool {
+        self.reachable
+    }
+}
+
 impl FuncTranslationState {
     /// Construct a new, empty, `FuncTranslationState`
     pub(crate) fn new() -> Self {
@@ -441,7 +480,7 @@ impl FuncTranslationState {
 
     /// Get the `Table` reference that should be used to access table `index`.
     /// Create the reference if necessary.
-    pub(crate) fn get_table<FE: FuncEnvironment + ?Sized>(
+    pub(crate) fn get_or_create_table<FE: FuncEnvironment + ?Sized>(
         &mut self,
         func: &mut ir::Function,
         index: u32,
diff --git a/lib/compiler-cranelift/src/translator/func_translator.rs b/lib/compiler-cranelift/src/translator/func_translator.rs
index 173707f0c..94dcd8d80 100644
--- a/lib/compiler-cranelift/src/translator/func_translator.rs
+++ b/lib/compiler-cranelift/src/translator/func_translator.rs
@@ -176,12 +176,9 @@ fn parse_local_decls<FE: FuncEnvironment + ?Sized>(
     let mut next_local = num_params;
     let local_count = reader.read_local_count().map_err(to_wasm_error)?;
 
-    let mut locals_total = 0;
     for _ in 0..local_count {
         builder.set_srcloc(cur_srcloc(reader));
-        let (count, ty) = reader
-            .read_local_decl(&mut locals_total)
-            .map_err(to_wasm_error)?;
+        let (count, ty) = reader.read_local_decl().map_err(to_wasm_error)?;
         declare_locals(builder, count, ty, &mut next_local, environ)?;
     }
 
diff --git a/lib/compiler-llvm/Cargo.toml b/lib/compiler-llvm/Cargo.toml
index 87a7c0295..d4e72f50a 100644
--- a/lib/compiler-llvm/Cargo.toml
+++ b/lib/compiler-llvm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-compiler-llvm"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "LLVM compiler for Wasmer WebAssembly runtime"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "compiler", "llvm"]
@@ -12,16 +12,16 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4", features = ["translator"] }
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
-target-lexicon = { version = "0.10", default-features = false }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5", features = ["translator"] }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha5" }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5" }
+target-lexicon = { version = "0.11", default-features = false }
 smallvec = "1"
 goblin = "0.2"
-libc = { version = "^0.2.69", default-features = false }
+libc = { version = "^0.2", default-features = false }
 byteorder = "1"
 itertools = "0.9"
-rayon = "1.3"
+rayon = "1.5"
 
 [dependencies.inkwell]
 version = "=0.1.0-llvm10sample"
diff --git a/lib/compiler-llvm/src/compiler.rs b/lib/compiler-llvm/src/compiler.rs
index 7c1b4f69e..9b344b61e 100644
--- a/lib/compiler-llvm/src/compiler.rs
+++ b/lib/compiler-llvm/src/compiler.rs
@@ -124,7 +124,7 @@ impl LLVMCompiler {
         compile_info
             .module
             .signatures
-            .into_iter()
+            .iter()
             .collect::<Vec<_>>()
             .par_iter()
             .map_init(
@@ -149,7 +149,7 @@ impl LLVMCompiler {
         compile_info
             .module
             .functions
-            .into_iter()
+            .iter()
             .collect::<Vec<_>>()
             .par_iter()
             .map_init(
@@ -248,7 +248,7 @@ impl Compiler for LLVMCompiler {
         let mut frame_section_bytes = vec![];
         let mut frame_section_relocations = vec![];
         let functions = function_body_inputs
-            .into_iter()
+            .iter()
             .collect::<Vec<(LocalFunctionIndex, &FunctionBodyData<'_>)>>()
             .par_iter()
             .map_init(
diff --git a/lib/compiler-llvm/src/translator/code.rs b/lib/compiler-llvm/src/translator/code.rs
index 6195b023f..52dcde51a 100644
--- a/lib/compiler-llvm/src/translator/code.rs
+++ b/lib/compiler-llvm/src/translator/code.rs
@@ -184,10 +184,7 @@ impl FuncTranslator {
         let mut locals = vec![];
         let num_locals = reader.read_local_count().map_err(to_wasm_error)?;
         for _ in 0..num_locals {
-            let mut counter = 0;
-            let (count, ty) = reader
-                .read_local_decl(&mut counter)
-                .map_err(to_wasm_error)?;
+            let (count, ty) = reader.read_local_decl().map_err(to_wasm_error)?;
             let ty = wptype_to_type(ty).map_err(to_compile_error)?;
             let ty = type_to_llvm(&intrinsics, ty)?;
             for _ in 0..count {
@@ -1110,21 +1107,13 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
     }
 
     fn trap_if_misaligned(&self, memarg: &MemoryImmediate, ptr: PointerValue<'ctx>) {
-        let align = match memarg.flags & 3 {
-            0 => {
-                return; /* No alignment to check. */
-            }
-            1 => 2,
-            2 => 4,
-            3 => 8,
-            _ => unreachable!("this match is fully covered"),
-        };
+        let align = memarg.align;
         let value = self
             .builder
             .build_ptr_to_int(ptr, self.intrinsics.i64_ty, "");
         let and = self.builder.build_and(
             value,
-            self.intrinsics.i64_ty.const_int(align - 1, false),
+            self.intrinsics.i64_ty.const_int((align - 1).into(), false),
             "misaligncheck",
         );
         let aligned =
@@ -1541,7 +1530,11 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                     .get_insert_block()
                     .ok_or_else(|| CompileError::Codegen("not currently in a block".to_string()))?;
 
-                let (label_depths, default_depth) = table.read_table().map_err(to_wasm_error)?;
+                let mut label_depths = table
+                    .targets()
+                    .collect::<Result<Vec<_>, _>>()
+                    .map_err(to_wasm_error)?;
+                let default_depth = label_depths.pop().unwrap().0;
 
                 let index = self.state.pop1()?;
 
@@ -1561,7 +1554,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let cases: Vec<_> = label_depths
                     .iter()
                     .enumerate()
-                    .map(|(case_index, &depth)| {
+                    .map(|(case_index, &(depth, _))| {
                         let frame_result: Result<&ControlFrame, CompileError> =
                             self.state.frame_at_depth(depth);
                         let frame = match frame_result {
@@ -2495,7 +2488,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I8x16AddSaturateS => {
+            Operator::I8x16AddSatS => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let (v1, _) = self.v128_into_i8x16(v1, i1);
                 let (v2, _) = self.v128_into_i8x16(v2, i2);
@@ -2512,7 +2505,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I16x8AddSaturateS => {
+            Operator::I16x8AddSatS => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let (v1, _) = self.v128_into_i16x8(v1, i1);
                 let (v2, _) = self.v128_into_i16x8(v2, i2);
@@ -2529,7 +2522,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I8x16AddSaturateU => {
+            Operator::I8x16AddSatU => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let (v1, _) = self.v128_into_i8x16(v1, i1);
                 let (v2, _) = self.v128_into_i8x16(v2, i2);
@@ -2546,7 +2539,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I16x8AddSaturateU => {
+            Operator::I16x8AddSatU => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let (v1, _) = self.v128_into_i16x8(v1, i1);
                 let (v2, _) = self.v128_into_i16x8(v2, i2);
@@ -2603,7 +2596,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I8x16SubSaturateS => {
+            Operator::I8x16SubSatS => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let (v1, _) = self.v128_into_i8x16(v1, i1);
                 let (v2, _) = self.v128_into_i8x16(v2, i2);
@@ -2620,7 +2613,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I16x8SubSaturateS => {
+            Operator::I16x8SubSatS => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let (v1, _) = self.v128_into_i16x8(v1, i1);
                 let (v2, _) = self.v128_into_i16x8(v2, i2);
@@ -2637,7 +2630,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I8x16SubSaturateU => {
+            Operator::I8x16SubSatU => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let (v1, _) = self.v128_into_i8x16(v1, i1);
                 let (v2, _) = self.v128_into_i8x16(v2, i2);
@@ -2654,7 +2647,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I16x8SubSaturateU => {
+            Operator::I16x8SubSatU => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let (v1, _) = self.v128_into_i16x8(v1, i1);
                 let (v2, _) = self.v128_into_i16x8(v2, i2);
@@ -6975,7 +6968,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 };
                 self.state.push1_extra(res, info);
             }
-            Operator::V8x16Swizzle => {
+            Operator::I8x16Swizzle => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let v1 = self.apply_pending_canonicalization(v1, i1);
                 let v1 = self
@@ -7043,7 +7036,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::V8x16Shuffle { lanes } => {
+            Operator::I8x16Shuffle { lanes } => {
                 let ((v1, i1), (v2, i2)) = self.state.pop2_extra()?;
                 let v1 = self.apply_pending_canonicalization(v1, i1);
                 let v1 = self
@@ -7066,7 +7059,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I16x8Load8x8S { ref memarg } => {
+            Operator::V128Load8x8S { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7087,7 +7080,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I16x8Load8x8U { ref memarg } => {
+            Operator::V128Load8x8U { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7108,7 +7101,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I32x4Load16x4S { ref memarg } => {
+            Operator::V128Load16x4S { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7129,7 +7122,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I32x4Load16x4U { ref memarg } => {
+            Operator::V128Load16x4U { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7150,7 +7143,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I64x2Load32x2S { ref memarg } => {
+            Operator::V128Load32x2S { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7171,7 +7164,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::I64x2Load32x2U { ref memarg } => {
+            Operator::V128Load32x2U { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7192,7 +7185,55 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::V8x16LoadSplat { ref memarg } => {
+            Operator::V128Load32Zero { ref memarg } => {
+                let offset = self.state.pop1()?.into_int_value();
+                let memory_index = MemoryIndex::from_u32(0);
+                let effective_address = self.resolve_memory_ptr(
+                    memory_index,
+                    memarg,
+                    self.intrinsics.i32_ptr_ty,
+                    offset,
+                    4,
+                )?;
+                let elem = self.builder.build_load(effective_address, "");
+                self.annotate_user_memaccess(
+                    memory_index,
+                    memarg,
+                    1,
+                    elem.as_instruction_value().unwrap(),
+                )?;
+                let res = self.builder.build_int_z_extend(
+                    elem.into_int_value(),
+                    self.intrinsics.i128_ty,
+                    "",
+                );
+                self.state.push1(res);
+            }
+            Operator::V128Load64Zero { ref memarg } => {
+                let offset = self.state.pop1()?.into_int_value();
+                let memory_index = MemoryIndex::from_u32(0);
+                let effective_address = self.resolve_memory_ptr(
+                    memory_index,
+                    memarg,
+                    self.intrinsics.i64_ptr_ty,
+                    offset,
+                    8,
+                )?;
+                let elem = self.builder.build_load(effective_address, "");
+                self.annotate_user_memaccess(
+                    memory_index,
+                    memarg,
+                    1,
+                    elem.as_instruction_value().unwrap(),
+                )?;
+                let res = self.builder.build_int_z_extend(
+                    elem.into_int_value(),
+                    self.intrinsics.i128_ty,
+                    "",
+                );
+                self.state.push1(res);
+            }
+            Operator::V128Load8Splat { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7213,7 +7254,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::V16x8LoadSplat { ref memarg } => {
+            Operator::V128Load16Splat { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7234,7 +7275,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::V32x4LoadSplat { ref memarg } => {
+            Operator::V128Load32Splat { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -7255,7 +7296,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 let res = self.builder.build_bitcast(res, self.intrinsics.i128_ty, "");
                 self.state.push1(res);
             }
-            Operator::V64x2LoadSplat { ref memarg } => {
+            Operator::V128Load64Splat { ref memarg } => {
                 let offset = self.state.pop1()?.into_int_value();
                 let memory_index = MemoryIndex::from_u32(0);
                 let effective_address = self.resolve_memory_ptr(
@@ -9246,8 +9287,8 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                 self.state.push1(old);
             }
 
-            Operator::MemoryGrow { reserved } => {
-                let memory_index = MemoryIndex::from_u32(reserved);
+            Operator::MemoryGrow { mem, mem_byte: _ } => {
+                let memory_index = MemoryIndex::from_u32(mem);
                 let delta = self.state.pop1()?;
                 let grow_fn_ptr = self.ctx.memory_grow(memory_index, self.intrinsics);
                 let grow = self.builder.build_call(
@@ -9257,15 +9298,15 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                         delta,
                         self.intrinsics
                             .i32_ty
-                            .const_int(reserved.into(), false)
+                            .const_int(mem.into(), false)
                             .as_basic_value_enum(),
                     ],
                     "",
                 );
                 self.state.push1(grow.try_as_basic_value().left().unwrap());
             }
-            Operator::MemorySize { reserved } => {
-                let memory_index = MemoryIndex::from_u32(reserved);
+            Operator::MemorySize { mem, mem_byte: _ } => {
+                let memory_index = MemoryIndex::from_u32(mem);
                 let size_fn_ptr = self.ctx.memory_size(memory_index, self.intrinsics);
                 let size = self.builder.build_call(
                     size_fn_ptr,
@@ -9273,7 +9314,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                         vmctx.as_basic_value_enum(),
                         self.intrinsics
                             .i32_ty
-                            .const_int(reserved.into(), false)
+                            .const_int(mem.into(), false)
                             .as_basic_value_enum(),
                     ],
                     "",
diff --git a/lib/compiler-singlepass/Cargo.toml b/lib/compiler-singlepass/Cargo.toml
index 9966a9dbc..abf006743 100644
--- a/lib/compiler-singlepass/Cargo.toml
+++ b/lib/compiler-singlepass/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-compiler-singlepass"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Singlepass compiler for Wasmer WebAssembly runtime"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "compiler", "singlepass"]
@@ -12,11 +12,11 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4", features = ["translator"], default-features = false }
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4", default-features = false, features = ["std"] }
-rayon = "1.3"
-hashbrown = { version = "0.8", optional = true }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5", features = ["translator"], default-features = false }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha5" }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5", default-features = false, features = ["std"] }
+rayon = "1.5"
+hashbrown = { version = "0.9", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 more-asserts = "0.2"
 dynasm = "1.0"
diff --git a/lib/compiler-singlepass/src/codegen_x64.rs b/lib/compiler-singlepass/src/codegen_x64.rs
index 8599d7320..a4f8dc9b4 100644
--- a/lib/compiler-singlepass/src/codegen_x64.rs
+++ b/lib/compiler-singlepass/src/codegen_x64.rs
@@ -1316,17 +1316,7 @@ impl<'a> FuncGen<'a> {
         self.machine.release_temp_gpr(tmp_bound);
         self.machine.release_temp_gpr(tmp_base);
 
-        let align = match memarg.flags & 3 {
-            0 => 1,
-            1 => 2,
-            2 => 4,
-            3 => 8,
-            _ => {
-                return Err(CodegenError {
-                    message: "emit_memory_op align: unreachable value".to_string(),
-                })
-            }
-        };
+        let align = memarg.align;
         if check_alignment && align != 1 {
             let tmp_aligncheck = self.machine.acquire_temp_gpr().unwrap();
             self.assembler.emit_mov(
@@ -1336,7 +1326,7 @@ impl<'a> FuncGen<'a> {
             );
             self.assembler.emit_and(
                 Size::S64,
-                Location::Imm32(align - 1),
+                Location::Imm32((align - 1).into()),
                 Location::GPR(tmp_aligncheck),
             );
             self.assembler
@@ -5615,8 +5605,8 @@ impl<'a> FuncGen<'a> {
                 // TODO: Re-enable interrupt signal check without branching
             }
             Operator::Nop => {}
-            Operator::MemorySize { reserved } => {
-                let memory_index = MemoryIndex::new(reserved as usize);
+            Operator::MemorySize { mem, mem_byte: _ } => {
+                let memory_index = MemoryIndex::new(mem as usize);
                 self.assembler.emit_mov(
                     Size::S64,
                     Location::Memory(
@@ -5653,8 +5643,8 @@ impl<'a> FuncGen<'a> {
                 self.assembler
                     .emit_mov(Size::S64, Location::GPR(GPR::RAX), ret);
             }
-            Operator::MemoryGrow { reserved } => {
-                let memory_index = MemoryIndex::new(reserved as usize);
+            Operator::MemoryGrow { mem, mem_byte: _ } => {
+                let memory_index = MemoryIndex::new(mem as usize);
                 let param_pages = self.value_stack.pop().unwrap();
 
                 self.machine.release_locations_only_regs(&[param_pages]);
@@ -6304,9 +6294,13 @@ impl<'a> FuncGen<'a> {
                 self.assembler.emit_label(after);
             }
             Operator::BrTable { ref table } => {
-                let (targets, default_target) = table.read_table().map_err(|e| CodegenError {
-                    message: format!("BrTable read_table: {:?}", e),
-                })?;
+                let mut targets = table
+                    .targets()
+                    .collect::<Result<Vec<_>, _>>()
+                    .map_err(|e| CodegenError {
+                        message: format!("BrTable read_table: {:?}", e),
+                    })?;
+                let default_target = targets.pop().unwrap().0;
                 let cond = self.pop_value_released();
                 let table_label = self.assembler.get_label();
                 let mut table: Vec<DynamicLabel> = vec![];
@@ -6334,7 +6328,7 @@ impl<'a> FuncGen<'a> {
                 );
                 self.assembler.emit_jmp_location(Location::GPR(GPR::RDX));
 
-                for target in targets.iter() {
+                for (target, _) in targets.iter() {
                     let label = self.assembler.get_label();
                     self.assembler.emit_label(label);
                     table.push(label);
@@ -8179,7 +8173,6 @@ impl<'a> FuncGen<'a> {
                     .into_iter()
                     .map(|(offset, code)| TrapInformation {
                         code_offset: offset as u32,
-                        source_loc: Default::default(),
                         trap_code: code,
                     })
                     .collect(),
diff --git a/lib/compiler-singlepass/src/compiler.rs b/lib/compiler-singlepass/src/compiler.rs
index 93170589d..448e8f19c 100644
--- a/lib/compiler-singlepass/src/compiler.rs
+++ b/lib/compiler-singlepass/src/compiler.rs
@@ -69,7 +69,7 @@ impl Compiler for SinglepassCompiler {
             .into_iter()
             .collect();
         let functions = function_body_inputs
-            .into_iter()
+            .iter()
             .collect::<Vec<(LocalFunctionIndex, &FunctionBodyData<'_>)>>()
             .par_iter()
             .map(|(i, input)| {
@@ -82,10 +82,7 @@ impl Compiler for SinglepassCompiler {
                 let mut locals = vec![];
                 let num_locals = reader.read_local_count().map_err(to_compile_error)?;
                 for _ in 0..num_locals {
-                    let mut counter = 0;
-                    let (count, ty) = reader
-                        .read_local_decl(&mut counter)
-                        .map_err(to_compile_error)?;
+                    let (count, ty) = reader.read_local_decl().map_err(to_compile_error)?;
                     for _ in 0..count {
                         locals.push(ty);
                     }
diff --git a/lib/compiler/Cargo.toml b/lib/compiler/Cargo.toml
index fc830edcd..64339fb9a 100644
--- a/lib/compiler/Cargo.toml
+++ b/lib/compiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-compiler"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Base compiler abstraction for Wasmer WebAssembly runtime"
 categories = ["wasm", "no-std"]
 keywords = ["wasm", "webassembly", "compiler"]
@@ -11,12 +11,12 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4", default-features = false }
-wasmparser = { version = "0.57", optional = true, default-features = false }
-target-lexicon = { version = "0.10", default-features = false }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha5" }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5", default-features = false }
+wasmparser = { version = "0.65", optional = true, default-features = false }
+target-lexicon = { version = "0.11", default-features = false }
 enumset = "1.0"
-hashbrown = { version = "0.8", optional = true }
+hashbrown = { version = "0.9", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 thiserror = "1.0"
 serde_bytes = { version = "0.11", optional = true }
diff --git a/lib/compiler/src/compiler.rs b/lib/compiler/src/compiler.rs
index 75b3b0811..d94df768e 100644
--- a/lib/compiler/src/compiler.rs
+++ b/lib/compiler/src/compiler.rs
@@ -13,7 +13,7 @@ use crate::ModuleTranslationState;
 use crate::SectionIndex;
 use wasmer_types::entity::PrimaryMap;
 use wasmer_types::{Features, FunctionIndex, LocalFunctionIndex, SignatureIndex};
-use wasmparser::{validate, OperatorValidatorConfig, ValidatingParserConfig};
+use wasmparser::{Validator, WasmFeatures};
 
 /// The compiler configuration options.
 pub trait CompilerConfig {
@@ -58,17 +58,24 @@ pub trait Compiler {
         features: &Features,
         data: &'data [u8],
     ) -> Result<(), CompileError> {
-        let config = ValidatingParserConfig {
-            operator_config: OperatorValidatorConfig {
-                enable_threads: features.threads,
-                enable_reference_types: features.reference_types,
-                enable_bulk_memory: features.bulk_memory,
-                enable_tail_call: false,
-                enable_simd: features.simd,
-                enable_multi_value: features.multi_value,
-            },
+        let mut validator = Validator::new();
+        let wasm_features = WasmFeatures {
+            bulk_memory: features.bulk_memory,
+            threads: features.threads,
+            reference_types: features.reference_types,
+            multi_value: features.multi_value,
+            simd: features.simd,
+            tail_call: features.tail_call,
+            module_linking: features.module_linking,
+            multi_memory: features.multi_memory,
+            memory64: features.memory64,
+            deterministic_only: false,
         };
-        validate(data, Some(config)).map_err(|e| CompileError::Validate(format!("{}", e)))
+        validator.wasm_features(wasm_features);
+        validator
+            .validate_all(data)
+            .map_err(|e| CompileError::Validate(format!("{}", e)))?;
+        Ok(())
     }
 
     /// Compiles a parsed module.
diff --git a/lib/compiler/src/translator/middleware.rs b/lib/compiler/src/translator/middleware.rs
index 1c1672c84..51dc1fcd3 100644
--- a/lib/compiler/src/translator/middleware.rs
+++ b/lib/compiler/src/translator/middleware.rs
@@ -94,13 +94,15 @@ impl<'a> MiddlewareBinaryReader<'a> {
     }
 
     /// Read a `count` indicating the number of times to call `read_local_decl`.
-    pub fn read_local_count(&mut self) -> WpResult<usize> {
-        self.state.inner.read_local_count()
+    pub fn read_local_count(&mut self) -> WpResult<u32> {
+        self.state.inner.read_var_u32()
     }
 
     /// Read a `(count, value_type)` declaration of local variables of the same type.
-    pub fn read_local_decl(&mut self, locals_total: &mut usize) -> WpResult<(u32, Type)> {
-        self.state.inner.read_local_decl(locals_total)
+    pub fn read_local_decl(&mut self) -> WpResult<(u32, Type)> {
+        let count = self.state.inner.read_var_u32()?;
+        let ty = self.state.inner.read_type()?;
+        Ok((count, ty))
     }
 
     /// Reads the next available `Operator`.
diff --git a/lib/compiler/src/translator/module.rs b/lib/compiler/src/translator/module.rs
index c28f0d326..8855a7a5f 100644
--- a/lib/compiler/src/translator/module.rs
+++ b/lib/compiler/src/translator/module.rs
@@ -6,13 +6,13 @@
 use super::environ::ModuleEnvironment;
 use super::error::to_wasm_error;
 use super::sections::{
-    parse_code_section, parse_data_section, parse_element_section, parse_export_section,
-    parse_function_section, parse_global_section, parse_import_section, parse_memory_section,
-    parse_name_section, parse_start_section, parse_table_section, parse_type_section,
+    parse_data_section, parse_element_section, parse_export_section, parse_function_section,
+    parse_global_section, parse_import_section, parse_memory_section, parse_name_section,
+    parse_start_section, parse_table_section, parse_type_section,
 };
 use super::state::ModuleTranslationState;
 use crate::WasmResult;
-use wasmparser::{CustomSectionContent, ModuleReader, SectionContent};
+use wasmparser::{NameSectionReader, Parser, Payload};
 
 /// Translate a sequence of bytes forming a valid Wasm binary into a
 /// parsed ModuleInfo `ModuleTranslationState`.
@@ -20,75 +20,88 @@ pub fn translate_module<'data>(
     data: &'data [u8],
     environ: &mut ModuleEnvironment<'data>,
 ) -> WasmResult<ModuleTranslationState> {
-    let mut reader = ModuleReader::new(data).map_err(to_wasm_error)?;
     let mut module_translation_state = ModuleTranslationState::new();
 
-    while !reader.eof() {
-        let section = reader.read().map_err(to_wasm_error)?;
-        match section.content().map_err(to_wasm_error)? {
-            SectionContent::Type(types) => {
+    for payload in Parser::new(0).parse_all(data) {
+        match payload.map_err(to_wasm_error)? {
+            Payload::Version { .. } | Payload::End => {}
+
+            Payload::TypeSection(types) => {
                 parse_type_section(types, &mut module_translation_state, environ)?;
             }
 
-            SectionContent::Import(imports) => {
+            Payload::ImportSection(imports) => {
                 parse_import_section(imports, environ)?;
             }
 
-            SectionContent::Function(functions) => {
+            Payload::FunctionSection(functions) => {
                 parse_function_section(functions, environ)?;
             }
 
-            SectionContent::Table(tables) => {
+            Payload::TableSection(tables) => {
                 parse_table_section(tables, environ)?;
             }
 
-            SectionContent::Memory(memories) => {
+            Payload::MemorySection(memories) => {
                 parse_memory_section(memories, environ)?;
             }
 
-            SectionContent::Global(globals) => {
+            Payload::GlobalSection(globals) => {
                 parse_global_section(globals, environ)?;
             }
 
-            SectionContent::Export(exports) => {
+            Payload::ExportSection(exports) => {
                 parse_export_section(exports, environ)?;
             }
 
-            SectionContent::Start(start) => {
-                parse_start_section(start, environ)?;
+            Payload::StartSection { func, .. } => {
+                parse_start_section(func, environ)?;
             }
 
-            SectionContent::Element(elements) => {
+            Payload::ElementSection(elements) => {
                 parse_element_section(elements, environ)?;
             }
 
-            SectionContent::Code(code) => {
-                parse_code_section(code, &module_translation_state, environ)?;
+            Payload::CodeSectionStart { .. } => {}
+            Payload::CodeSectionEntry(code) => {
+                let mut code = code.get_binary_reader();
+                let size = code.bytes_remaining();
+                let offset = code.original_position();
+                environ.define_function_body(
+                    &module_translation_state,
+                    code.read_bytes(size).map_err(to_wasm_error)?,
+                    offset,
+                )?;
             }
 
-            SectionContent::Data(data) => {
+            Payload::DataSection(data) => {
                 parse_data_section(data, environ)?;
             }
 
-            SectionContent::DataCount(count) => {
+            Payload::DataCountSection { count, .. } => {
                 environ.reserve_passive_data(count)?;
             }
 
-            SectionContent::Custom {
-                name,
-                binary,
-                content,
-            } => match content {
-                Some(CustomSectionContent::Name(names)) => {
-                    parse_name_section(names, environ)?;
-                }
-                _ => {
-                    let mut reader = binary.clone();
-                    let len = reader.bytes_remaining();
-                    let payload = reader.read_bytes(len).map_err(to_wasm_error)?;
-                    environ.custom_section(name, payload)?;
-                }
-            },
+            Payload::ModuleSection(_)
+            | Payload::InstanceSection(_)
+            | Payload::AliasSection(_)
+            | Payload::ModuleCodeSectionStart { .. }
+            | Payload::ModuleCodeSectionEntry { .. } => {
+                unimplemented!("module linking not implemented yet")
+            }
+
+            Payload::CustomSection {
+                name: "name",
+                data,
+                data_offset,
+            } => parse_name_section(
+                NameSectionReader::new(data, data_offset).map_err(to_wasm_error)?,
+                environ,
+            )?,
+
+            Payload::CustomSection { name, data, .. } => environ.custom_section(name, data)?,
+
+            Payload::UnknownSection { .. } => unreachable!(),
         }
     }
 
diff --git a/lib/compiler/src/translator/sections.rs b/lib/compiler/src/translator/sections.rs
index a361c8b0c..00721d6a9 100644
--- a/lib/compiler/src/translator/sections.rs
+++ b/lib/compiler/src/translator/sections.rs
@@ -26,12 +26,11 @@ use wasmer_types::{
     MemoryIndex, MemoryType, Pages, SignatureIndex, TableIndex, TableType, Type, V128,
 };
 use wasmparser::{
-    self, CodeSectionReader, Data, DataKind, DataSectionReader, Element, ElementItem, ElementItems,
-    ElementKind, ElementSectionReader, Export, ExportSectionReader, ExternalKind,
-    FuncType as WPFunctionType, FunctionSectionReader, GlobalSectionReader,
-    GlobalType as WPGlobalType, ImportSectionEntryType, ImportSectionReader, MemorySectionReader,
-    MemoryType as WPMemoryType, NameSectionReader, Naming, NamingReader, Operator,
-    TableSectionReader, TypeSectionReader,
+    self, Data, DataKind, DataSectionReader, Element, ElementItem, ElementItems, ElementKind,
+    ElementSectionReader, Export, ExportSectionReader, ExternalKind, FuncType as WPFunctionType,
+    FunctionSectionReader, GlobalSectionReader, GlobalType as WPGlobalType, ImportSectionEntryType,
+    ImportSectionReader, MemorySectionReader, MemoryType as WPMemoryType, NameSectionReader,
+    Naming, NamingReader, Operator, TableSectionReader, TypeDef, TypeSectionReader,
 };
 
 /// Helper function translating wasmparser types to Wasm Type.
@@ -61,25 +60,29 @@ pub fn parse_type_section(
     environ.reserve_signatures(count)?;
 
     for entry in types {
-        let WPFunctionType { params, returns } = entry.map_err(to_wasm_error)?;
-        let sig_params: Vec<Type> = params
-            .iter()
-            .map(|ty| {
-                wptype_to_type(*ty)
-                    .expect("only numeric types are supported in function signatures")
-            })
-            .collect();
-        let sig_returns: Vec<Type> = returns
-            .iter()
-            .map(|ty| {
-                wptype_to_type(*ty)
-                    .expect("only numeric types are supported in function signatures")
-            })
-            .collect();
-        let sig = FunctionType::new(sig_params, sig_returns);
-        environ.declare_signature(sig)?;
-        module_translation_state.wasm_types.push((params, returns));
+        if let Ok(TypeDef::Func(WPFunctionType { params, returns })) = entry {
+            let sig_params: Vec<Type> = params
+                .iter()
+                .map(|ty| {
+                    wptype_to_type(*ty)
+                        .expect("only numeric types are supported in function signatures")
+                })
+                .collect();
+            let sig_returns: Vec<Type> = returns
+                .iter()
+                .map(|ty| {
+                    wptype_to_type(*ty)
+                        .expect("only numeric types are supported in function signatures")
+                })
+                .collect();
+            let sig = FunctionType::new(sig_params, sig_returns);
+            environ.declare_signature(sig)?;
+            module_translation_state.wasm_types.push((params, returns));
+        } else {
+            unimplemented!("module linking not implemented yet")
+        }
     }
+
     Ok(())
 }
 
@@ -100,10 +103,13 @@ pub fn parse_import_section<'data>(
                 environ.declare_func_import(
                     SignatureIndex::from_u32(sig),
                     module_name,
-                    field_name,
+                    field_name.unwrap_or_default(),
                 )?;
             }
-            ImportSectionEntryType::Memory(WPMemoryType {
+            ImportSectionEntryType::Module(_sig) | ImportSectionEntryType::Instance(_sig) => {
+                unimplemented!("module linking not implemented yet")
+            }
+            ImportSectionEntryType::Memory(WPMemoryType::M32 {
                 limits: ref memlimits,
                 shared,
             }) => {
@@ -114,9 +120,12 @@ pub fn parse_import_section<'data>(
                         shared,
                     },
                     module_name,
-                    field_name,
+                    field_name.unwrap_or_default(),
                 )?;
             }
+            ImportSectionEntryType::Memory(WPMemoryType::M64 { .. }) => {
+                unimplemented!("64bit memory not implemented yet")
+            }
             ImportSectionEntryType::Global(ref ty) => {
                 environ.declare_global_import(
                     GlobalType {
@@ -124,7 +133,7 @@ pub fn parse_import_section<'data>(
                         mutability: ty.mutable.into(),
                     },
                     module_name,
-                    field_name,
+                    field_name.unwrap_or_default(),
                 )?;
             }
             ImportSectionEntryType::Table(ref tab) => {
@@ -135,7 +144,7 @@ pub fn parse_import_section<'data>(
                         maximum: tab.limits.maximum,
                     },
                     module_name,
-                    field_name,
+                    field_name.unwrap_or_default(),
                 )?;
             }
         }
@@ -194,11 +203,16 @@ pub fn parse_memory_section(
 
     for entry in memories {
         let memory = entry.map_err(to_wasm_error)?;
-        environ.declare_memory(MemoryType {
-            minimum: Pages(memory.limits.initial),
-            maximum: memory.limits.maximum.map(Pages),
-            shared: memory.shared,
-        })?;
+        match memory {
+            WPMemoryType::M32 { limits, shared } => {
+                environ.declare_memory(MemoryType {
+                    minimum: Pages(limits.initial),
+                    maximum: limits.maximum.map(Pages),
+                    shared: shared,
+                })?;
+            }
+            WPMemoryType::M64 { .. } => unimplemented!("64bit memory not implemented yet"),
+        }
     }
 
     Ok(())
@@ -281,6 +295,9 @@ pub fn parse_export_section<'data>(
             ExternalKind::Global => {
                 environ.declare_global_export(GlobalIndex::new(index), field)?
             }
+            ExternalKind::Type | ExternalKind::Module | ExternalKind::Instance => {
+                unimplemented!("module linking not implemented yet")
+            }
         }
     }
 
@@ -359,25 +376,6 @@ pub fn parse_element_section<'data>(
     Ok(())
 }
 
-/// Parses the Code section of the wasm module.
-pub fn parse_code_section<'data>(
-    code: CodeSectionReader<'data>,
-    module_translation_state: &ModuleTranslationState,
-    environ: &mut ModuleEnvironment<'data>,
-) -> WasmResult<()> {
-    for body in code {
-        let mut reader = body.map_err(to_wasm_error)?.get_binary_reader();
-        let size = reader.bytes_remaining();
-        let offset = reader.original_position();
-        environ.define_function_body(
-            module_translation_state,
-            reader.read_bytes(size).map_err(to_wasm_error)?,
-            offset,
-        )?;
-    }
-    Ok(())
-}
-
 /// Parses the Data section of the wasm module.
 pub fn parse_data_section<'data>(
     data: DataSectionReader<'data>,
diff --git a/lib/compiler/src/trap.rs b/lib/compiler/src/trap.rs
index 6a0a997d1..058f7e21c 100644
--- a/lib/compiler/src/trap.rs
+++ b/lib/compiler/src/trap.rs
@@ -1,4 +1,3 @@
-use crate::sourceloc::SourceLoc;
 use crate::CodeOffset;
 #[cfg(feature = "enable-serde")]
 use serde::{Deserialize, Serialize};
@@ -10,8 +9,6 @@ use wasmer_vm::TrapCode;
 pub struct TrapInformation {
     /// The offset of the trapping instruction in native code. It is relative to the beginning of the function.
     pub code_offset: CodeOffset,
-    /// Location of trapping instruction in WebAssembly binary module.
-    pub source_loc: SourceLoc,
     /// Code of the trap.
     pub trap_code: TrapCode,
 }
diff --git a/lib/deprecated/runtime-core/Cargo.lock b/lib/deprecated/runtime-core/Cargo.lock
index 7fdc5e1a0..f92b54975 100644
--- a/lib/deprecated/runtime-core/Cargo.lock
+++ b/lib/deprecated/runtime-core/Cargo.lock
@@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
 dependencies = [
  "addr2line",
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "miniz_oxide",
  "object 0.20.0",
@@ -81,7 +81,7 @@ dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "constant_time_eq",
  "crypto-mac",
  "digest",
@@ -105,6 +105,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "cloudabi"
 version = "0.1.0"
@@ -192,7 +198,7 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -213,7 +219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 0.1.10",
  "crossbeam-utils",
  "lazy_static",
  "maybe-uninit",
@@ -227,7 +233,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "crossbeam-utils",
  "maybe-uninit",
 ]
@@ -239,7 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 0.1.10",
  "lazy_static",
 ]
 
@@ -379,7 +385,7 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "wasi",
 ]
@@ -481,11 +487,11 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -552,7 +558,7 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -668,7 +674,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "cloudabi",
  "instant",
  "libc",
@@ -1015,7 +1021,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "rand",
  "redox_syscall",
@@ -1058,7 +1064,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2e2a2de6b0d5cbb13fc21193a2296888eaab62b6044479aafb3c54c01c29fcd"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -1111,7 +1117,7 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 name = "wasmer"
 version = "1.0.0-alpha4"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "indexmap",
  "more-asserts",
  "target-lexicon",
@@ -1245,7 +1251,7 @@ name = "wasmer-engine-jit"
 version = "1.0.0-alpha4"
 dependencies = [
  "bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
  "region",
  "serde",
  "serde_bytes",
@@ -1261,7 +1267,7 @@ name = "wasmer-engine-native"
 version = "1.0.0-alpha4"
 dependencies = [
  "bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
  "leb128",
  "libloading",
  "serde",
@@ -1317,7 +1323,7 @@ version = "1.0.0-alpha4"
 dependencies = [
  "backtrace",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "indexmap",
  "libc",
  "memoffset",
diff --git a/lib/deprecated/runtime-core/Cargo.toml b/lib/deprecated/runtime-core/Cargo.toml
index 603e56a5b..12d26452c 100644
--- a/lib/deprecated/runtime-core/Cargo.toml
+++ b/lib/deprecated/runtime-core/Cargo.toml
@@ -14,16 +14,16 @@ edition = "2018"
 maintenance = { status = "deprecated" }
 
 [dependencies]
-wasmer-types = { path = "../../wasmer-types", version = "1.0.0-alpha4" }
-wasmer = { path = "../../api", version = "1.0.0-alpha4" }
-wasmer-cache = { path = "../../cache", version = "1.0.0-alpha4" }
-wasmer-compiler = { path = "../../compiler", version = "1.0.0-alpha4", features = ["translator"] }
-wasmer-compiler-llvm = { path = "../../compiler-llvm", version = "1.0.0-alpha4", optional = true }
-wasmer-compiler-cranelift = { path = "../../compiler-cranelift", version = "1.0.0-alpha4", optional = true }
-wasmer-compiler-singlepass = { path = "../../compiler-singlepass", version = "1.0.0-alpha4", optional = true }
-wasmer-engine = { path = "../../engine", version = "1.0.0-alpha4" }
-wasmer-engine-jit = { path = "../../engine-jit", version = "1.0.0-alpha4" }
-wasmer-vm = { path = "../../vm", version = "1.0.0-alpha4" }
+wasmer-types = { path = "../../wasmer-types", version = "1.0.0-alpha5" }
+wasmer = { path = "../../api", version = "1.0.0-alpha5" }
+wasmer-cache = { path = "../../cache", version = "1.0.0-alpha5" }
+wasmer-compiler = { path = "../../compiler", version = "1.0.0-alpha5", features = ["translator"] }
+wasmer-compiler-llvm = { path = "../../compiler-llvm", version = "1.0.0-alpha5", optional = true }
+wasmer-compiler-cranelift = { path = "../../compiler-cranelift", version = "1.0.0-alpha5", optional = true }
+wasmer-compiler-singlepass = { path = "../../compiler-singlepass", version = "1.0.0-alpha5", optional = true }
+wasmer-engine = { path = "../../engine", version = "1.0.0-alpha5" }
+wasmer-engine-jit = { path = "../../engine-jit", version = "1.0.0-alpha5" }
+wasmer-vm = { path = "../../vm", version = "1.0.0-alpha5" }
 lazy_static = "1.4"
 
 [build-dependencies]
diff --git a/lib/deprecated/runtime-core/src/module.rs b/lib/deprecated/runtime-core/src/module.rs
index ac9b606d1..7ef483dcb 100644
--- a/lib/deprecated/runtime-core/src/module.rs
+++ b/lib/deprecated/runtime-core/src/module.rs
@@ -102,14 +102,14 @@ impl Module {
                                 // Properly drop the empty `vm::Ctx`
                                 // created by the host function.
                                 unsafe {
-                                    ptr::drop_in_place::<vm::Ctx>(function.vmctx as _);
+                                    ptr::drop_in_place::<vm::Ctx>(function.vmctx.host_env as _);
                                 }
 
                                 // Update the pointer to `VMContext`,
                                 // which is actually a `vm::Ctx`
                                 // pointer, to fallback on the
                                 // environment hack.
-                                function.vmctx = pre_instance.vmctx_ptr() as _;
+                                function.vmctx.host_env = pre_instance.vmctx_ptr() as _;
                             }
                             // `function` is a dynamic host function
                             // constructed with
@@ -147,13 +147,13 @@ impl Module {
                                     new::wasmer_vm::VMDynamicFunctionContext<
                                         VMDynamicFunctionWithEnv<DynamicCtx>,
                                     >,
-                                > = unsafe { Box::from_raw(function.vmctx as *mut _) };
+                                > = unsafe { Box::from_raw(function.vmctx.host_env as *mut _) };
 
                                 // Replace the environment by ours.
                                 vmctx.ctx.env.borrow_mut().vmctx = pre_instance.vmctx();
 
                                 // … without anyone noticing…
-                                function.vmctx = Box::into_raw(vmctx) as _;
+                                function.vmctx.host_env = Box::into_raw(vmctx) as _;
                             }
                         }
 
diff --git a/lib/deprecated/runtime/Cargo.lock b/lib/deprecated/runtime/Cargo.lock
index 3cb70a562..e4cfe7113 100644
--- a/lib/deprecated/runtime/Cargo.lock
+++ b/lib/deprecated/runtime/Cargo.lock
@@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
 dependencies = [
  "addr2line",
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "miniz_oxide",
  "object 0.20.0",
@@ -81,7 +81,7 @@ dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "constant_time_eq",
  "crypto-mac",
  "digest",
@@ -105,6 +105,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "cloudabi"
 version = "0.1.0"
@@ -192,7 +198,7 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -213,7 +219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 0.1.10",
  "crossbeam-utils",
  "lazy_static",
  "maybe-uninit",
@@ -227,7 +233,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "crossbeam-utils",
  "maybe-uninit",
 ]
@@ -239,7 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 0.1.10",
  "lazy_static",
 ]
 
@@ -379,7 +385,7 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "wasi",
 ]
@@ -481,11 +487,11 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -552,7 +558,7 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -668,7 +674,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "cloudabi",
  "instant",
  "libc",
@@ -1015,7 +1021,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "rand",
  "redox_syscall",
@@ -1058,7 +1064,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2e2a2de6b0d5cbb13fc21193a2296888eaab62b6044479aafb3c54c01c29fcd"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -1111,7 +1117,7 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 name = "wasmer"
 version = "1.0.0-alpha4"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "indexmap",
  "more-asserts",
  "target-lexicon",
@@ -1234,7 +1240,7 @@ name = "wasmer-engine-jit"
 version = "1.0.0-alpha4"
 dependencies = [
  "bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
  "region",
  "serde",
  "serde_bytes",
@@ -1250,7 +1256,7 @@ name = "wasmer-engine-native"
 version = "1.0.0-alpha4"
 dependencies = [
  "bincode",
- "cfg-if",
+ "cfg-if 0.1.10",
  "leb128",
  "libloading",
  "serde",
@@ -1313,7 +1319,7 @@ version = "1.0.0-alpha4"
 dependencies = [
  "backtrace",
  "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
  "indexmap",
  "libc",
  "memoffset",
diff --git a/lib/emscripten/Cargo.toml b/lib/emscripten/Cargo.toml
index 1cb602d33..f6989a7bd 100644
--- a/lib/emscripten/Cargo.toml
+++ b/lib/emscripten/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-emscripten"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Emscripten implementation library for Wasmer WebAssembly runtime"
 categories = ["wasm", "os"]
 keywords = ["wasm", "webassembly", "abi", "emscripten", "posix"]
@@ -13,10 +13,10 @@ edition = "2018"
 [dependencies]
 byteorder = "1.3"
 lazy_static = "1.4"
-libc = "^0.2.69"
+libc = "^0.2"
 log = "0.4"
 time = "0.1"
-wasmer = { path = "../api", version = "1.0.0-alpha4", default-features = false }
+wasmer = { path = "../api", version = "1.0.0-alpha5", default-features = false }
 
 [target.'cfg(windows)'.dependencies]
-getrandom = "0.1"
+getrandom = "0.2"
diff --git a/lib/engine-jit/Cargo.toml b/lib/engine-jit/Cargo.toml
index 7c0726b6b..8637422a2 100644
--- a/lib/engine-jit/Cargo.toml
+++ b/lib/engine-jit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-engine-jit"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Wasmer JIT Engine"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "engine", "jit"]
@@ -11,10 +11,10 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4", features = ["translator"] }
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
-wasmer-engine = { path = "../engine", version = "1.0.0-alpha4" }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5" }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5", features = ["translator"] }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha5" }
+wasmer-engine = { path = "../engine", version = "1.0.0-alpha5" }
 # flexbuffers = { path = "../../../flatbuffers/rust/flexbuffers", version = "0.1.0" }
 region = "2.2"
 serde = { version = "1.0", features = ["derive", "rc"] }
diff --git a/lib/engine-jit/src/artifact.rs b/lib/engine-jit/src/artifact.rs
index f7bca8910..f79ab1c0f 100644
--- a/lib/engine-jit/src/artifact.rs
+++ b/lib/engine-jit/src/artifact.rs
@@ -11,7 +11,8 @@ use wasmer_compiler::{CompileError, Features, Triple};
 #[cfg(feature = "compiler")]
 use wasmer_compiler::{CompileModuleInfo, ModuleEnvironment};
 use wasmer_engine::{
-    register_frame_info, Artifact, DeserializeError, GlobalFrameInfoRegistration, SerializeError,
+    register_frame_info, Artifact, DeserializeError, FunctionExtent, GlobalFrameInfoRegistration,
+    SerializeError,
 };
 #[cfg(feature = "compiler")]
 use wasmer_engine::{Engine, SerializableFunctionFrameInfo, Tunables};
@@ -32,6 +33,7 @@ pub struct JITArtifact {
     finished_dynamic_function_trampolines: BoxedSlice<FunctionIndex, FunctionBodyPtr>,
     signatures: BoxedSlice<SignatureIndex, VMSharedSignatureIndex>,
     frame_info_registration: Mutex<Option<GlobalFrameInfoRegistration>>,
+    finished_function_lengths: BoxedSlice<LocalFunctionIndex, usize>,
 }
 
 impl JITArtifact {
@@ -203,7 +205,16 @@ impl JITArtifact {
 
         inner_jit.publish_eh_frame(eh_frame)?;
 
-        let finished_functions = finished_functions.into_boxed_slice();
+        let finished_function_lengths = finished_functions
+            .values()
+            .map(|extent| extent.length)
+            .collect::<PrimaryMap<LocalFunctionIndex, usize>>()
+            .into_boxed_slice();
+        let finished_functions = finished_functions
+            .values()
+            .map(|extent| extent.ptr)
+            .collect::<PrimaryMap<LocalFunctionIndex, FunctionBodyPtr>>()
+            .into_boxed_slice();
         let finished_function_call_trampolines =
             finished_function_call_trampolines.into_boxed_slice();
         let finished_dynamic_function_trampolines =
@@ -217,6 +228,7 @@ impl JITArtifact {
             finished_dynamic_function_trampolines,
             signatures,
             frame_info_registration: Mutex::new(None),
+            finished_function_lengths,
         })
     }
 
@@ -247,11 +259,19 @@ impl Artifact for JITArtifact {
             return;
         }
 
+        let finished_function_extents = self
+            .finished_functions
+            .values()
+            .copied()
+            .zip(self.finished_function_lengths.values().copied())
+            .map(|(ptr, length)| FunctionExtent { ptr, length })
+            .collect::<PrimaryMap<LocalFunctionIndex, _>>()
+            .into_boxed_slice();
+
         let frame_infos = &self.serializable.compilation.function_frame_info;
-        let finished_functions = &self.finished_functions;
         *info = register_frame_info(
             self.serializable.compile_info.module.clone(),
-            finished_functions,
+            &finished_function_extents,
             frame_infos.clone(),
         );
     }
@@ -280,7 +300,6 @@ impl Artifact for JITArtifact {
         &self.finished_function_call_trampolines
     }
 
-    // TODO: return *const instead of *mut
     fn finished_dynamic_function_trampolines(&self) -> &BoxedSlice<FunctionIndex, FunctionBodyPtr> {
         &self.finished_dynamic_function_trampolines
     }
diff --git a/lib/engine-jit/src/engine.rs b/lib/engine-jit/src/engine.rs
index 82624fec6..64c5f4f27 100644
--- a/lib/engine-jit/src/engine.rs
+++ b/lib/engine-jit/src/engine.rs
@@ -7,7 +7,7 @@ use wasmer_compiler::Compiler;
 use wasmer_compiler::{
     CompileError, CustomSection, CustomSectionProtection, FunctionBody, SectionIndex, Target,
 };
-use wasmer_engine::{Artifact, DeserializeError, Engine, EngineId, Tunables};
+use wasmer_engine::{Artifact, DeserializeError, Engine, EngineId, FunctionExtent, Tunables};
 use wasmer_types::entity::PrimaryMap;
 use wasmer_types::Features;
 use wasmer_types::{FunctionIndex, FunctionType, LocalFunctionIndex, SignatureIndex};
@@ -193,7 +193,7 @@ impl JITEngineInner {
         custom_sections: &PrimaryMap<SectionIndex, CustomSection>,
     ) -> Result<
         (
-            PrimaryMap<LocalFunctionIndex, FunctionBodyPtr>,
+            PrimaryMap<LocalFunctionIndex, FunctionExtent>,
             PrimaryMap<SignatureIndex, VMTrampoline>,
             PrimaryMap<FunctionIndex, FunctionBodyPtr>,
             PrimaryMap<SectionIndex, SectionBodyPtr>,
@@ -228,7 +228,10 @@ impl JITEngineInner {
 
         let allocated_functions_result = allocated_functions
             .drain(0..functions.len())
-            .map(|slice| FunctionBodyPtr(slice as *mut [_]))
+            .map(|slice| FunctionExtent {
+                ptr: FunctionBodyPtr(slice.as_ptr()),
+                length: slice.len(),
+            })
             .collect::<PrimaryMap<LocalFunctionIndex, _>>();
 
         let mut allocated_function_call_trampolines: PrimaryMap<SignatureIndex, VMTrampoline> =
@@ -244,7 +247,7 @@ impl JITEngineInner {
 
         let allocated_dynamic_function_trampolines = allocated_functions
             .drain(..)
-            .map(|slice| FunctionBodyPtr(slice as *mut [_]))
+            .map(|slice| FunctionBodyPtr(slice.as_ptr()))
             .collect::<PrimaryMap<FunctionIndex, _>>();
 
         let mut exec_iter = allocated_executable_sections.iter();
diff --git a/lib/engine-jit/src/link.rs b/lib/engine-jit/src/link.rs
index e9b47a7e7..fdd2b5691 100644
--- a/lib/engine-jit/src/link.rs
+++ b/lib/engine-jit/src/link.rs
@@ -5,23 +5,21 @@ use wasmer_compiler::{
     JumpTable, JumpTableOffsets, Relocation, RelocationKind, RelocationTarget, Relocations,
     SectionIndex,
 };
+use wasmer_engine::FunctionExtent;
 use wasmer_types::entity::{EntityRef, PrimaryMap};
 use wasmer_types::LocalFunctionIndex;
 use wasmer_vm::ModuleInfo;
-use wasmer_vm::{FunctionBodyPtr, SectionBodyPtr, VMFunctionBody};
+use wasmer_vm::SectionBodyPtr;
 
 fn apply_relocation(
     body: usize,
     r: &Relocation,
-    allocated_functions: &PrimaryMap<LocalFunctionIndex, FunctionBodyPtr>,
+    allocated_functions: &PrimaryMap<LocalFunctionIndex, FunctionExtent>,
     jt_offsets: &PrimaryMap<LocalFunctionIndex, JumpTableOffsets>,
     allocated_sections: &PrimaryMap<SectionIndex, SectionBodyPtr>,
 ) {
     let target_func_address: usize = match r.reloc_target {
-        RelocationTarget::LocalFunc(index) => {
-            let fatptr: *const [VMFunctionBody] = allocated_functions[index].0;
-            fatptr as *const VMFunctionBody as usize
-        }
+        RelocationTarget::LocalFunc(index) => *allocated_functions[index].ptr as usize,
         RelocationTarget::LibCall(libcall) => libcall.function_pointer(),
         RelocationTarget::CustomSection(custom_section) => {
             *allocated_sections[custom_section] as usize
@@ -31,8 +29,7 @@ fn apply_relocation(
                 .get(func_index)
                 .and_then(|ofs| ofs.get(JumpTable::new(jt.index())))
                 .expect("func jump table");
-            let fatptr: *const [VMFunctionBody] = allocated_functions[func_index].0;
-            fatptr as *const VMFunctionBody as usize + offset as usize
+            *allocated_functions[func_index].ptr as usize + offset as usize
         }
     };
 
@@ -69,7 +66,7 @@ fn apply_relocation(
 /// required relocations and jump tables.
 pub fn link_module(
     _module: &ModuleInfo,
-    allocated_functions: &PrimaryMap<LocalFunctionIndex, FunctionBodyPtr>,
+    allocated_functions: &PrimaryMap<LocalFunctionIndex, FunctionExtent>,
     jt_offsets: &PrimaryMap<LocalFunctionIndex, JumpTableOffsets>,
     function_relocations: Relocations,
     allocated_sections: &PrimaryMap<SectionIndex, SectionBodyPtr>,
@@ -81,9 +78,8 @@ pub fn link_module(
             apply_relocation(body, r, allocated_functions, jt_offsets, allocated_sections);
         }
     }
-    for (i, function_relocs) in function_relocations.into_iter() {
-        let fatptr: *const [VMFunctionBody] = allocated_functions[i].0;
-        let body = fatptr as *const VMFunctionBody as usize;
+    for (i, function_relocs) in function_relocations.iter() {
+        let body = *allocated_functions[i].ptr as usize;
         for r in function_relocs {
             apply_relocation(body, r, allocated_functions, jt_offsets, allocated_sections);
         }
diff --git a/lib/engine-native/Cargo.toml b/lib/engine-native/Cargo.toml
index 1ee178f85..9840dcdd4 100644
--- a/lib/engine-native/Cargo.toml
+++ b/lib/engine-native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-engine-native"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Wasmer Native Engine"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "engine", "native"]
@@ -11,11 +11,11 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4" }
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
-wasmer-engine = { path = "../engine", version = "1.0.0-alpha4" }
-wasmer-object = { path = "../object", version = "1.0.0-alpha4" }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5" }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5" }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha5" }
+wasmer-engine = { path = "../engine", version = "1.0.0-alpha5" }
+wasmer-object = { path = "../object", version = "1.0.0-alpha5" }
 serde = { version = "1.0", features = ["derive", "rc"] }
 cfg-if = "0.1"
 tracing = "0.1"
diff --git a/lib/engine-native/src/artifact.rs b/lib/engine-native/src/artifact.rs
index 54e4fb5d6..809713474 100644
--- a/lib/engine-native/src/artifact.rs
+++ b/lib/engine-native/src/artifact.rs
@@ -347,7 +347,7 @@ impl NativeArtifact {
     ) -> Result<Self, CompileError> {
         let mut finished_functions: PrimaryMap<LocalFunctionIndex, FunctionBodyPtr> =
             PrimaryMap::new();
-        for (function_local_index, function_len) in metadata.function_body_lengths.iter() {
+        for (function_local_index, _function_len) in metadata.function_body_lengths.iter() {
             let function_name =
                 metadata.symbol_to_name(Symbol::LocalFunction(function_local_index));
             unsafe {
@@ -356,14 +356,9 @@ impl NativeArtifact {
                 let func: LibrarySymbol<unsafe extern "C" fn()> = lib
                     .get(function_name.as_bytes())
                     .map_err(to_compile_error)?;
-                let raw = *func.into_raw();
-                // The function pointer is a fat pointer, however this information
-                // is only used when retrieving the trap information which is not yet
-                // implemented in this engine.
-                let func_pointer =
-                    std::slice::from_raw_parts(raw as *const (), *function_len as usize);
-                let func_pointer = func_pointer as *const [()] as *mut [VMFunctionBody];
-                finished_functions.push(FunctionBodyPtr(func_pointer));
+                finished_functions.push(FunctionBodyPtr(
+                    func.into_raw().into_raw() as *const VMFunctionBody
+                ));
             }
         }
 
@@ -397,11 +392,9 @@ impl NativeArtifact {
                 let trampoline: LibrarySymbol<unsafe extern "C" fn()> = lib
                     .get(function_name.as_bytes())
                     .map_err(to_compile_error)?;
-                let raw = *trampoline.into_raw();
-                let trampoline_pointer = std::slice::from_raw_parts(raw as *const (), 0);
-                let trampoline_pointer =
-                    trampoline_pointer as *const [()] as *mut [VMFunctionBody];
-                finished_dynamic_function_trampolines.push(FunctionBodyPtr(trampoline_pointer));
+                finished_dynamic_function_trampolines.push(FunctionBodyPtr(
+                    trampoline.into_raw().into_raw() as *const VMFunctionBody,
+                ));
             }
         }
 
diff --git a/lib/engine-object-file/Cargo.toml b/lib/engine-object-file/Cargo.toml
index e1e414903..d41edbb99 100644
--- a/lib/engine-object-file/Cargo.toml
+++ b/lib/engine-object-file/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-engine-object-file"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
 description = "Wasmer Object File Engine"
 categories = ["wasm"]
@@ -11,11 +11,11 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4" }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5" }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5" }
 wasmer-vm = { path = "../vm", version = "1.0.0-alpha01.0" }
-wasmer-engine = { path = "../engine", version = "1.0.0-alpha4" }
-wasmer-object = { path = "../object", version = "1.0.0-alpha4" }
+wasmer-engine = { path = "../engine", version = "1.0.0-alpha5" }
+wasmer-object = { path = "../object", version = "1.0.0-alpha5" }
 serde = { version = "1.0", features = ["derive", "rc"] }
 cfg-if = "0.1"
 tracing = "0.1"
diff --git a/lib/engine-object-file/src/artifact.rs b/lib/engine-object-file/src/artifact.rs
index 18ca4d129..42b95c09c 100644
--- a/lib/engine-object-file/src/artifact.rs
+++ b/lib/engine-object-file/src/artifact.rs
@@ -306,12 +306,6 @@ impl ObjectFileArtifact {
         let num_finished_functions = usize::from_ne_bytes(byte_buffer);
         let mut finished_functions = PrimaryMap::new();
 
-        #[repr(C)]
-        struct SlicePtr {
-            ptr: usize,
-            len: usize,
-        }
-
         let engine_inner = engine.inner();
         let signature_registry = engine_inner.signatures();
         let mut sig_map: BTreeMap<SignatureIndex, VMSharedSignatureIndex> = BTreeMap::new();
@@ -323,14 +317,13 @@ impl ObjectFileArtifact {
             let vm_shared_idx = signature_registry.register(&func_type);
             sig_map.insert(sig_idx, vm_shared_idx);
 
-            let mut sp = SlicePtr { ptr: 0, len: 0 };
             byte_buffer[0..WORD_SIZE]
                 .clone_from_slice(&bytes[cur_offset..(cur_offset + WORD_SIZE)]);
-            sp.ptr = usize::from_ne_bytes(byte_buffer);
+            let fp = FunctionBodyPtr(usize::from_ne_bytes(byte_buffer) as _);
             cur_offset += WORD_SIZE;
-            // TODO: we can read  back the length here if we serialize it. This will improve debug output.
 
-            let fp = FunctionBodyPtr(mem::transmute(sp));
+            // TODO: we can read back the length here if we serialize it. This will improve debug output.
+
             finished_functions.push(fp);
         }
 
@@ -364,14 +357,12 @@ impl ObjectFileArtifact {
         cur_offset += WORD_SIZE;
         let num_dynamic_trampoline_functions = usize::from_ne_bytes(byte_buffer);
         for _i in 0..num_dynamic_trampoline_functions {
-            let mut sp = SlicePtr { ptr: 0, len: 0 };
             byte_buffer[0..WORD_SIZE]
                 .clone_from_slice(&bytes[cur_offset..(cur_offset + WORD_SIZE)]);
-            sp.ptr = usize::from_ne_bytes(byte_buffer);
+            let fp = FunctionBodyPtr(usize::from_ne_bytes(byte_buffer) as _);
             cur_offset += WORD_SIZE;
 
-            // TODO: we can read  back the length here if we serialize it. This will improve debug output.
-            let fp = FunctionBodyPtr(mem::transmute(sp));
+            // TODO: we can read back the length here if we serialize it. This will improve debug output.
 
             finished_dynamic_function_trampolines.push(fp);
         }
diff --git a/lib/engine/Cargo.toml b/lib/engine/Cargo.toml
index 87c611ad5..e48f48e92 100644
--- a/lib/engine/Cargo.toml
+++ b/lib/engine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-engine"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Wasmer Engine abstraction"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "engine"]
@@ -11,10 +11,10 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4" }
-wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
-target-lexicon = { version = "0.10", default-features = false }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5" }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5" }
+wasmer-vm = { path = "../vm", version = "1.0.0-alpha5" }
+target-lexicon = { version = "0.11", default-features = false }
 # flexbuffers = { path = "../../../flatbuffers/rust/flexbuffers", version = "0.1.0" }
 backtrace = "0.3"
 rustc-demangle = "0.1"
diff --git a/lib/engine/src/resolver.rs b/lib/engine/src/resolver.rs
index 11cdf2c45..cdb657412 100644
--- a/lib/engine/src/resolver.rs
+++ b/lib/engine/src/resolver.rs
@@ -170,7 +170,7 @@ pub fn resolve_imports(
                 };
                 function_imports.push(VMFunctionImport {
                     body: address,
-                    vmctx: f.vmctx,
+                    environment: f.vmctx,
                 });
 
                 host_function_env_initializers.push(f.function_ptr);
diff --git a/lib/engine/src/trap/frame_info.rs b/lib/engine/src/trap/frame_info.rs
index 464131f19..9d5585a03 100644
--- a/lib/engine/src/trap/frame_info.rs
+++ b/lib/engine/src/trap/frame_info.rs
@@ -219,6 +219,18 @@ impl Drop for GlobalFrameInfoRegistration {
     }
 }
 
+/// Represents a continuous region of executable memory starting with a function
+/// entry point.
+#[derive(Debug)]
+#[repr(C)]
+pub struct FunctionExtent {
+    /// Entry point for normal entry of the function. All addresses in the
+    /// function lie after this address.
+    pub ptr: FunctionBodyPtr,
+    /// Length in bytes.
+    pub length: usize,
+}
+
 /// Registers a new compiled module's frame information.
 ///
 /// This function will register the `names` information for all of the
@@ -227,18 +239,22 @@ impl Drop for GlobalFrameInfoRegistration {
 /// dropped, will be used to unregister all name information from this map.
 pub fn register(
     module: Arc<ModuleInfo>,
-    finished_functions: &BoxedSlice<LocalFunctionIndex, FunctionBodyPtr>,
+    finished_functions: &BoxedSlice<LocalFunctionIndex, FunctionExtent>,
     frame_infos: PrimaryMap<LocalFunctionIndex, SerializableFunctionFrameInfo>,
 ) -> Option<GlobalFrameInfoRegistration> {
     let mut min = usize::max_value();
     let mut max = 0;
     let mut functions = BTreeMap::new();
-    for (i, allocated) in finished_functions.iter() {
-        let (start, end) = unsafe {
-            let ptr = (***allocated).as_ptr();
-            let len = (***allocated).len();
-            (ptr as usize, ptr as usize + len)
-        };
+    for (
+        i,
+        FunctionExtent {
+            ptr: start,
+            length: len,
+        },
+    ) in finished_functions.iter()
+    {
+        let start = **start as usize;
+        let end = start + len;
         min = cmp::min(min, start);
         max = cmp::max(max, end);
         let func = FunctionInfo {
diff --git a/lib/engine/src/trap/mod.rs b/lib/engine/src/trap/mod.rs
index d32440a88..d1eac6b42 100644
--- a/lib/engine/src/trap/mod.rs
+++ b/lib/engine/src/trap/mod.rs
@@ -2,5 +2,6 @@ mod error;
 mod frame_info;
 pub use error::RuntimeError;
 pub use frame_info::{
-    register as register_frame_info, FrameInfo, GlobalFrameInfoRegistration, FRAME_INFO,
+    register as register_frame_info, FrameInfo, FunctionExtent, GlobalFrameInfoRegistration,
+    FRAME_INFO,
 };
diff --git a/lib/object/Cargo.toml b/lib/object/Cargo.toml
index 0e41bd522..67795fcc2 100644
--- a/lib/object/Cargo.toml
+++ b/lib/object/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-object"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Wasmer Native Object generator"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly"]
@@ -11,10 +11,10 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
-wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4", default-features = false, features = [
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5" }
+wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha5", default-features = false, features = [
     "std",
     "translator"
 ] }
-object = { version = "0.19", default-features = false, features = ["write"] }
+object = { version = "0.21", default-features = false, features = ["write"] }
 thiserror = "1.0"
diff --git a/lib/vm/Cargo.toml b/lib/vm/Cargo.toml
index 30dc929c4..c00667b16 100644
--- a/lib/vm/Cargo.toml
+++ b/lib/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-vm"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Runtime library support for Wasmer"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly"]
@@ -11,9 +11,9 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4" }
+wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha5" }
 region = "2.2"
-libc = { version = "^0.2.69", default-features = false }
+libc = { version = "^0.2", default-features = false }
 memoffset = "0.5"
 indexmap = { version = "1.4", features = ["serde-1"] }
 thiserror = "1.0"
diff --git a/lib/vm/src/export.rs b/lib/vm/src/export.rs
index 09800bf41..d12ab6579 100644
--- a/lib/vm/src/export.rs
+++ b/lib/vm/src/export.rs
@@ -4,7 +4,7 @@
 use crate::global::Global;
 use crate::memory::{Memory, MemoryStyle};
 use crate::table::{Table, TableStyle};
-use crate::vmcontext::{VMContext, VMFunctionBody, VMFunctionKind, VMTrampoline};
+use crate::vmcontext::{VMFunctionBody, VMFunctionEnvironment, VMFunctionKind, VMTrampoline};
 use std::sync::Arc;
 use wasmer_types::{FunctionType, MemoryType, TableType};
 
@@ -30,7 +30,7 @@ pub struct ExportFunction {
     /// The address of the native-code function.
     pub address: *const VMFunctionBody,
     /// Pointer to the containing `VMContext`.
-    pub vmctx: *mut VMContext,
+    pub vmctx: VMFunctionEnvironment,
     /// Function pointer to `WasmerEnv::finish(&mut self, instance: &Instance)`.
     ///
     /// This function is called to finish setting up the environment after
@@ -43,18 +43,19 @@ pub struct ExportFunction {
     >,
     /// The function type, used for compatibility checking.
     pub signature: FunctionType,
-    /// The function kind (it defines how it's the signature that provided `address` have)
+    /// The function kind (specifies the calling convention for the function).
     pub kind: VMFunctionKind,
     /// Address of the function call trampoline owned by the same VMContext that owns the VMFunctionBody.
-    /// May be None when the function is an host-function (FunctionType == Dynamic or vmctx == nullptr).
+    /// May be None when the function is a host-function (FunctionType == Dynamic or vmctx == nullptr).
     pub call_trampoline: Option<VMTrampoline>,
 }
 
 /// # Safety
-/// TODO:
+/// There is no non-threadsafe logic directly in this type. Calling the function
+/// may not be threadsafe.
 unsafe impl Send for ExportFunction {}
 /// # Safety
-/// TODO:
+/// The members of an ExportFunction are immutable after construction.
 unsafe impl Sync for ExportFunction {}
 
 impl From<ExportFunction> for Export {
diff --git a/lib/vm/src/global.rs b/lib/vm/src/global.rs
index d1ff6937f..bdf65af63 100644
--- a/lib/vm/src/global.rs
+++ b/lib/vm/src/global.rs
@@ -6,10 +6,10 @@ use thiserror::Error;
 use wasmer_types::{GlobalType, Mutability, Type, Value};
 
 #[derive(Debug)]
-/// TODO: figure out a decent name for this thing
+/// A Global instance
 pub struct Global {
     ty: GlobalType,
-    // this box may be unnecessary
+    // TODO: this box may be unnecessary
     vm_global_definition: Box<UnsafeCell<VMGlobalDefinition>>,
     // used to synchronize gets/sets
     lock: Mutex<()>,
@@ -69,11 +69,11 @@ impl Global {
         unsafe {
             let definition = &*self.vm_global_definition.get();
             match self.ty().ty {
-                Type::I32 => Value::I32(*definition.as_i32()),
-                Type::I64 => Value::I64(*definition.as_i64()),
-                Type::F32 => Value::F32(*definition.as_f32()),
-                Type::F64 => Value::F64(*definition.as_f64()),
-                Type::V128 => Value::V128(*definition.as_u128()),
+                Type::I32 => Value::I32(definition.to_i32()),
+                Type::I64 => Value::I64(definition.to_i64()),
+                Type::F32 => Value::F32(definition.to_f32()),
+                Type::F64 => Value::F64(definition.to_f64()),
+                Type::V128 => Value::V128(definition.to_u128()),
                 _ => unimplemented!("Global::get for {:?}", self.ty),
             }
         }
@@ -111,7 +111,7 @@ impl Global {
             Value::I64(i) => *definition.as_i64_mut() = i,
             Value::F32(f) => *definition.as_f32_mut() = f,
             Value::F64(f) => *definition.as_f64_mut() = f,
-            Value::V128(x) => *definition.as_u128_bits_mut() = x.to_ne_bytes(),
+            Value::V128(x) => *definition.as_bytes_mut() = x.to_ne_bytes(),
             _ => unimplemented!("Global::set for {:?}", val.ty()),
         }
         Ok(())
diff --git a/lib/vm/src/instance.rs b/lib/vm/src/instance.rs
index 3326741d0..28b55f9f0 100644
--- a/lib/vm/src/instance.rs
+++ b/lib/vm/src/instance.rs
@@ -11,9 +11,10 @@ use crate::memory::{Memory, MemoryError};
 use crate::table::Table;
 use crate::trap::{catch_traps, init_traps, Trap, TrapCode};
 use crate::vmcontext::{
-    VMBuiltinFunctionsArray, VMCallerCheckedAnyfunc, VMContext, VMFunctionBody, VMFunctionImport,
-    VMFunctionKind, VMGlobalDefinition, VMGlobalImport, VMMemoryDefinition, VMMemoryImport,
-    VMSharedSignatureIndex, VMTableDefinition, VMTableImport, VMTrampoline,
+    VMBuiltinFunctionsArray, VMCallerCheckedAnyfunc, VMContext, VMFunctionBody,
+    VMFunctionEnvironment, VMFunctionImport, VMFunctionKind, VMGlobalDefinition, VMGlobalImport,
+    VMMemoryDefinition, VMMemoryImport, VMSharedSignatureIndex, VMTableDefinition, VMTableImport,
+    VMTrampoline,
 };
 use crate::{ExportFunction, ExportGlobal, ExportMemory, ExportTable};
 use crate::{FunctionBodyPtr, ModuleInfo, VMOffsets};
@@ -323,6 +324,9 @@ impl Instance {
                     if let Some(def_index) = self.module.local_func_index(*index) {
                         (
                             self.functions[def_index].0 as *const _,
+                            VMFunctionEnvironment {
+                                vmctx: self.vmctx_ptr(),
+                            },
                             self.vmctx_ptr(),
                             None,
                         )
@@ -408,19 +412,24 @@ impl Instance {
                     .get(local_index)
                     .expect("function index is out of bounds")
                     .0;
-                (body as *const _, self.vmctx_ptr())
+                (
+                    body as *const _,
+                    VMFunctionEnvironment {
+                        vmctx: self.vmctx_ptr(),
+                    },
+                )
             }
             None => {
                 assert_lt!(start_index.index(), self.module.num_imported_functions);
                 let import = self.imported_function(start_index);
-                (import.body, import.vmctx)
+                (import.body, import.environment)
             }
         };
 
         // Make the call.
         unsafe {
-            catch_traps(callee_extra_data, || {
-                mem::transmute::<*const VMFunctionBody, unsafe extern "C" fn(*mut VMContext)>(
+            catch_traps(callee_vmctx, || {
+                mem::transmute::<*const VMFunctionBody, unsafe extern "C" fn(VMFunctionEnvironment)>(
                     callee_address,
                 )(callee_extra_data)
             })
@@ -582,10 +591,15 @@ impl Instance {
         let type_index = self.signature_id(sig);
 
         let (func_ptr, vmctx) = if let Some(def_index) = self.module.local_func_index(index) {
-            (self.functions[def_index].0 as *const _, self.vmctx_ptr())
+            (
+                self.functions[def_index].0 as *const _,
+                VMFunctionEnvironment {
+                    vmctx: self.vmctx_ptr(),
+                },
+            )
         } else {
             let import = self.imported_function(index);
-            (import.body, import.vmctx)
+            (import.body, import.environment)
         };
         VMCallerCheckedAnyfunc {
             func_ptr,
@@ -1229,9 +1243,9 @@ fn get_memory_init_start(init: &DataInitializer<'_>, instance: &Instance) -> usi
     if let Some(base) = init.location.base {
         let val = unsafe {
             if let Some(def_index) = instance.module.local_global_index(base) {
-                *instance.global(def_index).as_u32()
+                instance.global(def_index).to_u32()
             } else {
-                *instance.imported_global(base).definition.as_ref().as_u32()
+                instance.imported_global(base).definition.as_ref().to_u32()
             }
         };
         start += usize::try_from(val).unwrap();
@@ -1282,9 +1296,9 @@ fn get_table_init_start(init: &TableInitializer, instance: &Instance) -> usize {
     if let Some(base) = init.base {
         let val = unsafe {
             if let Some(def_index) = instance.module.local_global_index(base) {
-                *instance.global(def_index).as_u32()
+                instance.global(def_index).to_u32()
             } else {
-                *instance.imported_global(base).definition.as_ref().as_u32()
+                instance.imported_global(base).definition.as_ref().to_u32()
             }
         };
         start += usize::try_from(val).unwrap();
@@ -1383,7 +1397,7 @@ fn initialize_globals(instance: &Instance) {
                 GlobalInit::I64Const(x) => *(*to).as_i64_mut() = *x,
                 GlobalInit::F32Const(x) => *(*to).as_f32_mut() = *x,
                 GlobalInit::F64Const(x) => *(*to).as_f64_mut() = *x,
-                GlobalInit::V128Const(x) => *(*to).as_u128_bits_mut() = *x.bytes(),
+                GlobalInit::V128Const(x) => *(*to).as_bytes_mut() = *x.bytes(),
                 GlobalInit::GetGlobal(x) => {
                     let from: VMGlobalDefinition =
                         if let Some(def_x) = module.local_global_index(*x) {
diff --git a/lib/vm/src/lib.rs b/lib/vm/src/lib.rs
index f8e649f59..6a1af9f9a 100644
--- a/lib/vm/src/lib.rs
+++ b/lib/vm/src/lib.rs
@@ -49,22 +49,22 @@ pub use crate::table::{LinearTable, Table, TableStyle};
 pub use crate::trap::*;
 pub use crate::vmcontext::{
     VMBuiltinFunctionIndex, VMCallerCheckedAnyfunc, VMContext, VMDynamicFunctionContext,
-    VMFunctionBody, VMFunctionImport, VMFunctionKind, VMGlobalDefinition, VMGlobalImport,
-    VMMemoryDefinition, VMMemoryImport, VMSharedSignatureIndex, VMTableDefinition, VMTableImport,
-    VMTrampoline,
+    VMFunctionBody, VMFunctionEnvironment, VMFunctionImport, VMFunctionKind, VMGlobalDefinition,
+    VMGlobalImport, VMMemoryDefinition, VMMemoryImport, VMSharedSignatureIndex, VMTableDefinition,
+    VMTableImport, VMTrampoline,
 };
 pub use crate::vmoffsets::{TargetSharedSignatureIndex, VMOffsets};
 
 /// Version number of this crate.
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-/// A safe wrapper around `VMFunctionBody`
+/// A safe wrapper around `VMFunctionBody`.
 #[derive(Clone, Copy, Debug)]
 #[repr(transparent)]
-pub struct FunctionBodyPtr(pub *mut [VMFunctionBody]);
+pub struct FunctionBodyPtr(pub *const VMFunctionBody);
 
 impl std::ops::Deref for FunctionBodyPtr {
-    type Target = *mut [VMFunctionBody];
+    type Target = *const VMFunctionBody;
 
     fn deref(&self) -> &Self::Target {
         &self.0
@@ -72,10 +72,12 @@ impl std::ops::Deref for FunctionBodyPtr {
 }
 
 /// # Safety
-/// TODO:
+/// The VMFunctionBody that this points to is opaque, so there's no data to
+/// read or write through this pointer. This is essentially a usize.
 unsafe impl Send for FunctionBodyPtr {}
 /// # Safety
-/// TODO:
+/// The VMFunctionBody that this points to is opaque, so there's no data to
+/// read or write through this pointer. This is essentially a usize.
 unsafe impl Sync for FunctionBodyPtr {}
 
 /// Pointers to section data.
diff --git a/lib/vm/src/libcalls.rs b/lib/vm/src/libcalls.rs
index 986744d3c..5267d35a6 100644
--- a/lib/vm/src/libcalls.rs
+++ b/lib/vm/src/libcalls.rs
@@ -385,7 +385,8 @@ pub unsafe extern "C" fn wasmer_data_drop(vmctx: *mut VMContext, data_index: u32
 ///
 /// # Safety
 ///
-/// To be defined (TODO)
+/// Only safe to call when wasm code is on the stack, aka `wasmer_call` or
+/// `wasmer_call_trampoline` must have been previously called.
 #[no_mangle]
 pub unsafe extern "C" fn wasmer_raise_trap(trap_code: TrapCode) -> ! {
     let trap = Trap::new_from_runtime(trap_code);
diff --git a/lib/vm/src/trap/trapcode.rs b/lib/vm/src/trap/trapcode.rs
index 465bf8cec..32121fbd0 100644
--- a/lib/vm/src/trap/trapcode.rs
+++ b/lib/vm/src/trap/trapcode.rs
@@ -32,44 +32,47 @@ pub enum TrapCode {
     /// offset-guard pages.
     HeapAccessOutOfBounds = 2,
 
+    /// A `heap_addr` instruction was misaligned.
+    HeapMisaligned = 3,
+
     /// Table Elements doesn't fit the table size.
     ///
     /// This only can happen during instantiation.
-    TableSetterOutOfBounds = 3,
+    TableSetterOutOfBounds = 4,
 
     /// A `table_addr` instruction detected an out-of-bounds error.
-    TableAccessOutOfBounds = 4,
+    TableAccessOutOfBounds = 5,
 
     /// Other bounds checking error.
-    OutOfBounds = 5,
+    OutOfBounds = 6,
 
     /// Indirect call to a null table entry.
-    IndirectCallToNull = 6,
+    IndirectCallToNull = 7,
 
     /// Signature mismatch on indirect call.
-    BadSignature = 7,
+    BadSignature = 8,
 
     /// An integer arithmetic operation caused an overflow.
-    IntegerOverflow = 8,
+    IntegerOverflow = 9,
 
     /// An integer division by zero.
-    IntegerDivisionByZero = 9,
+    IntegerDivisionByZero = 10,
 
     /// Failed float-to-int conversion.
-    BadConversionToInteger = 10,
+    BadConversionToInteger = 11,
 
     /// Code that was supposed to have been unreachable was reached.
-    UnreachableCodeReached = 11,
+    UnreachableCodeReached = 12,
 
     /// Execution has potentially run too long and may be interrupted.
     /// This trap is resumable.
-    Interrupt = 12,
+    Interrupt = 13,
 
     /// An atomic memory access was attempted with an unaligned pointer.
-    UnalignedAtomic = 13,
+    UnalignedAtomic = 14,
 
     /// A trap indicating that the runtime was unable to allocate sufficient memory.
-    VMOutOfMemory = 14,
+    VMOutOfMemory = 15,
     // /// A user-defined trap code.
     // User(u16),
 }
@@ -81,6 +84,7 @@ impl TrapCode {
             Self::StackOverflow => "call stack exhausted",
             Self::HeapSetterOutOfBounds => "memory out of bounds: data segment does not fit",
             Self::HeapAccessOutOfBounds => "out of bounds memory access",
+            Self::HeapMisaligned => "misaligned heap",
             Self::TableSetterOutOfBounds => "table out of bounds: elements segment does not fit",
             Self::TableAccessOutOfBounds => "undefined element: out of bounds table access",
             Self::OutOfBounds => "out of bounds",
@@ -104,6 +108,7 @@ impl Display for TrapCode {
             Self::StackOverflow => "stk_ovf",
             Self::HeapSetterOutOfBounds => "heap_set_oob",
             Self::HeapAccessOutOfBounds => "heap_get_oob",
+            Self::HeapMisaligned => "heap_misaligned",
             Self::TableSetterOutOfBounds => "table_set_oob",
             Self::TableAccessOutOfBounds => "table_get_oob",
             Self::OutOfBounds => "oob",
@@ -131,6 +136,7 @@ impl FromStr for TrapCode {
             "stk_ovf" => Ok(StackOverflow),
             "heap_set_oob" => Ok(HeapSetterOutOfBounds),
             "heap_get_oob" => Ok(HeapAccessOutOfBounds),
+            "heap_misaligned" => Ok(HeapMisaligned),
             "table_set_oob" => Ok(TableSetterOutOfBounds),
             "table_get_oob" => Ok(TableAccessOutOfBounds),
             "oob" => Ok(OutOfBounds),
@@ -154,10 +160,11 @@ mod tests {
     use super::*;
 
     // Everything but user-defined codes.
-    const CODES: [TrapCode; 14] = [
+    const CODES: [TrapCode; 15] = [
         TrapCode::StackOverflow,
         TrapCode::HeapSetterOutOfBounds,
         TrapCode::HeapAccessOutOfBounds,
+        TrapCode::HeapMisaligned,
         TrapCode::TableSetterOutOfBounds,
         TrapCode::TableAccessOutOfBounds,
         TrapCode::OutOfBounds,
diff --git a/lib/vm/src/trap/traphandlers.rs b/lib/vm/src/trap/traphandlers.rs
index 613e8ec10..452e6ed61 100644
--- a/lib/vm/src/trap/traphandlers.rs
+++ b/lib/vm/src/trap/traphandlers.rs
@@ -6,7 +6,7 @@
 
 use super::trapcode::TrapCode;
 use crate::instance::{InstanceHandle, SignalHandler};
-use crate::vmcontext::{VMContext, VMFunctionBody, VMTrampoline};
+use crate::vmcontext::{VMFunctionBody, VMFunctionEnvironment, VMTrampoline};
 use backtrace::Backtrace;
 use std::any::Any;
 use std::cell::Cell;
@@ -429,13 +429,13 @@ impl Trap {
 /// Wildly unsafe because it calls raw function pointers and reads/writes raw
 /// function pointers.
 pub unsafe fn wasmer_call_trampoline(
-    vmctx: *mut VMContext,
+    vmctx: VMFunctionEnvironment,
     trampoline: VMTrampoline,
     callee: *const VMFunctionBody,
     values_vec: *mut u8,
 ) -> Result<(), Trap> {
     catch_traps(vmctx, || {
-        mem::transmute::<_, extern "C" fn(*mut VMContext, *const VMFunctionBody, *mut u8)>(
+        mem::transmute::<_, extern "C" fn(VMFunctionEnvironment, *const VMFunctionBody, *mut u8)>(
             trampoline,
         )(vmctx, callee, values_vec)
     })
@@ -447,7 +447,7 @@ pub unsafe fn wasmer_call_trampoline(
 /// # Safety
 ///
 /// Highly unsafe since `closure` won't have any destructors run.
-pub unsafe fn catch_traps<F>(vmctx: *mut VMContext, mut closure: F) -> Result<(), Trap>
+pub unsafe fn catch_traps<F>(vmctx: VMFunctionEnvironment, mut closure: F) -> Result<(), Trap>
 where
     F: FnMut(),
 {
@@ -481,7 +481,7 @@ where
 ///
 /// Check [`catch_traps`].
 pub unsafe fn catch_traps_with_result<F, R>(
-    vmctx: *mut VMContext,
+    vmctx: VMFunctionEnvironment,
     mut closure: F,
 ) -> Result<R, Trap>
 where
@@ -501,7 +501,7 @@ pub struct CallThreadState {
     jmp_buf: Cell<*const u8>,
     reset_guard_page: Cell<bool>,
     prev: Option<*const CallThreadState>,
-    vmctx: *mut VMContext,
+    vmctx: VMFunctionEnvironment,
     handling_trap: Cell<bool>,
 }
 
@@ -518,7 +518,7 @@ enum UnwindReason {
 }
 
 impl CallThreadState {
-    fn new(vmctx: *mut VMContext) -> Self {
+    fn new(vmctx: VMFunctionEnvironment) -> Self {
         Self {
             unwind: Cell::new(UnwindReason::None),
             vmctx,
@@ -561,7 +561,7 @@ impl CallThreadState {
 
     fn any_instance(&self, func: impl Fn(&InstanceHandle) -> bool) -> bool {
         unsafe {
-            if func(&InstanceHandle::from_vmctx(self.vmctx)) {
+            if func(&InstanceHandle::from_vmctx(self.vmctx.vmctx)) {
                 return true;
             }
             match self.prev {
diff --git a/lib/vm/src/vmcontext.rs b/lib/vm/src/vmcontext.rs
index 9ca9051dd..43bdcd59d 100644
--- a/lib/vm/src/vmcontext.rs
+++ b/lib/vm/src/vmcontext.rs
@@ -11,10 +11,44 @@ use crate::table::Table;
 use crate::trap::{Trap, TrapCode};
 use std::any::Any;
 use std::convert::TryFrom;
+use std::fmt;
 use std::ptr::{self, NonNull};
 use std::sync::Arc;
 use std::u32;
 
+/// Union representing the first parameter passed when calling a function.
+///
+/// It may either be a pointer to the [`VMContext`] if it's a Wasm function
+/// or a pointer to arbitrary data controlled by the host if it's a host function.
+#[derive(Copy, Clone)]
+pub union VMFunctionEnvironment {
+    /// Wasm functions take a pointer to [`VMContext`].
+    pub vmctx: *mut VMContext,
+    /// Host functions can have custom environments.
+    pub host_env: *mut std::ffi::c_void,
+}
+
+impl VMFunctionEnvironment {
+    /// Check whether the pointer stored is null or not.
+    pub fn is_null(&self) -> bool {
+        unsafe { self.host_env.is_null() }
+    }
+}
+
+impl std::fmt::Debug for VMFunctionEnvironment {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        f.debug_struct("VMFunctionEnvironment")
+            .field("vmctx_or_hostenv", unsafe { &self.host_env })
+            .finish()
+    }
+}
+
+impl std::cmp::PartialEq for VMFunctionEnvironment {
+    fn eq(&self, rhs: &Self) -> bool {
+        unsafe { self.host_env as usize == rhs.host_env as usize }
+    }
+}
+
 /// An imported function.
 #[derive(Debug, Copy, Clone)]
 #[repr(C)]
@@ -22,8 +56,8 @@ pub struct VMFunctionImport {
     /// A pointer to the imported function body.
     pub body: *const VMFunctionBody,
 
-    /// A pointer to the `VMContext` that owns the function or host data.
-    pub vmctx: *mut VMContext,
+    /// A pointer to the `VMContext` that owns the function or host env data.
+    pub environment: VMFunctionEnvironment,
 }
 
 #[cfg(test)]
@@ -46,7 +80,7 @@ mod test_vmfunction_import {
             usize::from(offsets.vmfunction_import_body())
         );
         assert_eq!(
-            offset_of!(VMFunctionImport, vmctx),
+            offset_of!(VMFunctionImport, environment),
             usize::from(offsets.vmfunction_import_vmctx())
         );
     }
@@ -116,20 +150,20 @@ mod test_vmfunction_body {
     }
 }
 
-/// A function kind.
+/// A function kind is a calling convention into and out of wasm code.
 #[derive(Debug, Copy, Clone, PartialEq)]
 #[repr(C)]
 pub enum VMFunctionKind {
-    /// A function is static when its address matches the signature:
-    /// (vmctx, vmctx, arg1, arg2...) -> (result1, result2, ...)
+    /// A static function has the native signature:
+    /// extern "C" (vmctx, arg1, arg2...) -> (result1, result2, ...)
     ///
     /// This is the default for functions that are defined:
     /// 1. In the Host, natively
     /// 2. In the WebAssembly file
     Static,
 
-    /// A function is dynamic when its address matches the signature:
-    /// (ctx, &[Type]) -> Vec<Type>
+    /// A dynamic function has the native signature:
+    /// extern "C" (ctx, &[Value]) -> Vec<Value>
     ///
     /// This is the default for functions that are defined:
     /// 1. In the Host, dynamically
@@ -421,6 +455,34 @@ mod test_vmtable_definition {
     }
 }
 
+/// A typesafe wrapper around the storage for a global variables.
+///
+/// # Safety
+///
+/// Accessing the different members of this union is always safe because there
+/// are no invalid values for any of the types and the whole object is
+/// initialized by VMGlobalDefinition::new().
+#[derive(Clone, Copy)]
+#[repr(C, align(16))]
+pub union VMGlobalDefinitionStorage {
+    as_i32: i32,
+    as_u32: u32,
+    as_f32: f32,
+    as_i64: i64,
+    as_u64: u64,
+    as_f64: f64,
+    as_u128: u128,
+    bytes: [u8; 16],
+}
+
+impl fmt::Debug for VMGlobalDefinitionStorage {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("VMGlobalDefinitionStorage")
+            .field("bytes", unsafe { &self.bytes })
+            .finish()
+    }
+}
+
 /// The storage for a WebAssembly global defined within the instance.
 ///
 /// TODO: Pack the globals more densely, rather than using the same size
@@ -428,7 +490,7 @@ mod test_vmtable_definition {
 #[derive(Debug, Clone)]
 #[repr(C, align(16))]
 pub struct VMGlobalDefinition {
-    storage: [u8; 16],
+    storage: VMGlobalDefinitionStorage,
     // If more elements are added here, remember to add offset_of tests below!
 }
 
@@ -469,207 +531,158 @@ mod test_vmglobal_definition {
 impl VMGlobalDefinition {
     /// Construct a `VMGlobalDefinition`.
     pub fn new() -> Self {
-        Self { storage: [0; 16] }
+        Self {
+            storage: VMGlobalDefinitionStorage { bytes: [0; 16] },
+        }
     }
 
-    /// Return a reference to the value as an i32.
+    /// Return the value as an i32.
     ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_i32(&self) -> &i32 {
-        &*(self.storage.as_ref().as_ptr() as *const i32)
+    /// If this is not an I32 typed global it is unspecified what value is returned.
+    pub fn to_i32(&self) -> i32 {
+        unsafe { self.storage.as_i32 }
     }
 
     /// Return a mutable reference to the value as an i32.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
+    /// It is the callers responsibility to make sure the global has I32 type.
+    /// Until the returned borrow is dropped, reads and writes of this global
+    /// must be done exclusively through this borrow. That includes reads and
+    /// writes of globals inside wasm functions.
     pub unsafe fn as_i32_mut(&mut self) -> &mut i32 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut i32)
+        &mut self.storage.as_i32
     }
 
-    /// Return a reference to the value as a u32.
+    /// Return a reference to the value as an u32.
     ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_u32(&self) -> &u32 {
-        &*(self.storage.as_ref().as_ptr() as *const u32)
+    /// If this is not an I32 typed global it is unspecified what value is returned.
+    pub fn to_u32(&self) -> u32 {
+        unsafe { self.storage.as_u32 }
     }
 
     /// Return a mutable reference to the value as an u32.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
+    /// It is the callers responsibility to make sure the global has I32 type.
+    /// Until the returned borrow is dropped, reads and writes of this global
+    /// must be done exclusively through this borrow. That includes reads and
+    /// writes of globals inside wasm functions.
     pub unsafe fn as_u32_mut(&mut self) -> &mut u32 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut u32)
+        &mut self.storage.as_u32
     }
 
     /// Return a reference to the value as an i64.
     ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_i64(&self) -> &i64 {
-        &*(self.storage.as_ref().as_ptr() as *const i64)
+    /// If this is not an I64 typed global it is unspecified what value is returned.
+    pub fn to_i64(&self) -> i64 {
+        unsafe { self.storage.as_i64 }
     }
 
     /// Return a mutable reference to the value as an i64.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
+    /// It is the callers responsibility to make sure the global has I32 type.
+    /// Until the returned borrow is dropped, reads and writes of this global
+    /// must be done exclusively through this borrow. That includes reads and
+    /// writes of globals inside wasm functions.
     pub unsafe fn as_i64_mut(&mut self) -> &mut i64 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut i64)
+        &mut self.storage.as_i64
     }
 
     /// Return a reference to the value as an u64.
     ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_u64(&self) -> &u64 {
-        &*(self.storage.as_ref().as_ptr() as *const u64)
+    /// If this is not an I64 typed global it is unspecified what value is returned.
+    pub fn to_u64(&self) -> u64 {
+        unsafe { self.storage.as_u64 }
     }
 
     /// Return a mutable reference to the value as an u64.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
+    /// It is the callers responsibility to make sure the global has I64 type.
+    /// Until the returned borrow is dropped, reads and writes of this global
+    /// must be done exclusively through this borrow. That includes reads and
+    /// writes of globals inside wasm functions.
     pub unsafe fn as_u64_mut(&mut self) -> &mut u64 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut u64)
+        &mut self.storage.as_u64
     }
 
     /// Return a reference to the value as an f32.
     ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_f32(&self) -> &f32 {
-        &*(self.storage.as_ref().as_ptr() as *const f32)
+    /// If this is not an F32 typed global it is unspecified what value is returned.
+    pub fn to_f32(&self) -> f32 {
+        unsafe { self.storage.as_f32 }
     }
 
     /// Return a mutable reference to the value as an f32.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
+    /// It is the callers responsibility to make sure the global has F32 type.
+    /// Until the returned borrow is dropped, reads and writes of this global
+    /// must be done exclusively through this borrow. That includes reads and
+    /// writes of globals inside wasm functions.
     pub unsafe fn as_f32_mut(&mut self) -> &mut f32 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut f32)
-    }
-
-    /// Return a reference to the value as f32 bits.
-    ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_f32_bits(&self) -> &u32 {
-        &*(self.storage.as_ref().as_ptr() as *const u32)
-    }
-
-    /// Return a mutable reference to the value as f32 bits.
-    ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_f32_bits_mut(&mut self) -> &mut u32 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut u32)
+        &mut self.storage.as_f32
     }
 
     /// Return a reference to the value as an f64.
     ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_f64(&self) -> &f64 {
-        &*(self.storage.as_ref().as_ptr() as *const f64)
+    /// If this is not an F64 typed global it is unspecified what value is returned.
+    pub fn to_f64(&self) -> f64 {
+        unsafe { self.storage.as_f64 }
     }
 
     /// Return a mutable reference to the value as an f64.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
+    /// It is the callers responsibility to make sure the global has F64 type.
+    /// Until the returned borrow is dropped, reads and writes of this global
+    /// must be done exclusively through this borrow. That includes reads and
+    /// writes of globals inside wasm functions.
     pub unsafe fn as_f64_mut(&mut self) -> &mut f64 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut f64)
-    }
-
-    /// Return a reference to the value as f64 bits.
-    ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_f64_bits(&self) -> &u64 {
-        &*(self.storage.as_ref().as_ptr() as *const u64)
-    }
-
-    /// Return a mutable reference to the value as f64 bits.
-    ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_f64_bits_mut(&mut self) -> &mut u64 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut u64)
+        &mut self.storage.as_f64
     }
 
     /// Return a reference to the value as an u128.
     ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_u128(&self) -> &u128 {
-        &*(self.storage.as_ref().as_ptr() as *const u128)
+    /// If this is not an V128 typed global it is unspecified what value is returned.
+    pub fn to_u128(&self) -> u128 {
+        unsafe { self.storage.as_u128 }
     }
 
     /// Return a mutable reference to the value as an u128.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
+    /// It is the callers responsibility to make sure the global has V128 type.
+    /// Until the returned borrow is dropped, reads and writes of this global
+    /// must be done exclusively through this borrow. That includes reads and
+    /// writes of globals inside wasm functions.
     pub unsafe fn as_u128_mut(&mut self) -> &mut u128 {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut u128)
+        &mut self.storage.as_u128
     }
 
-    /// Return a reference to the value as u128 bits.
+    /// Return a reference to the value as bytes.
+    pub fn to_bytes(&self) -> [u8; 16] {
+        unsafe { self.storage.bytes }
+    }
+
+    /// Return a mutable reference to the value as bytes.
     ///
     /// # Safety
     ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_u128_bits(&self) -> &[u8; 16] {
-        &*(self.storage.as_ref().as_ptr() as *const [u8; 16])
-    }
-
-    /// Return a mutable reference to the value as u128 bits.
-    ///
-    /// # Safety
-    ///
-    /// To be defined (TODO).
-    #[allow(clippy::cast_ptr_alignment)]
-    pub unsafe fn as_u128_bits_mut(&mut self) -> &mut [u8; 16] {
-        &mut *(self.storage.as_mut().as_mut_ptr() as *mut [u8; 16])
+    /// Until the returned borrow is dropped, reads and writes of this global
+    /// must be done exclusively through this borrow. That includes reads and
+    /// writes of globals inside wasm functions.
+    pub unsafe fn as_bytes_mut(&mut self) -> &mut [u8; 16] {
+        &mut self.storage.bytes
     }
 }
 
@@ -728,8 +741,8 @@ pub struct VMCallerCheckedAnyfunc {
     pub func_ptr: *const VMFunctionBody,
     /// Function signature id.
     pub type_index: VMSharedSignatureIndex,
-    /// Function `VMContext`.
-    pub vmctx: *mut VMContext,
+    /// Function `VMContext` or host env.
+    pub vmctx: VMFunctionEnvironment,
     // If more elements are added here, remember to add offset_of tests below!
 }
 
@@ -768,7 +781,9 @@ impl Default for VMCallerCheckedAnyfunc {
         Self {
             func_ptr: ptr::null_mut(),
             type_index: Default::default(),
-            vmctx: ptr::null_mut(),
+            vmctx: VMFunctionEnvironment {
+                vmctx: ptr::null_mut(),
+            },
         }
     }
 }
diff --git a/lib/wasi-experimental-io-devices/Cargo.toml b/lib/wasi-experimental-io-devices/Cargo.toml
index 73985d363..6218a3b1f 100644
--- a/lib/wasi-experimental-io-devices/Cargo.toml
+++ b/lib/wasi-experimental-io-devices/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-wasi-experimental-io-devices"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "An experimental non-standard WASI extension for graphics"
 categories = ["wasm"]
 keywords = ["wasm", "webassembly", "types"]
@@ -14,9 +14,9 @@ edition = "2018"
 maintenance = { status = "experimental" }
 
 [dependencies]
-wasmer-wasi = { version = "1.0.0-alpha4", path = "../wasi" }
+wasmer-wasi = { version = "1.0.0-alpha5", path = "../wasi" }
 tracing = "0.1"
-minifb = "0.16"
+minifb = "0.19"
 ref_thread_local = "0.0"
 serde = "1"
 typetag = "0.1"
diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml
index eea131462..ad64b45a7 100644
--- a/lib/wasi/Cargo.toml
+++ b/lib/wasi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-wasi"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "WASI implementation library for Wasmer WebAssembly runtime"
 categories = ["wasm", "os"]
 keywords = ["wasm", "webassembly", "wasi", "sandbox", "ABI"]
@@ -15,13 +15,13 @@ bincode = "1"
 byteorder = "1.3"
 thiserror = "1"
 generational-arena = { version = "0.2", features = ["serde"] }
-libc = { version = "^0.2.69", default-features = false }
+libc = { version = "^0.2", default-features = false }
 tracing = { version = "0.1", features = ["log"] }
-getrandom = "0.1"
+getrandom = "0.2"
 time = "0.1"
 typetag = "0.1"
 serde = { version = "1.0", features = ["derive"] }
-wasmer = { path = "../api", version = "1.0.0-alpha4", default-features = false }
+wasmer = { path = "../api", version = "1.0.0-alpha5", default-features = false }
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"
diff --git a/lib/wasi/src/syscalls/mod.rs b/lib/wasi/src/syscalls/mod.rs
index 6fbd345ff..23ecd7b58 100644
--- a/lib/wasi/src/syscalls/mod.rs
+++ b/lib/wasi/src/syscalls/mod.rs
@@ -2030,12 +2030,16 @@ pub fn path_rename(
     new_path: WasmPtr<u8, Array>,
     new_path_len: u32,
 ) -> __wasi_errno_t {
-    debug!("wasi::path_rename");
+    debug!(
+        "wasi::path_rename: old_fd = {}, new_fd = {}",
+        old_fd, new_fd
+    );
     let (memory, mut state) = env.get_memory_and_wasi_state(0);
     let source_str = get_input_str!(memory, old_path, old_path_len);
     let source_path = std::path::Path::new(source_str);
     let target_str = get_input_str!(memory, new_path, new_path_len);
     let target_path = std::path::Path::new(target_str);
+    debug!("=> rename from {} to {}", source_str, target_str);
 
     {
         let source_fd = wasi_try!(state.fs.get_fd(old_fd));
@@ -2059,8 +2063,6 @@ pub fn path_rename(
                 return __WASI_EEXIST;
             }
             let mut out_path = path.clone();
-            // remove fd's own name which will be double counted
-            out_path.pop();
             out_path.push(target_path);
             out_path
         }
diff --git a/lib/wasmer-types/Cargo.toml b/lib/wasmer-types/Cargo.toml
index b47c8a9e6..2f0c2008e 100644
--- a/lib/wasmer-types/Cargo.toml
+++ b/lib/wasmer-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-types"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 description = "Wasmer Common Types"
 categories = ["wasm", "no-std", "data-structures"]
 keywords = ["wasm", "webassembly", "types"]
@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 # We use `cranelift-entity` here because it's a lightweight dependency and it contains
 # some useful data structures
-cranelift-entity = "0.65"
+cranelift-entity = "0.67"
 serde = { version = "1.0", features = ["derive"], optional = true, default-features = false }
 
 [features]
diff --git a/lib/wasmer-types/src/features.rs b/lib/wasmer-types/src/features.rs
index 6b1169a3b..545e7f58c 100644
--- a/lib/wasmer-types/src/features.rs
+++ b/lib/wasmer-types/src/features.rs
@@ -18,6 +18,14 @@ pub struct Features {
     pub bulk_memory: bool,
     /// Multi Value proposal should be enabled
     pub multi_value: bool,
+    /// Tail call proposal should be enabled
+    pub tail_call: bool,
+    /// Module Linking proposal should be enabled
+    pub module_linking: bool,
+    /// Multi Memory proposal should be enabled
+    pub multi_memory: bool,
+    /// 64-bit Memory proposal should be enabled
+    pub memory64: bool,
 }
 
 impl Features {
@@ -31,6 +39,10 @@ impl Features {
             bulk_memory: true,
             // Multivalue should be on by default
             multi_value: true,
+            tail_call: false,
+            module_linking: false,
+            multi_memory: false,
+            memory64: false,
         }
     }
 
@@ -136,6 +148,81 @@ impl Features {
         self.multi_value = enable;
         self
     }
+
+    /// Configures whether the WebAssembly tail-call proposal will
+    /// be enabled.
+    ///
+    /// The [WebAssembly tail-call proposal][proposal] is not
+    /// currently fully standardized and is undergoing development.
+    /// Support for this feature can be enabled through this method for
+    /// appropriate WebAssembly modules.
+    ///
+    /// This feature gates tail-call functions in WebAssembly.
+    ///
+    /// This is `false` by default.
+    ///
+    /// [proposal]: https://github.com/webassembly/tail-call
+    pub fn tail_call(&mut self, enable: bool) -> &mut Self {
+        self.tail_call = enable;
+        self
+    }
+
+    /// Configures whether the WebAssembly tail-call proposal will
+    /// be enabled.
+    ///
+    /// The [WebAssembly tail-call proposal][proposal] is not
+    /// currently fully standardized and is undergoing development.
+    /// Support for this feature can be enabled through this method for
+    /// appropriate WebAssembly modules.
+    ///
+    /// This feature allows WebAssembly modules to define, import and
+    /// export modules and instances.
+    ///
+    /// This is `false` by default.
+    ///
+    /// [proposal]: https://github.com/webassembly/module-linking
+    pub fn module_linking(&mut self, enable: bool) -> &mut Self {
+        self.module_linking = enable;
+        self
+    }
+
+    /// Configures whether the WebAssembly multi-memory proposal will
+    /// be enabled.
+    ///
+    /// The [WebAssembly multi-memory proposal][proposal] is not
+    /// currently fully standardized and is undergoing development.
+    /// Support for this feature can be enabled through this method for
+    /// appropriate WebAssembly modules.
+    ///
+    /// This feature adds the ability to use multiple memories within a
+    /// single Wasm module.
+    ///
+    /// This is `false` by default.
+    ///
+    /// [proposal]: https://github.com/WebAssembly/multi-memory
+    pub fn multi_memory(&mut self, enable: bool) -> &mut Self {
+        self.multi_memory = enable;
+        self
+    }
+
+    /// Configures whether the WebAssembly 64-bit memory proposal will
+    /// be enabled.
+    ///
+    /// The [WebAssembly 64-bit memory proposal][proposal] is not
+    /// currently fully standardized and is undergoing development.
+    /// Support for this feature can be enabled through this method for
+    /// appropriate WebAssembly modules.
+    ///
+    /// This feature gates support for linear memory of sizes larger than
+    /// 2^32 bits.
+    ///
+    /// This is `false` by default.
+    ///
+    /// [proposal]: https://github.com/WebAssembly/memory64
+    pub fn memory64(&mut self, enable: bool) -> &mut Self {
+        self.memory64 = enable;
+        self
+    }
 }
 
 impl Default for Features {
@@ -158,6 +245,10 @@ mod test_features {
                 simd: false,
                 bulk_memory: true,
                 multi_value: true,
+                tail_call: false,
+                module_linking: false,
+                multi_memory: false,
+                memory64: false,
             }
         );
     }
@@ -209,4 +300,32 @@ mod test_features {
         assert!(!features.bulk_memory);
         assert!(!features.reference_types);
     }
+
+    #[test]
+    fn enable_tail_call() {
+        let mut features = Features::new();
+        features.tail_call(true);
+        assert!(features.tail_call);
+    }
+
+    #[test]
+    fn enable_module_linking() {
+        let mut features = Features::new();
+        features.module_linking(true);
+        assert!(features.module_linking);
+    }
+
+    #[test]
+    fn enable_multi_memory() {
+        let mut features = Features::new();
+        features.multi_memory(true);
+        assert!(features.multi_memory);
+    }
+
+    #[test]
+    fn enable_memory64() {
+        let mut features = Features::new();
+        features.memory64(true);
+        assert!(features.memory64);
+    }
 }
diff --git a/scripts/publish.py b/scripts/publish.py
index 8fce6df0b..100e82581 100644
--- a/scripts/publish.py
+++ b/scripts/publish.py
@@ -21,7 +21,7 @@ except ImportError:
 
 
 # TODO: find this automatically
-target_version = "1.0.0-alpha4"
+target_version = "1.0.0-alpha5"
 
 # TODO: generate this by parsing toml files
 dep_graph = {
@@ -126,9 +126,12 @@ def main():
         # sleep for 16 seconds between crates to ensure the crates.io index has time to update
         # this can be optimized with knowledge of our dep graph via toposort; we can even publish
         # crates in parallel; however this is out of scope for the first version of this script
-        print("Sleeping for 16 seconds to allow the `crates.io` index to update...")
-        time.sleep(16)
-        
+        if no_dry_run:
+            print("Sleeping for 16 seconds to allow the `crates.io` index to update...")
+            time.sleep(16)
+        else:
+            print("In dry-run: not sleeping for crates.io to update.")
+
 
 if __name__ == "__main__":
     main()
diff --git a/scripts/update-version.sh b/scripts/update-version.sh
index aa1fb9dea..2b81f981e 100755
--- a/scripts/update-version.sh
+++ b/scripts/update-version.sh
@@ -1,12 +1,17 @@
+#! /bin/sh
+
+# How to install `fd`: https://github.com/sharkdp/fd#installation
+: "${FD:=fd}"
+
 # A script to update the version of all the crates at the same time
-PREVIOUS_VERSION='1.0.0-alpha3'
-NEXT_VERSION='1.0.0-alpha4'
+PREVIOUS_VERSION='1.0.0-alpha4'
+NEXT_VERSION='1.0.0-alpha5'
 
 # quick hack
-fd Cargo.toml --exec sed -i '' "s/version = \"$PREVIOUS_VERSION\"/version = \"$NEXT_VERSION\"/"
+${FD} Cargo.toml --exec sed -i '{}' -e "s/version = \"$PREVIOUS_VERSION\"/version = \"$NEXT_VERSION\"/"
 echo "manually check changes to Cargo.toml"
 
-fd wasmer.iss --exec sed -i '' "s/AppVersion=$PREVIOUS_VERSION/AppVersion=$NEXT_VERSION/"
+${FD} wasmer.iss --exec sed -i '{}' -e "s/AppVersion=$PREVIOUS_VERSION/AppVersion=$NEXT_VERSION/"
 echo "manually check changes to wasmer.iss"
 
 # Order to upload packages in
diff --git a/scripts/windows-installer/wasmer.iss b/scripts/windows-installer/wasmer.iss
index ba8eb6044..7c6e6ccc9 100644
--- a/scripts/windows-installer/wasmer.iss
+++ b/scripts/windows-installer/wasmer.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Wasmer
-AppVersion=1.0.0-alpha4
+AppVersion=1.0.0-alpha5
 DefaultDirName={pf}\Wasmer
 DefaultGroupName=Wasmer
 Compression=lzma2
diff --git a/tests/compilers/wast.rs b/tests/compilers/wast.rs
index 76fb8a95e..548c21605 100644
--- a/tests/compilers/wast.rs
+++ b/tests/compilers/wast.rs
@@ -84,7 +84,7 @@ pub fn run_wast(wast_path: &str, compiler: &str) -> anyhow::Result<()> {
     if is_simd {
         // We allow this, so tests can be run properly for `simd_const` test.
         wast.allow_instantiation_failures(&[
-            "Validation error: multiple tables: tables count must be at most 1",
+            "Validation error: multiple tables",
             "Validation error: unknown memory 0",
             "Validation error: Invalid var_u32",
         ]);
diff --git a/tests/ignores.txt b/tests/ignores.txt
index 6fcd597d8..2b3fe69d1 100644
--- a/tests/ignores.txt
+++ b/tests/ignores.txt
@@ -2,17 +2,8 @@
 singlepass::spec::multi_value
 singlepass::spec::simd
 
-## SIMD in Cranelift 0.65 is not fully supported
-cranelift::spec::simd::simd_conversions
-cranelift::spec::simd::simd_f32x4
-cranelift::spec::simd::simd_f64x2
+## SIMD in Cranelift 0.67 has a small bug
 cranelift::spec::simd::simd_f64x2_arith
-cranelift::spec::simd::simd_i16x8_arith2
-cranelift::spec::simd::simd_i32x4_arith2
-cranelift::spec::simd::simd_i8x16_arith2
-cranelift::spec::simd::simd_load
-cranelift::spec::simd::simd_splat
-
 
 singlepass on windows # Singlepass is not yet supported on Windows
 
diff --git a/tests/integration/cli/Cargo.toml b/tests/integration/cli/Cargo.toml
index a6803db3b..157b51641 100644
--- a/tests/integration/cli/Cargo.toml
+++ b/tests/integration/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-integration-tests-cli"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
 description = "CLI integration tests"
 repository = "https://github.com/wasmerio/wasmer"
diff --git a/tests/lib/engine-dummy/Cargo.toml b/tests/lib/engine-dummy/Cargo.toml
index e7044a276..884c2ca8f 100644
--- a/tests/lib/engine-dummy/Cargo.toml
+++ b/tests/lib/engine-dummy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-engine-dummy"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
 description = "Wasmer placeholder engine"
 license = "MIT"
@@ -8,10 +8,10 @@ edition = "2018"
 publish = false
 
 [dependencies]
-wasmer-types = { path = "../../../lib/wasmer-types", version = "1.0.0-alpha4" }
-wasmer-compiler = { path = "../../../lib/compiler", version = "1.0.0-alpha4" }
-wasmer-vm = { path = "../../../lib/vm", version = "1.0.0-alpha4" }
-wasmer-engine = { path = "../../../lib/engine", version = "1.0.0-alpha4" }
+wasmer-types = { path = "../../../lib/wasmer-types", version = "1.0.0-alpha5" }
+wasmer-compiler = { path = "../../../lib/compiler", version = "1.0.0-alpha5" }
+wasmer-vm = { path = "../../../lib/vm", version = "1.0.0-alpha5" }
+wasmer-engine = { path = "../../../lib/engine", version = "1.0.0-alpha5" }
 serde = { version = "1.0", features = ["derive", "rc"], optional = true }
 serde_bytes = { version = "0.11", optional = true }
 bincode = { version = "1.2", optional = true }
diff --git a/tests/lib/engine-dummy/src/artifact.rs b/tests/lib/engine-dummy/src/artifact.rs
index e8e693661..a744370df 100644
--- a/tests/lib/engine-dummy/src/artifact.rs
+++ b/tests/lib/engine-dummy/src/artifact.rs
@@ -15,8 +15,8 @@ use wasmer_types::{
     TableIndex,
 };
 use wasmer_vm::{
-    FunctionBodyPtr, MemoryStyle, ModuleInfo, TableStyle, VMContext, VMFunctionBody,
-    VMSharedSignatureIndex, VMTrampoline,
+    FunctionBodyPtr, MemoryStyle, ModuleInfo, TableStyle, VMContext, VMSharedSignatureIndex,
+    VMTrampoline,
 };
 
 /// Serializable struct for the artifact
@@ -135,11 +135,7 @@ impl DummyArtifact {
         // We prepare the pointers for the finished functions.
         let finished_functions: PrimaryMap<LocalFunctionIndex, FunctionBodyPtr> = (0
             ..num_local_functions)
-            .map(|_| unsafe {
-                let func_pointer = std::slice::from_raw_parts(dummy_function as *const (), 0);
-                let func_pointer = std::mem::transmute::<_, *mut [VMFunctionBody]>(func_pointer);
-                FunctionBodyPtr(func_pointer)
-            })
+            .map(|_| FunctionBodyPtr(dummy_function as _))
             .collect::<PrimaryMap<_, _>>();
 
         // We prepare the pointers for the finished function call trampolines.
@@ -151,14 +147,7 @@ impl DummyArtifact {
         // We prepare the pointers for the finished dynamic function trampolines.
         let finished_dynamic_function_trampolines: PrimaryMap<FunctionIndex, FunctionBodyPtr> = (0
             ..metadata.module.num_imported_functions)
-            .map(|_| {
-                FunctionBodyPtr(unsafe {
-                    std::mem::transmute::<_, *mut [VMFunctionBody]>((
-                        dummy_function as *const (),
-                        0,
-                    ))
-                })
-            })
+            .map(|_| FunctionBodyPtr(dummy_function as _))
             .collect::<PrimaryMap<_, _>>();
 
         // Compute indices into the shared signature table.
diff --git a/tests/lib/engine-dummy/src/engine.rs b/tests/lib/engine-dummy/src/engine.rs
index 14c5c0bec..fa240098a 100644
--- a/tests/lib/engine-dummy/src/engine.rs
+++ b/tests/lib/engine-dummy/src/engine.rs
@@ -7,6 +7,7 @@ use wasmer_engine::{Artifact, DeserializeError, Engine, EngineId, Tunables};
 use wasmer_types::FunctionType;
 use wasmer_vm::{SignatureRegistry, VMContext, VMFunctionBody, VMSharedSignatureIndex};
 
+#[allow(dead_code)]
 extern "C" fn dummy_trampoline(
     _context: *mut VMContext,
     _body: *const VMFunctionBody,
@@ -59,22 +60,27 @@ impl Engine for DummyEngine {
     #[cfg(feature = "compiler")]
     /// Validates a WebAssembly module
     fn validate(&self, binary: &[u8]) -> Result<(), CompileError> {
-        use wasmer_compiler::wasmparser::{
-            validate, OperatorValidatorConfig, ValidatingParserConfig,
-        };
+        use wasmer_compiler::wasmparser::{Validator, WasmFeatures};
 
         let features = self.features();
-        let config = ValidatingParserConfig {
-            operator_config: OperatorValidatorConfig {
-                enable_threads: features.threads,
-                enable_reference_types: features.reference_types,
-                enable_bulk_memory: features.bulk_memory,
-                enable_simd: features.simd,
-                enable_tail_call: false,
-                enable_multi_value: features.multi_value,
-            },
+        let mut validator = Validator::new();
+        let wasm_features = WasmFeatures {
+            bulk_memory: features.bulk_memory,
+            threads: features.threads,
+            reference_types: features.reference_types,
+            multi_value: features.multi_value,
+            simd: features.simd,
+            tail_call: features.tail_call,
+            module_linking: features.module_linking,
+            multi_memory: features.multi_memory,
+            memory64: features.memory64,
+            deterministic_only: false,
         };
-        validate(binary, Some(config)).map_err(|e| CompileError::Validate(format!("{}", e)))
+        validator.wasm_features(wasm_features);
+        validator
+            .validate_all(binary)
+            .map_err(|e| CompileError::Validate(format!("{}", e)))?;
+        Ok(())
     }
 
     #[cfg(not(feature = "compiler"))]
diff --git a/tests/lib/test-generator/Cargo.toml b/tests/lib/test-generator/Cargo.toml
index 6dfc8fa7d..7ab18cdaa 100644
--- a/tests/lib/test-generator/Cargo.toml
+++ b/tests/lib/test-generator/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 anyhow = "1.0"
-target-lexicon = "0.10"
+target-lexicon = "0.11"
 
 [features]
 test-native = []
diff --git a/tests/lib/wast/Cargo.toml b/tests/lib/wast/Cargo.toml
index b9c26627f..6e60788ea 100644
--- a/tests/lib/wast/Cargo.toml
+++ b/tests/lib/wast/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-wast"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
 description = "wast testing support for wasmer"
 license = "MIT OR (Apache-2.0 WITH LLVM-exception)"
@@ -12,8 +12,8 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0"
-wasmer = { path = "../../../lib/api", version = "1.0.0-alpha4", default-features = false }
-wasmer-wasi = { path = "../../../lib/wasi", version = "1.0.0-alpha4" }
+wasmer = { path = "../../../lib/api", version = "1.0.0-alpha5", default-features = false }
+wasmer-wasi = { path = "../../../lib/wasi", version = "1.0.0-alpha5" }
 wast = "17.0"
 serde = "1"
 tempfile = "3"
diff --git a/tests/wasi-wast/README.md b/tests/wasi-wast/README.md
index 42a05578a..36968c631 100644
--- a/tests/wasi-wast/README.md
+++ b/tests/wasi-wast/README.md
@@ -7,7 +7,7 @@ WASI test files with expected output in a custom WAST format.
 In order to run the test generator properly you will need:
 
 - `rustup` installed and on your PATH
-- `wasm-opt` and `wasm-strip` from `wabt` installed and on your PATH
+- `wasm-opt` from `binaryen` and `wasm-strip` from `wabt` are installed and on your PATH
 
 ## Usage
 
diff --git a/tests/wasi-wast/wasi/snapshot1/path_rename.wasm b/tests/wasi-wast/wasi/snapshot1/path_rename.wasm
index 5250a1d40..9d5c5377e 100755
Binary files a/tests/wasi-wast/wasi/snapshot1/path_rename.wasm and b/tests/wasi-wast/wasi/snapshot1/path_rename.wasm differ
diff --git a/tests/wasi-wast/wasi/snapshot1/path_rename.wast b/tests/wasi-wast/wasi/snapshot1/path_rename.wast
index 845a4d282..37462eedb 100644
--- a/tests/wasi-wast/wasi/snapshot1/path_rename.wast
+++ b/tests/wasi-wast/wasi/snapshot1/path_rename.wast
@@ -3,5 +3,5 @@
 (wasi_test "path_rename.wasm"
   (temp_dirs "temp")
   (assert_return (i64.const 0))
-  (assert_stdout "The original file does not still exist!\n柴犬\n")
+  (assert_stdout "The original file does not still exist!\nFound item: path_renamed_file.txt\n柴犬\n")
 )
diff --git a/tests/wasi-wast/wasi/tests/path_rename.rs b/tests/wasi-wast/wasi/tests/path_rename.rs
index ef6a70a3c..266990c65 100644
--- a/tests/wasi-wast/wasi/tests/path_rename.rs
+++ b/tests/wasi-wast/wasi/tests/path_rename.rs
@@ -43,6 +43,25 @@ fn main() {
         println!("The original file does not still exist!");
     }
 
+    if !file_to_rename_to.exists() {
+        println!("The moved file does not exist!");
+        return;
+    }
+
+    // TODO: add temp directory suport for native execution...
+    // until then, don't actually inspect the directory when running native code.
+    #[cfg(target_os = "wasi")]
+    for item in fs::read_dir(&base).unwrap() {
+        println!(
+            "Found item: {}",
+            item.unwrap().path().file_name().unwrap().to_str().unwrap()
+        );
+    }
+    #[cfg(not(target_os = "wasi"))]
+    {
+        println!("Found item: path_renamed_file.txt");
+    }
+
     let mut out_str = String::new();
     file.read_to_string(&mut out_str).unwrap();
     let mut test_str = String::new();
diff --git a/tests/wasi-wast/wasi/unstable/path_rename.wasm b/tests/wasi-wast/wasi/unstable/path_rename.wasm
index 120ceea48..4642d3185 100755
Binary files a/tests/wasi-wast/wasi/unstable/path_rename.wasm and b/tests/wasi-wast/wasi/unstable/path_rename.wasm differ
diff --git a/tests/wasi-wast/wasi/unstable/path_rename.wast b/tests/wasi-wast/wasi/unstable/path_rename.wast
index 845a4d282..37462eedb 100644
--- a/tests/wasi-wast/wasi/unstable/path_rename.wast
+++ b/tests/wasi-wast/wasi/unstable/path_rename.wast
@@ -3,5 +3,5 @@
 (wasi_test "path_rename.wasm"
   (temp_dirs "temp")
   (assert_return (i64.const 0))
-  (assert_stdout "The original file does not still exist!\n柴犬\n")
+  (assert_stdout "The original file does not still exist!\nFound item: path_renamed_file.txt\n柴犬\n")
 )