diff --git a/.gitignore b/.gitignore
index 1f5f395f..f5e9505b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,6 @@ $RECYCLE.BIN/
 *.lnk
 
 # Conduit
-Rocket.toml
 conduit.toml
 conduit.db
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d701c2a..eb7a96fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
     - if: "$CI_COMMIT_TAG"
     - if: '($CI_MERGE_REQUEST_APPROVED == "true") || $BUILD_EVERYTHING' # Once MR is approved, test all builds. Or if BUILD_EVERYTHING is set.
   interruptible: true
-  image: "registry.gitlab.com/jfowl/conduit-containers/rust-with-tools:latest"
+  image: "registry.gitlab.com/jfowl/conduit-containers/rust-with-tools@sha256:69ab327974aef4cc0daf4273579253bf7ae5e379a6c52729b83137e4caa9d093"
   tags: ["docker"]
   services: ["docker:dind"]
   variables:
@@ -220,11 +220,25 @@ docker:master:dockerhub:
   variables:
     TAG: "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:latest"
 
+docker:tags:gitlab:
+  extends: .docker-shared-settings
+  rules:
+    - if: "$CI_COMMIT_TAG"
+  variables:
+    TAG: "$CI_REGISTRY_IMAGE/matrix-conduit:$CI_COMMIT_TAG"
+
+docker:tags:dockerhub:
+  extends: .docker-shared-settings
+  rules:
+    - if: "$CI_COMMIT_TAG && $DOCKER_HUB"
+  variables:
+    TAG: "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:$CI_COMMIT_TAG"
+
 # --------------------------------------------------------------------- #
 #  Run tests                                                            #
 # --------------------------------------------------------------------- #
 
-test:cargo:
+.test-shared-settings:
   stage: "test"
   needs: []
   image: "registry.gitlab.com/jfowl/conduit-containers/rust-with-tools:latest"
@@ -232,21 +246,54 @@ test:cargo:
   variables:
     CARGO_INCREMENTAL: "false" # https://matklad.github.io/2021/09/04/fast-rust-builds.html#ci-workflow
   interruptible: true
+
+test:cargo:
+  extends: .test-shared-settings
   before_script:
-    - rustup component add clippy rustfmt
     # If provided, bring in caching through sccache, which uses an external S3 endpoint to store compilation results:
     - if [ -n "${SCCACHE_ENDPOINT}" ]; then export RUSTC_WRAPPER=/usr/local/cargo/bin/sccache; fi
   script:
     - rustc --version && cargo --version # Print version info for debugging
-    - cargo fmt --all -- --check
     - "cargo test --color always --workspace --verbose --locked --no-fail-fast -- -Z unstable-options --format json | gitlab-report -p test > $CI_PROJECT_DIR/report.xml"
-    - "cargo clippy --color always --verbose --message-format=json | gitlab-report -p clippy > $CI_PROJECT_DIR/gl-code-quality-report.json"
   artifacts:
     when: always
     reports:
       junit: report.xml
+
+
+test:clippy:
+  extends: .test-shared-settings
+  allow_failure: true
+  before_script:
+    - rustup component add clippy
+    # If provided, bring in caching through sccache, which uses an external S3 endpoint to store compilation results:
+    - if [ -n "${SCCACHE_ENDPOINT}" ]; then export RUSTC_WRAPPER=/usr/local/cargo/bin/sccache; fi
+  script:
+    - rustc --version && cargo --version # Print version info for debugging
+    - "cargo clippy --color always --verbose --message-format=json | gitlab-report -p clippy > $CI_PROJECT_DIR/gl-code-quality-report.json"
+  artifacts:
+    when: always
+    reports:
       codequality: gl-code-quality-report.json
 
+test:format:
+  extends: .test-shared-settings
+  before_script:
+    - rustup component add rustfmt
+  script:
+    - cargo fmt --all -- --check
+
+test:audit:
+  extends: .test-shared-settings
+  allow_failure: true
+  script:
+    - cargo audit --color always || true
+    - cargo audit --stale --json | gitlab-report -p audit > gl-sast-report.json
+  artifacts:
+    when: always
+    reports:
+      sast: gl-sast-report.json
+
 test:sytest:
   stage: "test"
   allow_failure: true
@@ -258,6 +305,7 @@ test:sytest:
   tags: ["docker"]
   variables:
     PLUGINS: "https://github.com/valkum/sytest_conduit/archive/master.tar.gz"
+  interruptible: true
   before_script:
     - "mkdir -p /app"
     - "cp ./conduit-debug-x86_64-unknown-linux-musl /app/conduit"
@@ -278,6 +326,41 @@ test:sytest:
     reports:
       junit: "$CI_PROJECT_DIR/sytest.xml"
 
+test:dockerlint:
+  stage: "test"
+  needs: []
+  image: "ghcr.io/hadolint/hadolint@sha256:6c4b7c23f96339489dd35f21a711996d7ce63047467a9a562287748a03ad5242" # 2.8.0-alpine
+  interruptible: true
+  script:
+    - hadolint --version
+    # First pass: Print for CI log:
+    - >
+      hadolint
+      --no-fail --verbose
+      ./Dockerfile
+      ./docker/ci-binaries-packaging.Dockerfile
+    # Then output the results into a json for GitLab to pretty-print this in the MR:
+    - >
+      hadolint
+      --format gitlab_codeclimate
+      --failure-threshold error
+      ./Dockerfile
+      ./docker/ci-binaries-packaging.Dockerfile > dockerlint.json
+  artifacts:
+    when: always
+    reports:
+      codequality: dockerlint.json
+    paths:
+      - dockerlint.json
+  rules:
+    - if: '$CI_COMMIT_REF_NAME != "master"'
+      changes:
+        - docker/*Dockerfile
+        - Dockerfile
+        - .gitlab-ci.yml
+    - if: '$CI_COMMIT_REF_NAME == "master"'
+    - if: '$CI_COMMIT_REF_NAME == "next"'
+
 # --------------------------------------------------------------------- #
 #  Store binaries as package so they have download urls                 #
 # --------------------------------------------------------------------- #
@@ -313,3 +396,4 @@ workflow:
     - if: "$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS"
       when: never
     - if: "$CI_COMMIT_BRANCH"
+    - if: "$CI_COMMIT_TAG"
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000..037f20d7
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,11 @@
+{
+    "recommendations": [
+        "rust-lang.rust-analyzer",
+        "bungcip.better-toml",
+        "ms-azuretools.vscode-docker",
+        "eamodio.gitlens",
+        "serayuzgur.crates",
+        "vadimcn.vscode-lldb",
+        "timonwong.shellcheck"
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..da521604
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,35 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug conduit",
+            "sourceLanguages": ["rust"],
+            "cargo": {
+                "args": [
+                    "build",
+                    "--bin=conduit",
+                    "--package=conduit"
+                ],
+                "filter": {
+                    "name": "conduit",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "env": {
+                "RUST_BACKTRACE": "1",
+                "CONDUIT_CONFIG": "",
+                "CONDUIT_SERVER_NAME": "localhost",
+                "CONDUIT_DATABASE_PATH": "/tmp",
+                "CONDUIT_ADDRESS": "0.0.0.0",
+                "CONDUIT_PORT": "6167"
+            },
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c3f66054..95294d48 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "rust-analyzer.procMacro.enable": true
+    "rust-analyzer.procMacro.enable": true,
 }
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 632b4cea..c4700bae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "adler32"
 version = "1.2.0"
@@ -14,7 +20,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.7",
  "once_cell",
  "version_check",
 ]
@@ -28,6 +34,21 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -37,6 +58,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "arc-swap"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f"
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -56,31 +83,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002"
 
 [[package]]
-name = "async-stream"
-version = "0.3.2"
+name = "async-compression"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625"
+checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695"
 dependencies = [
- "async-stream-impl",
+ "brotli",
+ "flate2",
  "futures-core",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.52"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
+checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -97,27 +117,76 @@ dependencies = [
 ]
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "autocfg"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "axum"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b4d4f9a5ca8b1ab8de59e663e68c6207059239373ca72980f5be7ab81231f74"
 dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
+ "async-trait",
+ "axum-core",
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "headers",
+ "http",
+ "http-body",
+ "hyper",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-http",
+ "tower-layer",
+ "tower-service",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.0.1"
+name = "axum-core"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "cf4d047478b986f14a13edad31a009e2e05cb241f9805d0d75e4cba4e129ad4d"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "mime",
+]
 
 [[package]]
-name = "base-x"
-version = "0.2.8"
+name = "axum-server"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
+checksum = "abf18303ef7e23b045301555bf8a0dfbc1444ea1a37b3c81757a32680ace4d7d"
+dependencies = [
+ "arc-swap",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile 1.0.0",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
 
 [[package]]
 name = "base64"
@@ -131,12 +200,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
-[[package]]
-name = "binascii"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -192,16 +255,46 @@ dependencies = [
 ]
 
 [[package]]
-name = "bumpalo"
-version = "3.9.1"
+name = "block-buffer"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "brotli"
+version = "3.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
 
 [[package]]
 name = "bytemuck"
-version = "1.7.3"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"
+checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
 
 [[package]]
 name = "byteorder"
@@ -217,9 +310,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
 [[package]]
 name = "cc"
-version = "1.0.72"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 dependencies = [
  "jobserver",
 ]
@@ -254,15 +347,15 @@ dependencies = [
  "libc",
  "num-integer",
  "num-traits",
- "time 0.1.43",
+ "time",
  "winapi",
 ]
 
 [[package]]
 name = "clang-sys"
-version = "1.3.0"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90"
+checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
 dependencies = [
  "glob",
  "libc",
@@ -271,31 +364,40 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.0.10"
+version = "3.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a30c3bf9ff12dfe5dae53f0a96e0febcd18420d1c0e7fad77796d9d5c4b5375"
+checksum = "d53da17d37dba964b9b3ecb5c5a1f193a2762c700e6829201e645b9381c99dc7"
 dependencies = [
  "bitflags",
  "clap_derive",
+ "clap_lex",
  "indexmap",
- "lazy_static",
- "os_str_bytes",
+ "once_cell",
  "textwrap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.6"
+version = "3.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "517358c28fcef6607bf6f76108e02afad7e82297d132a6b846dcc1fc3efcd153"
+checksum = "c11d40217d16aee8508cc8e5fde8b4ff24639758608e5374e731b53f85749fb9"
 dependencies = [
- "heck 0.4.0",
+ "heck",
  "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
+dependencies = [
+ "os_str_bytes",
+]
+
 [[package]]
 name = "color_quant"
 version = "1.1.0"
@@ -304,30 +406,32 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "conduit"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
+ "axum",
+ "axum-server",
  "base64 0.13.0",
  "bytes",
  "clap",
  "crossbeam",
  "directories",
+ "figment",
+ "futures-util",
  "heed",
  "hmac",
  "http",
  "image",
  "jsonwebtoken",
  "lru-cache",
- "maplit",
  "num_cpus",
  "opentelemetry",
  "opentelemetry-jaeger",
  "parking_lot",
  "persy",
- "rand 0.8.4",
+ "rand 0.8.5",
  "regex",
  "reqwest",
  "ring",
- "rocket",
  "rocksdb",
  "ruma",
  "rusqlite",
@@ -335,7 +439,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "sha-1",
+ "sha-1 0.9.8",
  "sled",
  "thiserror",
  "thread_local",
@@ -343,9 +447,11 @@ dependencies = [
  "tikv-jemalloc-ctl",
  "tikv-jemallocator",
  "tokio",
+ "tower",
+ "tower-http",
  "tracing",
  "tracing-flame",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
  "trust-dns-resolver",
 ]
 
@@ -355,12 +461,6 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b"
 
-[[package]]
-name = "const_fn"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
-
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -368,21 +468,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
-name = "cookie"
-version = "0.15.1"
+name = "core-foundation"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f1c7727e460397e56abc4bddc1d49e07a1ad78fc98eb2e1c8f032a58a2f80d"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
- "percent-encoding",
- "time 0.2.27",
- "version_check",
+ "core-foundation-sys",
+ "libc",
 ]
 
 [[package]]
-name = "cpufeatures"
-version = "0.2.1"
+name = "core-foundation-sys"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
 dependencies = [
  "libc",
 ]
@@ -404,9 +509,9 @@ checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -421,18 +526,18 @@ dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-epoch",
- "crossbeam-queue 0.3.3",
- "crossbeam-utils 0.8.6",
+ "crossbeam-queue 0.3.5",
+ "crossbeam-utils 0.8.9",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
+checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.9",
 ]
 
 [[package]]
@@ -443,19 +548,20 @@ checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.9",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.6"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
+checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
 dependencies = [
+ "autocfg",
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.6",
- "lazy_static",
+ "crossbeam-utils 0.8.9",
  "memoffset",
+ "once_cell",
  "scopeguard",
 ]
 
@@ -470,12 +576,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b979d76c9fcb84dffc80a73f7290da0f83e4c95773494674cb44b76d13a7a110"
+checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.9",
 ]
 
 [[package]]
@@ -490,12 +596,22 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.6"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
+checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978"
 dependencies = [
  "cfg-if 1.0.0",
- "lazy_static",
+ "once_cell",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+dependencies = [
+ "generic-array",
+ "typenum",
 ]
 
 [[package]]
@@ -510,12 +626,12 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
 dependencies = [
  "byteorder",
- "digest",
+ "digest 0.9.0",
  "rand_core 0.5.1",
  "subtle",
  "zeroize",
@@ -546,39 +662,6 @@ dependencies = [
  "const-oid",
 ]
 
-[[package]]
-name = "devise"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595"
-dependencies = [
- "devise_codegen",
- "devise_core",
-]
-
-[[package]]
-name = "devise_codegen"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2"
-dependencies = [
- "devise_core",
- "quote",
-]
-
-[[package]]
-name = "devise_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0"
-dependencies = [
- "bitflags",
- "proc-macro2",
- "proc-macro2-diagnostics",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -589,36 +672,40 @@ dependencies = [
 ]
 
 [[package]]
-name = "directories"
-version = "3.0.2"
+name = "digest"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+dependencies = [
+ "block-buffer 0.10.2",
+ "crypto-common",
+]
+
+[[package]]
+name = "directories"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
 dependencies = [
  "dirs-sys",
 ]
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
  "libc",
  "redox_users",
  "winapi",
 ]
 
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
 [[package]]
 name = "ed25519"
-version = "1.3.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e1069e39f1454367eb2de793ed062fac4c35c2934b76a81d90dd9abcd28816"
+checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
 dependencies = [
  "signature",
 ]
@@ -645,20 +732,20 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.30"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "enum-as-inner"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
+checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4"
 dependencies = [
- "heck 0.3.3",
+ "heck",
  "proc-macro2",
  "quote",
  "syn",
@@ -676,15 +763,6 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
-[[package]]
-name = "fastrand"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "figment"
 version = "0.10.6"
@@ -699,6 +777,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide 0.5.3",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -733,9 +821,9 @@ checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
 [[package]]
 name = "futures"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
+checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -748,9 +836,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -758,15 +846,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
+checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -775,15 +863,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -792,21 +880,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
 
 [[package]]
 name = "futures-task"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-util"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -829,19 +917,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "generator"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "winapi",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.5"
@@ -865,13 +940,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.4"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -892,9 +967,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "h2"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9de88456263e249e241fcd211d3954e2c9b0ef7ccfc235a444eb367cae3689"
+checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
 dependencies = [
  "bytes",
  "fnv",
@@ -918,22 +993,44 @@ dependencies = [
  "ahash",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+
 [[package]]
 name = "hashlink"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.11.2",
 ]
 
 [[package]]
-name = "heck"
-version = "0.3.3"
+name = "headers"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
 dependencies = [
- "unicode-segmentation",
+ "base64 0.13.0",
+ "bitflags",
+ "bytes",
+ "headers-core",
+ "http",
+ "httpdate",
+ "mime",
+ "sha-1 0.10.0",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+dependencies = [
+ "http",
 ]
 
 [[package]]
@@ -994,7 +1091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
 dependencies = [
  "crypto-mac",
- "digest",
+ "digest 0.9.0",
 ]
 
 [[package]]
@@ -1010,20 +1107,20 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.1",
+ "itoa",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
  "http",
@@ -1031,10 +1128,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "httparse"
-version = "1.5.1"
+name = "http-range-header"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
+checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+
+[[package]]
+name = "httparse"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
 
 [[package]]
 name = "httpdate"
@@ -1044,9 +1147,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "hyper"
-version = "0.14.16"
+version = "0.14.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55"
+checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1057,9 +1160,9 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 0.4.8",
+ "itoa",
  "pin-project-lite",
- "socket2 0.4.3",
+ "socket2 0.4.4",
  "tokio",
  "tower-service",
  "tracing",
@@ -1074,9 +1177,9 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
 dependencies = [
  "http",
  "hyper",
- "rustls 0.20.2",
+ "rustls",
  "tokio",
- "tokio-rustls 0.23.2",
+ "tokio-rustls",
 ]
 
 [[package]]
@@ -1109,23 +1212,20 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
+checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.1",
  "serde",
 ]
 
 [[package]]
 name = "indoc"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
-dependencies = [
- "unindent",
-]
+checksum = "05a0bd019339e5d968b37855180087b7b9d512c5046fbd244cf8c95687927d6e"
 
 [[package]]
 name = "inlinable_string"
@@ -1162,9 +1262,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.3.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
+checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
 
 [[package]]
 name = "itertools"
@@ -1177,15 +1277,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "0.4.8"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
 
 [[package]]
 name = "jobserver"
@@ -1204,18 +1298,18 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
 
 [[package]]
 name = "js-sys"
-version = "0.3.56"
+version = "0.3.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
+checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "js_int"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaba9bcd19568a4b4b3736b23e368e5b75e3ea126fd4cb3e4ad2ea5af274fd"
+checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a"
 dependencies = [
  "serde",
 ]
@@ -1248,9 +1342,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.113"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "libloading"
@@ -1293,9 +1387,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "lmdb-rkv-sys"
-version = "0.11.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b27470ac25167b3afdfb6af8fcd3bc1be67de50ffbdaf4073378cfded6ae24a5"
+checksum = "61b9ce6b3be08acefa3003c57b7565377432a89ec24476bbe72e11d101f852fe"
 dependencies = [
  "cc",
  "libc",
@@ -1304,37 +1398,23 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.5"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
 dependencies = [
+ "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.14"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "loom"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc5c7d328e32cc4954e8e01193d7f0ef5ab257b5090b70a964e099a36034309"
-dependencies = [
- "cfg-if 1.0.0",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
- "tracing",
- "tracing-subscriber 0.3.6",
-]
-
 [[package]]
 name = "lru-cache"
 version = "0.1.2"
@@ -1365,15 +1445,6 @@ dependencies = [
  "regex-automata",
 ]
 
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
 [[package]]
 name = "matches"
 version = "0.1.9"
@@ -1381,10 +1452,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
-name = "memchr"
-version = "2.4.1"
+name = "matchit"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memoffset"
@@ -1417,65 +1494,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "mio"
-version = "0.7.14"
+name = "miniz_oxide"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
 dependencies = [
  "libc",
  "log",
- "miow",
- "ntapi",
- "winapi",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "multer"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f8f35e687561d5c1667590911e6698a8cb714a134a7505718a182e7bc9d3836"
-dependencies = [
- "bytes",
- "encoding_rs",
- "futures-util",
- "http",
- "httparse",
- "log",
- "memchr",
- "mime",
- "spin 0.9.2",
- "tokio",
- "tokio-util",
- "version_check",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys",
 ]
 
 [[package]]
 name = "nom"
-version = "7.1.0"
+version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
 dependencies = [
  "memchr",
  "minimal-lexical",
- "version_check",
-]
-
-[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi",
 ]
 
 [[package]]
@@ -1491,9 +1537,9 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
  "autocfg",
  "num-traits",
@@ -1501,9 +1547,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.42"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -1523,9 +1569,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
 ]
@@ -1542,9 +1588,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.9.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
+checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
 
 [[package]]
 name = "opaque-debug"
@@ -1552,6 +1598,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
 [[package]]
 name = "opentelemetry"
 version = "0.16.0"
@@ -1565,7 +1617,7 @@ dependencies = [
  "lazy_static",
  "percent-encoding",
  "pin-project",
- "rand 0.8.4",
+ "rand 0.8.5",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -1606,12 +1658,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.0.0"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
-dependencies = [
- "memchr",
-]
+checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
 
 [[package]]
 name = "page_size"
@@ -1650,9 +1699,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5"
+checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
 
 [[package]]
 name = "pear"
@@ -1702,15 +1751,15 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "persy"
-version = "1.2.1"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71907e1dfa6844b657f5ca59e9a076e7d6281efb4885526ba9e235a18e7e3b3"
+checksum = "5af61053f1daed3ff0265fad7f924e43ce07642a336c79304f8e5aec205460fb"
 dependencies = [
  "crc",
  "data-encoding",
  "fs2",
  "linked-hash-map",
- "rand 0.8.4",
+ "rand 0.8.5",
  "thiserror",
  "unsigned-varint",
  "zigzag",
@@ -1738,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "pin-utils"
@@ -1761,9 +1810,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "png"
@@ -1774,7 +1823,7 @@ dependencies = [
  "bitflags",
  "crc32fast",
  "deflate",
- "miniz_oxide",
+ "miniz_oxide 0.3.7",
 ]
 
 [[package]]
@@ -1785,9 +1834,9 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
 dependencies = [
  "thiserror",
  "toml",
@@ -1817,19 +1866,13 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -1853,9 +1896,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.14"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
+checksum = "f53dc8cf16a769a6f677e09e7ff2cd4be1ea0f48754aac39520536962011de0d"
 dependencies = [
  "proc-macro2",
 ]
@@ -1870,19 +1913,18 @@ dependencies = [
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
- "rand_hc 0.2.0",
+ "rand_hc",
 ]
 
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
  "rand_core 0.6.3",
- "rand_hc 0.3.1",
 ]
 
 [[package]]
@@ -1920,7 +1962,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.7",
 ]
 
 [[package]]
@@ -1932,59 +1974,31 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.3",
-]
-
 [[package]]
 name = "redox_syscall"
-version = "0.2.10"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.7",
  "redox_syscall",
-]
-
-[[package]]
-name = "ref-cast"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2002,18 +2016,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.25"
+version = "0.6.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
+checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
 
 [[package]]
 name = "reqwest"
@@ -2037,19 +2042,19 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.20.2",
- "rustls-pemfile",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pemfile 0.2.1",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-rustls 0.23.2",
+ "tokio-rustls",
  "tokio-socks",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots",
  "winreg 0.7.0",
 ]
 
@@ -2072,95 +2077,12 @@ dependencies = [
  "cc",
  "libc",
  "once_cell",
- "spin 0.5.2",
+ "spin",
  "untrusted",
  "web-sys",
  "winapi",
 ]
 
-[[package]]
-name = "rocket"
-version = "0.5.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a71c18c42a0eb15bf3816831caf0dad11e7966f2a41aaf486a701979c4dd1f2"
-dependencies = [
- "async-stream",
- "async-trait",
- "atomic",
- "atty",
- "binascii",
- "bytes",
- "either",
- "figment",
- "futures",
- "indexmap",
- "log",
- "memchr",
- "multer",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "rand 0.8.4",
- "ref-cast",
- "rocket_codegen",
- "rocket_http",
- "serde",
- "state",
- "tempfile",
- "time 0.2.27",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "ubyte",
- "version_check",
- "yansi",
-]
-
-[[package]]
-name = "rocket_codegen"
-version = "0.5.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66f5fa462f7eb958bba8710c17c5d774bbbd59809fa76fb1957af7e545aea8bb"
-dependencies = [
- "devise",
- "glob",
- "indexmap",
- "proc-macro2",
- "quote",
- "rocket_http",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "rocket_http"
-version = "0.5.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c8b7d512d2fcac2316ebe590cde67573844b99e6cc9ee0f53375fa16e25ebd"
-dependencies = [
- "cookie",
- "either",
- "http",
- "hyper",
- "indexmap",
- "log",
- "memchr",
- "mime",
- "parking_lot",
- "pear",
- "percent-encoding",
- "pin-project-lite",
- "ref-cast",
- "serde",
- "smallvec",
- "stable-pattern",
- "state",
- "time 0.2.27",
- "tokio",
- "tokio-rustls 0.22.0",
- "uncased",
-]
-
 [[package]]
 name = "rocksdb"
 version = "0.17.0"
@@ -2173,70 +2095,35 @@ dependencies = [
 
 [[package]]
 name = "ruma"
-version = "0.4.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
+version = "0.5.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
 dependencies = [
  "assign",
  "js_int",
- "ruma-api",
  "ruma-appservice-api",
  "ruma-client-api",
  "ruma-common",
- "ruma-events",
  "ruma-federation-api",
- "ruma-identifiers",
  "ruma-identity-service-api",
  "ruma-push-gateway-api",
- "ruma-serde",
  "ruma-signatures",
  "ruma-state-res",
 ]
 
-[[package]]
-name = "ruma-api"
-version = "0.18.5"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "bytes",
- "http",
- "percent-encoding",
- "ruma-api-macros",
- "ruma-identifiers",
- "ruma-serde",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "ruma-api-macros"
-version = "0.18.5"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ruma-appservice-api"
-version = "0.4.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
+version = "0.5.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
 dependencies = [
- "ruma-api",
  "ruma-common",
- "ruma-events",
- "ruma-identifiers",
- "ruma-serde",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "ruma-client-api"
-version = "0.12.3"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
+version = "0.13.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
 dependencies = [
  "assign",
  "bytes",
@@ -2244,171 +2131,100 @@ dependencies = [
  "js_int",
  "maplit",
  "percent-encoding",
- "ruma-api",
  "ruma-common",
- "ruma-events",
- "ruma-identifiers",
- "ruma-serde",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "ruma-common"
-version = "0.6.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "indexmap",
- "js_int",
- "ruma-identifiers",
- "ruma-serde",
- "serde",
- "serde_json",
- "tracing",
- "wildmatch",
-]
-
-[[package]]
-name = "ruma-events"
-version = "0.24.6"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "indoc",
- "js_int",
- "ruma-common",
- "ruma-events-macros",
- "ruma-identifiers",
- "ruma-serde",
- "serde",
- "serde_json",
- "thiserror",
- "wildmatch",
-]
-
-[[package]]
-name = "ruma-events-macros"
-version = "0.24.6"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ruma-federation-api"
-version = "0.3.1"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "js_int",
- "ruma-api",
- "ruma-common",
- "ruma-events",
- "ruma-identifiers",
- "ruma-serde",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "ruma-identifiers"
-version = "0.20.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "percent-encoding",
- "rand 0.8.4",
- "ruma-identifiers-macros",
- "ruma-identifiers-validation",
- "ruma-serde",
- "ruma-serde-macros",
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "ruma-identifiers-macros"
-version = "0.20.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "quote",
- "ruma-identifiers-validation",
- "syn",
-]
-
-[[package]]
-name = "ruma-identifiers-validation"
-version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "ruma-identity-service-api"
-version = "0.3.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "js_int",
- "ruma-api",
- "ruma-common",
- "ruma-identifiers",
- "ruma-serde",
- "serde",
-]
-
-[[package]]
-name = "ruma-push-gateway-api"
-version = "0.3.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
-dependencies = [
- "js_int",
- "ruma-api",
- "ruma-common",
- "ruma-events",
- "ruma-identifiers",
- "ruma-serde",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "ruma-serde"
-version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
+version = "0.8.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
 dependencies = [
  "base64 0.13.0",
  "bytes",
  "form_urlencoded",
- "itoa 0.4.8",
+ "http",
+ "indexmap",
+ "indoc",
+ "itoa",
  "js_int",
- "ruma-serde-macros",
+ "percent-encoding",
+ "rand 0.8.5",
+ "ruma-identifiers-validation",
+ "ruma-macros",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+ "url",
+ "uuid",
+ "wildmatch",
+]
+
+[[package]]
+name = "ruma-federation-api"
+version = "0.4.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
+dependencies = [
+ "js_int",
+ "ruma-common",
  "serde",
  "serde_json",
 ]
 
 [[package]]
-name = "ruma-serde-macros"
-version = "0.5.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
+name = "ruma-identifiers-validation"
+version = "0.7.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
+dependencies = [
+ "thiserror",
+ "url",
+]
+
+[[package]]
+name = "ruma-identity-service-api"
+version = "0.4.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
+dependencies = [
+ "js_int",
+ "ruma-common",
+ "serde",
+]
+
+[[package]]
+name = "ruma-macros"
+version = "0.1.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
+ "ruma-identifiers-validation",
  "syn",
 ]
 
+[[package]]
+name = "ruma-push-gateway-api"
+version = "0.4.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
+dependencies = [
+ "js_int",
+ "ruma-common",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "ruma-signatures"
-version = "0.9.0"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
+version = "0.10.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
 dependencies = [
  "base64 0.13.0",
  "ed25519-dalek",
  "pkcs8",
  "rand 0.7.3",
- "ruma-identifiers",
- "ruma-serde",
+ "ruma-common",
  "serde_json",
  "sha2",
  "thiserror",
@@ -2417,15 +2233,12 @@ dependencies = [
 
 [[package]]
 name = "ruma-state-res"
-version = "0.4.1"
-source = "git+https://github.com/ruma/ruma?rev=f7a10a7e471b59d3096be2695c2a05d407d80df1#f7a10a7e471b59d3096be2695c2a05d407d80df1"
+version = "0.6.0"
+source = "git+https://github.com/ruma/ruma?rev=d614ad1422d6c4b3437ebc318ca8514ae338fd6d#d614ad1422d6c4b3437ebc318ca8514ae338fd6d"
 dependencies = [
  "itertools",
  "js_int",
  "ruma-common",
- "ruma-events",
- "ruma-identifiers",
- "ruma-serde",
  "serde",
  "serde_json",
  "thiserror",
@@ -2456,7 +2269,7 @@ dependencies = [
  "base64 0.13.0",
  "blake2b_simd",
  "constant_time_eq",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.9",
 ]
 
 [[package]]
@@ -2465,38 +2278,28 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustls"
-version = "0.19.1"
+version = "0.20.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.0",
- "log",
- "ring",
- "sct 0.6.1",
- "webpki 0.21.4",
-]
-
-[[package]]
-name = "rustls"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84"
+checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
 dependencies = [
  "log",
  "ring",
- "sct 0.7.0",
- "webpki 0.22.0",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 1.0.0",
+ "schannel",
+ "security-framework",
 ]
 
 [[package]]
@@ -2509,22 +2312,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustversion"
-version = "1.0.6"
+name = "rustls-pemfile"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
+dependencies = [
+ "base64 0.13.0",
+]
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
 
 [[package]]
-name = "scoped-tls"
-version = "1.0.0"
+name = "schannel"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+dependencies = [
+ "lazy_static",
+ "windows-sys",
+]
 
 [[package]]
 name = "scopeguard"
@@ -2532,16 +2342,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -2553,34 +2353,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "semver"
-version = "0.9.0"
+name = "security-framework"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
 dependencies = [
- "semver-parser",
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
 ]
 
 [[package]]
-name = "semver-parser"
-version = "0.7.0"
+name = "security-framework-sys"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
 
 [[package]]
 name = "serde"
-version = "1.0.134"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b3c34c1690edf8174f5b289a336ab03f568a4460d8c6df75f2f3a692b3bc6a"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.134"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784ed1fbfa13fe191077537b0d70ec8ad1e903cfe04831da608aa36457cb653d"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2589,11 +2397,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.75"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79"
+checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
 dependencies = [
- "itoa 1.0.1",
+ "itoa",
  "ryu",
  "serde",
 ]
@@ -2605,16 +2413,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.1",
+ "itoa",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.23"
+version = "0.8.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
+checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
 dependencies = [
  "indexmap",
  "ryu",
@@ -2628,38 +2436,34 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.9.0",
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest",
+ "digest 0.9.0",
  "opaque-debug",
 ]
 
 [[package]]
-name = "sha1"
-version = "0.6.1"
+name = "sha-1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
 dependencies = [
- "sha1_smol",
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
 ]
 
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
 [[package]]
 name = "sha2"
 version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.9.0",
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest",
+ "digest 0.9.0",
  "opaque-debug",
 ]
 
@@ -2706,9 +2510,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
+checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
 
 [[package]]
 name = "sled"
@@ -2718,7 +2522,7 @@ checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
 dependencies = [
  "crc32fast",
  "crossbeam-epoch",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.9",
  "fs2",
  "fxhash",
  "libc",
@@ -2746,9 +2550,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 dependencies = [
  "libc",
  "winapi",
@@ -2760,12 +2564,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
-[[package]]
-name = "spin"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
-
 [[package]]
 name = "spki"
 version = "0.4.1"
@@ -2775,82 +2573,6 @@ dependencies = [
  "der",
 ]
 
-[[package]]
-name = "stable-pattern"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "standback"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "state"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cf4f5369e6d3044b5e365c9690f451516ac8f0954084622b49ea3fde2f6de5"
-dependencies = [
- "loom",
-]
-
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
 [[package]]
 name = "subtle"
 version = "2.4.1"
@@ -2859,15 +2581,21 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.86"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"
+
 [[package]]
 name = "synchronoise"
 version = "1.0.0"
@@ -2889,40 +2617,26 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
 [[package]]
 name = "textwrap"
-version = "0.14.2"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
 [[package]]
 name = "thiserror"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
+checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
+checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2931,9 +2645,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
  "once_cell",
 ]
@@ -2973,9 +2687,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemalloc-sys"
-version = "0.4.2+5.2.1-patched.2"
+version = "0.4.3+5.2.1-patched.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5844e429d797c62945a566f8da4e24c7fe3fbd5d6617fd8bf7a0b7dc1ee0f22e"
+checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49"
 dependencies = [
  "cc",
  "fs_extra",
@@ -2984,9 +2698,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemallocator"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf"
+checksum = "a5b7bcecfafe4998587d636f9ae9d55eb9d0499877b88757767c346875067098"
 dependencies = [
  "libc",
  "tikv-jemalloc-sys",
@@ -2994,57 +2708,20 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
  "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
  "winapi",
 ]
 
-[[package]]
-name = "time"
-version = "0.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
-dependencies = [
- "const_fn",
- "libc",
- "standback",
- "stdweb",
- "time-macros",
- "version_check",
- "winapi",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
-[[package]]
-name = "time-macros-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "standback",
- "syn",
-]
-
 [[package]]
 name = "tinyvec"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3057,9 +2734,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.15.0"
+version = "1.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
 dependencies = [
  "bytes",
  "libc",
@@ -3069,15 +2746,16 @@ dependencies = [
  "once_cell",
  "pin-project-lite",
  "signal-hook-registry",
+ "socket2 0.4.4",
  "tokio-macros",
  "winapi",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3086,24 +2764,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.22.0"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
+checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
- "rustls 0.19.1",
+ "rustls",
  "tokio",
- "webpki 0.21.4",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b"
-dependencies = [
- "rustls 0.20.2",
- "tokio",
- "webpki 0.22.0",
+ "webpki",
 ]
 
 [[package]]
@@ -3120,9 +2787,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
+checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -3131,40 +2798,86 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.9"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
+checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
- "log",
  "pin-project-lite",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
 dependencies = [
  "serde",
 ]
 
 [[package]]
-name = "tower-service"
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba"
+dependencies = [
+ "async-compression",
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-range-header",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.29"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
+checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
 dependencies = [
  "cfg-if 1.0.0",
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -3172,9 +2885,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.18"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
+checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3183,11 +2896,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.21"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
+checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921"
 dependencies = [
- "lazy_static",
+ "once_cell",
+ "valuable",
 ]
 
 [[package]]
@@ -3198,14 +2912,14 @@ checksum = "bd520fe41c667b437952383f3a1ec14f1fa45d653f719a77eedd6e6a02d8fa54"
 dependencies = [
  "lazy_static",
  "tracing",
- "tracing-subscriber 0.2.25",
+ "tracing-subscriber",
 ]
 
 [[package]]
 name = "tracing-log"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
 dependencies = [
  "lazy_static",
  "log",
@@ -3214,9 +2928,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-serde"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
 dependencies = [
  "serde",
  "tracing-core",
@@ -3231,7 +2945,7 @@ dependencies = [
  "ansi_term",
  "chrono",
  "lazy_static",
- "matchers 0.0.1",
+ "matchers",
  "regex",
  "serde",
  "serde_json",
@@ -3244,29 +2958,11 @@ dependencies = [
  "tracing-serde",
 ]
 
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77be66445c4eeebb934a7340f227bfe7b338173d3f8c00a60a5a58005c9faecf"
-dependencies = [
- "ansi_term",
- "lazy_static",
- "matchers 0.1.0",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
 [[package]]
 name = "trust-dns-proto"
-version = "0.20.3"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4"
+checksum = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -3279,7 +2975,7 @@ dependencies = [
  "ipnet",
  "lazy_static",
  "log",
- "rand 0.8.4",
+ "rand 0.8.5",
  "smallvec",
  "thiserror",
  "tinyvec",
@@ -3289,9 +2985,9 @@ dependencies = [
 
 [[package]]
 name = "trust-dns-resolver"
-version = "0.20.3"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770"
+checksum = "ecae383baad9995efaa34ce8e57d12c3f305e545887472a492b838f4b5cfb77a"
 dependencies = [
  "cfg-if 1.0.0",
  "futures-util",
@@ -3319,30 +3015,26 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
-[[package]]
-name = "ubyte"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42756bb9e708855de2f8a98195643dff31a97f0485d90d8467b39dc24be9e8fe"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "uncased"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0"
+checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
 dependencies = [
- "serde",
  "version_check",
 ]
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
 
 [[package]]
 name = "unicode-normalization"
@@ -3353,23 +3045,11 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
 [[package]]
 name = "unicode-xid"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "unindent"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
+checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
 
 [[package]]
 name = "unsigned-varint"
@@ -3401,9 +3081,15 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.7",
 ]
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -3434,15 +3120,21 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
+checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -3450,9 +3142,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
+checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -3465,9 +3157,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.29"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
+checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -3477,9 +3169,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
+checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3487,9 +3179,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
+checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3500,30 +3192,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
+checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
 
 [[package]]
 name = "web-sys"
-version = "0.3.56"
+version = "0.3.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
+checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki"
 version = "0.22.0"
@@ -3534,20 +3216,11 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449"
-dependencies = [
- "webpki 0.22.0",
-]
-
 [[package]]
 name = "weezl"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e"
+checksum = "9c97e489d8f836838d497091de568cf16b117486d529ec5579233521065bd5e4"
 
 [[package]]
 name = "widestring"
@@ -3583,6 +3256,49 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+
 [[package]]
 name = "winreg"
 version = "0.6.2"
@@ -3612,24 +3328,24 @@ dependencies = [
 
 [[package]]
 name = "yansi"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
 [[package]]
 name = "zeroize"
-version = "1.5.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc222aec311c323c717f56060324f32b82da1ce1dd81d9a09aa6a9030bfe08db"
+checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb"
+checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 7f843435..a8556a45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,41 +6,41 @@ authors = ["timokoesters <timo@koesters.xyz>"]
 homepage = "https://conduit.rs"
 repository = "https://gitlab.com/famedly/conduit"
 readme = "README.md"
-version = "0.3.0"
+version = "0.4.0"
 rust-version = "1.56"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# Used to handle requests
-# TODO: This can become optional as soon as proper configs are supported
-# rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev = "801e04bd5369eb39e126c75f6d11e1e9597304d8", features = ["tls"] } # Used to handle requests
-rocket = { version = "0.5.0-rc.1", features = ["tls"] } # Used to handle requests
+# Web framework
+axum = { version = "0.5.8", default-features = false, features = ["form", "headers", "http1", "http2", "json", "matched-path"], optional = true }
+axum-server = { version = "0.4.0", features = ["tls-rustls"] }
+tower = { version = "0.4.8", features = ["util"] }
+tower-http = { version = "0.3.4", features = ["add-extension", "cors", "compression-full", "sensitive-headers", "trace", "util"] }
 
 # Used for matrix spec type definitions and helpers
 #ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
-ruma = { git = "https://github.com/ruma/ruma", rev = "f7a10a7e471b59d3096be2695c2a05d407d80df1", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
+ruma = { git = "https://github.com/ruma/ruma", rev = "d614ad1422d6c4b3437ebc318ca8514ae338fd6d", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-pre-spec", "unstable-exhaustive-types"] }
 #ruma = { git = "https://github.com/timokoesters/ruma", rev = "50c1db7e0a3a21fc794b0cce3b64285a4c750c71", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
 #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
 
-# Used for long polling and federation sender, should be the same as rocket::tokio
-tokio = "1.11.0"
+# Async runtime and utilities
+tokio = { version = "1.11.0", features = ["fs", "macros", "signal", "sync"] }
 # Used for storing data permanently
-sled = { version = "0.34.6", features = ["compression", "no_metrics"], optional = true }
+sled = { version = "0.34.7", features = ["compression", "no_metrics"], optional = true }
 #sled = { git = "https://github.com/spacejam/sled.git", rev = "e4640e0773595229f398438886f19bca6f7326a2", features = ["compression"] }
-persy = { version = "1.2" , optional = true, features=["background_ops"] }
+persy = { version = "1.0.0", optional = true, features = ["background_ops"] }
 
 # Used for the http request / response body type for Ruma endpoints used with reqwest
 bytes = "1.1.0"
-# Used for rocket<->ruma conversions
 http = "0.2.4"
 # Used to find data directory for default db path
-directories = "3.0.2"
+directories = "4.0.0"
 # Used for ruma wrapper
-serde_json = { version = "1.0.70", features = ["raw_value"] }
+serde_json = { version = "1.0.68", features = ["raw_value"] }
 # Used for appservice registration files
-serde_yaml = "0.8.20"
+serde_yaml = "0.8.21"
 # Used for pdu definition
 serde = { version = "1.0.130", features = ["rc"] }
 # Used for secure identifiers
@@ -48,9 +48,9 @@ rand = "0.8.4"
 # Used to hash passwords
 rust-argon2 = "0.8.3"
 # Used to send requests
-reqwest = { default-features = false, features = ["rustls-tls", "socks"], git = "https://github.com/timokoesters/reqwest", rev = "57b7cf4feb921573dfafad7d34b9ac6e44ead0bd" }
+reqwest = { default-features = false, features = ["rustls-tls-native-roots", "socks"], git = "https://github.com/timokoesters/reqwest", rev = "57b7cf4feb921573dfafad7d34b9ac6e44ead0bd" }
 # Used for conduit::Error type
-thiserror = "1.0.28"
+thiserror = "1.0.29"
 # Used to generate thumbnails for images
 image = { version = "0.23.14", default-features = false, features = ["jpeg", "png", "gif"] }
 # Used to encode server public key
@@ -64,8 +64,8 @@ regex = "1.5.4"
 # jwt jsonwebtokens
 jsonwebtoken = "7.2.0"
 # Performance measurements
-tracing = { version = "0.1.26", features = ["release_max_level_warn"] }
-tracing-subscriber = "0.2.20"
+tracing = { version = "0.1.27", features = [] }
+tracing-subscriber = "0.2.22"
 tracing-flame = "0.1.0"
 opentelemetry = { version = "0.16.0", features = ["rt-tokio"] }
 opentelemetry-jaeger = { version = "0.15.0", features = ["rt-tokio"] }
@@ -76,15 +76,17 @@ crossbeam = { version = "0.8.1", optional = true }
 num_cpus = "1.13.0"
 threadpool = "1.8.1"
 heed = { git = "https://github.com/timokoesters/heed.git", rev = "f6f825da7fb2c758867e05ad973ef800a6fe1d5d", optional = true }
-rocksdb = { version = "0.17.0", default-features = false, features = ["multi-threaded-cf", "zstd"], optional = true }
+rocksdb = { version = "0.17.0", default-features = true, features = ["multi-threaded-cf", "zstd"], optional = true }
 
 thread_local = "1.1.3"
 # used for TURN server authentication
 hmac = "0.11.0"
 sha-1 = "0.9.8"
 # used for conduit's CLI and admin room command parsing
-clap = { version = "3.0.10", default-features = false, features = ["std", "derive"] }
-maplit = "1.0.2"
+clap = { version = "3.2.5", default-features = false, features = ["std", "derive"] }
+futures-util = { version = "0.3.17", default-features = false }
+# Used for reading the configuration from conduit.toml & environment variables
+figment = { version = "0.10.6", features = ["env", "toml"] }
 
 tikv-jemalloc-ctl = { version = "0.4.2", features = ["use_std"], optional = true }
 tikv-jemallocator = { version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"], optional = true }
@@ -98,7 +100,7 @@ backend_heed = ["heed", "crossbeam"]
 backend_rocksdb = ["rocksdb"]
 jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator"]
 sqlite = ["rusqlite", "parking_lot", "tokio/signal"]
-conduit_bin = [] # TODO: add rocket to this when it is optional
+conduit_bin = ["axum"]
 
 [[bin]]
 name = "conduit"
diff --git a/Cross.toml b/Cross.toml
index a1387b43..5d99a358 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -20,4 +20,4 @@ image = "registry.gitlab.com/jfowl/conduit-containers/rust-cross-arm-unknown-lin
 image = "registry.gitlab.com/jfowl/conduit-containers/rust-cross-armv7-unknown-linux-musleabihf:latest"
 
 [target.x86_64-unknown-linux-musl]
-image = "registry.gitlab.com/jfowl/conduit-containers/rust-cross-x86_64-unknown-linux-musl:latest"
+image = "registry.gitlab.com/jfowl/conduit-containers/rust-cross-x86_64-unknown-linux-musl@sha256:b6d689e42f0236c8a38b961bca2a12086018b85ed20e0826310421daf182e2bb"
diff --git a/DEPLOY.md b/DEPLOY.md
index c3da6975..f0990dcf 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -43,7 +43,6 @@ $ sudo apt install libclang-dev build-essential
 $ cargo build --release
 ```
 
-Note that this currently requires Rust 1.50.
 
 If you want to cross compile Conduit to another architecture, read the [Cross-Compile Guide](cross/README.md).
 
@@ -58,6 +57,12 @@ In Debian you can use this command to create a Conduit user:
 sudo adduser --system conduit --no-create-home
 ```
 
+## Forwarding ports in the firewall or the router
+
+Conduit uses the ports 443 and 8448 both of which need to be open in the firewall.
+
+If Conduit runs behind a router or in a container and has a different public IP address than the host system these public ports need to be forwarded directly or indirectly to the port mentioned in the config.
+
 ## Setting up a systemd service
 
 Now we'll set up a systemd service for Conduit, so it's easy to start/stop Conduit and set it to autostart when your
@@ -89,28 +94,35 @@ $ sudo systemctl daemon-reload
 ## Creating the Conduit configuration file
 
 Now we need to create the Conduit's config file in `/etc/matrix-conduit/conduit.toml`. Paste this in **and take a moment
-to read it. You need to change at least the server name.**
+to read it. You need to change at least the server name.**  
+You can also choose to use a different database backend, but right now only `rocksdb` and `sqlite` are recommended.
 
 ```toml
 [global]
-# The server_name is the name of this server. It is used as a suffix for user
+# The server_name is the pretty name of this server. It is used as a suffix for user
 # and room ids. Examples: matrix.org, conduit.rs
-# The Conduit server needs to be reachable at https://your.server.name/ on port
-# 443 (client-server) and 8448 (federation) OR you can create /.well-known
-# files to redirect requests. See
+
+# The Conduit server needs all /_matrix/ requests to be reachable at
+# https://your.server.name/ on port 443 (client-server) and 8448 (federation).
+
+# If that's not possible for you, you can create /.well-known files to redirect
+# requests. See
 # https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client
-# and https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server
+# and
+# https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server
 # for more information
 
 # YOU NEED TO EDIT THIS
 #server_name = "your.server.name"
 
 # This is the only directory where Conduit will save its data
-database_path = "/var/lib/matrix-conduit/conduit_db"
+database_path = "/var/lib/matrix-conduit/"
+database_backend = "rocksdb"
 
 # The port Conduit will be running on. You need to set up a reverse proxy in
 # your web server (e.g. apache or nginx), so all requests to /_matrix on port
 # 443 and 8448 will be forwarded to the Conduit instance running on this port
+# Docker users: Don't change this, you'll need to map an external port to this.
 port = 6167
 
 # Max size for uploads
@@ -119,20 +131,15 @@ max_request_size = 20_000_000 # in bytes
 # Enables registration. If set to false, no users can register on this server.
 allow_registration = true
 
-# Disable encryption, so no new encrypted rooms can be created
-# Note: existing rooms will continue to work
-allow_encryption = true
 allow_federation = true
 
 trusted_servers = ["matrix.org"]
 
 #max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
-#workers = 4 # default: cpu core count * 2
+#log = "info,state_res=warn,rocket=off,_=off,sled=off"
 
 address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
-
-# The total amount of memory that the database will use.
-#db_cache_capacity_mb = 200
+#address = "0.0.0.0" # If Conduit is running in a container, make sure the reverse proxy (ie. Traefik) can reach it.
 ```
 
 ## Setting the correct file permissions
@@ -141,19 +148,21 @@ As we are using a Conduit specific user we need to allow it to read the config.
 Debian:
 
 ```bash
-sudo chown -R conduit:nogroup /etc/matrix-conduit
+sudo chown -R root:root /etc/matrix-conduit
+sudo chmod 755 /etc/matrix-conduit
 ```
 
 If you use the default database path you also need to run this:
 
 ```bash
-sudo mkdir -p /var/lib/matrix-conduit/conduit_db
-sudo chown -R conduit:nogroup /var/lib/matrix-conduit/conduit_db
+sudo mkdir -p /var/lib/matrix-conduit/
+sudo chown -R conduit:nogroup /var/lib/matrix-conduit/
+sudo chmod 700 /var/lib/matrix-conduit/
 ```
 
 ## Setting up the Reverse Proxy
 
-This depends on whether you use Apache, Nginx or another web server.
+This depends on whether you use Apache, Caddy, Nginx or another web server.
 
 ### Apache
 
@@ -179,6 +188,19 @@ ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/
 $ sudo systemctl reload apache2
 ```
 
+### Caddy
+Create `/etc/caddy/conf.d/conduit_caddyfile` and enter this (substitute for your server name).
+```caddy
+your.server.name, your.server.name:8448 {
+        reverse_proxy /_matrix/* 127.0.0.1:6167
+}
+```
+That's it! Just start or enable the service and you're set.
+```bash
+$ sudo systemctl enable caddy
+```
+
+
 ### Nginx
 
 If you use Nginx and not Apache, add the following server section inside the http section of `/etc/nginx/nginx.conf`
@@ -213,6 +235,8 @@ $ sudo systemctl reload nginx
 
 ## SSL Certificate
 
+If you chose Caddy as your web proxy SSL certificates are handled automatically and you can skip this step.
+
 The easiest way to get an SSL certificate, if you don't have one already, is to install `certbot` and run this:
 
 ```bash
@@ -244,5 +268,15 @@ $ curl https://your.server.name/_matrix/client/versions
 $ curl https://your.server.name:8448/_matrix/client/versions
 ```
 
-- To check if your server can talk with other homeservers, you can use the [Matrix Federation Tester](https://federationtester.matrix.org/)
-- If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
+- To check if your server can talk with other homeservers, you can use the [Matrix Federation Tester](https://federationtester.matrix.org/).
+  If you can register but cannot join federated rooms check your config again and also check if the port 8448 is open and forwarded correctly.
+
+# What's next?
+
+## Audio/Video calls
+
+For Audio/Video call functionality see the [TURN Guide](TURN.md).
+
+## Appservices
+
+If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
diff --git a/Dockerfile b/Dockerfile
index b631f297..76d10ea9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,8 @@ FROM docker.io/rust:1.58-bullseye AS builder
 WORKDIR /usr/src/conduit
 
 # Install required packages to build Conduit and it's dependencies
-RUN apt update && apt -y install libclang-dev
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install libclang-dev=1:11.0-51+nmu5
 
 # == Build dependencies without our own code separately for caching ==
 #
@@ -35,14 +36,16 @@ FROM docker.io/debian:bullseye-slim AS runner
 # You still need to map the port when using the docker command or docker-compose.
 EXPOSE 6167
 
-# Note from @jfowl: I would like to remove the config file in the future and just have the Docker version be configured with envs.
-ENV CONDUIT_CONFIG="/srv/conduit/conduit.toml" \
-    CONDUIT_PORT=6167
+ENV CONDUIT_PORT=6167 \
+    CONDUIT_ADDRESS="0.0.0.0" \
+    CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit \
+    CONDUIT_CONFIG=''
+#    └─> Set no config file to do all configuration with env vars
 
 # Conduit needs:
 #   ca-certificates: for https
 #   iproute2 & wget: for the healthcheck script
-RUN apt update && apt -y install \
+RUN apt-get update && apt-get -y --no-install-recommends install \
     ca-certificates \
     iproute2 \
     wget \
@@ -59,12 +62,12 @@ HEALTHCHECK --start-period=5s --interval=5s CMD ./healthcheck.sh
 COPY --from=builder /usr/src/conduit/target/release/conduit /srv/conduit/conduit
 
 # Improve security: Don't run stuff as root, that does not need to run as root
-# Add 'conduit' user and group (100:82). The UID:GID choice is to be compatible
-# with previous, Alpine-based containers, where the user and group were both
-# named 'www-data'.
+# Most distros also use 1000:1000 for the first real user, so this should resolve volume mounting problems.
+ARG USER_ID=1000
+ARG GROUP_ID=1000
 RUN set -x ; \
-    groupadd -r -g 82 conduit ; \
-    useradd -r -M -d /srv/conduit -o -u 100 -g conduit conduit && exit 0 ; exit 1
+    groupadd -r -g ${GROUP_ID} conduit ; \
+    useradd -l -r -M -d /srv/conduit -o -u ${USER_ID} -g conduit conduit && exit 0 ; exit 1
 
 # Change ownership of Conduit files to conduit user and group and make the healthcheck executable:
 RUN chown -cR conduit:conduit /srv/conduit && \
diff --git a/README.md b/README.md
index a4f09298..730b2512 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ HQ.
 
 #### What is the current status?
 
-As of 2021-09-01, Conduit is Beta, meaning you can join and participate in most
+Conduit is Beta, meaning you can join and participate in most
 Matrix rooms, but not all features are supported and you might run into bugs
 from time to time.
 
@@ -54,7 +54,7 @@ Thanks to Famedly, Prototype Fund (DLR and German BMBF) and all other individual
 Thanks to the contributors to Conduit and all libraries we use, for example:
 
 - Ruma: A clean library for the Matrix Spec in Rust
-- Rocket: A flexible web framework
+- axum: A modular web framework
 
 #### Donate
 
diff --git a/TURN.md b/TURN.md
new file mode 100644
index 00000000..63c1e99f
--- /dev/null
+++ b/TURN.md
@@ -0,0 +1,25 @@
+# Setting up TURN/STURN
+
+## General instructions
+
+* It is assumed you have a [Coturn server](https://github.com/coturn/coturn) up and running. See [Synapse reference implementation](https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md).
+
+## Edit/Add a few settings to your existing conduit.toml
+
+```
+# Refer to your Coturn settings. 
+# `your.turn.url` has to match the REALM setting of your Coturn as well as `transport`.
+turn_uris = ["turn:your.turn.url?transport=udp", "turn:your.turn.url?transport=tcp"]
+
+# static-auth-secret of your turnserver
+turn_secret = "ADD SECRET HERE"
+
+# If you have your TURN server configured to use a username and password
+# you can provide these information too. In this case comment out `turn_secret above`!
+#turn_username = ""
+#turn_password = ""
+```
+
+## Apply settings
+
+Restart Conduit.
\ No newline at end of file
diff --git a/conduit-example.toml b/conduit-example.toml
index f1578078..5eed0708 100644
--- a/conduit-example.toml
+++ b/conduit-example.toml
@@ -1,3 +1,10 @@
+# =============================================================================
+#  This is the official example config for Conduit.
+#  If you use it for your server, you will need to adjust it to your own needs.
+#  At the very least, change the server_name field!
+# =============================================================================
+
+
 [global]
 # The server_name is the pretty name of this server. It is used as a suffix for user
 # and room ids. Examples: matrix.org, conduit.rs
@@ -16,7 +23,7 @@
 #server_name = "your.server.name"
 
 # This is the only directory where Conduit will save its data
-database_path = "/var/lib/conduit/"
+database_path = "/var/lib/matrix-conduit/"
 database_backend = "rocksdb"
 
 # The port Conduit will be running on. You need to set up a reverse proxy in
@@ -31,24 +38,15 @@ max_request_size = 20_000_000 # in bytes
 # Enables registration. If set to false, no users can register on this server.
 allow_registration = true
 
-# Disable encryption, so no new encrypted rooms can be created
-# Note: existing rooms will continue to work
-#allow_encryption = false
-#allow_federation = false
+allow_federation = true
 
-# Enable jaeger to support monitoring and troubleshooting through jaeger
-#allow_jaeger = false
+# Enable the display name lightning bolt on registration.
+enable_lightning_bolt = true
 
 trusted_servers = ["matrix.org"]
 
 #max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
 #log = "info,state_res=warn,rocket=off,_=off,sled=off"
-#workers = 4 # default: cpu core count * 2
 
 address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
 #address = "0.0.0.0" # If Conduit is running in a container, make sure the reverse proxy (ie. Traefik) can reach it.
-
-proxy = "none" # more examples can be found at src/database/proxy.rs:6
-
-# The total amount of memory that the database will use.
-#db_cache_capacity_mb = 200
diff --git a/cross/README.md b/cross/README.md
deleted file mode 100644
index 2829d239..00000000
--- a/cross/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-## Cross compilation
-
-The `cross` folder contains a set of convenience scripts (`build.sh` and `test.sh`) for cross-compiling Conduit.
-
-Currently supported targets are
-
-- aarch64-unknown-linux-musl
-- arm-unknown-linux-musleabihf
-- armv7-unknown-linux-musleabihf
-- x86\_64-unknown-linux-musl
-
-### Install prerequisites
-#### Docker
-[Installation guide](https://docs.docker.com/get-docker/).
-```sh
-$ sudo apt install docker
-$ sudo systemctl start docker
-$ sudo usermod -aG docker $USER
-$ newgrp docker
-```
-
-#### Cross
-[Installation guide](https://github.com/rust-embedded/cross/#installation).
-```sh
-$ cargo install cross
-```
-
-### Buiding Conduit
-```sh
-$ TARGET=armv7-unknown-linux-musleabihf ./cross/build.sh --release
-```
-The cross-compiled binary is at `target/armv7-unknown-linux-musleabihf/release/conduit`
-
-### Testing Conduit
-```sh
-$ TARGET=armv7-unknown-linux-musleabihf ./cross/test.sh --release
-```
diff --git a/debian/matrix-conduit.service b/debian/matrix-conduit.service
index 7c12d1a7..299f2680 100644
--- a/debian/matrix-conduit.service
+++ b/debian/matrix-conduit.service
@@ -3,6 +3,7 @@ Description=Conduit Matrix homeserver
 After=network.target
 
 [Service]
+DynamicUser=yes
 User=_matrix-conduit
 Group=_matrix-conduit
 Type=simple
diff --git a/debian/postinst b/debian/postinst
index 6bd1a3a7..aab2480c 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,7 +5,7 @@ set -e
 
 CONDUIT_CONFIG_PATH=/etc/matrix-conduit
 CONDUIT_CONFIG_FILE="${CONDUIT_CONFIG_PATH}/conduit.toml"
-CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit/conduit_db
+CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit/
 
 case "$1" in
   configure)
@@ -36,18 +36,24 @@ case "$1" in
       mkdir -p "$CONDUIT_CONFIG_PATH"
       cat > "$CONDUIT_CONFIG_FILE" << EOF
 [global]
-# The server_name is the name of this server. It is used as a suffix for user
-# and room ids. Examples: matrix.org, conduit.rs
-# The Conduit server needs to be reachable at https://your.server.name/ on port
-# 443 (client-server) and 8448 (federation) OR you can create /.well-known
-# files to redirect requests. See
+# The server_name is the pretty name of this server. It is used as a suffix for
+# user and room ids. Examples: matrix.org, conduit.rs
+
+# The Conduit server needs all /_matrix/ requests to be reachable at
+# https://your.server.name/ on port 443 (client-server) and 8448 (federation).
+
+# If that's not possible for you, you can create /.well-known files to redirect
+# requests. See
 # https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client
-# and https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server
-# for more information.
+# and
+# https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server
+# for more information
+
 server_name = "${CONDUIT_SERVER_NAME}"
 
 # This is the only directory where Conduit will save its data.
 database_path = "${CONDUIT_DATABASE_PATH}"
+database_backend = "rocksdb"
 
 # The address Conduit will be listening on.
 # By default the server listens on address 0.0.0.0. Change this to 127.0.0.1 to
@@ -56,7 +62,8 @@ address = "${CONDUIT_ADDRESS}"
 
 # The port Conduit will be running on. You need to set up a reverse proxy in
 # your web server (e.g. apache or nginx), so all requests to /_matrix on port
-# 443 and 8448 will be forwarded to the Conduit instance running on this port.
+# 443 and 8448 will be forwarded to the Conduit instance running on this port
+# Docker users: Don't change this, you'll need to map an external port to this.
 port = ${CONDUIT_PORT}
 
 # Max size for uploads
@@ -65,20 +72,12 @@ max_request_size = 20_000_000 # in bytes
 # Enables registration. If set to false, no users can register on this server.
 allow_registration = true
 
-# Disable encryption, so no new encrypted rooms can be created.
-# Note: Existing rooms will continue to work.
-#allow_encryption = false
-#allow_federation = false
+allow_federation = true
 
-# Enable jaeger to support monitoring and troubleshooting through jaeger.
-#allow_jaeger = false
+trusted_servers = ["matrix.org"]
 
 #max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
 #log = "info,state_res=warn,rocket=off,_=off,sled=off"
-#workers = 4 # default: cpu core count * 2
-
-# The total amount of memory that the database will use.
-#db_cache_capacity_mb = 200
 EOF
     fi
     ;;
diff --git a/docker-compose.yml b/docker-compose.yml
index 530fc198..0a9d8f4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,27 +20,21 @@ services:
         ports:
             - 8448:6167
         volumes:
-            - db:/srv/conduit/.local/share/conduit
-            ### Uncomment if you want to use conduit.toml to configure Conduit
-            ### Note: Set env vars will override conduit.toml values
-            # - ./conduit.toml:/srv/conduit/conduit.toml
+            - db:/var/lib/matrix-conduit/
         environment:
-            CONDUIT_SERVER_NAME: localhost:6167  # replace with your own name
-            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
+            CONDUIT_DATABASE_BACKEND: rocksdb
+            CONDUIT_PORT: 6167
+            CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
             CONDUIT_ALLOW_REGISTRATION: 'true'
-            ### Uncomment and change values as desired
-            # CONDUIT_ADDRESS: 0.0.0.0
-            # CONDUIT_PORT: 6167
-            # CONDUIT_CONFIG: '/srv/conduit/conduit.toml'  # if you want to configure purely by env vars, set this to an empty string ''
-            # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
-            # CONDUIT_LOG: info  # default is: "info,rocket=off,_=off,sled=off"
-            # CONDUIT_ALLOW_JAEGER: 'false'
-            # CONDUIT_ALLOW_ENCRYPTION: 'false'
-            # CONDUIT_ALLOW_FEDERATION: 'false'
-            # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit
-            # CONDUIT_WORKERS: 10
-            # CONDUIT_MAX_REQUEST_SIZE: 20_000_000  # in bytes, ~20 MB
-
+            CONDUIT_ALLOW_FEDERATION: 'true'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            #CONDUIT_MAX_CONCURRENT_REQUESTS: 100
+            #CONDUIT_LOG: info,rocket=off,_=off,sled=off
+            CONDUIT_ADDRESS: 0.0.0.0
+            CONDUIT_CONFIG: '' # Ignore this
+    #
     ### Uncomment if you want to use your own Element-Web App.
     ### Note: You need to provide a config.json for Element and you also need a second
     ###       Domain or Subdomain for the communication between Element and Conduit
@@ -56,4 +50,4 @@ services:
     #         - homeserver
 
 volumes:
-  db:
+    db:
diff --git a/docker/README.md b/docker/README.md
index d8867385..c980adcc 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -24,7 +24,17 @@ which also will tag the resulting image as `matrixconduit/matrix-conduit:latest`
 After building the image you can simply run it with
 
 ```bash
-docker run -d -p 8448:6167 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/srv/conduit/.local/share/conduit matrixconduit/matrix-conduit:latest
+docker run -d -p 8448:6167 \
+  -v db:/var/lib/matrix-conduit/ \
+  -e CONDUIT_SERVER_NAME="your.server.name" \
+  -e CONDUIT_DATABASE_BACKEND="rocksdb" \
+  -e CONDUIT_ALLOW_REGISTRATION=true \
+  -e CONDUIT_ALLOW_FEDERATION=true \
+  -e CONDUIT_MAX_REQUEST_SIZE="20_000_000" \
+  -e CONDUIT_TRUSTED_SERVERS="[\"matrix.org\"]" \
+  -e CONDUIT_MAX_CONCURRENT_REQUESTS="100" \
+  -e CONDUIT_LOG="info,rocket=off,_=off,sled=off" \
+  --name conduit matrixconduit/matrix-conduit:latest
 ```
 
 or you can skip the build step and pull the image from one of the following registries:
@@ -46,8 +56,18 @@ If you just want to test Conduit for a short time, you can use the `--rm` flag,
 
 ## Docker-compose
 
-If the docker command is not for you or your setup, you can also use one of the provided `docker-compose` files. Depending on your proxy setup, use the [`docker-compose.traefik.yml`](docker-compose.traefik.yml) and [`docker-compose.override.traefik.yml`](docker-compose.override.traefik.yml) for Traefik (don't forget to remove `.traefik` from the filenames) or the normal [`docker-compose.yml`](../docker-compose.yml) for every other reverse proxy. Additional info about deploying
-Conduit can be found [here](../DEPLOY.md).
+If the `docker run` command is not for you or your setup, you can also use one of the provided `docker-compose` files.
+
+Depending on your proxy setup, you can use one of the following files;
+- If you already have a `traefik` instance set up, use [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml)
+- If you don't have a `traefik` instance set up (or any other reverse proxy), use [`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)
+- For any other reverse proxy, use [`docker-compose.yml`](docker-compose.yml)
+
+When picking the traefik-related compose file, rename it so it matches `docker-compose.yml`, and
+rename the override file to `docker-compose.override.yml`. Edit the latter with the values you want
+for your server.
+
+Additional info about deploying Conduit can be found [here](../DEPLOY.md).
 
 ### Build
 
@@ -71,11 +91,16 @@ docker-compose up -d
 
 ### Use Traefik as Proxy
 
-As a container user, you probably know about Traefik. It is a easy to use reverse proxy for making containerized app and services available through the web. With the
-two provided files, [`docker-compose.traefik.yml`](docker-compose.traefik.yml) and [`docker-compose.override.traefik.yml`](docker-compose.override.traefik.yml), it is
-equally easy to deploy and use Conduit, with a little caveat. If you already took a look at the files, then you should have seen the `well-known` service, and that is
-the little caveat. Traefik is simply a proxy and loadbalancer and is not able to serve any kind of content, but for Conduit to federate, we need to either expose ports
-`443` and `8448` or serve two endpoints `.well-known/matrix/client` and `.well-known/matrix/server`.
+As a container user, you probably know about Traefik. It is a easy to use reverse proxy for making
+containerized app and services available through the web. With the two provided files,
+[`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml) (or
+[`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)) and
+[`docker-compose.override.yml`](docker-compose.override.traefik.yml), it is equally easy to deploy
+and use Conduit, with a little caveat. If you already took a look at the files, then you should have
+seen the `well-known` service, and that is the little caveat. Traefik is simply a proxy and
+loadbalancer and is not able to serve any kind of content, but for Conduit to federate, we need to
+either expose ports `443` and `8448` or serve two endpoints `.well-known/matrix/client` and
+`.well-known/matrix/server`.
 
 With the service `well-known` we use a single `nginx` container that will serve those two files.
 
@@ -112,4 +137,4 @@ So...step by step:
      ```
 
 6. Run `docker-compose up -d`
-7. Connect to your homeserver with your preferred client and create a user. You should do this immediatly after starting Conduit, because the first created user is the admin.
+7. Connect to your homeserver with your preferred client and create a user. You should do this immediately after starting Conduit, because the first created user is the admin.
diff --git a/docker/ci-binaries-packaging.Dockerfile b/docker/ci-binaries-packaging.Dockerfile
index 3731bac1..4c1199ed 100644
--- a/docker/ci-binaries-packaging.Dockerfile
+++ b/docker/ci-binaries-packaging.Dockerfile
@@ -7,16 +7,21 @@
 # Credit's for the original Dockerfile: Weasy666.
 # ---------------------------------------------------------------------------------------------------------
 
-FROM docker.io/alpine:3.15.0 AS runner
+FROM docker.io/alpine:3.16.0@sha256:4ff3ca91275773af45cb4b0834e12b7eb47d1c18f770a0b151381cd227f4c253 AS runner
 
 
 # Standard port on which Conduit launches.
 # You still need to map the port when using the docker command or docker-compose.
 EXPOSE 6167
 
-# Note from @jfowl: I would like to remove the config file in the future and just have the Docker version be configured with envs. 
-ENV CONDUIT_CONFIG="/srv/conduit/conduit.toml" \
-    CONDUIT_PORT=6167
+# Users are expected to mount a volume to this directory:
+ARG DEFAULT_DB_PATH=/var/lib/matrix-conduit
+
+ENV CONDUIT_PORT=6167 \
+    CONDUIT_ADDRESS="0.0.0.0" \
+    CONDUIT_DATABASE_PATH=${DEFAULT_DB_PATH} \
+    CONDUIT_CONFIG=''
+#    └─> Set no config file to do all configuration with env vars
 
 # Conduit needs:
 #   ca-certificates: for https
@@ -25,7 +30,6 @@ RUN apk add --no-cache \
     ca-certificates \
     iproute2
 
-
 ARG CREATED
 ARG VERSION
 ARG GIT_REF
@@ -44,37 +48,37 @@ LABEL org.opencontainers.image.created=${CREATED} \
     org.opencontainers.image.documentation="https://gitlab.com/famedly/conduit" \
     org.opencontainers.image.ref.name=""
 
-# Created directory for the database and media files
-RUN mkdir -p /srv/conduit/.local/share/conduit
 
 # Test if Conduit is still alive, uses the same endpoint as Element
 COPY ./docker/healthcheck.sh /srv/conduit/healthcheck.sh
 HEALTHCHECK --start-period=5s --interval=5s CMD ./healthcheck.sh
 
-
-# Depending on the target platform (e.g. "linux/arm/v7", "linux/arm64/v8", or "linux/amd64")
-# copy the matching binary into this docker image
-ARG TARGETPLATFORM
-COPY ./$TARGETPLATFORM /srv/conduit/conduit
-
-
 # Improve security: Don't run stuff as root, that does not need to run as root:
-# Add www-data user and group with UID 82, as used by alpine
-# https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install
+# Most distros also use 1000:1000 for the first real user, so this should resolve volume mounting problems.
+ARG USER_ID=1000
+ARG GROUP_ID=1000
 RUN set -x ; \
-    addgroup -Sg 82 www-data 2>/dev/null ; \
-    adduser -S -D -H -h /srv/conduit -G www-data -g www-data www-data 2>/dev/null ; \
-    addgroup www-data www-data 2>/dev/null && exit 0 ; exit 1
+    deluser --remove-home www-data ; \
+    addgroup -S -g ${GROUP_ID} conduit 2>/dev/null ; \
+    adduser -S -u ${USER_ID} -D -H -h /srv/conduit -G conduit -g conduit conduit 2>/dev/null ; \
+    addgroup conduit conduit 2>/dev/null && exit 0 ; exit 1
 
-# Change ownership of Conduit files to www-data user and group
-RUN chown -cR www-data:www-data /srv/conduit
-RUN chmod +x /srv/conduit/healthcheck.sh
+# Change ownership of Conduit files to conduit user and group
+RUN chown -cR conduit:conduit /srv/conduit && \
+    chmod +x /srv/conduit/healthcheck.sh && \
+    mkdir -p ${DEFAULT_DB_PATH} && \
+    chown -cR conduit:conduit ${DEFAULT_DB_PATH}
 
-# Change user to www-data
-USER www-data
+# Change user to conduit
+USER conduit
 # Set container home directory
 WORKDIR /srv/conduit
 
 # Run Conduit and print backtraces on panics
 ENV RUST_BACKTRACE=1
 ENTRYPOINT [ "/srv/conduit/conduit" ]
+
+# Depending on the target platform (e.g. "linux/arm/v7", "linux/arm64/v8", or "linux/amd64")
+# copy the matching binary into this docker image
+ARG TARGETPLATFORM
+COPY --chown=conduit:conduit ./$TARGETPLATFORM /srv/conduit/conduit
diff --git a/docker/docker-compose.for-traefik.yml b/docker/docker-compose.for-traefik.yml
new file mode 100644
index 00000000..ca560b89
--- /dev/null
+++ b/docker/docker-compose.for-traefik.yml
@@ -0,0 +1,68 @@
+# Conduit - Behind Traefik Reverse Proxy
+version: '3'
+
+services:
+    homeserver:
+        ### If you already built the Conduit image with 'docker build' or want to use the Docker Hub image,
+        ### then you are ready to go.
+        image: matrixconduit/matrix-conduit:latest
+        ### If you want to build a fresh image from the sources, then comment the image line and uncomment the
+        ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this:
+        ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d
+        # build:
+        #     context: .
+        #     args:
+        #         CREATED: '2021-03-16T08:18:27Z'
+        #         VERSION: '0.1.0'
+        #         LOCAL: 'false'
+        #         GIT_REF: origin/master
+        restart: unless-stopped
+        volumes:
+            - db:/var/lib/matrix-conduit/
+        networks:
+            - proxy
+        environment:
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
+            CONDUIT_DATABASE_BACKEND: rocksdb
+            CONDUIT_PORT: 6167
+            CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
+            CONDUIT_ALLOW_REGISTRATION: 'true'
+            CONDUIT_ALLOW_FEDERATION: 'true'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            #CONDUIT_MAX_CONCURRENT_REQUESTS: 100
+            #CONDUIT_LOG: info,rocket=off,_=off,sled=off
+            CONDUIT_ADDRESS: 0.0.0.0
+            CONDUIT_CONFIG: '' # Ignore this
+
+    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
+    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
+    # and in the docker-compose override file.
+    well-known:
+        image: nginx:latest
+        restart: unless-stopped
+        volumes:
+            - ./nginx/matrix.conf:/etc/nginx/conf.d/matrix.conf # the config to serve the .well-known/matrix files
+            - ./nginx/www:/var/www/ # location of the client and server .well-known-files
+    ### Uncomment if you want to use your own Element-Web App.
+    ### Note: You need to provide a config.json for Element and you also need a second
+    ###       Domain or Subdomain for the communication between Element and Conduit
+    ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
+    # element-web:
+    #     image: vectorim/element-web:latest
+    #     restart: unless-stopped
+    #     volumes:
+    #         - ./element_config.json:/app/config.json
+    #     networks:
+    #         - proxy
+    #     depends_on:
+    #         - homeserver
+
+volumes:
+    db:
+
+networks:
+    # This is the network Traefik listens to, if your network has a different
+    # name, don't forget to change it here and in the docker-compose.override.yml
+    proxy:
+        external: true
diff --git a/docker/docker-compose.override.traefik.yml b/docker/docker-compose.override.yml
similarity index 100%
rename from docker/docker-compose.override.traefik.yml
rename to docker/docker-compose.override.yml
diff --git a/docker/docker-compose.traefik.yml b/docker/docker-compose.with-traefik.yml
similarity index 78%
rename from docker/docker-compose.traefik.yml
rename to docker/docker-compose.with-traefik.yml
index 392b3828..6d46827f 100644
--- a/docker/docker-compose.traefik.yml
+++ b/docker/docker-compose.with-traefik.yml
@@ -33,7 +33,7 @@ services:
             # CONDUIT_PORT: 6167
             # CONDUIT_CONFIG: '/srv/conduit/conduit.toml'  # if you want to configure purely by env vars, set this to an empty string ''
             # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
-            # CONDUIT_LOG: info  # default is: "info,rocket=off,_=off,sled=off"
+            # CONDUIT_LOG: info  # default is: "info,_=off,sled=off"
             # CONDUIT_ALLOW_JAEGER: 'false'
             # CONDUIT_ALLOW_ENCRYPTION: 'false'
             # CONDUIT_ALLOW_FEDERATION: 'false'
@@ -65,11 +65,33 @@ services:
     #     depends_on:
     #         - homeserver
 
+    traefik:
+        image: "traefik:latest"
+        container_name: "traefik"
+        restart: "unless-stopped"
+        ports:
+            - "80:80"
+            - "443:443"
+        volumes:
+            - "/var/run/docker.sock:/var/run/docker.sock"
+            # - "./traefik_config:/etc/traefik"
+            - "acme:/etc/traefik/acme"
+        labels:
+            - "traefik.enable=true"
+
+            # middleware redirect
+            - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+            # global redirect to https
+            - "traefik.http.routers.redirs.rule=hostregexp(`{host:.+}`)"
+            - "traefik.http.routers.redirs.entrypoints=http"
+            - "traefik.http.routers.redirs.middlewares=redirect-to-https"
+
+        networks:
+            - proxy
+
 volumes:
     db:
+    acme:
 
 networks:
-    # This is the network Traefik listens to, if your network has a different
-    # name, don't forget to change it here and in the docker-compose.override.yml
-    proxy:
-        external: true
+    proxy:
\ No newline at end of file
diff --git a/src/appservice_server.rs b/src/appservice_server.rs
index b2154b8d..ce122dad 100644
--- a/src/appservice_server.rs
+++ b/src/appservice_server.rs
@@ -1,9 +1,10 @@
 use crate::{utils, Error, Result};
 use bytes::BytesMut;
-use ruma::api::{IncomingResponse, OutgoingRequest, SendAccessToken};
+use ruma::api::{IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken};
 use std::{fmt::Debug, mem, time::Duration};
 use tracing::warn;
 
+#[tracing::instrument(skip(globals, request))]
 pub(crate) async fn send_request<T: OutgoingRequest>(
     globals: &crate::database::globals::Globals,
     registration: serde_yaml::Value,
@@ -16,7 +17,11 @@ where
     let hs_token = registration.get("hs_token").unwrap().as_str().unwrap();
 
     let mut http_request = request
-        .try_into_http_request::<BytesMut>(destination, SendAccessToken::IfRequired(""))
+        .try_into_http_request::<BytesMut>(
+            destination,
+            SendAccessToken::IfRequired(""),
+            &[MatrixVersion::V1_0],
+        )
         .unwrap()
         .map(|body| body.freeze());
 
diff --git a/src/client_server/account.rs b/src/client_server/account.rs
index a210e8ae..1484bf66 100644
--- a/src/client_server/account.rs
+++ b/src/client_server/account.rs
@@ -1,36 +1,25 @@
-use std::sync::Arc;
-
 use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
 use crate::{
     database::{admin::make_user_admin, DatabaseGuard},
-    pdu::PduBuilder,
-    utils, ConduitResult, Error, Ruma,
+    utils, Error, Result, Ruma,
 };
 use ruma::{
     api::client::{
-        error::ErrorKind,
-        r0::{
-            account::{
-                change_password, deactivate, get_3pids, get_username_availability, register,
-                whoami, ThirdPartyIdRemovalStatus,
-            },
-            uiaa::{AuthFlow, AuthType, UiaaInfo},
+        account::{
+            change_password, deactivate, get_3pids, get_username_availability, register, whoami,
+            ThirdPartyIdRemovalStatus,
         },
+        error::ErrorKind,
+        uiaa::{AuthFlow, AuthType, UiaaInfo},
     },
-    events::{
-        room::member::{MembershipState, RoomMemberEventContent},
-        EventType,
-    },
+    events::{room::message::RoomMessageEventContent, GlobalAccountDataEventType},
     push, UserId,
 };
-use serde_json::value::to_raw_value;
 use tracing::{info, warn};
 
 use register::RegistrationKind;
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post};
 
-const GUEST_NAME_LENGTH: usize = 10;
+const RANDOM_USER_ID_LENGTH: usize = 10;
 
 /// # `GET /_matrix/client/r0/register/available`
 ///
@@ -42,15 +31,10 @@ const GUEST_NAME_LENGTH: usize = 10;
 /// - No user or appservice on this server already claimed this username
 ///
 /// Note: This will not reserve the username, so the username might become invalid when trying to register
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/register/available", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_register_available_route(
     db: DatabaseGuard,
-    body: Ruma<get_username_availability::Request<'_>>,
-) -> ConduitResult<get_username_availability::Response> {
+    body: Ruma<get_username_availability::v3::IncomingRequest>,
+) -> Result<get_username_availability::v3::Response> {
     // Validate user id
     let user_id =
         UserId::parse_with_server_name(body.username.to_lowercase(), db.globals.server_name())
@@ -74,7 +58,7 @@ pub async fn get_register_available_route(
     // TODO add check for appservice namespaces
 
     // If no if check is true we have an username that's available to be used.
-    Ok(get_username_availability::Response { available: true }.into())
+    Ok(get_username_availability::v3::Response { available: true })
 }
 
 /// # `POST /_matrix/client/r0/register`
@@ -90,15 +74,10 @@ pub async fn get_register_available_route(
 /// - If type is not guest and no username is given: Always fails after UIAA check
 /// - Creates a new account and populates it with default account data
 /// - If `inhibit_login` is false: Creates a device and returns device id and access_token
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/register", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn register_route(
     db: DatabaseGuard,
-    body: Ruma<register::Request<'_>>,
-) -> ConduitResult<register::Response> {
+    body: Ruma<register::v3::IncomingRequest>,
+) -> Result<register::v3::Response> {
     if !db.globals.allow_registration() && !body.from_appservice {
         return Err(Error::BadRequest(
             ErrorKind::Forbidden,
@@ -108,38 +87,38 @@ pub async fn register_route(
 
     let is_guest = body.kind == RegistrationKind::Guest;
 
-    let mut missing_username = false;
-
-    // Validate user id
-    let user_id = UserId::parse_with_server_name(
-        if is_guest {
-            utils::random_string(GUEST_NAME_LENGTH)
-        } else {
-            body.username.clone().unwrap_or_else(|| {
-                // If the user didn't send a username field, that means the client is just trying
-                // the get an UIAA error to see available flows
-                missing_username = true;
-                // Just give the user a random name. He won't be able to register with it anyway.
-                utils::random_string(GUEST_NAME_LENGTH)
-            })
+    let user_id = match (&body.username, is_guest) {
+        (Some(username), false) => {
+            let proposed_user_id =
+                UserId::parse_with_server_name(username.to_lowercase(), db.globals.server_name())
+                    .ok()
+                    .filter(|user_id| {
+                        !user_id.is_historical()
+                            && user_id.server_name() == db.globals.server_name()
+                    })
+                    .ok_or(Error::BadRequest(
+                        ErrorKind::InvalidUsername,
+                        "Username is invalid.",
+                    ))?;
+            if db.users.exists(&proposed_user_id)? {
+                return Err(Error::BadRequest(
+                    ErrorKind::UserInUse,
+                    "Desired user ID is already taken.",
+                ));
+            }
+            proposed_user_id
         }
-        .to_lowercase(),
-        db.globals.server_name(),
-    )
-    .ok()
-    .filter(|user_id| !user_id.is_historical() && user_id.server_name() == db.globals.server_name())
-    .ok_or(Error::BadRequest(
-        ErrorKind::InvalidUsername,
-        "Username is invalid.",
-    ))?;
-
-    // Check if username is creative enough
-    if db.users.exists(&user_id)? {
-        return Err(Error::BadRequest(
-            ErrorKind::UserInUse,
-            "Desired user ID is already taken.",
-        ));
-    }
+        _ => loop {
+            let proposed_user_id = UserId::parse_with_server_name(
+                utils::random_string(RANDOM_USER_ID_LENGTH).to_lowercase(),
+                db.globals.server_name(),
+            )
+            .unwrap();
+            if !db.users.exists(&proposed_user_id)? {
+                break proposed_user_id;
+            }
+        },
+    };
 
     // UIAA
     let mut uiaainfo = UiaaInfo {
@@ -182,13 +161,6 @@ pub async fn register_route(
         }
     }
 
-    if missing_username {
-        return Err(Error::BadRequest(
-            ErrorKind::MissingParam,
-            "Missing username field.",
-        ));
-    }
-
     let password = if is_guest {
         None
     } else {
@@ -199,7 +171,13 @@ pub async fn register_route(
     db.users.create(&user_id, password)?;
 
     // Default to pretty displayname
-    let displayname = format!("{} ⚡️", user_id.localpart());
+    let mut displayname = user_id.localpart().to_owned();
+
+    // If enabled append lightning bolt to display name (default true)
+    if db.globals.enable_lightning_bolt() {
+        displayname.push_str(" ⚡️");
+    }
+
     db.users
         .set_displayname(&user_id, Some(displayname.clone()))?;
 
@@ -207,7 +185,7 @@ pub async fn register_route(
     db.account_data.update(
         None,
         &user_id,
-        EventType::PushRules,
+        GlobalAccountDataEventType::PushRules.to_string().into(),
         &ruma::events::push_rules::PushRulesEvent {
             content: ruma::events::push_rules::PushRulesEventContent {
                 global: push::Ruleset::server_default(&user_id),
@@ -218,12 +196,11 @@ pub async fn register_route(
 
     // Inhibit login does not work for guests
     if !is_guest && body.inhibit_login {
-        return Ok(register::Response {
+        return Ok(register::v3::Response {
             access_token: None,
             user_id,
             device_id: None,
-        }
-        .into());
+        });
     }
 
     // Generate new device id if the user didn't specify one
@@ -245,7 +222,12 @@ pub async fn register_route(
         body.initial_device_display_name.clone(),
     )?;
 
-    info!("{} registered on this server", user_id);
+    info!("New user {} registered on this server.", user_id);
+    db.admin
+        .send_message(RoomMessageEventContent::notice_plain(format!(
+            "New user {} registered on this server.",
+            user_id
+        )));
 
     // If this is the first real user, grant them admin privileges
     // Note: the server user, @conduit:servername, is generated first
@@ -257,12 +239,11 @@ pub async fn register_route(
 
     db.flush()?;
 
-    Ok(register::Response {
+    Ok(register::v3::Response {
         access_token: Some(token),
         user_id,
         device_id: Some(device_id),
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/client/r0/account/password`
@@ -279,15 +260,10 @@ pub async fn register_route(
 /// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/account/password", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn change_password_route(
     db: DatabaseGuard,
-    body: Ruma<change_password::Request<'_>>,
-) -> ConduitResult<change_password::Response> {
+    body: Ruma<change_password::v3::IncomingRequest>,
+) -> Result<change_password::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -340,7 +316,14 @@ pub async fn change_password_route(
 
     db.flush()?;
 
-    Ok(change_password::Response {}.into())
+    info!("User {} changed their password.", sender_user);
+    db.admin
+        .send_message(RoomMessageEventContent::notice_plain(format!(
+            "User {} changed their password.",
+            sender_user
+        )));
+
+    Ok(change_password::v3::Response {})
 }
 
 /// # `GET _matrix/client/r0/account/whoami`
@@ -348,17 +331,18 @@ pub async fn change_password_route(
 /// Get user_id of the sender user.
 ///
 /// Note: Also works for Application Services
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/account/whoami", data = "<body>")
-)]
-#[tracing::instrument(skip(body))]
-pub async fn whoami_route(body: Ruma<whoami::Request>) -> ConduitResult<whoami::Response> {
+pub async fn whoami_route(
+    db: DatabaseGuard,
+    body: Ruma<whoami::v3::Request>,
+) -> Result<whoami::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-    Ok(whoami::Response {
+    let device_id = body.sender_device.as_ref().cloned();
+
+    Ok(whoami::v3::Response {
         user_id: sender_user.clone(),
-    }
-    .into())
+        device_id,
+        is_guest: db.users.is_deactivated(&sender_user)?,
+    })
 }
 
 /// # `POST /_matrix/client/r0/account/deactivate`
@@ -371,15 +355,10 @@ pub async fn whoami_route(body: Ruma<whoami::Request>) -> ConduitResult<whoami::
 /// - Forgets all to-device events
 /// - Triggers device list updates
 /// - Removes ability to log in again
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/account/deactivate", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn deactivate_route(
     db: DatabaseGuard,
-    body: Ruma<deactivate::Request<'_>>,
-) -> ConduitResult<deactivate::Response> {
+    body: Ruma<deactivate::v3::IncomingRequest>,
+) -> Result<deactivate::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -415,67 +394,24 @@ pub async fn deactivate_route(
         return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
     }
 
-    // Leave all joined rooms and reject all invitations
-    // TODO: work over federation invites
-    let all_rooms = db
-        .rooms
-        .rooms_joined(sender_user)
-        .chain(
-            db.rooms
-                .rooms_invited(sender_user)
-                .map(|t| t.map(|(r, _)| r)),
-        )
-        .collect::<Vec<_>>();
-
-    for room_id in all_rooms {
-        let room_id = room_id?;
-        let event = RoomMemberEventContent {
-            membership: MembershipState::Leave,
-            displayname: None,
-            avatar_url: None,
-            is_direct: None,
-            third_party_invite: None,
-            blurhash: None,
-            reason: None,
-            join_authorized_via_users_server: None,
-        };
-
-        let mutex_state = Arc::clone(
-            db.globals
-                .roomid_mutex_state
-                .write()
-                .unwrap()
-                .entry(room_id.clone())
-                .or_default(),
-        );
-        let state_lock = mutex_state.lock().await;
-
-        db.rooms.build_and_append_pdu(
-            PduBuilder {
-                event_type: EventType::RoomMember,
-                content: to_raw_value(&event).expect("event is valid, we just created it"),
-                unsigned: None,
-                state_key: Some(sender_user.to_string()),
-                redacts: None,
-            },
-            sender_user,
-            &room_id,
-            &db,
-            &state_lock,
-        )?;
-    }
+    // Make the user leave all rooms before deactivation
+    db.rooms.leave_all_rooms(&sender_user, &db).await?;
 
     // Remove devices and mark account as deactivated
     db.users.deactivate_account(sender_user)?;
 
-    info!("{} deactivated their account", sender_user);
+    info!("User {} deactivated their account.", sender_user);
+    db.admin
+        .send_message(RoomMessageEventContent::notice_plain(format!(
+            "User {} deactivated their account.",
+            sender_user
+        )));
 
     db.flush()?;
 
-    Ok(deactivate::Response {
+    Ok(deactivate::v3::Response {
         id_server_unbind_result: ThirdPartyIdRemovalStatus::NoSupport,
-    }
-    .into())
+    })
 }
 
 /// # `GET _matrix/client/r0/account/3pid`
@@ -483,14 +419,10 @@ pub async fn deactivate_route(
 /// Get a list of third party identifiers associated with this account.
 ///
 /// - Currently always returns empty list
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/account/3pid", data = "<body>")
-)]
 pub async fn third_party_route(
-    body: Ruma<get_3pids::Request>,
-) -> ConduitResult<get_3pids::Response> {
+    body: Ruma<get_3pids::v3::Request>,
+) -> Result<get_3pids::v3::Response> {
     let _sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    Ok(get_3pids::Response::new(Vec::new()).into())
+    Ok(get_3pids::v3::Response::new(Vec::new()))
 }
diff --git a/src/client_server/alias.rs b/src/client_server/alias.rs
index 129ac166..90e9d2c3 100644
--- a/src/client_server/alias.rs
+++ b/src/client_server/alias.rs
@@ -1,32 +1,24 @@
-use crate::{database::DatabaseGuard, ConduitResult, Database, Error, Ruma};
+use crate::{database::DatabaseGuard, Database, Error, Result, Ruma};
 use regex::Regex;
 use ruma::{
     api::{
         appservice,
         client::{
+            alias::{create_alias, delete_alias, get_alias},
             error::ErrorKind,
-            r0::alias::{create_alias, delete_alias, get_alias},
         },
         federation,
     },
     RoomAliasId,
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{delete, get, put};
-
 /// # `PUT /_matrix/client/r0/directory/room/{roomAlias}`
 ///
 /// Creates a new room alias on this server.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/directory/room/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn create_alias_route(
     db: DatabaseGuard,
-    body: Ruma<create_alias::Request<'_>>,
-) -> ConduitResult<create_alias::Response> {
+    body: Ruma<create_alias::v3::IncomingRequest>,
+) -> Result<create_alias::v3::Response> {
     if body.room_alias.server_name() != db.globals.server_name() {
         return Err(Error::BadRequest(
             ErrorKind::InvalidParam,
@@ -43,7 +35,7 @@ pub async fn create_alias_route(
 
     db.flush()?;
 
-    Ok(create_alias::Response::new().into())
+    Ok(create_alias::v3::Response::new())
 }
 
 /// # `DELETE /_matrix/client/r0/directory/room/{roomAlias}`
@@ -52,15 +44,10 @@ pub async fn create_alias_route(
 ///
 /// - TODO: additional access control checks
 /// - TODO: Update canonical alias event
-#[cfg_attr(
-    feature = "conduit_bin",
-    delete("/_matrix/client/r0/directory/room/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn delete_alias_route(
     db: DatabaseGuard,
-    body: Ruma<delete_alias::Request<'_>>,
-) -> ConduitResult<delete_alias::Response> {
+    body: Ruma<delete_alias::v3::IncomingRequest>,
+) -> Result<delete_alias::v3::Response> {
     if body.room_alias.server_name() != db.globals.server_name() {
         return Err(Error::BadRequest(
             ErrorKind::InvalidParam,
@@ -74,7 +61,7 @@ pub async fn delete_alias_route(
 
     db.flush()?;
 
-    Ok(delete_alias::Response::new().into())
+    Ok(delete_alias::v3::Response::new())
 }
 
 /// # `GET /_matrix/client/r0/directory/room/{roomAlias}`
@@ -82,22 +69,17 @@ pub async fn delete_alias_route(
 /// Resolve an alias locally or over federation.
 ///
 /// - TODO: Suggest more servers to join via
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/directory/room/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_alias_route(
     db: DatabaseGuard,
-    body: Ruma<get_alias::Request<'_>>,
-) -> ConduitResult<get_alias::Response> {
+    body: Ruma<get_alias::v3::IncomingRequest>,
+) -> Result<get_alias::v3::Response> {
     get_alias_helper(&db, &body.room_alias).await
 }
 
 pub(crate) async fn get_alias_helper(
     db: &Database,
     room_alias: &RoomAliasId,
-) -> ConduitResult<get_alias::Response> {
+) -> Result<get_alias::v3::Response> {
     if room_alias.server_name() != db.globals.server_name() {
         let response = db
             .sending
@@ -108,7 +90,10 @@ pub(crate) async fn get_alias_helper(
             )
             .await?;
 
-        return Ok(get_alias::Response::new(response.room_id, response.servers).into());
+        return Ok(get_alias::v3::Response::new(
+            response.room_id,
+            response.servers,
+        ));
     }
 
     let mut room_id = None;
@@ -159,5 +144,8 @@ pub(crate) async fn get_alias_helper(
         }
     };
 
-    Ok(get_alias::Response::new(room_id, vec![db.globals.server_name().to_owned()]).into())
+    Ok(get_alias::v3::Response::new(
+        room_id,
+        vec![db.globals.server_name().to_owned()],
+    ))
 }
diff --git a/src/client_server/backup.rs b/src/client_server/backup.rs
index bbb86726..067f20cd 100644
--- a/src/client_server/backup.rs
+++ b/src/client_server/backup.rs
@@ -1,29 +1,22 @@
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, Error, Result, Ruma};
 use ruma::api::client::{
-    error::ErrorKind,
-    r0::backup::{
-        add_backup_key_session, add_backup_key_sessions, add_backup_keys, create_backup,
-        delete_backup, delete_backup_key_session, delete_backup_key_sessions, delete_backup_keys,
-        get_backup, get_backup_key_session, get_backup_key_sessions, get_backup_keys,
-        get_latest_backup, update_backup,
+    backup::{
+        add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session,
+        create_backup_version, delete_backup_keys, delete_backup_keys_for_room,
+        delete_backup_keys_for_session, delete_backup_version, get_backup_info, get_backup_keys,
+        get_backup_keys_for_room, get_backup_keys_for_session, get_latest_backup_info,
+        update_backup_version,
     },
+    error::ErrorKind,
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{delete, get, post, put};
-
 /// # `POST /_matrix/client/r0/room_keys/version`
 ///
 /// Creates a new backup.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/unstable/room_keys/version", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn create_backup_route(
+pub async fn create_backup_version_route(
     db: DatabaseGuard,
-    body: Ruma<create_backup::Request>,
-) -> ConduitResult<create_backup::Response> {
+    body: Ruma<create_backup_version::v3::Request>,
+) -> Result<create_backup_version::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let version = db
         .key_backups
@@ -31,42 +24,32 @@ pub async fn create_backup_route(
 
     db.flush()?;
 
-    Ok(create_backup::Response { version }.into())
+    Ok(create_backup_version::v3::Response { version })
 }
 
 /// # `PUT /_matrix/client/r0/room_keys/version/{version}`
 ///
 /// Update information about an existing backup. Only `auth_data` can be modified.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn update_backup_route(
+pub async fn update_backup_version_route(
     db: DatabaseGuard,
-    body: Ruma<update_backup::Request<'_>>,
-) -> ConduitResult<update_backup::Response> {
+    body: Ruma<update_backup_version::v3::IncomingRequest>,
+) -> Result<update_backup_version::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     db.key_backups
         .update_backup(sender_user, &body.version, &body.algorithm, &db.globals)?;
 
     db.flush()?;
 
-    Ok(update_backup::Response {}.into())
+    Ok(update_backup_version::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/room_keys/version`
 ///
 /// Get information about the latest backup version.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/unstable/room_keys/version", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn get_latest_backup_route(
+pub async fn get_latest_backup_info_route(
     db: DatabaseGuard,
-    body: Ruma<get_latest_backup::Request>,
-) -> ConduitResult<get_latest_backup::Response> {
+    body: Ruma<get_latest_backup_info::v3::Request>,
+) -> Result<get_latest_backup_info::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let (version, algorithm) =
@@ -77,27 +60,21 @@ pub async fn get_latest_backup_route(
                 "Key backup does not exist.",
             ))?;
 
-    Ok(get_latest_backup::Response {
+    Ok(get_latest_backup_info::v3::Response {
         algorithm,
         count: (db.key_backups.count_keys(sender_user, &version)? as u32).into(),
         etag: db.key_backups.get_etag(sender_user, &version)?,
         version,
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/client/r0/room_keys/version`
 ///
 /// Get information about an existing backup.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn get_backup_route(
+pub async fn get_backup_info_route(
     db: DatabaseGuard,
-    body: Ruma<get_backup::Request<'_>>,
-) -> ConduitResult<get_backup::Response> {
+    body: Ruma<get_backup_info::v3::IncomingRequest>,
+) -> Result<get_backup_info::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let algorithm = db
         .key_backups
@@ -107,13 +84,12 @@ pub async fn get_backup_route(
             "Key backup does not exist.",
         ))?;
 
-    Ok(get_backup::Response {
+    Ok(get_backup_info::v3::Response {
         algorithm,
         count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
         etag: db.key_backups.get_etag(sender_user, &body.version)?,
         version: body.version.to_owned(),
-    }
-    .into())
+    })
 }
 
 /// # `DELETE /_matrix/client/r0/room_keys/version/{version}`
@@ -121,22 +97,17 @@ pub async fn get_backup_route(
 /// Delete an existing key backup.
 ///
 /// - Deletes both information about the backup, as well as all key data related to the backup
-#[cfg_attr(
-    feature = "conduit_bin",
-    delete("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn delete_backup_route(
+pub async fn delete_backup_version_route(
     db: DatabaseGuard,
-    body: Ruma<delete_backup::Request<'_>>,
-) -> ConduitResult<delete_backup::Response> {
+    body: Ruma<delete_backup_version::v3::IncomingRequest>,
+) -> Result<delete_backup_version::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.key_backups.delete_backup(sender_user, &body.version)?;
 
     db.flush()?;
 
-    Ok(delete_backup::Response {}.into())
+    Ok(delete_backup_version::v3::Response {})
 }
 
 /// # `PUT /_matrix/client/r0/room_keys/keys`
@@ -146,15 +117,10 @@ pub async fn delete_backup_route(
 /// - Only manipulating the most recently created version of the backup is allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/unstable/room_keys/keys", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn add_backup_keys_route(
     db: DatabaseGuard,
-    body: Ruma<add_backup_keys::Request<'_>>,
-) -> ConduitResult<add_backup_keys::Response> {
+    body: Ruma<add_backup_keys::v3::IncomingRequest>,
+) -> Result<add_backup_keys::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if Some(&body.version)
@@ -184,11 +150,10 @@ pub async fn add_backup_keys_route(
 
     db.flush()?;
 
-    Ok(add_backup_keys::Response {
+    Ok(add_backup_keys::v3::Response {
         count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
         etag: db.key_backups.get_etag(sender_user, &body.version)?,
-    }
-    .into())
+    })
 }
 
 /// # `PUT /_matrix/client/r0/room_keys/keys/{roomId}`
@@ -198,15 +163,10 @@ pub async fn add_backup_keys_route(
 /// - Only manipulating the most recently created version of the backup is allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn add_backup_key_sessions_route(
+pub async fn add_backup_keys_for_room_route(
     db: DatabaseGuard,
-    body: Ruma<add_backup_key_sessions::Request<'_>>,
-) -> ConduitResult<add_backup_key_sessions::Response> {
+    body: Ruma<add_backup_keys_for_room::v3::IncomingRequest>,
+) -> Result<add_backup_keys_for_room::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if Some(&body.version)
@@ -234,11 +194,10 @@ pub async fn add_backup_key_sessions_route(
 
     db.flush()?;
 
-    Ok(add_backup_key_sessions::Response {
+    Ok(add_backup_keys_for_room::v3::Response {
         count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
         etag: db.key_backups.get_etag(sender_user, &body.version)?,
-    }
-    .into())
+    })
 }
 
 /// # `PUT /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
@@ -248,15 +207,10 @@ pub async fn add_backup_key_sessions_route(
 /// - Only manipulating the most recently created version of the backup is allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn add_backup_key_session_route(
+pub async fn add_backup_keys_for_session_route(
     db: DatabaseGuard,
-    body: Ruma<add_backup_key_session::Request<'_>>,
-) -> ConduitResult<add_backup_key_session::Response> {
+    body: Ruma<add_backup_keys_for_session::v3::IncomingRequest>,
+) -> Result<add_backup_keys_for_session::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if Some(&body.version)
@@ -282,65 +236,49 @@ pub async fn add_backup_key_session_route(
 
     db.flush()?;
 
-    Ok(add_backup_key_session::Response {
+    Ok(add_backup_keys_for_session::v3::Response {
         count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
         etag: db.key_backups.get_etag(sender_user, &body.version)?,
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/client/r0/room_keys/keys`
 ///
 /// Retrieves all keys from the backup.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/unstable/room_keys/keys", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_backup_keys_route(
     db: DatabaseGuard,
-    body: Ruma<get_backup_keys::Request<'_>>,
-) -> ConduitResult<get_backup_keys::Response> {
+    body: Ruma<get_backup_keys::v3::IncomingRequest>,
+) -> Result<get_backup_keys::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let rooms = db.key_backups.get_all(sender_user, &body.version)?;
 
-    Ok(get_backup_keys::Response { rooms }.into())
+    Ok(get_backup_keys::v3::Response { rooms })
 }
 
 /// # `GET /_matrix/client/r0/room_keys/keys/{roomId}`
 ///
 /// Retrieves all keys from the backup for a given room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn get_backup_key_sessions_route(
+pub async fn get_backup_keys_for_room_route(
     db: DatabaseGuard,
-    body: Ruma<get_backup_key_sessions::Request<'_>>,
-) -> ConduitResult<get_backup_key_sessions::Response> {
+    body: Ruma<get_backup_keys_for_room::v3::IncomingRequest>,
+) -> Result<get_backup_keys_for_room::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let sessions = db
         .key_backups
         .get_room(sender_user, &body.version, &body.room_id)?;
 
-    Ok(get_backup_key_sessions::Response { sessions }.into())
+    Ok(get_backup_keys_for_room::v3::Response { sessions })
 }
 
 /// # `GET /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
 ///
 /// Retrieves a key from the backup.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn get_backup_key_session_route(
+pub async fn get_backup_keys_for_session_route(
     db: DatabaseGuard,
-    body: Ruma<get_backup_key_session::Request<'_>>,
-) -> ConduitResult<get_backup_key_session::Response> {
+    body: Ruma<get_backup_keys_for_session::v3::IncomingRequest>,
+) -> Result<get_backup_keys_for_session::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let key_data = db
@@ -351,46 +289,35 @@ pub async fn get_backup_key_session_route(
             "Backup key not found for this user's session.",
         ))?;
 
-    Ok(get_backup_key_session::Response { key_data }.into())
+    Ok(get_backup_keys_for_session::v3::Response { key_data })
 }
 
 /// # `DELETE /_matrix/client/r0/room_keys/keys`
 ///
 /// Delete the keys from the backup.
-#[cfg_attr(
-    feature = "conduit_bin",
-    delete("/_matrix/client/unstable/room_keys/keys", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn delete_backup_keys_route(
     db: DatabaseGuard,
-    body: Ruma<delete_backup_keys::Request<'_>>,
-) -> ConduitResult<delete_backup_keys::Response> {
+    body: Ruma<delete_backup_keys::v3::IncomingRequest>,
+) -> Result<delete_backup_keys::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.key_backups.delete_all_keys(sender_user, &body.version)?;
 
     db.flush()?;
 
-    Ok(delete_backup_keys::Response {
+    Ok(delete_backup_keys::v3::Response {
         count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
         etag: db.key_backups.get_etag(sender_user, &body.version)?,
-    }
-    .into())
+    })
 }
 
 /// # `DELETE /_matrix/client/r0/room_keys/keys/{roomId}`
 ///
 /// Delete the keys from the backup for a given room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    delete("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn delete_backup_key_sessions_route(
+pub async fn delete_backup_keys_for_room_route(
     db: DatabaseGuard,
-    body: Ruma<delete_backup_key_sessions::Request<'_>>,
-) -> ConduitResult<delete_backup_key_sessions::Response> {
+    body: Ruma<delete_backup_keys_for_room::v3::IncomingRequest>,
+) -> Result<delete_backup_keys_for_room::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.key_backups
@@ -398,25 +325,19 @@ pub async fn delete_backup_key_sessions_route(
 
     db.flush()?;
 
-    Ok(delete_backup_key_sessions::Response {
+    Ok(delete_backup_keys_for_room::v3::Response {
         count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
         etag: db.key_backups.get_etag(sender_user, &body.version)?,
-    }
-    .into())
+    })
 }
 
 /// # `DELETE /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
 ///
 /// Delete a key from the backup.
-#[cfg_attr(
-    feature = "conduit_bin",
-    delete("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub async fn delete_backup_key_session_route(
+pub async fn delete_backup_keys_for_session_route(
     db: DatabaseGuard,
-    body: Ruma<delete_backup_key_session::Request<'_>>,
-) -> ConduitResult<delete_backup_key_session::Response> {
+    body: Ruma<delete_backup_keys_for_session::v3::IncomingRequest>,
+) -> Result<delete_backup_keys_for_session::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.key_backups
@@ -424,9 +345,8 @@ pub async fn delete_backup_key_session_route(
 
     db.flush()?;
 
-    Ok(delete_backup_key_session::Response {
+    Ok(delete_backup_keys_for_session::v3::Response {
         count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
         etag: db.key_backups.get_etag(sender_user, &body.version)?,
-    }
-    .into())
+    })
 }
diff --git a/src/client_server/capabilities.rs b/src/client_server/capabilities.rs
index c69b7cb2..417ad29d 100644
--- a/src/client_server/capabilities.rs
+++ b/src/client_server/capabilities.rs
@@ -1,35 +1,35 @@
-use crate::{ConduitResult, Ruma};
-use ruma::{
-    api::client::r0::capabilities::{
-        get_capabilities, Capabilities, RoomVersionStability, RoomVersionsCapability,
-    },
-    RoomVersionId,
+use crate::{database::DatabaseGuard, Result, Ruma};
+use ruma::api::client::discovery::get_capabilities::{
+    self, Capabilities, RoomVersionStability, RoomVersionsCapability,
 };
 use std::collections::BTreeMap;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::get;
-
 /// # `GET /_matrix/client/r0/capabilities`
 ///
 /// Get information on the supported feature set and other relevent capabilities of this server.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/capabilities", data = "<_body>")
-)]
-#[tracing::instrument(skip(_body))]
 pub async fn get_capabilities_route(
-    _body: Ruma<get_capabilities::Request>,
-) -> ConduitResult<get_capabilities::Response> {
+    db: DatabaseGuard,
+    _body: Ruma<get_capabilities::v3::IncomingRequest>,
+) -> Result<get_capabilities::v3::Response> {
     let mut available = BTreeMap::new();
-    available.insert(RoomVersionId::V5, RoomVersionStability::Stable);
-    available.insert(RoomVersionId::V6, RoomVersionStability::Stable);
+    if db.globals.allow_unstable_room_versions() {
+        for room_version in &db.globals.unstable_room_versions {
+            available.insert(room_version.clone(), RoomVersionStability::Stable);
+        }
+    } else {
+        for room_version in &db.globals.unstable_room_versions {
+            available.insert(room_version.clone(), RoomVersionStability::Unstable);
+        }
+    }
+    for room_version in &db.globals.stable_room_versions {
+        available.insert(room_version.clone(), RoomVersionStability::Stable);
+    }
 
     let mut capabilities = Capabilities::new();
     capabilities.room_versions = RoomVersionsCapability {
-        default: RoomVersionId::V6,
+        default: db.globals.default_room_version(),
         available,
     };
 
-    Ok(get_capabilities::Response { capabilities }.into())
+    Ok(get_capabilities::v3::Response { capabilities })
 }
diff --git a/src/client_server/config.rs b/src/client_server/config.rs
index 0c668ff1..6184e0bc 100644
--- a/src/client_server/config.rs
+++ b/src/client_server/config.rs
@@ -1,11 +1,11 @@
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, Error, Result, Ruma};
 use ruma::{
     api::client::{
-        error::ErrorKind,
-        r0::config::{
+        config::{
             get_global_account_data, get_room_account_data, set_global_account_data,
             set_room_account_data,
         },
+        error::ErrorKind,
     },
     events::{AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent},
     serde::Raw,
@@ -13,24 +13,16 @@ use ruma::{
 use serde::Deserialize;
 use serde_json::{json, value::RawValue as RawJsonValue};
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, put};
-
 /// # `PUT /_matrix/client/r0/user/{userId}/account_data/{type}`
 ///
 /// Sets some account data for the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/user/<_>/account_data/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_global_account_data_route(
     db: DatabaseGuard,
-    body: Ruma<set_global_account_data::Request<'_>>,
-) -> ConduitResult<set_global_account_data::Response> {
+    body: Ruma<set_global_account_data::v3::IncomingRequest>,
+) -> Result<set_global_account_data::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let data: serde_json::Value = serde_json::from_str(body.data.get())
+    let data: serde_json::Value = serde_json::from_str(body.data.json().get())
         .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
 
     let event_type = body.event_type.to_string();
@@ -48,27 +40,19 @@ pub async fn set_global_account_data_route(
 
     db.flush()?;
 
-    Ok(set_global_account_data::Response {}.into())
+    Ok(set_global_account_data::v3::Response {})
 }
 
 /// # `PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}`
 ///
 /// Sets some room account data for the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put(
-        "/_matrix/client/r0/user/<_>/rooms/<_>/account_data/<_>",
-        data = "<body>"
-    )
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_room_account_data_route(
     db: DatabaseGuard,
-    body: Ruma<set_room_account_data::Request<'_>>,
-) -> ConduitResult<set_room_account_data::Response> {
+    body: Ruma<set_room_account_data::v3::IncomingRequest>,
+) -> Result<set_room_account_data::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let data: serde_json::Value = serde_json::from_str(body.data.get())
+    let data: serde_json::Value = serde_json::from_str(body.data.json().get())
         .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
 
     let event_type = body.event_type.to_string();
@@ -86,21 +70,16 @@ pub async fn set_room_account_data_route(
 
     db.flush()?;
 
-    Ok(set_room_account_data::Response {}.into())
+    Ok(set_room_account_data::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/user/{userId}/account_data/{type}`
 ///
 /// Gets some account data for the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/user/<_>/account_data/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_global_account_data_route(
     db: DatabaseGuard,
-    body: Ruma<get_global_account_data::Request<'_>>,
-) -> ConduitResult<get_global_account_data::Response> {
+    body: Ruma<get_global_account_data::v3::IncomingRequest>,
+) -> Result<get_global_account_data::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let event: Box<RawJsonValue> = db
@@ -112,24 +91,16 @@ pub async fn get_global_account_data_route(
         .map_err(|_| Error::bad_database("Invalid account data event in db."))?
         .content;
 
-    Ok(get_global_account_data::Response { account_data }.into())
+    Ok(get_global_account_data::v3::Response { account_data })
 }
 
 /// # `GET /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}`
 ///
 /// Gets some room account data for the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get(
-        "/_matrix/client/r0/user/<_>/rooms/<_>/account_data/<_>",
-        data = "<body>"
-    )
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_room_account_data_route(
     db: DatabaseGuard,
-    body: Ruma<get_room_account_data::Request<'_>>,
-) -> ConduitResult<get_room_account_data::Response> {
+    body: Ruma<get_room_account_data::v3::IncomingRequest>,
+) -> Result<get_room_account_data::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let event: Box<RawJsonValue> = db
@@ -145,7 +116,7 @@ pub async fn get_room_account_data_route(
         .map_err(|_| Error::bad_database("Invalid account data event in db."))?
         .content;
 
-    Ok(get_room_account_data::Response { account_data }.into())
+    Ok(get_room_account_data::v3::Response { account_data })
 }
 
 #[derive(Deserialize)]
diff --git a/src/client_server/context.rs b/src/client_server/context.rs
index 02148f41..e93f5a5b 100644
--- a/src/client_server/context.rs
+++ b/src/client_server/context.rs
@@ -1,42 +1,28 @@
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, Error, Result, Ruma};
 use ruma::{
-    api::client::{
-        error::ErrorKind,
-        r0::{context::get_context, filter::LazyLoadOptions},
-    },
-    events::EventType,
+    api::client::{context::get_context, error::ErrorKind, filter::LazyLoadOptions},
+    events::StateEventType,
 };
 use std::{collections::HashSet, convert::TryFrom};
 use tracing::error;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::get;
-
 /// # `GET /_matrix/client/r0/rooms/{roomId}/context`
 ///
 /// Allows loading room history around an event.
 ///
 /// - Only works if the user is joined (TODO: always allow, but only show events if the user was
 /// joined, depending on history_visibility)
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/context/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_context_route(
     db: DatabaseGuard,
-    body: Ruma<get_context::Request<'_>>,
-) -> ConduitResult<get_context::Response> {
+    body: Ruma<get_context::v3::IncomingRequest>,
+) -> Result<get_context::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
-    // Load filter
-    let filter = body.filter.clone().unwrap_or_default();
-
-    let (lazy_load_enabled, lazy_load_send_redundant) = match filter.lazy_load_options {
+    let (lazy_load_enabled, lazy_load_send_redundant) = match &body.filter.lazy_load_options {
         LazyLoadOptions::Enabled {
-            include_redundant_members: redundant,
-        } => (true, redundant),
+            include_redundant_members,
+        } => (true, *include_redundant_members),
         _ => (false, false),
     };
 
@@ -151,7 +137,7 @@ pub async fn get_context_route(
             .expect("All rooms have state"),
     };
 
-    let state_ids = db.rooms.state_full_ids(shortstatehash)?;
+    let state_ids = db.rooms.state_full_ids(shortstatehash).await?;
 
     let end_token = events_after
         .last()
@@ -168,7 +154,7 @@ pub async fn get_context_route(
     for (shortstatekey, id) in state_ids {
         let (event_type, state_key) = db.rooms.get_statekey_from_short(shortstatekey)?;
 
-        if event_type != EventType::RoomMember {
+        if event_type != StateEventType::RoomMember {
             let pdu = match db.rooms.get_pdu(&id)? {
                 Some(pdu) => pdu,
                 None => {
@@ -189,7 +175,7 @@ pub async fn get_context_route(
         }
     }
 
-    let resp = get_context::Response {
+    let resp = get_context::v3::Response {
         start: start_token,
         end: end_token,
         events_before,
@@ -198,5 +184,5 @@ pub async fn get_context_route(
         state,
     };
 
-    Ok(resp.into())
+    Ok(resp)
 }
diff --git a/src/client_server/device.rs b/src/client_server/device.rs
index f240f2e7..b100bf22 100644
--- a/src/client_server/device.rs
+++ b/src/client_server/device.rs
@@ -1,28 +1,19 @@
-use crate::{database::DatabaseGuard, utils, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, utils, Error, Result, Ruma};
 use ruma::api::client::{
+    device::{self, delete_device, delete_devices, get_device, get_devices, update_device},
     error::ErrorKind,
-    r0::{
-        device::{self, delete_device, delete_devices, get_device, get_devices, update_device},
-        uiaa::{AuthFlow, AuthType, UiaaInfo},
-    },
+    uiaa::{AuthFlow, AuthType, UiaaInfo},
 };
 
 use super::SESSION_ID_LENGTH;
-#[cfg(feature = "conduit_bin")]
-use rocket::{delete, get, post, put};
 
 /// # `GET /_matrix/client/r0/devices`
 ///
 /// Get metadata on all devices of the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/devices", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_devices_route(
     db: DatabaseGuard,
-    body: Ruma<get_devices::Request>,
-) -> ConduitResult<get_devices::Response> {
+    body: Ruma<get_devices::v3::Request>,
+) -> Result<get_devices::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let devices: Vec<device::Device> = db
@@ -31,21 +22,16 @@ pub async fn get_devices_route(
         .filter_map(|r| r.ok()) // Filter out buggy devices
         .collect();
 
-    Ok(get_devices::Response { devices }.into())
+    Ok(get_devices::v3::Response { devices })
 }
 
 /// # `GET /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Get metadata on a single device of the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/devices/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_device_route(
     db: DatabaseGuard,
-    body: Ruma<get_device::Request<'_>>,
-) -> ConduitResult<get_device::Response> {
+    body: Ruma<get_device::v3::IncomingRequest>,
+) -> Result<get_device::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let device = db
@@ -53,21 +39,16 @@ pub async fn get_device_route(
         .get_device_metadata(sender_user, &body.body.device_id)?
         .ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?;
 
-    Ok(get_device::Response { device }.into())
+    Ok(get_device::v3::Response { device })
 }
 
 /// # `PUT /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Updates the metadata on a given device of the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/devices/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn update_device_route(
     db: DatabaseGuard,
-    body: Ruma<update_device::Request<'_>>,
-) -> ConduitResult<update_device::Response> {
+    body: Ruma<update_device::v3::IncomingRequest>,
+) -> Result<update_device::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let mut device = db
@@ -82,7 +63,7 @@ pub async fn update_device_route(
 
     db.flush()?;
 
-    Ok(update_device::Response {}.into())
+    Ok(update_device::v3::Response {})
 }
 
 /// # `DELETE /_matrix/client/r0/devices/{deviceId}`
@@ -94,15 +75,10 @@ pub async fn update_device_route(
 /// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-#[cfg_attr(
-    feature = "conduit_bin",
-    delete("/_matrix/client/r0/devices/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn delete_device_route(
     db: DatabaseGuard,
-    body: Ruma<delete_device::Request<'_>>,
-) -> ConduitResult<delete_device::Response> {
+    body: Ruma<delete_device::v3::IncomingRequest>,
+) -> Result<delete_device::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -143,7 +119,7 @@ pub async fn delete_device_route(
 
     db.flush()?;
 
-    Ok(delete_device::Response {}.into())
+    Ok(delete_device::v3::Response {})
 }
 
 /// # `PUT /_matrix/client/r0/devices/{deviceId}`
@@ -157,15 +133,10 @@ pub async fn delete_device_route(
 /// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/delete_devices", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn delete_devices_route(
     db: DatabaseGuard,
-    body: Ruma<delete_devices::Request<'_>>,
-) -> ConduitResult<delete_devices::Response> {
+    body: Ruma<delete_devices::v3::IncomingRequest>,
+) -> Result<delete_devices::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -208,5 +179,5 @@ pub async fn delete_devices_route(
 
     db.flush()?;
 
-    Ok(delete_devices::Response {}.into())
+    Ok(delete_devices::v3::Response {})
 }
diff --git a/src/client_server/directory.rs b/src/client_server/directory.rs
index 719d9af4..4e4a3225 100644
--- a/src/client_server/directory.rs
+++ b/src/client_server/directory.rs
@@ -1,51 +1,45 @@
-use crate::{database::DatabaseGuard, ConduitResult, Database, Error, Result, Ruma};
+use crate::{database::DatabaseGuard, Database, Error, Result, Ruma};
 use ruma::{
     api::{
         client::{
-            error::ErrorKind,
-            r0::{
-                directory::{
-                    get_public_rooms, get_public_rooms_filtered, get_room_visibility,
-                    set_room_visibility,
-                },
-                room,
+            directory::{
+                get_public_rooms, get_public_rooms_filtered, get_room_visibility,
+                set_room_visibility,
             },
+            error::ErrorKind,
+            room,
         },
         federation,
     },
-    directory::{Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork},
+    directory::{
+        Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomJoinRule, PublicRoomsChunk,
+        RoomNetwork,
+    },
     events::{
         room::{
             avatar::RoomAvatarEventContent,
             canonical_alias::RoomCanonicalAliasEventContent,
             guest_access::{GuestAccess, RoomGuestAccessEventContent},
             history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
+            join_rules::{JoinRule, RoomJoinRulesEventContent},
             name::RoomNameEventContent,
             topic::RoomTopicEventContent,
         },
-        EventType,
+        StateEventType,
     },
     ServerName, UInt,
 };
 use tracing::{info, warn};
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post, put};
-
 /// # `POST /_matrix/client/r0/publicRooms`
 ///
 /// Lists the public rooms on this server.
 ///
 /// - Rooms are ordered by the number of joined members
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/publicRooms", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_public_rooms_filtered_route(
     db: DatabaseGuard,
-    body: Ruma<get_public_rooms_filtered::Request<'_>>,
-) -> ConduitResult<get_public_rooms_filtered::Response> {
+    body: Ruma<get_public_rooms_filtered::v3::IncomingRequest>,
+) -> Result<get_public_rooms_filtered::v3::Response> {
     get_public_rooms_filtered_helper(
         &db,
         body.server.as_deref(),
@@ -62,15 +56,10 @@ pub async fn get_public_rooms_filtered_route(
 /// Lists the public rooms on this server.
 ///
 /// - Rooms are ordered by the number of joined members
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/publicRooms", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_public_rooms_route(
     db: DatabaseGuard,
-    body: Ruma<get_public_rooms::Request<'_>>,
-) -> ConduitResult<get_public_rooms::Response> {
+    body: Ruma<get_public_rooms::v3::IncomingRequest>,
+) -> Result<get_public_rooms::v3::Response> {
     let response = get_public_rooms_filtered_helper(
         &db,
         body.server.as_deref(),
@@ -79,16 +68,14 @@ pub async fn get_public_rooms_route(
         &IncomingFilter::default(),
         &IncomingRoomNetwork::Matrix,
     )
-    .await?
-    .0;
+    .await?;
 
-    Ok(get_public_rooms::Response {
+    Ok(get_public_rooms::v3::Response {
         chunk: response.chunk,
         prev_batch: response.prev_batch,
         next_batch: response.next_batch,
         total_room_count_estimate: response.total_room_count_estimate,
-    }
-    .into())
+    })
 }
 
 /// # `PUT /_matrix/client/r0/directory/list/room/{roomId}`
@@ -96,15 +83,10 @@ pub async fn get_public_rooms_route(
 /// Sets the visibility of a given room in the room directory.
 ///
 /// - TODO: Access control checks
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/directory/list/room/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_room_visibility_route(
     db: DatabaseGuard,
-    body: Ruma<set_room_visibility::Request<'_>>,
-) -> ConduitResult<set_room_visibility::Response> {
+    body: Ruma<set_room_visibility::v3::IncomingRequest>,
+) -> Result<set_room_visibility::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     match &body.visibility {
@@ -123,29 +105,23 @@ pub async fn set_room_visibility_route(
 
     db.flush()?;
 
-    Ok(set_room_visibility::Response {}.into())
+    Ok(set_room_visibility::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/directory/list/room/{roomId}`
 ///
 /// Gets the visibility of a given room in the room directory.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/directory/list/room/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_room_visibility_route(
     db: DatabaseGuard,
-    body: Ruma<get_room_visibility::Request<'_>>,
-) -> ConduitResult<get_room_visibility::Response> {
-    Ok(get_room_visibility::Response {
+    body: Ruma<get_room_visibility::v3::IncomingRequest>,
+) -> Result<get_room_visibility::v3::Response> {
+    Ok(get_room_visibility::v3::Response {
         visibility: if db.rooms.is_public_room(&body.room_id)? {
             room::Visibility::Public
         } else {
             room::Visibility::Private
         },
-    }
-    .into())
+    })
 }
 
 pub(crate) async fn get_public_rooms_filtered_helper(
@@ -155,7 +131,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
     since: Option<&str>,
     filter: &IncomingFilter,
     _network: &IncomingRoomNetwork,
-) -> ConduitResult<get_public_rooms_filtered::Response> {
+) -> Result<get_public_rooms_filtered::v3::Response> {
     if let Some(other_server) = server.filter(|server| *server != db.globals.server_name().as_str())
     {
         let response = db
@@ -174,25 +150,12 @@ pub(crate) async fn get_public_rooms_filtered_helper(
             )
             .await?;
 
-        return Ok(get_public_rooms_filtered::Response {
-            chunk: response
-                .chunk
-                .into_iter()
-                .map(|c| {
-                    // Convert ruma::api::federation::directory::get_public_rooms::v1::PublicRoomsChunk
-                    // to ruma::api::client::r0::directory::PublicRoomsChunk
-                    serde_json::from_str(
-                        &serde_json::to_string(&c)
-                            .expect("PublicRoomsChunk::to_string always works"),
-                    )
-                    .expect("federation and client-server PublicRoomsChunk are the same type")
-                })
-                .collect(),
+        return Ok(get_public_rooms_filtered::v3::Response {
+            chunk: response.chunk,
             prev_batch: response.prev_batch,
             next_batch: response.next_batch,
             total_room_count_estimate: response.total_room_count_estimate,
-        }
-        .into());
+        });
     }
 
     let limit = limit.map_or(10, u64::from);
@@ -228,10 +191,9 @@ pub(crate) async fn get_public_rooms_filtered_helper(
             let room_id = room_id?;
 
             let chunk = PublicRoomsChunk {
-                aliases: Vec::new(),
                 canonical_alias: db
                     .rooms
-                    .room_state_get(&room_id, &EventType::RoomCanonicalAlias, "")?
+                    .room_state_get(&room_id, &StateEventType::RoomCanonicalAlias, "")?
                     .map_or(Ok(None), |s| {
                         serde_json::from_str(s.content.get())
                             .map(|c: RoomCanonicalAliasEventContent| c.alias)
@@ -241,7 +203,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
                     })?,
                 name: db
                     .rooms
-                    .room_state_get(&room_id, &EventType::RoomName, "")?
+                    .room_state_get(&room_id, &StateEventType::RoomName, "")?
                     .map_or(Ok(None), |s| {
                         serde_json::from_str(s.content.get())
                             .map(|c: RoomNameEventContent| c.name)
@@ -260,7 +222,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
                     .expect("user count should not be that big"),
                 topic: db
                     .rooms
-                    .room_state_get(&room_id, &EventType::RoomTopic, "")?
+                    .room_state_get(&room_id, &StateEventType::RoomTopic, "")?
                     .map_or(Ok(None), |s| {
                         serde_json::from_str(s.content.get())
                             .map(|c: RoomTopicEventContent| Some(c.topic))
@@ -270,7 +232,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
                     })?,
                 world_readable: db
                     .rooms
-                    .room_state_get(&room_id, &EventType::RoomHistoryVisibility, "")?
+                    .room_state_get(&room_id, &StateEventType::RoomHistoryVisibility, "")?
                     .map_or(Ok(false), |s| {
                         serde_json::from_str(s.content.get())
                             .map(|c: RoomHistoryVisibilityEventContent| {
@@ -284,7 +246,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
                     })?,
                 guest_can_join: db
                     .rooms
-                    .room_state_get(&room_id, &EventType::RoomGuestAccess, "")?
+                    .room_state_get(&room_id, &StateEventType::RoomGuestAccess, "")?
                     .map_or(Ok(false), |s| {
                         serde_json::from_str(s.content.get())
                             .map(|c: RoomGuestAccessEventContent| {
@@ -296,7 +258,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
                     })?,
                 avatar_url: db
                     .rooms
-                    .room_state_get(&room_id, &EventType::RoomAvatar, "")?
+                    .room_state_get(&room_id, &StateEventType::RoomAvatar, "")?
                     .map(|s| {
                         serde_json::from_str(s.content.get())
                             .map(|c: RoomAvatarEventContent| c.url)
@@ -307,6 +269,25 @@ pub(crate) async fn get_public_rooms_filtered_helper(
                     .transpose()?
                     // url is now an Option<String> so we must flatten
                     .flatten(),
+                join_rule: db
+                    .rooms
+                    .room_state_get(&room_id, &StateEventType::RoomJoinRules, "")?
+                    .map(|s| {
+                        serde_json::from_str(s.content.get())
+                            .map(|c: RoomJoinRulesEventContent| match c.join_rule {
+                                JoinRule::Public => Some(PublicRoomJoinRule::Public),
+                                JoinRule::Knock => Some(PublicRoomJoinRule::Knock),
+                                _ => None,
+                            })
+                            .map_err(|_| {
+                                Error::bad_database("Invalid room join rule event in database.")
+                            })
+                    })
+                    .transpose()?
+                    .flatten()
+                    .ok_or(Error::bad_database(
+                        "Invalid room join rule event in database.",
+                    ))?,
                 room_id,
             };
             Ok(chunk)
@@ -367,11 +348,10 @@ pub(crate) async fn get_public_rooms_filtered_helper(
         Some(format!("n{}", num_since + limit))
     };
 
-    Ok(get_public_rooms_filtered::Response {
+    Ok(get_public_rooms_filtered::v3::Response {
         chunk,
         prev_batch,
         next_batch,
         total_room_count_estimate: Some(total_room_count_estimate),
-    }
-    .into())
+    })
 }
diff --git a/src/client_server/filter.rs b/src/client_server/filter.rs
index f8845f1e..6522c900 100644
--- a/src/client_server/filter.rs
+++ b/src/client_server/filter.rs
@@ -1,47 +1,36 @@
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, Error, Result, Ruma};
 use ruma::api::client::{
     error::ErrorKind,
-    r0::filter::{create_filter, get_filter},
+    filter::{create_filter, get_filter},
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post};
-
 /// # `GET /_matrix/client/r0/user/{userId}/filter/{filterId}`
 ///
 /// Loads a filter that was previously created.
 ///
 /// - A user can only access their own filters
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/user/<_>/filter/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_filter_route(
     db: DatabaseGuard,
-    body: Ruma<get_filter::Request<'_>>,
-) -> ConduitResult<get_filter::Response> {
+    body: Ruma<get_filter::v3::IncomingRequest>,
+) -> Result<get_filter::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let filter = match db.users.get_filter(sender_user, &body.filter_id)? {
         Some(filter) => filter,
         None => return Err(Error::BadRequest(ErrorKind::NotFound, "Filter not found.")),
     };
 
-    Ok(get_filter::Response::new(filter).into())
+    Ok(get_filter::v3::Response::new(filter))
 }
 
 /// # `PUT /_matrix/client/r0/user/{userId}/filter`
 ///
 /// Creates a new filter to be used by other endpoints.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/user/<_>/filter", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn create_filter_route(
     db: DatabaseGuard,
-    body: Ruma<create_filter::Request<'_>>,
-) -> ConduitResult<create_filter::Response> {
+    body: Ruma<create_filter::v3::IncomingRequest>,
+) -> Result<create_filter::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-    Ok(create_filter::Response::new(db.users.create_filter(sender_user, &body.filter)?).into())
+    Ok(create_filter::v3::Response::new(
+        db.users.create_filter(sender_user, &body.filter)?,
+    ))
 }
diff --git a/src/client_server/keys.rs b/src/client_server/keys.rs
index e7aec26b..c4f91cb2 100644
--- a/src/client_server/keys.rs
+++ b/src/client_server/keys.rs
@@ -1,17 +1,15 @@
 use super::SESSION_ID_LENGTH;
-use crate::{database::DatabaseGuard, utils, ConduitResult, Database, Error, Result, Ruma};
-use rocket::futures::{prelude::*, stream::FuturesUnordered};
+use crate::{database::DatabaseGuard, utils, Database, Error, Result, Ruma};
+use futures_util::{stream::FuturesUnordered, StreamExt};
 use ruma::{
     api::{
         client::{
             error::ErrorKind,
-            r0::{
-                keys::{
-                    claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures,
-                    upload_signing_keys,
-                },
-                uiaa::{AuthFlow, AuthType, UiaaInfo},
+            keys::{
+                claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures,
+                upload_signing_keys,
             },
+            uiaa::{AuthFlow, AuthType, UiaaInfo},
         },
         federation,
     },
@@ -21,24 +19,16 @@ use ruma::{
 use serde_json::json;
 use std::collections::{BTreeMap, HashMap, HashSet};
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post};
-
 /// # `POST /_matrix/client/r0/keys/upload`
 ///
 /// Publish end-to-end encryption keys for the sender device.
 ///
 /// - Adds one time keys
 /// - If there are no device keys yet: Adds device keys (TODO: merge with existing keys?)
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/keys/upload", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn upload_keys_route(
     db: DatabaseGuard,
-    body: Ruma<upload_keys::Request>,
-) -> ConduitResult<upload_keys::Response> {
+    body: Ruma<upload_keys::v3::Request>,
+) -> Result<upload_keys::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -67,10 +57,9 @@ pub async fn upload_keys_route(
 
     db.flush()?;
 
-    Ok(upload_keys::Response {
+    Ok(upload_keys::v3::Response {
         one_time_key_counts: db.users.count_one_time_keys(sender_user, sender_device)?,
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/client/r0/keys/query`
@@ -80,15 +69,10 @@ pub async fn upload_keys_route(
 /// - Always fetches users from other servers over federation
 /// - Gets master keys, self-signing keys, user signing keys and device keys.
 /// - The master and self-signing keys contain signatures that the user is allowed to see
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/keys/query", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_keys_route(
     db: DatabaseGuard,
-    body: Ruma<get_keys::Request<'_>>,
-) -> ConduitResult<get_keys::Response> {
+    body: Ruma<get_keys::v3::IncomingRequest>,
+) -> Result<get_keys::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let response = get_keys_helper(
@@ -99,26 +83,21 @@ pub async fn get_keys_route(
     )
     .await?;
 
-    Ok(response.into())
+    Ok(response)
 }
 
 /// # `POST /_matrix/client/r0/keys/claim`
 ///
 /// Claims one-time keys
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/keys/claim", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn claim_keys_route(
     db: DatabaseGuard,
-    body: Ruma<claim_keys::Request>,
-) -> ConduitResult<claim_keys::Response> {
+    body: Ruma<claim_keys::v3::Request>,
+) -> Result<claim_keys::v3::Response> {
     let response = claim_keys_helper(&body.one_time_keys, &db).await?;
 
     db.flush()?;
 
-    Ok(response.into())
+    Ok(response)
 }
 
 /// # `POST /_matrix/client/r0/keys/device_signing/upload`
@@ -126,15 +105,10 @@ pub async fn claim_keys_route(
 /// Uploads end-to-end key information for the sender user.
 ///
 /// - Requires UIAA to verify password
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/unstable/keys/device_signing/upload", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn upload_signing_keys_route(
     db: DatabaseGuard,
-    body: Ruma<upload_signing_keys::Request<'_>>,
-) -> ConduitResult<upload_signing_keys::Response> {
+    body: Ruma<upload_signing_keys::v3::IncomingRequest>,
+) -> Result<upload_signing_keys::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -184,25 +158,22 @@ pub async fn upload_signing_keys_route(
 
     db.flush()?;
 
-    Ok(upload_signing_keys::Response {}.into())
+    Ok(upload_signing_keys::v3::Response {})
 }
 
 /// # `POST /_matrix/client/r0/keys/signatures/upload`
 ///
 /// Uploads end-to-end key signatures from the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/unstable/keys/signatures/upload", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn upload_signatures_route(
     db: DatabaseGuard,
-    body: Ruma<upload_signatures::Request>,
-) -> ConduitResult<upload_signatures::Response> {
+    body: Ruma<upload_signatures::v3::Request>,
+) -> Result<upload_signatures::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     for (user_id, signed_keys) in &body.signed_keys {
         for (key_id, signed_key) in signed_keys {
+            let signed_key = serde_json::to_value(signed_key).unwrap();
+
             for signature in signed_key
                 .get("signatures")
                 .ok_or(Error::BadRequest(
@@ -248,7 +219,9 @@ pub async fn upload_signatures_route(
 
     db.flush()?;
 
-    Ok(upload_signatures::Response {}.into())
+    Ok(upload_signatures::v3::Response {
+        failures: BTreeMap::new(), // TODO: integrate
+    })
 }
 
 /// # `POST /_matrix/client/r0/keys/changes`
@@ -256,15 +229,10 @@ pub async fn upload_signatures_route(
 /// Gets a list of users who have updated their device identity keys since the previous sync token.
 ///
 /// - TODO: left users
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/keys/changes", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_key_changes_route(
     db: DatabaseGuard,
-    body: Ruma<get_key_changes::Request<'_>>,
-) -> ConduitResult<get_key_changes::Response> {
+    body: Ruma<get_key_changes::v3::IncomingRequest>,
+) -> Result<get_key_changes::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let mut device_list_updates = HashSet::new();
@@ -300,11 +268,10 @@ pub async fn get_key_changes_route(
                 .filter_map(|r| r.ok()),
         );
     }
-    Ok(get_key_changes::Response {
+    Ok(get_key_changes::v3::Response {
         changed: device_list_updates.into_iter().collect(),
         left: Vec::new(), // TODO
-    }
-    .into())
+    })
 }
 
 pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
@@ -312,7 +279,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
     device_keys_input: &BTreeMap<Box<UserId>, Vec<Box<DeviceId>>>,
     allowed_signatures: F,
     db: &Database,
-) -> Result<get_keys::Response> {
+) -> Result<get_keys::v3::Response> {
     let mut master_keys = BTreeMap::new();
     let mut self_signing_keys = BTreeMap::new();
     let mut user_signing_keys = BTreeMap::new();
@@ -421,7 +388,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
         }
     }
 
-    Ok(get_keys::Response {
+    Ok(get_keys::v3::Response {
         master_keys,
         self_signing_keys,
         user_signing_keys,
@@ -432,7 +399,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 
 fn add_unsigned_device_display_name(
     keys: &mut Raw<ruma::encryption::DeviceKeys>,
-    metadata: ruma::api::client::r0::device::Device,
+    metadata: ruma::api::client::device::Device,
 ) -> serde_json::Result<()> {
     if let Some(display_name) = metadata.display_name {
         let mut object = keys.deserialize_as::<serde_json::Map<String, serde_json::Value>>()?;
@@ -451,7 +418,7 @@ fn add_unsigned_device_display_name(
 pub(crate) async fn claim_keys_helper(
     one_time_keys_input: &BTreeMap<Box<UserId>, BTreeMap<Box<DeviceId>, DeviceKeyAlgorithm>>,
     db: &Database,
-) -> Result<claim_keys::Response> {
+) -> Result<claim_keys::v3::Response> {
     let mut one_time_keys = BTreeMap::new();
 
     let mut get_over_federation = BTreeMap::new();
@@ -503,7 +470,7 @@ pub(crate) async fn claim_keys_helper(
         }
     }
 
-    Ok(claim_keys::Response {
+    Ok(claim_keys::v3::Response {
         failures,
         one_time_keys,
     })
diff --git a/src/client_server/media.rs b/src/client_server/media.rs
index deea319e..a9a6d6cd 100644
--- a/src/client_server/media.rs
+++ b/src/client_server/media.rs
@@ -1,32 +1,27 @@
 use crate::{
     database::{media::FileMeta, DatabaseGuard},
-    utils, ConduitResult, Error, Ruma,
+    utils, Error, Result, Ruma,
 };
 use ruma::api::client::{
     error::ErrorKind,
-    r0::media::{
+    media::{
         create_content, get_content, get_content_as_filename, get_content_thumbnail,
         get_media_config,
     },
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post};
-
 const MXC_LENGTH: usize = 32;
 
 /// # `GET /_matrix/media/r0/config`
 ///
 /// Returns max upload size.
-#[cfg_attr(feature = "conduit_bin", get("/_matrix/media/r0/config"))]
-#[tracing::instrument(skip(db))]
 pub async fn get_media_config_route(
     db: DatabaseGuard,
-) -> ConduitResult<get_media_config::Response> {
-    Ok(get_media_config::Response {
+    _body: Ruma<get_media_config::v3::Request>,
+) -> Result<get_media_config::v3::Response> {
+    Ok(get_media_config::v3::Response {
         upload_size: db.globals.max_request_size().into(),
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/media/r0/upload`
@@ -35,15 +30,10 @@ pub async fn get_media_config_route(
 ///
 /// - Some metadata will be saved in the database
 /// - Media will be saved in the media/ directory
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/media/r0/upload", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn create_content_route(
     db: DatabaseGuard,
-    body: Ruma<create_content::Request<'_>>,
-) -> ConduitResult<create_content::Response> {
+    body: Ruma<create_content::v3::IncomingRequest>,
+) -> Result<create_content::v3::Response> {
     let mxc = format!(
         "mxc://{}/{}",
         db.globals.server_name(),
@@ -66,11 +56,10 @@ pub async fn create_content_route(
 
     db.flush()?;
 
-    Ok(create_content::Response {
+    Ok(create_content::v3::Response {
         content_uri: mxc.try_into().expect("Invalid mxc:// URI"),
         blurhash: None,
-    }
-    .into())
+    })
 }
 
 pub async fn get_remote_content(
@@ -78,13 +67,13 @@ pub async fn get_remote_content(
     mxc: &str,
     server_name: &ruma::ServerName,
     media_id: &str,
-) -> Result<get_content::Response, Error> {
+) -> Result<get_content::v3::Response, Error> {
     let content_response = db
         .sending
         .send_federation_request(
             &db.globals,
             server_name,
-            get_content::Request {
+            get_content::v3::Request {
                 allow_remote: false,
                 server_name,
                 media_id,
@@ -110,15 +99,10 @@ pub async fn get_remote_content(
 /// Load media from our server or over federation.
 ///
 /// - Only allows federation if `allow_remote` is true
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/media/r0/download/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_content_route(
     db: DatabaseGuard,
-    body: Ruma<get_content::Request<'_>>,
-) -> ConduitResult<get_content::Response> {
+    body: Ruma<get_content::v3::IncomingRequest>,
+) -> Result<get_content::v3::Response> {
     let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
 
     if let Some(FileMeta {
@@ -127,16 +111,15 @@ pub async fn get_content_route(
         file,
     }) = db.media.get(&db.globals, &mxc).await?
     {
-        Ok(get_content::Response {
+        Ok(get_content::v3::Response {
             file,
             content_type,
             content_disposition,
-        }
-        .into())
+        })
     } else if &*body.server_name != db.globals.server_name() && body.allow_remote {
         let remote_content_response =
             get_remote_content(&db, &mxc, &body.server_name, &body.media_id).await?;
-        Ok(remote_content_response.into())
+        Ok(remote_content_response)
     } else {
         Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
     }
@@ -147,15 +130,10 @@ pub async fn get_content_route(
 /// Load media from our server or over federation, permitting desired filename.
 ///
 /// - Only allows federation if `allow_remote` is true
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/media/r0/download/<_>/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_content_as_filename_route(
     db: DatabaseGuard,
-    body: Ruma<get_content_as_filename::Request<'_>>,
-) -> ConduitResult<get_content_as_filename::Response> {
+    body: Ruma<get_content_as_filename::v3::IncomingRequest>,
+) -> Result<get_content_as_filename::v3::Response> {
     let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
 
     if let Some(FileMeta {
@@ -164,22 +142,20 @@ pub async fn get_content_as_filename_route(
         file,
     }) = db.media.get(&db.globals, &mxc).await?
     {
-        Ok(get_content_as_filename::Response {
+        Ok(get_content_as_filename::v3::Response {
             file,
             content_type,
             content_disposition: Some(format!("inline; filename={}", body.filename)),
-        }
-        .into())
+        })
     } else if &*body.server_name != db.globals.server_name() && body.allow_remote {
         let remote_content_response =
             get_remote_content(&db, &mxc, &body.server_name, &body.media_id).await?;
 
-        Ok(get_content_as_filename::Response {
+        Ok(get_content_as_filename::v3::Response {
             content_disposition: Some(format!("inline: filename={}", body.filename)),
             content_type: remote_content_response.content_type,
             file: remote_content_response.file,
-        }
-        .into())
+        })
     } else {
         Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
     }
@@ -190,15 +166,10 @@ pub async fn get_content_as_filename_route(
 /// Load media thumbnail from our server or over federation.
 ///
 /// - Only allows federation if `allow_remote` is true
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/media/r0/thumbnail/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_content_thumbnail_route(
     db: DatabaseGuard,
-    body: Ruma<get_content_thumbnail::Request<'_>>,
-) -> ConduitResult<get_content_thumbnail::Response> {
+    body: Ruma<get_content_thumbnail::v3::IncomingRequest>,
+) -> Result<get_content_thumbnail::v3::Response> {
     let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
 
     if let Some(FileMeta {
@@ -217,14 +188,14 @@ pub async fn get_content_thumbnail_route(
         )
         .await?
     {
-        Ok(get_content_thumbnail::Response { file, content_type }.into())
+        Ok(get_content_thumbnail::v3::Response { file, content_type })
     } else if &*body.server_name != db.globals.server_name() && body.allow_remote {
         let get_thumbnail_response = db
             .sending
             .send_federation_request(
                 &db.globals,
                 &body.server_name,
-                get_content_thumbnail::Request {
+                get_content_thumbnail::v3::Request {
                     allow_remote: false,
                     height: body.height,
                     width: body.width,
@@ -247,7 +218,7 @@ pub async fn get_content_thumbnail_route(
             )
             .await?;
 
-        Ok(get_thumbnail_response.into())
+        Ok(get_thumbnail_response)
     } else {
         Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
     }
diff --git a/src/client_server/membership.rs b/src/client_server/membership.rs
index e855dba2..a1b616be 100644
--- a/src/client_server/membership.rs
+++ b/src/client_server/membership.rs
@@ -2,13 +2,13 @@ use crate::{
     client_server,
     database::DatabaseGuard,
     pdu::{EventHash, PduBuilder, PduEvent},
-    server_server, utils, ConduitResult, Database, Error, Result, Ruma,
+    server_server, utils, Database, Error, Result, Ruma,
 };
 use ruma::{
     api::{
         client::{
             error::ErrorKind,
-            r0::membership::{
+            membership::{
                 ban_user, forget_room, get_member_events, invite_user, join_room_by_id,
                 join_room_by_id_or_alias, joined_members, joined_rooms, kick_user, leave_room,
                 unban_user, IncomingThirdPartySigned,
@@ -21,7 +21,7 @@ use ruma::{
             create::RoomCreateEventContent,
             member::{MembershipState, RoomMemberEventContent},
         },
-        EventType,
+        RoomEventType, StateEventType,
     },
     serde::{to_canonical_value, Base64, CanonicalJsonObject, CanonicalJsonValue},
     state_res::{self, RoomVersion},
@@ -29,46 +29,39 @@ use ruma::{
 };
 use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
 use std::{
-    collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
+    collections::{hash_map::Entry, BTreeMap, HashMap},
     iter,
     sync::{Arc, RwLock},
     time::{Duration, Instant},
 };
 use tracing::{debug, error, warn};
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post};
-
 /// # `POST /_matrix/client/r0/rooms/{roomId}/join`
 ///
 /// Tries to join the sender user into a room.
 ///
 /// - If the server knowns about this room: creates the join event and does auth rules locally
 /// - If the server does not know about the room: asks other servers over federation
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/join", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn join_room_by_id_route(
     db: DatabaseGuard,
-    body: Ruma<join_room_by_id::Request<'_>>,
-) -> ConduitResult<join_room_by_id::Response> {
+    body: Ruma<join_room_by_id::v3::IncomingRequest>,
+) -> Result<join_room_by_id::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let mut servers: HashSet<_> = db
-        .rooms
-        .invite_state(sender_user, &body.room_id)?
-        .unwrap_or_default()
-        .iter()
-        .filter_map(|event| serde_json::from_str(event.json().get()).ok())
-        .filter_map(|event: serde_json::Value| event.get("sender").cloned())
-        .filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
-        .filter_map(|sender| UserId::parse(sender).ok())
-        .map(|user| user.server_name().to_owned())
-        .collect();
+    let mut servers = Vec::new(); // There is no body.server_name for /roomId/join
+    servers.extend(
+        db.rooms
+            .invite_state(sender_user, &body.room_id)?
+            .unwrap_or_default()
+            .iter()
+            .filter_map(|event| serde_json::from_str(event.json().get()).ok())
+            .filter_map(|event: serde_json::Value| event.get("sender").cloned())
+            .filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
+            .filter_map(|sender| UserId::parse(sender).ok())
+            .map(|user| user.server_name().to_owned()),
+    );
 
-    servers.insert(body.room_id.server_name().to_owned());
+    servers.push(body.room_id.server_name().to_owned());
 
     let ret = join_room_by_id_helper(
         &db,
@@ -90,39 +83,35 @@ pub async fn join_room_by_id_route(
 ///
 /// - If the server knowns about this room: creates the join event and does auth rules locally
 /// - If the server does not know about the room: asks other servers over federation
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/join/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn join_room_by_id_or_alias_route(
     db: DatabaseGuard,
-    body: Ruma<join_room_by_id_or_alias::Request<'_>>,
-) -> ConduitResult<join_room_by_id_or_alias::Response> {
+    body: Ruma<join_room_by_id_or_alias::v3::IncomingRequest>,
+) -> Result<join_room_by_id_or_alias::v3::Response> {
     let sender_user = body.sender_user.as_deref().expect("user is authenticated");
     let body = body.body;
 
     let (servers, room_id) = match Box::<RoomId>::try_from(body.room_id_or_alias) {
         Ok(room_id) => {
-            let mut servers: HashSet<_> = db
-                .rooms
-                .invite_state(sender_user, &room_id)?
-                .unwrap_or_default()
-                .iter()
-                .filter_map(|event| serde_json::from_str(event.json().get()).ok())
-                .filter_map(|event: serde_json::Value| event.get("sender").cloned())
-                .filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
-                .filter_map(|sender| UserId::parse(sender).ok())
-                .map(|user| user.server_name().to_owned())
-                .collect();
+            let mut servers = body.server_name.clone();
+            servers.extend(
+                db.rooms
+                    .invite_state(sender_user, &room_id)?
+                    .unwrap_or_default()
+                    .iter()
+                    .filter_map(|event| serde_json::from_str(event.json().get()).ok())
+                    .filter_map(|event: serde_json::Value| event.get("sender").cloned())
+                    .filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
+                    .filter_map(|sender| UserId::parse(sender).ok())
+                    .map(|user| user.server_name().to_owned()),
+            );
 
-            servers.insert(room_id.server_name().to_owned());
+            servers.push(room_id.server_name().to_owned());
             (servers, room_id)
         }
         Err(room_alias) => {
             let response = client_server::get_alias_helper(&db, &room_alias).await?;
 
-            (response.0.servers.into_iter().collect(), response.0.room_id)
+            (response.servers.into_iter().collect(), response.room_id)
         }
     };
 
@@ -137,10 +126,9 @@ pub async fn join_room_by_id_or_alias_route(
 
     db.flush()?;
 
-    Ok(join_room_by_id_or_alias::Response {
-        room_id: join_room_response.0.room_id,
-    }
-    .into())
+    Ok(join_room_by_id_or_alias::v3::Response {
+        room_id: join_room_response.room_id,
+    })
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/leave`
@@ -148,42 +136,32 @@ pub async fn join_room_by_id_or_alias_route(
 /// Tries to leave the sender user from a room.
 ///
 /// - This should always work if the user is currently joined.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/leave", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn leave_room_route(
     db: DatabaseGuard,
-    body: Ruma<leave_room::Request<'_>>,
-) -> ConduitResult<leave_room::Response> {
+    body: Ruma<leave_room::v3::IncomingRequest>,
+) -> Result<leave_room::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.rooms.leave_room(sender_user, &body.room_id, &db).await?;
 
     db.flush()?;
 
-    Ok(leave_room::Response::new().into())
+    Ok(leave_room::v3::Response::new())
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/invite`
 ///
 /// Tries to send an invite event into the room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/invite", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn invite_user_route(
     db: DatabaseGuard,
-    body: Ruma<invite_user::Request<'_>>,
-) -> ConduitResult<invite_user::Response> {
+    body: Ruma<invite_user::v3::IncomingRequest>,
+) -> Result<invite_user::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if let invite_user::IncomingInvitationRecipient::UserId { user_id } = &body.recipient {
+    if let invite_user::v3::IncomingInvitationRecipient::UserId { user_id } = &body.recipient {
         invite_helper(sender_user, user_id, &body.room_id, &db, false).await?;
         db.flush()?;
-        Ok(invite_user::Response {}.into())
+        Ok(invite_user::v3::Response {})
     } else {
         Err(Error::BadRequest(ErrorKind::NotFound, "User not found."))
     }
@@ -192,22 +170,17 @@ pub async fn invite_user_route(
 /// # `POST /_matrix/client/r0/rooms/{roomId}/kick`
 ///
 /// Tries to send a kick event into the room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/kick", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn kick_user_route(
     db: DatabaseGuard,
-    body: Ruma<kick_user::Request<'_>>,
-) -> ConduitResult<kick_user::Response> {
+    body: Ruma<kick_user::v3::IncomingRequest>,
+) -> Result<kick_user::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let mut event: RoomMemberEventContent = serde_json::from_str(
         db.rooms
             .room_state_get(
                 &body.room_id,
-                &EventType::RoomMember,
+                &StateEventType::RoomMember,
                 &body.user_id.to_string(),
             )?
             .ok_or(Error::BadRequest(
@@ -234,7 +207,7 @@ pub async fn kick_user_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&event).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some(body.user_id.to_string()),
@@ -250,21 +223,16 @@ pub async fn kick_user_route(
 
     db.flush()?;
 
-    Ok(kick_user::Response::new().into())
+    Ok(kick_user::v3::Response::new())
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/ban`
 ///
 /// Tries to send a ban event into the room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/ban", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn ban_user_route(
     db: DatabaseGuard,
-    body: Ruma<ban_user::Request<'_>>,
-) -> ConduitResult<ban_user::Response> {
+    body: Ruma<ban_user::v3::IncomingRequest>,
+) -> Result<ban_user::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     // TODO: reason
@@ -273,7 +241,7 @@ pub async fn ban_user_route(
         .rooms
         .room_state_get(
             &body.room_id,
-            &EventType::RoomMember,
+            &StateEventType::RoomMember,
             &body.user_id.to_string(),
         )?
         .map_or(
@@ -309,7 +277,7 @@ pub async fn ban_user_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&event).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some(body.user_id.to_string()),
@@ -325,28 +293,23 @@ pub async fn ban_user_route(
 
     db.flush()?;
 
-    Ok(ban_user::Response::new().into())
+    Ok(ban_user::v3::Response::new())
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/unban`
 ///
 /// Tries to send an unban event into the room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/unban", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn unban_user_route(
     db: DatabaseGuard,
-    body: Ruma<unban_user::Request<'_>>,
-) -> ConduitResult<unban_user::Response> {
+    body: Ruma<unban_user::v3::IncomingRequest>,
+) -> Result<unban_user::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let mut event: RoomMemberEventContent = serde_json::from_str(
         db.rooms
             .room_state_get(
                 &body.room_id,
-                &EventType::RoomMember,
+                &StateEventType::RoomMember,
                 &body.user_id.to_string(),
             )?
             .ok_or(Error::BadRequest(
@@ -372,7 +335,7 @@ pub async fn unban_user_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&event).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some(body.user_id.to_string()),
@@ -388,7 +351,7 @@ pub async fn unban_user_route(
 
     db.flush()?;
 
-    Ok(unban_user::Response::new().into())
+    Ok(unban_user::v3::Response::new())
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/forget`
@@ -399,46 +362,35 @@ pub async fn unban_user_route(
 ///
 /// Note: Other devices of the user have no way of knowing the room was forgotten, so this has to
 /// be called from every device
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/forget", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn forget_room_route(
     db: DatabaseGuard,
-    body: Ruma<forget_room::Request<'_>>,
-) -> ConduitResult<forget_room::Response> {
+    body: Ruma<forget_room::v3::IncomingRequest>,
+) -> Result<forget_room::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.rooms.forget(&body.room_id, sender_user)?;
 
     db.flush()?;
 
-    Ok(forget_room::Response::new().into())
+    Ok(forget_room::v3::Response::new())
 }
 
 /// # `POST /_matrix/client/r0/joined_rooms`
 ///
 /// Lists all rooms the user has joined.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/joined_rooms", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn joined_rooms_route(
     db: DatabaseGuard,
-    body: Ruma<joined_rooms::Request>,
-) -> ConduitResult<joined_rooms::Response> {
+    body: Ruma<joined_rooms::v3::Request>,
+) -> Result<joined_rooms::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    Ok(joined_rooms::Response {
+    Ok(joined_rooms::v3::Response {
         joined_rooms: db
             .rooms
             .rooms_joined(sender_user)
             .filter_map(|r| r.ok())
             .collect(),
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/members`
@@ -446,15 +398,10 @@ pub async fn joined_rooms_route(
 /// Lists all joined users in a room (TODO: at a specific point in time, with a specific membership).
 ///
 /// - Only works if the user is currently joined
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/members", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_member_events_route(
     db: DatabaseGuard,
-    body: Ruma<get_member_events::Request<'_>>,
-) -> ConduitResult<get_member_events::Response> {
+    body: Ruma<get_member_events::v3::IncomingRequest>,
+) -> Result<get_member_events::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     // TODO: check history visibility?
@@ -465,16 +412,16 @@ pub async fn get_member_events_route(
         ));
     }
 
-    Ok(get_member_events::Response {
+    Ok(get_member_events::v3::Response {
         chunk: db
             .rooms
-            .room_state_full(&body.room_id)?
+            .room_state_full(&body.room_id)
+            .await?
             .iter()
-            .filter(|(key, _)| key.0 == EventType::RoomMember)
-            .map(|(_, pdu)| pdu.to_member_event())
+            .filter(|(key, _)| key.0 == StateEventType::RoomMember)
+            .map(|(_, pdu)| pdu.to_member_event().into())
             .collect(),
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/joined_members`
@@ -483,15 +430,10 @@ pub async fn get_member_events_route(
 ///
 /// - The sender user must be in the room
 /// - TODO: An appservice just needs a puppet joined
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/joined_members", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn joined_members_route(
     db: DatabaseGuard,
-    body: Ruma<joined_members::Request<'_>>,
-) -> ConduitResult<joined_members::Response> {
+    body: Ruma<joined_members::v3::IncomingRequest>,
+) -> Result<joined_members::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if !db.rooms.is_joined(sender_user, &body.room_id)? {
@@ -508,14 +450,14 @@ pub async fn joined_members_route(
 
         joined.insert(
             user_id,
-            joined_members::RoomMember {
+            joined_members::v3::RoomMember {
                 display_name,
                 avatar_url,
             },
         );
     }
 
-    Ok(joined_members::Response { joined }.into())
+    Ok(joined_members::v3::Response { joined })
 }
 
 #[tracing::instrument(skip(db))]
@@ -523,9 +465,9 @@ async fn join_room_by_id_helper(
     db: &Database,
     sender_user: Option<&UserId>,
     room_id: &RoomId,
-    servers: &HashSet<Box<ServerName>>,
+    servers: &[Box<ServerName>],
     _third_party_signed: Option<&IncomingThirdPartySigned>,
-) -> ConduitResult<join_room_by_id::Response> {
+) -> Result<join_room_by_id::v3::Response> {
     let sender_user = sender_user.expect("user is authenticated");
 
     let mutex_state = Arc::clone(
@@ -539,7 +481,7 @@ async fn join_room_by_id_helper(
     let state_lock = mutex_state.lock().await;
 
     // Ask a remote server if we don't have this room
-    if !db.rooms.exists(room_id)? && room_id.server_name() != db.globals.server_name() {
+    if !db.rooms.exists(room_id)? {
         let mut make_join_response_and_server = Err(Error::BadServerResponse(
             "No server available to assist in joining.",
         ));
@@ -550,10 +492,10 @@ async fn join_room_by_id_helper(
                 .send_federation_request(
                     &db.globals,
                     remote_server,
-                    federation::membership::create_join_event_template::v1::Request {
+                    federation::membership::prepare_join_event::v1::Request {
                         room_id,
                         user_id: sender_user,
-                        ver: &[RoomVersionId::V5, RoomVersionId::V6],
+                        ver: &db.globals.supported_room_versions(),
                     },
                 )
                 .await;
@@ -568,11 +510,7 @@ async fn join_room_by_id_helper(
         let (make_join_response, remote_server) = make_join_response_and_server?;
 
         let room_version = match make_join_response.room_version {
-            Some(room_version)
-                if room_version == RoomVersionId::V5 || room_version == RoomVersionId::V6 =>
-            {
-                room_version
-            }
+            Some(room_version) if db.rooms.is_supported_version(&db, &room_version) => room_version,
             _ => return Err(Error::BadServerResponse("Room version is not supported")),
         };
 
@@ -686,15 +624,17 @@ async fn join_room_by_id_helper(
 
             db.rooms.add_pdu_outlier(&event_id, &value)?;
             if let Some(state_key) = &pdu.state_key {
-                let shortstatekey =
-                    db.rooms
-                        .get_or_create_shortstatekey(&pdu.kind, state_key, &db.globals)?;
+                let shortstatekey = db.rooms.get_or_create_shortstatekey(
+                    &pdu.kind.to_string().into(),
+                    state_key,
+                    &db.globals,
+                )?;
                 state.insert(shortstatekey, pdu.event_id.clone());
             }
         }
 
         let incoming_shortstatekey = db.rooms.get_or_create_shortstatekey(
-            &parsed_pdu.kind,
+            &parsed_pdu.kind.to_string().into(),
             parsed_pdu
                 .state_key
                 .as_ref()
@@ -706,7 +646,7 @@ async fn join_room_by_id_helper(
 
         let create_shortstatekey = db
             .rooms
-            .get_shortstatekey(&EventType::RoomCreate, "")?
+            .get_shortstatekey(&StateEventType::RoomCreate, "")?
             .expect("Room exists");
 
         if state.get(&create_shortstatekey).is_none() {
@@ -764,7 +704,7 @@ async fn join_room_by_id_helper(
 
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                event_type: EventType::RoomMember,
+                event_type: RoomEventType::RoomMember,
                 content: to_raw_value(&event).expect("event is valid, we just created it"),
                 unsigned: None,
                 state_key: Some(sender_user.to_string()),
@@ -781,7 +721,7 @@ async fn join_room_by_id_helper(
 
     db.flush()?;
 
-    Ok(join_room_by_id::Response::new(room_id.to_owned()).into())
+    Ok(join_room_by_id::v3::Response::new(room_id.to_owned()))
 }
 
 fn validate_and_add_event_id(
@@ -875,7 +815,7 @@ pub(crate) async fn invite_helper<'a>(
 
             let create_event = db
                 .rooms
-                .room_state_get(room_id, &EventType::RoomCreate, "")?;
+                .room_state_get(room_id, &StateEventType::RoomCreate, "")?;
 
             let create_event_content: Option<RoomCreateEventContent> = create_event
                 .as_ref()
@@ -887,17 +827,12 @@ pub(crate) async fn invite_helper<'a>(
                 })
                 .transpose()?;
 
-            let create_prev_event = if prev_events.len() == 1
-                && Some(&prev_events[0]) == create_event.as_ref().map(|c| &c.event_id)
-            {
-                create_event
-            } else {
-                None
-            };
-
-            // If there was no create event yet, assume we are creating a version 6 room right now
+            // If there was no create event yet, assume we are creating a room with the default
+            // version right now
             let room_version_id = create_event_content
-                .map_or(RoomVersionId::V6, |create_event| create_event.room_version);
+                .map_or(db.globals.default_room_version(), |create_event| {
+                    create_event.room_version
+                });
             let room_version =
                 RoomVersion::new(&room_version_id).expect("room version is supported");
 
@@ -914,11 +849,11 @@ pub(crate) async fn invite_helper<'a>(
             .expect("member event is valid value");
 
             let state_key = user_id.to_string();
-            let kind = EventType::RoomMember;
+            let kind = StateEventType::RoomMember;
 
             let auth_events = db.rooms.get_auth_events(
                 room_id,
-                &kind,
+                &kind.to_string().into(),
                 sender_user,
                 Some(&state_key),
                 &content,
@@ -949,7 +884,7 @@ pub(crate) async fn invite_helper<'a>(
                 origin_server_ts: utils::millis_since_unix_epoch()
                     .try_into()
                     .expect("time is valid"),
-                kind,
+                kind: kind.to_string().into(),
                 content,
                 state_key: Some(state_key),
                 prev_events,
@@ -973,7 +908,6 @@ pub(crate) async fn invite_helper<'a>(
             let auth_check = state_res::auth_check(
                 &room_version,
                 &pdu,
-                create_prev_event,
                 None::<PduEvent>, // TODO: third_party_invite
                 |k, s| auth_events.get(&(k.clone(), s.to_owned())),
             )
@@ -1044,7 +978,8 @@ pub(crate) async fn invite_helper<'a>(
         let pub_key_map = RwLock::new(BTreeMap::new());
 
         // We do not add the event_id field to the pdu here because of signature and hashes checks
-        let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(&response.event) {
+        let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(&response.event, &db)
+        {
             Ok(t) => t,
             Err(_) => {
                 // Event could not be converted to canonical json
@@ -1100,6 +1035,13 @@ pub(crate) async fn invite_helper<'a>(
         return Ok(());
     }
 
+    if !db.rooms.is_joined(sender_user, &room_id)? {
+        return Err(Error::BadRequest(
+            ErrorKind::Forbidden,
+            "You don't have permission to view this room.",
+        ));
+    }
+
     let mutex_state = Arc::clone(
         db.globals
             .roomid_mutex_state
@@ -1112,7 +1054,7 @@ pub(crate) async fn invite_helper<'a>(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&RoomMemberEventContent {
                 membership: MembershipState::Invite,
                 displayname: db.users.displayname(user_id)?,
diff --git a/src/client_server/message.rs b/src/client_server/message.rs
index cf4f0cb6..1348132f 100644
--- a/src/client_server/message.rs
+++ b/src/client_server/message.rs
@@ -1,19 +1,16 @@
-use crate::{database::DatabaseGuard, pdu::PduBuilder, utils, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, pdu::PduBuilder, utils, Error, Result, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::message::{get_message_events, send_message_event},
+        message::{get_message_events, send_message_event},
     },
-    events::EventType,
+    events::{RoomEventType, StateEventType},
 };
 use std::{
     collections::{BTreeMap, HashSet},
     sync::Arc,
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, put};
-
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId}`
 ///
 /// Send a message event into the room.
@@ -21,15 +18,10 @@ use rocket::{get, put};
 /// - Is a NOOP if the txn id was already used before and returns the same event id again
 /// - The only requirement for the content is that it has to be valid json
 /// - Tries to send the event into the room, auth rules will determine if it is allowed
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/rooms/<_>/send/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn send_message_event_route(
     db: DatabaseGuard,
-    body: Ruma<send_message_event::Request<'_>>,
-) -> ConduitResult<send_message_event::Response> {
+    body: Ruma<send_message_event::v3::IncomingRequest>,
+) -> Result<send_message_event::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_deref();
 
@@ -44,7 +36,9 @@ pub async fn send_message_event_route(
     let state_lock = mutex_state.lock().await;
 
     // Forbid m.room.encrypted if encryption is disabled
-    if &body.event_type == "m.room.encrypted" && !db.globals.allow_encryption() {
+    if RoomEventType::RoomEncrypted == body.event_type.to_string().into()
+        && !db.globals.allow_encryption()
+    {
         return Err(Error::BadRequest(
             ErrorKind::Forbidden,
             "Encryption has been disabled",
@@ -69,7 +63,7 @@ pub async fn send_message_event_route(
             .map_err(|_| Error::bad_database("Invalid txnid bytes in database."))?
             .try_into()
             .map_err(|_| Error::bad_database("Invalid event id in txnid data."))?;
-        return Ok(send_message_event::Response { event_id }.into());
+        return Ok(send_message_event::v3::Response { event_id });
     }
 
     let mut unsigned = BTreeMap::new();
@@ -77,7 +71,7 @@ pub async fn send_message_event_route(
 
     let event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::from(&*body.event_type),
+            event_type: body.event_type.to_string().into(),
             content: serde_json::from_str(body.body.body.json().get())
                 .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?,
             unsigned: Some(unsigned),
@@ -101,7 +95,9 @@ pub async fn send_message_event_route(
 
     db.flush()?;
 
-    Ok(send_message_event::Response::new((*event_id).to_owned()).into())
+    Ok(send_message_event::v3::Response::new(
+        (*event_id).to_owned(),
+    ))
 }
 
 /// # `GET /_matrix/client/r0/rooms/{roomId}/messages`
@@ -110,15 +106,10 @@ pub async fn send_message_event_route(
 ///
 /// - Only works if the user is joined (TODO: always allow, but only show events where the user was
 /// joined, depending on history_visibility)
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/messages", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_message_events_route(
     db: DatabaseGuard,
-    body: Ruma<get_message_events::Request<'_>>,
-) -> ConduitResult<get_message_events::Response> {
+    body: Ruma<get_message_events::v3::IncomingRequest>,
+) -> Result<get_message_events::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -129,11 +120,16 @@ pub async fn get_message_events_route(
         ));
     }
 
-    let from = body
-        .from
-        .clone()
-        .parse()
-        .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from` value."))?;
+    let from = match body.from.clone() {
+        Some(from) => from
+            .parse()
+            .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from` value."))?,
+
+        None => match body.dir {
+            get_message_events::v3::Direction::Forward => 0,
+            get_message_events::v3::Direction::Backward => u64::MAX,
+        },
+    };
 
     let to = body.to.as_ref().map(|t| t.parse());
 
@@ -145,12 +141,12 @@ pub async fn get_message_events_route(
 
     let next_token;
 
-    let mut resp = get_message_events::Response::new();
+    let mut resp = get_message_events::v3::Response::new();
 
     let mut lazy_loaded = HashSet::new();
 
     match body.dir {
-        get_message_events::Direction::Forward => {
+        get_message_events::v3::Direction::Forward => {
             let events_after: Vec<_> = db
                 .rooms
                 .pdus_after(sender_user, &body.room_id, from)?
@@ -183,11 +179,11 @@ pub async fn get_message_events_route(
                 .map(|(_, pdu)| pdu.to_room_event())
                 .collect();
 
-            resp.start = body.from.to_owned();
+            resp.start = from.to_string();
             resp.end = next_token.map(|count| count.to_string());
             resp.chunk = events_after;
         }
-        get_message_events::Direction::Backward => {
+        get_message_events::v3::Direction::Backward => {
             let events_before: Vec<_> = db
                 .rooms
                 .pdus_until(sender_user, &body.room_id, from)?
@@ -220,7 +216,7 @@ pub async fn get_message_events_route(
                 .map(|(_, pdu)| pdu.to_room_event())
                 .collect();
 
-            resp.start = body.from.to_owned();
+            resp.start = from.to_string();
             resp.end = next_token.map(|count| count.to_string());
             resp.chunk = events_before;
         }
@@ -230,7 +226,7 @@ pub async fn get_message_events_route(
     for ll_id in &lazy_loaded {
         if let Some(member_event) =
             db.rooms
-                .room_state_get(&body.room_id, &EventType::RoomMember, ll_id.as_str())?
+                .room_state_get(&body.room_id, &StateEventType::RoomMember, ll_id.as_str())?
         {
             resp.state.push(member_event.to_state_event());
         }
@@ -246,5 +242,5 @@ pub async fn get_message_events_route(
         );
     }
 
-    Ok(resp.into())
+    Ok(resp)
 }
diff --git a/src/client_server/mod.rs b/src/client_server/mod.rs
index 115ddaf6..65b7a100 100644
--- a/src/client_server/mod.rs
+++ b/src/client_server/mod.rs
@@ -62,23 +62,7 @@ pub use unversioned::*;
 pub use user_directory::*;
 pub use voip::*;
 
-#[cfg(not(feature = "conduit_bin"))]
-use super::State;
-#[cfg(feature = "conduit_bin")]
-use {
-    crate::ConduitResult, rocket::options, ruma::api::client::r0::to_device::send_event_to_device,
-};
-
 pub const DEVICE_ID_LENGTH: usize = 10;
 pub const TOKEN_LENGTH: usize = 256;
 pub const SESSION_ID_LENGTH: usize = 256;
-
-/// # `OPTIONS`
-///
-/// Web clients use this to get CORS headers.
-#[cfg(feature = "conduit_bin")]
-#[options("/<_..>")]
-#[tracing::instrument]
-pub async fn options_route() -> ConduitResult<send_event_to_device::Response> {
-    Ok(send_event_to_device::Response {}.into())
-}
+pub const AUTO_GEN_PASSWORD_LENGTH: usize = 15;
diff --git a/src/client_server/presence.rs b/src/client_server/presence.rs
index cdc1e1f5..773fef47 100644
--- a/src/client_server/presence.rs
+++ b/src/client_server/presence.rs
@@ -1,22 +1,14 @@
-use crate::{database::DatabaseGuard, utils, ConduitResult, Ruma};
-use ruma::api::client::r0::presence::{get_presence, set_presence};
+use crate::{database::DatabaseGuard, utils, Result, Ruma};
+use ruma::api::client::presence::{get_presence, set_presence};
 use std::time::Duration;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, put};
-
 /// # `PUT /_matrix/client/r0/presence/{userId}/status`
 ///
 /// Sets the presence state of the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/presence/<_>/status", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_presence_route(
     db: DatabaseGuard,
-    body: Ruma<set_presence::Request<'_>>,
-) -> ConduitResult<set_presence::Response> {
+    body: Ruma<set_presence::v3::IncomingRequest>,
+) -> Result<set_presence::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     for room_id in db.rooms.rooms_joined(sender_user) {
@@ -46,7 +38,7 @@ pub async fn set_presence_route(
 
     db.flush()?;
 
-    Ok(set_presence::Response {}.into())
+    Ok(set_presence::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/presence/{userId}/status`
@@ -54,15 +46,10 @@ pub async fn set_presence_route(
 /// Gets the presence state of the given user.
 ///
 /// - Only works if you share a room with the user
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/presence/<_>/status", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_presence_route(
     db: DatabaseGuard,
-    body: Ruma<get_presence::Request<'_>>,
-) -> ConduitResult<get_presence::Response> {
+    body: Ruma<get_presence::v3::IncomingRequest>,
+) -> Result<get_presence::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let mut presence_event = None;
@@ -84,7 +71,7 @@ pub async fn get_presence_route(
     }
 
     if let Some(presence) = presence_event {
-        Ok(get_presence::Response {
+        Ok(get_presence::v3::Response {
             // TODO: Should ruma just use the presenceeventcontent type here?
             status_msg: presence.content.status_msg,
             currently_active: presence.content.currently_active,
@@ -93,8 +80,7 @@ pub async fn get_presence_route(
                 .last_active_ago
                 .map(|millis| Duration::from_millis(millis.into())),
             presence: presence.content.presence,
-        }
-        .into())
+        })
     } else {
         todo!();
     }
diff --git a/src/client_server/profile.rs b/src/client_server/profile.rs
index ef58a980..acea19f0 100644
--- a/src/client_server/profile.rs
+++ b/src/client_server/profile.rs
@@ -1,36 +1,28 @@
-use crate::{database::DatabaseGuard, pdu::PduBuilder, utils, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, pdu::PduBuilder, utils, Error, Result, Ruma};
 use ruma::{
     api::{
         client::{
             error::ErrorKind,
-            r0::profile::{
+            profile::{
                 get_avatar_url, get_display_name, get_profile, set_avatar_url, set_display_name,
             },
         },
         federation::{self, query::get_profile_information::v1::ProfileField},
     },
-    events::{room::member::RoomMemberEventContent, EventType},
+    events::{room::member::RoomMemberEventContent, RoomEventType, StateEventType},
 };
 use serde_json::value::to_raw_value;
 use std::sync::Arc;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, put};
-
 /// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
 ///
 /// Updates the displayname.
 ///
 /// - Also makes sure other users receive the update using presence EDUs
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/profile/<_>/displayname", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_displayname_route(
     db: DatabaseGuard,
-    body: Ruma<set_display_name::Request<'_>>,
-) -> ConduitResult<set_display_name::Response> {
+    body: Ruma<set_display_name::v3::IncomingRequest>,
+) -> Result<set_display_name::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.users
@@ -44,14 +36,14 @@ pub async fn set_displayname_route(
         .map(|room_id| {
             Ok::<_, Error>((
                 PduBuilder {
-                    event_type: EventType::RoomMember,
+                    event_type: RoomEventType::RoomMember,
                     content: to_raw_value(&RoomMemberEventContent {
                         displayname: body.displayname.clone(),
                         ..serde_json::from_str(
                             db.rooms
                                 .room_state_get(
                                     &room_id,
-                                    &EventType::RoomMember,
+                                    &StateEventType::RoomMember,
                                     sender_user.as_str(),
                                 )?
                                 .ok_or_else(|| {
@@ -116,7 +108,7 @@ pub async fn set_displayname_route(
 
     db.flush()?;
 
-    Ok(set_display_name::Response {}.into())
+    Ok(set_display_name::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/profile/{userId}/displayname`
@@ -124,15 +116,10 @@ pub async fn set_displayname_route(
 /// Returns the displayname of the user.
 ///
 /// - If user is on another server: Fetches displayname over federation
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/profile/<_>/displayname", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_displayname_route(
     db: DatabaseGuard,
-    body: Ruma<get_display_name::Request<'_>>,
-) -> ConduitResult<get_display_name::Response> {
+    body: Ruma<get_display_name::v3::IncomingRequest>,
+) -> Result<get_display_name::v3::Response> {
     if body.user_id.server_name() != db.globals.server_name() {
         let response = db
             .sending
@@ -146,16 +133,14 @@ pub async fn get_displayname_route(
             )
             .await?;
 
-        return Ok(get_display_name::Response {
+        return Ok(get_display_name::v3::Response {
             displayname: response.displayname,
-        }
-        .into());
+        });
     }
 
-    Ok(get_display_name::Response {
+    Ok(get_display_name::v3::Response {
         displayname: db.users.displayname(&body.user_id)?,
-    }
-    .into())
+    })
 }
 
 /// # `PUT /_matrix/client/r0/profile/{userId}/avatar_url`
@@ -163,15 +148,10 @@ pub async fn get_displayname_route(
 /// Updates the avatar_url and blurhash.
 ///
 /// - Also makes sure other users receive the update using presence EDUs
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/profile/<_>/avatar_url", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_avatar_url_route(
     db: DatabaseGuard,
-    body: Ruma<set_avatar_url::Request<'_>>,
-) -> ConduitResult<set_avatar_url::Response> {
+    body: Ruma<set_avatar_url::v3::IncomingRequest>,
+) -> Result<set_avatar_url::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.users
@@ -187,14 +167,14 @@ pub async fn set_avatar_url_route(
         .map(|room_id| {
             Ok::<_, Error>((
                 PduBuilder {
-                    event_type: EventType::RoomMember,
+                    event_type: RoomEventType::RoomMember,
                     content: to_raw_value(&RoomMemberEventContent {
                         avatar_url: body.avatar_url.clone(),
                         ..serde_json::from_str(
                             db.rooms
                                 .room_state_get(
                                     &room_id,
-                                    &EventType::RoomMember,
+                                    &StateEventType::RoomMember,
                                     sender_user.as_str(),
                                 )?
                                 .ok_or_else(|| {
@@ -259,7 +239,7 @@ pub async fn set_avatar_url_route(
 
     db.flush()?;
 
-    Ok(set_avatar_url::Response {}.into())
+    Ok(set_avatar_url::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/profile/{userId}/avatar_url`
@@ -267,15 +247,10 @@ pub async fn set_avatar_url_route(
 /// Returns the avatar_url and blurhash of the user.
 ///
 /// - If user is on another server: Fetches avatar_url and blurhash over federation
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/profile/<_>/avatar_url", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_avatar_url_route(
     db: DatabaseGuard,
-    body: Ruma<get_avatar_url::Request<'_>>,
-) -> ConduitResult<get_avatar_url::Response> {
+    body: Ruma<get_avatar_url::v3::IncomingRequest>,
+) -> Result<get_avatar_url::v3::Response> {
     if body.user_id.server_name() != db.globals.server_name() {
         let response = db
             .sending
@@ -289,18 +264,16 @@ pub async fn get_avatar_url_route(
             )
             .await?;
 
-        return Ok(get_avatar_url::Response {
+        return Ok(get_avatar_url::v3::Response {
             avatar_url: response.avatar_url,
             blurhash: response.blurhash,
-        }
-        .into());
+        });
     }
 
-    Ok(get_avatar_url::Response {
+    Ok(get_avatar_url::v3::Response {
         avatar_url: db.users.avatar_url(&body.user_id)?,
         blurhash: db.users.blurhash(&body.user_id)?,
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/client/r0/profile/{userId}`
@@ -308,15 +281,10 @@ pub async fn get_avatar_url_route(
 /// Returns the displayname, avatar_url and blurhash of the user.
 ///
 /// - If user is on another server: Fetches profile over federation
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/profile/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_profile_route(
     db: DatabaseGuard,
-    body: Ruma<get_profile::Request<'_>>,
-) -> ConduitResult<get_profile::Response> {
+    body: Ruma<get_profile::v3::IncomingRequest>,
+) -> Result<get_profile::v3::Response> {
     if body.user_id.server_name() != db.globals.server_name() {
         let response = db
             .sending
@@ -330,12 +298,11 @@ pub async fn get_profile_route(
             )
             .await?;
 
-        return Ok(get_profile::Response {
+        return Ok(get_profile::v3::Response {
             displayname: response.displayname,
             avatar_url: response.avatar_url,
             blurhash: response.blurhash,
-        }
-        .into());
+        });
     }
 
     if !db.users.exists(&body.user_id)? {
@@ -346,10 +313,9 @@ pub async fn get_profile_route(
         ));
     }
 
-    Ok(get_profile::Response {
+    Ok(get_profile::v3::Response {
         avatar_url: db.users.avatar_url(&body.user_id)?,
         blurhash: db.users.blurhash(&body.user_id)?,
         displayname: db.users.displayname(&body.user_id)?,
-    }
-    .into())
+    })
 }
diff --git a/src/client_server/push.rs b/src/client_server/push.rs
index a8ba1a2a..dc45ea0b 100644
--- a/src/client_server/push.rs
+++ b/src/client_server/push.rs
@@ -1,65 +1,59 @@
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, Error, Result, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::push::{
+        push::{
             delete_pushrule, get_pushers, get_pushrule, get_pushrule_actions, get_pushrule_enabled,
             get_pushrules_all, set_pusher, set_pushrule, set_pushrule_actions,
             set_pushrule_enabled, RuleKind,
         },
     },
-    events::{push_rules::PushRulesEvent, EventType},
+    events::{push_rules::PushRulesEvent, GlobalAccountDataEventType},
     push::{ConditionalPushRuleInit, PatternedPushRuleInit, SimplePushRuleInit},
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{delete, get, post, put};
-
 /// # `GET /_matrix/client/r0/pushrules`
 ///
 /// Retrieves the push rules event for this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/pushrules", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_pushrules_all_route(
     db: DatabaseGuard,
-    body: Ruma<get_pushrules_all::Request>,
-) -> ConduitResult<get_pushrules_all::Response> {
+    body: Ruma<get_pushrules_all::v3::Request>,
+) -> Result<get_pushrules_all::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let event: PushRulesEvent = db
         .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get(
+            None,
+            sender_user,
+            GlobalAccountDataEventType::PushRules.to_string().into(),
+        )?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
         ))?;
 
-    Ok(get_pushrules_all::Response {
+    Ok(get_pushrules_all::v3::Response {
         global: event.content.global,
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Retrieves a single specified push rule for this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_pushrule_route(
     db: DatabaseGuard,
-    body: Ruma<get_pushrule::Request<'_>>,
-) -> ConduitResult<get_pushrule::Response> {
+    body: Ruma<get_pushrule::v3::IncomingRequest>,
+) -> Result<get_pushrule::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let event: PushRulesEvent = db
         .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get(
+            None,
+            sender_user,
+            GlobalAccountDataEventType::PushRules.to_string().into(),
+        )?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
@@ -91,7 +85,7 @@ pub async fn get_pushrule_route(
     };
 
     if let Some(rule) = rule {
-        Ok(get_pushrule::Response { rule }.into())
+        Ok(get_pushrule::v3::Response { rule })
     } else {
         Err(Error::BadRequest(
             ErrorKind::NotFound,
@@ -103,15 +97,10 @@ pub async fn get_pushrule_route(
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Creates a single specified push rule for this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_pushrule_route(
     db: DatabaseGuard,
-    body: Ruma<set_pushrule::Request<'_>>,
-) -> ConduitResult<set_pushrule::Response> {
+    body: Ruma<set_pushrule::v3::IncomingRequest>,
+) -> Result<set_pushrule::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let body = body.body;
 
@@ -124,7 +113,11 @@ pub async fn set_pushrule_route(
 
     let mut event: PushRulesEvent = db
         .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get(
+            None,
+            sender_user,
+            GlobalAccountDataEventType::PushRules.to_string().into(),
+        )?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
@@ -193,26 +186,26 @@ pub async fn set_pushrule_route(
         _ => {}
     }
 
-    db.account_data
-        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
+    db.account_data.update(
+        None,
+        sender_user,
+        GlobalAccountDataEventType::PushRules.to_string().into(),
+        &event,
+        &db.globals,
+    )?;
 
     db.flush()?;
 
-    Ok(set_pushrule::Response {}.into())
+    Ok(set_pushrule::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
 ///
 /// Gets the actions of a single specified push rule for this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>/actions", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_pushrule_actions_route(
     db: DatabaseGuard,
-    body: Ruma<get_pushrule_actions::Request<'_>>,
-) -> ConduitResult<get_pushrule_actions::Response> {
+    body: Ruma<get_pushrule_actions::v3::IncomingRequest>,
+) -> Result<get_pushrule_actions::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if body.scope != "global" {
@@ -224,7 +217,11 @@ pub async fn get_pushrule_actions_route(
 
     let mut event: PushRulesEvent = db
         .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get(
+            None,
+            sender_user,
+            GlobalAccountDataEventType::PushRules.to_string().into(),
+        )?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
@@ -257,24 +254,18 @@ pub async fn get_pushrule_actions_route(
 
     db.flush()?;
 
-    Ok(get_pushrule_actions::Response {
+    Ok(get_pushrule_actions::v3::Response {
         actions: actions.unwrap_or_default(),
-    }
-    .into())
+    })
 }
 
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
 ///
 /// Sets the actions of a single specified push rule for this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>/actions", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_pushrule_actions_route(
     db: DatabaseGuard,
-    body: Ruma<set_pushrule_actions::Request<'_>>,
-) -> ConduitResult<set_pushrule_actions::Response> {
+    body: Ruma<set_pushrule_actions::v3::IncomingRequest>,
+) -> Result<set_pushrule_actions::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if body.scope != "global" {
@@ -286,7 +277,11 @@ pub async fn set_pushrule_actions_route(
 
     let mut event: PushRulesEvent = db
         .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get(
+            None,
+            sender_user,
+            GlobalAccountDataEventType::PushRules.to_string().into(),
+        )?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
@@ -327,26 +322,26 @@ pub async fn set_pushrule_actions_route(
         _ => {}
     };
 
-    db.account_data
-        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
+    db.account_data.update(
+        None,
+        sender_user,
+        GlobalAccountDataEventType::PushRules.to_string().into(),
+        &event,
+        &db.globals,
+    )?;
 
     db.flush()?;
 
-    Ok(set_pushrule_actions::Response {}.into())
+    Ok(set_pushrule_actions::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
 ///
 /// Gets the enabled status of a single specified push rule for this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/pushrules/<_>/<_>/<_>/enabled", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_pushrule_enabled_route(
     db: DatabaseGuard,
-    body: Ruma<get_pushrule_enabled::Request<'_>>,
-) -> ConduitResult<get_pushrule_enabled::Response> {
+    body: Ruma<get_pushrule_enabled::v3::IncomingRequest>,
+) -> Result<get_pushrule_enabled::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if body.scope != "global" {
@@ -358,7 +353,11 @@ pub async fn get_pushrule_enabled_route(
 
     let mut event: PushRulesEvent = db
         .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get(
+            None,
+            sender_user,
+            GlobalAccountDataEventType::PushRules.to_string().into(),
+        )?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
@@ -396,21 +395,16 @@ pub async fn get_pushrule_enabled_route(
 
     db.flush()?;
 
-    Ok(get_pushrule_enabled::Response { enabled }.into())
+    Ok(get_pushrule_enabled::v3::Response { enabled })
 }
 
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
 ///
 /// Sets the enabled status of a single specified push rule for this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/pushrules/<_>/<_>/<_>/enabled", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_pushrule_enabled_route(
     db: DatabaseGuard,
-    body: Ruma<set_pushrule_enabled::Request<'_>>,
-) -> ConduitResult<set_pushrule_enabled::Response> {
+    body: Ruma<set_pushrule_enabled::v3::IncomingRequest>,
+) -> Result<set_pushrule_enabled::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if body.scope != "global" {
@@ -422,7 +416,11 @@ pub async fn set_pushrule_enabled_route(
 
     let mut event: PushRulesEvent = db
         .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get(
+            None,
+            sender_user,
+            GlobalAccountDataEventType::PushRules.to_string().into(),
+        )?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
@@ -468,26 +466,26 @@ pub async fn set_pushrule_enabled_route(
         _ => {}
     }
 
-    db.account_data
-        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
+    db.account_data.update(
+        None,
+        sender_user,
+        GlobalAccountDataEventType::PushRules.to_string().into(),
+        &event,
+        &db.globals,
+    )?;
 
     db.flush()?;
 
-    Ok(set_pushrule_enabled::Response {}.into())
+    Ok(set_pushrule_enabled::v3::Response {})
 }
 
 /// # `DELETE /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Deletes a single specified push rule for this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    delete("/_matrix/client/r0/pushrules/<_>/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn delete_pushrule_route(
     db: DatabaseGuard,
-    body: Ruma<delete_pushrule::Request<'_>>,
-) -> ConduitResult<delete_pushrule::Response> {
+    body: Ruma<delete_pushrule::v3::IncomingRequest>,
+) -> Result<delete_pushrule::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if body.scope != "global" {
@@ -499,7 +497,11 @@ pub async fn delete_pushrule_route(
 
     let mut event: PushRulesEvent = db
         .account_data
-        .get(None, sender_user, EventType::PushRules)?
+        .get(
+            None,
+            sender_user,
+            GlobalAccountDataEventType::PushRules.to_string().into(),
+        )?
         .ok_or(Error::BadRequest(
             ErrorKind::NotFound,
             "PushRules event not found.",
@@ -535,32 +537,31 @@ pub async fn delete_pushrule_route(
         _ => {}
     }
 
-    db.account_data
-        .update(None, sender_user, EventType::PushRules, &event, &db.globals)?;
+    db.account_data.update(
+        None,
+        sender_user,
+        GlobalAccountDataEventType::PushRules.to_string().into(),
+        &event,
+        &db.globals,
+    )?;
 
     db.flush()?;
 
-    Ok(delete_pushrule::Response {}.into())
+    Ok(delete_pushrule::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/pushers`
 ///
 /// Gets all currently active pushers for the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/pushers", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_pushers_route(
     db: DatabaseGuard,
-    body: Ruma<get_pushers::Request>,
-) -> ConduitResult<get_pushers::Response> {
+    body: Ruma<get_pushers::v3::Request>,
+) -> Result<get_pushers::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    Ok(get_pushers::Response {
+    Ok(get_pushers::v3::Response {
         pushers: db.pusher.get_pushers(sender_user)?,
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/client/r0/pushers/set`
@@ -568,15 +569,10 @@ pub async fn get_pushers_route(
 /// Adds a pusher for the sender user.
 ///
 /// - TODO: Handle `append`
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/pushers/set", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_pushers_route(
     db: DatabaseGuard,
-    body: Ruma<set_pusher::Request>,
-) -> ConduitResult<set_pusher::Response> {
+    body: Ruma<set_pusher::v3::Request>,
+) -> Result<set_pusher::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let pusher = body.pusher.clone();
 
@@ -584,5 +580,5 @@ pub async fn set_pushers_route(
 
     db.flush()?;
 
-    Ok(set_pusher::Response::default().into())
+    Ok(set_pusher::v3::Response::default())
 }
diff --git a/src/client_server/read_marker.rs b/src/client_server/read_marker.rs
index 60aa4cef..91988a47 100644
--- a/src/client_server/read_marker.rs
+++ b/src/client_server/read_marker.rs
@@ -1,33 +1,22 @@
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, Error, Result, Ruma};
 use ruma::{
-    api::client::{
-        error::ErrorKind,
-        r0::{read_marker::set_read_marker, receipt::create_receipt},
-    },
-    events::{AnyEphemeralRoomEvent, EventType},
+    api::client::{error::ErrorKind, read_marker::set_read_marker, receipt::create_receipt},
+    events::RoomAccountDataEventType,
     receipt::ReceiptType,
     MilliSecondsSinceUnixEpoch,
 };
 use std::collections::BTreeMap;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::post;
-
 /// # `POST /_matrix/client/r0/rooms/{roomId}/read_markers`
 ///
 /// Sets different types of read markers.
 ///
 /// - Updates fully-read account data event to `fully_read`
 /// - If `read_receipt` is set: Update private marker and public read receipt EDU
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/read_markers", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn set_read_marker_route(
     db: DatabaseGuard,
-    body: Ruma<set_read_marker::Request<'_>>,
-) -> ConduitResult<set_read_marker::Response> {
+    body: Ruma<set_read_marker::v3::IncomingRequest>,
+) -> Result<set_read_marker::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let fully_read_event = ruma::events::fully_read::FullyReadEvent {
@@ -38,7 +27,7 @@ pub async fn set_read_marker_route(
     db.account_data.update(
         Some(&body.room_id),
         sender_user,
-        EventType::FullyRead,
+        RoomAccountDataEventType::FullyRead,
         &fully_read_event,
         &db.globals,
     )?;
@@ -73,31 +62,26 @@ pub async fn set_read_marker_route(
         db.rooms.edus.readreceipt_update(
             sender_user,
             &body.room_id,
-            AnyEphemeralRoomEvent::Receipt(ruma::events::receipt::ReceiptEvent {
+            ruma::events::receipt::ReceiptEvent {
                 content: ruma::events::receipt::ReceiptEventContent(receipt_content),
                 room_id: body.room_id.clone(),
-            }),
+            },
             &db.globals,
         )?;
     }
 
     db.flush()?;
 
-    Ok(set_read_marker::Response {}.into())
+    Ok(set_read_marker::v3::Response {})
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/receipt/{receiptType}/{eventId}`
 ///
 /// Sets private read marker and public read receipt EDU.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/receipt/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn create_receipt_route(
     db: DatabaseGuard,
-    body: Ruma<create_receipt::Request<'_>>,
-) -> ConduitResult<create_receipt::Response> {
+    body: Ruma<create_receipt::v3::IncomingRequest>,
+) -> Result<create_receipt::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     db.rooms.edus.private_read_set(
@@ -130,14 +114,14 @@ pub async fn create_receipt_route(
     db.rooms.edus.readreceipt_update(
         sender_user,
         &body.room_id,
-        AnyEphemeralRoomEvent::Receipt(ruma::events::receipt::ReceiptEvent {
+        ruma::events::receipt::ReceiptEvent {
             content: ruma::events::receipt::ReceiptEventContent(receipt_content),
             room_id: body.room_id.clone(),
-        }),
+        },
         &db.globals,
     )?;
 
     db.flush()?;
 
-    Ok(create_receipt::Response {}.into())
+    Ok(create_receipt::v3::Response {})
 }
diff --git a/src/client_server/redact.rs b/src/client_server/redact.rs
index 85de2330..059e0f52 100644
--- a/src/client_server/redact.rs
+++ b/src/client_server/redact.rs
@@ -1,13 +1,11 @@
 use std::sync::Arc;
 
-use crate::{database::DatabaseGuard, pdu::PduBuilder, ConduitResult, Ruma};
+use crate::{database::DatabaseGuard, pdu::PduBuilder, Result, Ruma};
 use ruma::{
-    api::client::r0::redact::redact_event,
-    events::{room::redaction::RoomRedactionEventContent, EventType},
+    api::client::redact::redact_event,
+    events::{room::redaction::RoomRedactionEventContent, RoomEventType},
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::put;
 use serde_json::value::to_raw_value;
 
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}`
@@ -15,15 +13,10 @@ use serde_json::value::to_raw_value;
 /// Tries to send a redaction event into the room.
 ///
 /// - TODO: Handle txn id
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/rooms/<_>/redact/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn redact_event_route(
     db: DatabaseGuard,
-    body: Ruma<redact_event::Request<'_>>,
-) -> ConduitResult<redact_event::Response> {
+    body: Ruma<redact_event::v3::IncomingRequest>,
+) -> Result<redact_event::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let body = body.body;
 
@@ -39,7 +32,7 @@ pub async fn redact_event_route(
 
     let event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomRedaction,
+            event_type: RoomEventType::RoomRedaction,
             content: to_raw_value(&RoomRedactionEventContent {
                 reason: body.reason.clone(),
             })
@@ -59,5 +52,5 @@ pub async fn redact_event_route(
     db.flush()?;
 
     let event_id = (*event_id).to_owned();
-    Ok(redact_event::Response { event_id }.into())
+    Ok(redact_event::v3::Response { event_id })
 }
diff --git a/src/client_server/report.rs b/src/client_server/report.rs
index 032e446c..14768e1c 100644
--- a/src/client_server/report.rs
+++ b/src/client_server/report.rs
@@ -1,26 +1,18 @@
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, utils::HtmlEscape, Error, Result, Ruma};
 use ruma::{
-    api::client::{error::ErrorKind, r0::room::report_content},
+    api::client::{error::ErrorKind, room::report_content},
     events::room::message,
     int,
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{http::RawStr, post};
-
 /// # `POST /_matrix/client/r0/rooms/{roomId}/report/{eventId}`
 ///
 /// Reports an inappropriate event to homeserver admins
 ///
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/report/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn report_event_route(
     db: DatabaseGuard,
-    body: Ruma<report_content::Request<'_>>,
-) -> ConduitResult<report_content::Response> {
+    body: Ruma<report_content::v3::IncomingRequest>,
+) -> Result<report_content::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let pdu = match db.rooms.get_pdu(&body.event_id)? {
@@ -33,14 +25,14 @@ pub async fn report_event_route(
         }
     };
 
-    if body.score > int!(0) || body.score < int!(-100) {
+    if let Some(true) = body.score.map(|s| s > int!(0) || s < int!(-100)) {
         return Err(Error::BadRequest(
             ErrorKind::InvalidParam,
             "Invalid score, must be within 0 to -100",
         ));
     };
 
-    if body.reason.chars().count() > 250 {
+    if let Some(true) = body.reason.clone().map(|s| s.chars().count() > 250) {
         return Err(Error::BadRequest(
             ErrorKind::InvalidParam,
             "Reason too long, should be 250 characters or fewer",
@@ -51,30 +43,30 @@ pub async fn report_event_route(
         .send_message(message::RoomMessageEventContent::text_html(
             format!(
                 "Report received from: {}\n\n\
-                Event ID: {}\n\
-                Room ID: {}\n\
-                Sent By: {}\n\n\
-                Report Score: {}\n\
-                Report Reason: {}",
+                Event ID: {:?}\n\
+                Room ID: {:?}\n\
+                Sent By: {:?}\n\n\
+                Report Score: {:?}\n\
+                Report Reason: {:?}",
                 sender_user, pdu.event_id, pdu.room_id, pdu.sender, body.score, body.reason
             ),
             format!(
-                "<details><summary>Report received from: <a href=\"https://matrix.to/#/{0}\">{0}\
-                </a></summary><ul><li>Event Info<ul><li>Event ID: <code>{1}</code>\
-                <a href=\"https://matrix.to/#/{2}/{1}\">🔗</a></li><li>Room ID: <code>{2}</code>\
-                </li><li>Sent By: <a href=\"https://matrix.to/#/{3}\">{3}</a></li></ul></li><li>\
-                Report Info<ul><li>Report Score: {4}</li><li>Report Reason: {5}</li></ul></li>\
+                "<details><summary>Report received from: <a href=\"https://matrix.to/#/{0:?}\">{0:?}\
+                </a></summary><ul><li>Event Info<ul><li>Event ID: <code>{1:?}</code>\
+                <a href=\"https://matrix.to/#/{2:?}/{1:?}\">🔗</a></li><li>Room ID: <code>{2:?}</code>\
+                </li><li>Sent By: <a href=\"https://matrix.to/#/{3:?}\">{3:?}</a></li></ul></li><li>\
+                Report Info<ul><li>Report Score: {4:?}</li><li>Report Reason: {5}</li></ul></li>\
                 </ul></details>",
                 sender_user,
                 pdu.event_id,
                 pdu.room_id,
                 pdu.sender,
                 body.score,
-                RawStr::new(&body.reason).html_escape()
+                HtmlEscape(body.reason.as_deref().unwrap_or(""))
             ),
         ));
 
     db.flush()?;
 
-    Ok(report_content::Response {}.into())
+    Ok(report_content::v3::Response {})
 }
diff --git a/src/client_server/room.rs b/src/client_server/room.rs
index 7ea31d8a..a5b79705 100644
--- a/src/client_server/room.rs
+++ b/src/client_server/room.rs
@@ -1,11 +1,10 @@
 use crate::{
-    client_server::invite_helper, database::DatabaseGuard, pdu::PduBuilder, ConduitResult, Error,
-    Ruma,
+    client_server::invite_helper, database::DatabaseGuard, pdu::PduBuilder, Error, Result, Ruma,
 };
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::room::{self, aliases, create_room, get_room_event, upgrade_room},
+        room::{self, aliases, create_room, get_room_event, upgrade_room},
     },
     events::{
         room::{
@@ -20,19 +19,16 @@ use ruma::{
             tombstone::RoomTombstoneEventContent,
             topic::RoomTopicEventContent,
         },
-        EventType,
+        RoomEventType, StateEventType,
     },
     int,
     serde::{CanonicalJsonObject, JsonObject},
-    RoomAliasId, RoomId, RoomVersionId,
+    RoomAliasId, RoomId,
 };
 use serde_json::{json, value::to_raw_value};
 use std::{cmp::max, collections::BTreeMap, sync::Arc};
 use tracing::{info, warn};
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post};
-
 /// # `POST /_matrix/client/r0/createRoom`
 ///
 /// Creates a new room.
@@ -49,15 +45,12 @@ use rocket::{get, post};
 /// - Send events listed in initial state
 /// - Send events implied by `name` and `topic`
 /// - Send invite events
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/createRoom", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn create_room_route(
     db: DatabaseGuard,
-    body: Ruma<create_room::Request<'_>>,
-) -> ConduitResult<create_room::Response> {
+    body: Ruma<create_room::v3::IncomingRequest>,
+) -> Result<create_room::v3::Response> {
+    use create_room::v3::RoomPreset;
+
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let room_id = RoomId::new(db.globals.server_name());
@@ -107,7 +100,7 @@ pub async fn create_room_route(
 
     let room_version = match body.room_version.clone() {
         Some(room_version) => {
-            if room_version == RoomVersionId::V5 || room_version == RoomVersionId::V6 {
+            if db.rooms.is_supported_version(&db, &room_version) {
                 room_version
             } else {
                 return Err(Error::BadRequest(
@@ -116,7 +109,7 @@ pub async fn create_room_route(
                 ));
             }
         }
-        None => RoomVersionId::V6,
+        None => db.globals.default_room_version(),
     };
 
     let content = match &body.creation_content {
@@ -172,7 +165,7 @@ pub async fn create_room_route(
     // 1. The room create event
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomCreate,
+            event_type: RoomEventType::RoomCreate,
             content: to_raw_value(&content).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some("".to_owned()),
@@ -187,7 +180,7 @@ pub async fn create_room_route(
     // 2. Let the room creator join
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&RoomMemberEventContent {
                 membership: MembershipState::Join,
                 displayname: db.users.displayname(sender_user)?,
@@ -216,15 +209,15 @@ pub async fn create_room_route(
         .preset
         .clone()
         .unwrap_or_else(|| match &body.visibility {
-            room::Visibility::Private => create_room::RoomPreset::PrivateChat,
-            room::Visibility::Public => create_room::RoomPreset::PublicChat,
-            _ => create_room::RoomPreset::PrivateChat, // Room visibility should not be custom
+            room::Visibility::Private => RoomPreset::PrivateChat,
+            room::Visibility::Public => RoomPreset::PublicChat,
+            _ => RoomPreset::PrivateChat, // Room visibility should not be custom
         });
 
     let mut users = BTreeMap::new();
     users.insert(sender_user.clone(), int!(100));
 
-    if preset == create_room::RoomPreset::TrustedPrivateChat {
+    if preset == RoomPreset::TrustedPrivateChat {
         for invite_ in &body.invite {
             users.insert(invite_.clone(), int!(100));
         }
@@ -249,7 +242,7 @@ pub async fn create_room_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomPowerLevels,
+            event_type: RoomEventType::RoomPowerLevels,
             content: to_raw_value(&power_levels_content)
                 .expect("to_raw_value always works on serde_json::Value"),
             unsigned: None,
@@ -266,7 +259,7 @@ pub async fn create_room_route(
     if let Some(room_alias_id) = &alias {
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                event_type: EventType::RoomCanonicalAlias,
+                event_type: RoomEventType::RoomCanonicalAlias,
                 content: to_raw_value(&RoomCanonicalAliasEventContent {
                     alias: Some(room_alias_id.to_owned()),
                     alt_aliases: vec![],
@@ -288,9 +281,9 @@ pub async fn create_room_route(
     // 5.1 Join Rules
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomJoinRules,
+            event_type: RoomEventType::RoomJoinRules,
             content: to_raw_value(&RoomJoinRulesEventContent::new(match preset {
-                create_room::RoomPreset::PublicChat => JoinRule::Public,
+                RoomPreset::PublicChat => JoinRule::Public,
                 // according to spec "invite" is the default
                 _ => JoinRule::Invite,
             }))
@@ -308,7 +301,7 @@ pub async fn create_room_route(
     // 5.2 History Visibility
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomHistoryVisibility,
+            event_type: RoomEventType::RoomHistoryVisibility,
             content: to_raw_value(&RoomHistoryVisibilityEventContent::new(
                 HistoryVisibility::Shared,
             ))
@@ -326,9 +319,9 @@ pub async fn create_room_route(
     // 5.3 Guest Access
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomGuestAccess,
+            event_type: RoomEventType::RoomGuestAccess,
             content: to_raw_value(&RoomGuestAccessEventContent::new(match preset {
-                create_room::RoomPreset::PublicChat => GuestAccess::Forbidden,
+                RoomPreset::PublicChat => GuestAccess::Forbidden,
                 _ => GuestAccess::CanJoin,
             }))
             .expect("event is valid, we just created it"),
@@ -353,7 +346,8 @@ pub async fn create_room_route(
         pdu_builder.state_key.get_or_insert_with(|| "".to_owned());
 
         // Silently skip encryption events if they are not allowed
-        if pdu_builder.event_type == EventType::RoomEncryption && !db.globals.allow_encryption() {
+        if pdu_builder.event_type == RoomEventType::RoomEncryption && !db.globals.allow_encryption()
+        {
             continue;
         }
 
@@ -365,7 +359,7 @@ pub async fn create_room_route(
     if let Some(name) = &body.name {
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                event_type: EventType::RoomName,
+                event_type: RoomEventType::RoomName,
                 content: to_raw_value(&RoomNameEventContent::new(Some(name.clone())))
                     .expect("event is valid, we just created it"),
                 unsigned: None,
@@ -382,7 +376,7 @@ pub async fn create_room_route(
     if let Some(topic) = &body.topic {
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                event_type: EventType::RoomTopic,
+                event_type: RoomEventType::RoomTopic,
                 content: to_raw_value(&RoomTopicEventContent {
                     topic: topic.clone(),
                 })
@@ -417,7 +411,7 @@ pub async fn create_room_route(
 
     db.flush()?;
 
-    Ok(create_room::Response::new(room_id).into())
+    Ok(create_room::v3::Response::new(room_id))
 }
 
 /// # `GET /_matrix/client/r0/rooms/{roomId}/event/{eventId}`
@@ -425,15 +419,10 @@ pub async fn create_room_route(
 /// Gets a single event.
 ///
 /// - You have to currently be joined to the room (TODO: Respect history visibility)
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/event/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_room_event_route(
     db: DatabaseGuard,
-    body: Ruma<get_room_event::Request<'_>>,
-) -> ConduitResult<get_room_event::Response> {
+    body: Ruma<get_room_event::v3::IncomingRequest>,
+) -> Result<get_room_event::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if !db.rooms.is_joined(sender_user, &body.room_id)? {
@@ -443,14 +432,13 @@ pub async fn get_room_event_route(
         ));
     }
 
-    Ok(get_room_event::Response {
+    Ok(get_room_event::v3::Response {
         event: db
             .rooms
             .get_pdu(&body.event_id)?
             .ok_or(Error::BadRequest(ErrorKind::NotFound, "Event not found."))?
             .to_room_event(),
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/client/r0/rooms/{roomId}/aliases`
@@ -458,15 +446,10 @@ pub async fn get_room_event_route(
 /// Lists all aliases of the room.
 ///
 /// - Only users joined to the room are allowed to call this TODO: Allow any user to call it if history_visibility is world readable
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/aliases", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_room_aliases_route(
     db: DatabaseGuard,
-    body: Ruma<aliases::Request<'_>>,
-) -> ConduitResult<aliases::Response> {
+    body: Ruma<aliases::v3::IncomingRequest>,
+) -> Result<aliases::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     if !db.rooms.is_joined(sender_user, &body.room_id)? {
@@ -476,14 +459,13 @@ pub async fn get_room_aliases_route(
         ));
     }
 
-    Ok(aliases::Response {
+    Ok(aliases::v3::Response {
         aliases: db
             .rooms
             .room_aliases(&body.room_id)
             .filter_map(|a| a.ok())
             .collect(),
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/upgrade`
@@ -496,18 +478,13 @@ pub async fn get_room_aliases_route(
 /// - Transfers some state events
 /// - Moves local aliases
 /// - Modifies old room power levels to prevent users from speaking
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/rooms/<_>/upgrade", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn upgrade_room_route(
     db: DatabaseGuard,
-    body: Ruma<upgrade_room::Request<'_>>,
-) -> ConduitResult<upgrade_room::Response> {
+    body: Ruma<upgrade_room::v3::IncomingRequest>,
+) -> Result<upgrade_room::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !matches!(body.new_version, RoomVersionId::V5 | RoomVersionId::V6) {
+    if !db.rooms.is_supported_version(&db, &body.new_version) {
         return Err(Error::BadRequest(
             ErrorKind::UnsupportedRoomVersion,
             "This server does not support that room version.",
@@ -533,7 +510,7 @@ pub async fn upgrade_room_route(
     // Fail if the sender does not have the required permissions
     let tombstone_event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomTombstone,
+            event_type: RoomEventType::RoomTombstone,
             content: to_raw_value(&RoomTombstoneEventContent {
                 body: "This room has been replaced".to_owned(),
                 replacement_room: replacement_room.clone(),
@@ -564,7 +541,7 @@ pub async fn upgrade_room_route(
     // Get the old room creation event
     let mut create_event_content = serde_json::from_str::<CanonicalJsonObject>(
         db.rooms
-            .room_state_get(&body.room_id, &EventType::RoomCreate, "")?
+            .room_state_get(&body.room_id, &StateEventType::RoomCreate, "")?
             .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?
             .content
             .get(),
@@ -613,7 +590,7 @@ pub async fn upgrade_room_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomCreate,
+            event_type: RoomEventType::RoomCreate,
             content: to_raw_value(&create_event_content)
                 .expect("event is valid, we just created it"),
             unsigned: None,
@@ -629,7 +606,7 @@ pub async fn upgrade_room_route(
     // Join the new room
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&RoomMemberEventContent {
                 membership: MembershipState::Join,
                 displayname: db.users.displayname(sender_user)?,
@@ -653,15 +630,15 @@ pub async fn upgrade_room_route(
 
     // Recommended transferable state events list from the specs
     let transferable_state_events = vec![
-        EventType::RoomServerAcl,
-        EventType::RoomEncryption,
-        EventType::RoomName,
-        EventType::RoomAvatar,
-        EventType::RoomTopic,
-        EventType::RoomGuestAccess,
-        EventType::RoomHistoryVisibility,
-        EventType::RoomJoinRules,
-        EventType::RoomPowerLevels,
+        StateEventType::RoomServerAcl,
+        StateEventType::RoomEncryption,
+        StateEventType::RoomName,
+        StateEventType::RoomAvatar,
+        StateEventType::RoomTopic,
+        StateEventType::RoomGuestAccess,
+        StateEventType::RoomHistoryVisibility,
+        StateEventType::RoomJoinRules,
+        StateEventType::RoomPowerLevels,
     ];
 
     // Replicate transferable state events to the new room
@@ -673,7 +650,7 @@ pub async fn upgrade_room_route(
 
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                event_type,
+                event_type: event_type.to_string().into(),
                 content: event_content,
                 unsigned: None,
                 state_key: Some("".to_owned()),
@@ -695,7 +672,7 @@ pub async fn upgrade_room_route(
     // Get the old room power levels
     let mut power_levels_event_content: RoomPowerLevelsEventContent = serde_json::from_str(
         db.rooms
-            .room_state_get(&body.room_id, &EventType::RoomPowerLevels, "")?
+            .room_state_get(&body.room_id, &StateEventType::RoomPowerLevels, "")?
             .ok_or_else(|| Error::bad_database("Found room without m.room.create event."))?
             .content
             .get(),
@@ -710,7 +687,7 @@ pub async fn upgrade_room_route(
     // Modify the power levels in the old room to prevent sending of events and inviting new users
     let _ = db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomPowerLevels,
+            event_type: RoomEventType::RoomPowerLevels,
             content: to_raw_value(&power_levels_event_content)
                 .expect("event is valid, we just created it"),
             unsigned: None,
@@ -728,5 +705,5 @@ pub async fn upgrade_room_route(
     db.flush()?;
 
     // Return the replacement room id
-    Ok(upgrade_room::Response { replacement_room }.into())
+    Ok(upgrade_room::v3::Response { replacement_room })
 }
diff --git a/src/client_server/search.rs b/src/client_server/search.rs
index f492292c..686e3b5e 100644
--- a/src/client_server/search.rs
+++ b/src/client_server/search.rs
@@ -1,9 +1,12 @@
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
-use ruma::api::client::{error::ErrorKind, r0::search::search_events};
+use crate::{database::DatabaseGuard, Error, Result, Ruma};
+use ruma::api::client::{
+    error::ErrorKind,
+    search::search_events::{
+        self,
+        v3::{EventContextResult, ResultCategories, ResultRoomEvents, SearchResult},
+    },
+};
 
-#[cfg(feature = "conduit_bin")]
-use rocket::post;
-use search_events::{EventContextResult, ResultCategories, ResultRoomEvents, SearchResult};
 use std::collections::BTreeMap;
 
 /// # `POST /_matrix/client/r0/search`
@@ -11,19 +14,14 @@ use std::collections::BTreeMap;
 /// Searches rooms for messages.
 ///
 /// - Only works if the user is currently joined to the room (TODO: Respect history visibility)
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/search", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn search_events_route(
     db: DatabaseGuard,
-    body: Ruma<search_events::Request<'_>>,
-) -> ConduitResult<search_events::Response> {
+    body: Ruma<search_events::v3::IncomingRequest>,
+) -> Result<search_events::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let search_criteria = body.search_categories.room_events.as_ref().unwrap();
-    let filter = search_criteria.filter.clone().unwrap_or_default();
+    let filter = &search_criteria.filter;
 
     let room_ids = filter.rooms.clone().unwrap_or_else(|| {
         db.rooms
@@ -104,7 +102,7 @@ pub async fn search_events_route(
         Some((skip + limit).to_string())
     };
 
-    Ok(search_events::Response::new(ResultCategories {
+    Ok(search_events::v3::Response::new(ResultCategories {
         room_events: ResultRoomEvents {
             count: Some((results.len() as u32).into()), // TODO: set this to none. Element shouldn't depend on it
             groups: BTreeMap::new(),                    // TODO
@@ -117,6 +115,5 @@ pub async fn search_events_route(
                 .map(str::to_lowercase)
                 .collect(),
         },
-    })
-    .into())
+    }))
 }
diff --git a/src/client_server/session.rs b/src/client_server/session.rs
index 61e5519a..c2a79ca6 100644
--- a/src/client_server/session.rs
+++ b/src/client_server/session.rs
@@ -1,12 +1,10 @@
 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
-use crate::{database::DatabaseGuard, utils, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, utils, Error, Result, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::{
-            session::{get_login_types, login, logout, logout_all},
-            uiaa::IncomingUserIdentifier,
-        },
+        session::{get_login_types, login, logout, logout_all},
+        uiaa::IncomingUserIdentifier,
     },
     UserId,
 };
@@ -16,25 +14,19 @@ use tracing::info;
 #[derive(Debug, Deserialize)]
 struct Claims {
     sub: String,
-    exp: usize,
+    //exp: usize,
 }
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post};
-
 /// # `GET /_matrix/client/r0/login`
 ///
 /// Get the supported login types of this server. One of these should be used as the `type` field
 /// when logging in.
-#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/login"))]
-#[tracing::instrument]
-pub async fn get_login_types_route() -> ConduitResult<get_login_types::Response> {
-    Ok(
-        get_login_types::Response::new(vec![get_login_types::LoginType::Password(
-            Default::default(),
-        )])
-        .into(),
-    )
+pub async fn get_login_types_route(
+    _body: Ruma<get_login_types::v3::IncomingRequest>,
+) -> Result<get_login_types::v3::Response> {
+    Ok(get_login_types::v3::Response::new(vec![
+        get_login_types::v3::LoginType::Password(Default::default()),
+    ]))
 }
 
 /// # `POST /_matrix/client/r0/login`
@@ -48,24 +40,19 @@ pub async fn get_login_types_route() -> ConduitResult<get_login_types::Response>
 ///
 /// Note: You can use [`GET /_matrix/client/r0/login`](fn.get_supported_versions_route.html) to see
 /// supported login types.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/login", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn login_route(
     db: DatabaseGuard,
-    body: Ruma<login::Request<'_>>,
-) -> ConduitResult<login::Response> {
+    body: Ruma<login::v3::IncomingRequest>,
+) -> Result<login::v3::Response> {
     // Validate login method
     // TODO: Other login methods
     let user_id = match &body.login_info {
-        login::IncomingLoginInfo::Password(login::IncomingPassword {
+        login::v3::IncomingLoginInfo::Password(login::v3::IncomingPassword {
             identifier,
             password,
         }) => {
-            let username = if let IncomingUserIdentifier::MatrixId(matrix_id) = identifier {
-                matrix_id
+            let username = if let IncomingUserIdentifier::UserIdOrLocalpart(user_id) = identifier {
+                user_id.to_lowercase()
             } else {
                 return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
             };
@@ -97,7 +84,7 @@ pub async fn login_route(
 
             user_id
         }
-        login::IncomingLoginInfo::Token(login::IncomingToken { token }) => {
+        login::v3::IncomingLoginInfo::Token(login::v3::IncomingToken { token }) => {
             if let Some(jwt_decoding_key) = db.globals.jwt_decoding_key() {
                 let token = jsonwebtoken::decode::<Claims>(
                     token,
@@ -155,14 +142,13 @@ pub async fn login_route(
 
     db.flush()?;
 
-    Ok(login::Response {
+    Ok(login::v3::Response {
         user_id,
         access_token: token,
         home_server: Some(db.globals.server_name().to_owned()),
         device_id,
         well_known: None,
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/client/r0/logout`
@@ -173,15 +159,10 @@ pub async fn login_route(
 /// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/logout", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn logout_route(
     db: DatabaseGuard,
-    body: Ruma<logout::Request>,
-) -> ConduitResult<logout::Response> {
+    body: Ruma<logout::v3::Request>,
+) -> Result<logout::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -189,7 +170,7 @@ pub async fn logout_route(
 
     db.flush()?;
 
-    Ok(logout::Response::new().into())
+    Ok(logout::v3::Response::new())
 }
 
 /// # `POST /_matrix/client/r0/logout/all`
@@ -203,15 +184,10 @@ pub async fn logout_route(
 ///
 /// Note: This is equivalent to calling [`GET /_matrix/client/r0/logout`](fn.logout_route.html)
 /// from each device of this user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/logout/all", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn logout_all_route(
     db: DatabaseGuard,
-    body: Ruma<logout_all::Request>,
-) -> ConduitResult<logout_all::Response> {
+    body: Ruma<logout_all::v3::Request>,
+) -> Result<logout_all::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     for device_id in db.users.all_device_ids(sender_user).flatten() {
@@ -220,5 +196,5 @@ pub async fn logout_all_route(
 
     db.flush()?;
 
-    Ok(logout_all::Response::new().into())
+    Ok(logout_all::v3::Response::new())
 }
diff --git a/src/client_server/state.rs b/src/client_server/state.rs
index c07d4825..4df953cf 100644
--- a/src/client_server/state.rs
+++ b/src/client_server/state.rs
@@ -1,27 +1,24 @@
 use std::sync::Arc;
 
 use crate::{
-    database::DatabaseGuard, pdu::PduBuilder, ConduitResult, Database, Error, Result, Ruma,
+    database::DatabaseGuard, pdu::PduBuilder, Database, Error, Result, Ruma, RumaResponse,
 };
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::state::{get_state_events, get_state_events_for_key, send_state_event},
+        state::{get_state_events, get_state_events_for_key, send_state_event},
     },
     events::{
         room::{
             canonical_alias::RoomCanonicalAliasEventContent,
             history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
         },
-        AnyStateEventContent, EventType,
+        AnyStateEventContent, StateEventType,
     },
     serde::Raw,
     EventId, RoomId, UserId,
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, put};
-
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}`
 ///
 /// Sends a state event into the room.
@@ -29,22 +26,17 @@ use rocket::{get, put};
 /// - The only requirement for the content is that it has to be valid json
 /// - Tries to send the event into the room, auth rules will determine if it is allowed
 /// - If event is new canonical_alias: Rejects if alias is incorrect
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/rooms/<_>/state/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn send_state_event_for_key_route(
     db: DatabaseGuard,
-    body: Ruma<send_state_event::Request<'_>>,
-) -> ConduitResult<send_state_event::Response> {
+    body: Ruma<send_state_event::v3::IncomingRequest>,
+) -> Result<send_state_event::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let event_id = send_state_event_for_key_helper(
         &db,
         sender_user,
         &body.room_id,
-        EventType::from(&*body.event_type),
+        &body.event_type,
         &body.body.body, // Yes, I hate it too
         body.state_key.to_owned(),
     )
@@ -53,7 +45,7 @@ pub async fn send_state_event_for_key_route(
     db.flush()?;
 
     let event_id = (*event_id).to_owned();
-    Ok(send_state_event::Response { event_id }.into())
+    Ok(send_state_event::v3::Response { event_id })
 }
 
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}`
@@ -63,19 +55,14 @@ pub async fn send_state_event_for_key_route(
 /// - The only requirement for the content is that it has to be valid json
 /// - Tries to send the event into the room, auth rules will determine if it is allowed
 /// - If event is new canonical_alias: Rejects if alias is incorrect
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/rooms/<_>/state/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn send_state_event_for_empty_key_route(
     db: DatabaseGuard,
-    body: Ruma<send_state_event::Request<'_>>,
-) -> ConduitResult<send_state_event::Response> {
+    body: Ruma<send_state_event::v3::IncomingRequest>,
+) -> Result<RumaResponse<send_state_event::v3::Response>> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     // Forbid m.room.encryption if encryption is disabled
-    if &body.event_type == "m.room.encryption" && !db.globals.allow_encryption() {
+    if body.event_type == StateEventType::RoomEncryption && !db.globals.allow_encryption() {
         return Err(Error::BadRequest(
             ErrorKind::Forbidden,
             "Encryption has been disabled",
@@ -86,7 +73,7 @@ pub async fn send_state_event_for_empty_key_route(
         &db,
         sender_user,
         &body.room_id,
-        EventType::from(&*body.event_type),
+        &body.event_type.to_string().into(),
         &body.body.body,
         body.state_key.to_owned(),
     )
@@ -95,7 +82,7 @@ pub async fn send_state_event_for_empty_key_route(
     db.flush()?;
 
     let event_id = (*event_id).to_owned();
-    Ok(send_state_event::Response { event_id }.into())
+    Ok(send_state_event::v3::Response { event_id }.into())
 }
 
 /// # `GET /_matrix/client/r0/rooms/{roomid}/state`
@@ -103,15 +90,10 @@ pub async fn send_state_event_for_empty_key_route(
 /// Get all state events for a room.
 ///
 /// - If not joined: Only works if current room history visibility is world readable
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/state", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_state_events_route(
     db: DatabaseGuard,
-    body: Ruma<get_state_events::Request<'_>>,
-) -> ConduitResult<get_state_events::Response> {
+    body: Ruma<get_state_events::v3::IncomingRequest>,
+) -> Result<get_state_events::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     #[allow(clippy::blocks_in_if_conditions)]
@@ -120,7 +102,7 @@ pub async fn get_state_events_route(
     if !db.rooms.is_joined(sender_user, &body.room_id)?
         && !matches!(
             db.rooms
-                .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
+                .room_state_get(&body.room_id, &StateEventType::RoomHistoryVisibility, "")?
                 .map(|event| {
                     serde_json::from_str(event.content.get())
                         .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility)
@@ -139,15 +121,15 @@ pub async fn get_state_events_route(
         ));
     }
 
-    Ok(get_state_events::Response {
+    Ok(get_state_events::v3::Response {
         room_state: db
             .rooms
-            .room_state_full(&body.room_id)?
+            .room_state_full(&body.room_id)
+            .await?
             .values()
             .map(|pdu| pdu.to_state_event())
             .collect(),
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/client/r0/rooms/{roomid}/state/{eventType}/{stateKey}`
@@ -155,15 +137,10 @@ pub async fn get_state_events_route(
 /// Get single state event of a room.
 ///
 /// - If not joined: Only works if current room history visibility is world readable
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/state/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_state_events_for_key_route(
     db: DatabaseGuard,
-    body: Ruma<get_state_events_for_key::Request<'_>>,
-) -> ConduitResult<get_state_events_for_key::Response> {
+    body: Ruma<get_state_events_for_key::v3::IncomingRequest>,
+) -> Result<get_state_events_for_key::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     #[allow(clippy::blocks_in_if_conditions)]
@@ -172,7 +149,7 @@ pub async fn get_state_events_for_key_route(
     if !db.rooms.is_joined(sender_user, &body.room_id)?
         && !matches!(
             db.rooms
-                .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
+                .room_state_get(&body.room_id, &StateEventType::RoomHistoryVisibility, "")?
                 .map(|event| {
                     serde_json::from_str(event.content.get())
                         .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility)
@@ -199,11 +176,10 @@ pub async fn get_state_events_for_key_route(
             "State event not found.",
         ))?;
 
-    Ok(get_state_events_for_key::Response {
+    Ok(get_state_events_for_key::v3::Response {
         content: serde_json::from_str(event.content.get())
             .map_err(|_| Error::bad_database("Invalid event content in database"))?,
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/client/r0/rooms/{roomid}/state/{eventType}`
@@ -211,15 +187,10 @@ pub async fn get_state_events_for_key_route(
 /// Get single state event of a room.
 ///
 /// - If not joined: Only works if current room history visibility is world readable
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/rooms/<_>/state/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_state_events_for_empty_key_route(
     db: DatabaseGuard,
-    body: Ruma<get_state_events_for_key::Request<'_>>,
-) -> ConduitResult<get_state_events_for_key::Response> {
+    body: Ruma<get_state_events_for_key::v3::IncomingRequest>,
+) -> Result<RumaResponse<get_state_events_for_key::v3::Response>> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     #[allow(clippy::blocks_in_if_conditions)]
@@ -228,7 +199,7 @@ pub async fn get_state_events_for_empty_key_route(
     if !db.rooms.is_joined(sender_user, &body.room_id)?
         && !matches!(
             db.rooms
-                .room_state_get(&body.room_id, &EventType::RoomHistoryVisibility, "")?
+                .room_state_get(&body.room_id, &StateEventType::RoomHistoryVisibility, "")?
                 .map(|event| {
                     serde_json::from_str(event.content.get())
                         .map(|e: RoomHistoryVisibilityEventContent| e.history_visibility)
@@ -255,7 +226,7 @@ pub async fn get_state_events_for_empty_key_route(
             "State event not found.",
         ))?;
 
-    Ok(get_state_events_for_key::Response {
+    Ok(get_state_events_for_key::v3::Response {
         content: serde_json::from_str(event.content.get())
             .map_err(|_| Error::bad_database("Invalid event content in database"))?,
     }
@@ -266,7 +237,7 @@ async fn send_state_event_for_key_helper(
     db: &Database,
     sender: &UserId,
     room_id: &RoomId,
-    event_type: EventType,
+    event_type: &StateEventType,
     json: &Raw<AnyStateEventContent>,
     state_key: String,
 ) -> Result<Arc<EventId>> {
@@ -312,7 +283,7 @@ async fn send_state_event_for_key_helper(
 
     let event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type,
+            event_type: event_type.to_string().into(),
             content: serde_json::from_str(json.json().get()).expect("content is valid json"),
             unsigned: None,
             state_key: Some(state_key),
diff --git a/src/client_server/sync.rs b/src/client_server/sync.rs
index 7cfea5af..0c294b7e 100644
--- a/src/client_server/sync.rs
+++ b/src/client_server/sync.rs
@@ -1,13 +1,13 @@
-use crate::{database::DatabaseGuard, ConduitResult, Database, Error, Result, Ruma, RumaResponse};
+use crate::{database::DatabaseGuard, Database, Error, Result, Ruma, RumaResponse};
 use ruma::{
-    api::client::r0::{
+    api::client::{
         filter::{IncomingFilterDefinition, LazyLoadOptions},
         sync::sync_events,
         uiaa::UiaaResponse,
     },
     events::{
         room::member::{MembershipState, RoomMemberEventContent},
-        AnySyncEphemeralRoomEvent, EventType,
+        RoomEventType, StateEventType,
     },
     serde::Raw,
     DeviceId, RoomId, UserId,
@@ -20,9 +20,6 @@ use std::{
 use tokio::sync::watch::Sender;
 use tracing::error;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, tokio};
-
 /// # `GET /_matrix/client/r0/sync`
 ///
 /// Synchronize the client's state with the latest state on the server.
@@ -57,15 +54,10 @@ use rocket::{get, tokio};
 ///
 /// - Sync is handled in an async task, multiple requests from the same device with the same
 /// `since` will be cached
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/sync", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn sync_events_route(
     db: DatabaseGuard,
-    body: Ruma<sync_events::Request<'_>>,
-) -> Result<RumaResponse<sync_events::Response>, RumaResponse<UiaaResponse>> {
+    body: Ruma<sync_events::v3::IncomingRequest>,
+) -> Result<sync_events::v3::Response, RumaResponse<UiaaResponse>> {
     let sender_user = body.sender_user.expect("user is authenticated");
     let sender_device = body.sender_device.expect("user is authenticated");
     let body = body.body;
@@ -82,7 +74,7 @@ pub async fn sync_events_route(
         Entry::Vacant(v) => {
             let (tx, rx) = tokio::sync::watch::channel(None);
 
-            v.insert((body.since.clone(), rx.clone()));
+            v.insert((body.since.to_owned(), rx.clone()));
 
             tokio::spawn(sync_helper_wrapper(
                 Arc::clone(&arc_db),
@@ -138,8 +130,8 @@ async fn sync_helper_wrapper(
     db: Arc<DatabaseGuard>,
     sender_user: Box<UserId>,
     sender_device: Box<DeviceId>,
-    body: sync_events::IncomingRequest,
-    tx: Sender<Option<ConduitResult<sync_events::Response>>>,
+    body: sync_events::v3::IncomingRequest,
+    tx: Sender<Option<Result<sync_events::v3::Response>>>,
 ) {
     let since = body.since.clone();
 
@@ -173,16 +165,22 @@ async fn sync_helper_wrapper(
 
     drop(db);
 
-    let _ = tx.send(Some(r.map(|(r, _)| r.into())));
+    let _ = tx.send(Some(r.map(|(r, _)| r)));
 }
 
 async fn sync_helper(
     db: Arc<DatabaseGuard>,
     sender_user: Box<UserId>,
     sender_device: Box<DeviceId>,
-    body: sync_events::IncomingRequest,
+    body: sync_events::v3::IncomingRequest,
     // bool = caching allowed
-) -> Result<(sync_events::Response, bool), Error> {
+) -> Result<(sync_events::v3::Response, bool), Error> {
+    use sync_events::v3::{
+        DeviceLists, Ephemeral, GlobalAccountData, IncomingFilter, InviteState, InvitedRoom,
+        JoinedRoom, LeftRoom, Presence, RoomAccountData, RoomSummary, Rooms, State, Timeline,
+        ToDevice, UnreadNotificationsCount,
+    };
+
     // TODO: match body.set_presence {
     db.rooms.edus.ping_presence(&sender_user)?;
 
@@ -195,8 +193,8 @@ async fn sync_helper(
     // Load filter
     let filter = match body.filter {
         None => IncomingFilterDefinition::default(),
-        Some(sync_events::IncomingFilter::FilterDefinition(filter)) => filter,
-        Some(sync_events::IncomingFilter::FilterId(filter_id)) => db
+        Some(IncomingFilter::FilterDefinition(filter)) => filter,
+        Some(IncomingFilter::FilterId(filter_id)) => db
             .users
             .get_filter(&sender_user, &filter_id)?
             .unwrap_or_default(),
@@ -232,43 +230,56 @@ async fn sync_helper(
     for room_id in all_joined_rooms {
         let room_id = room_id?;
 
-        // Get and drop the lock to wait for remaining operations to finish
-        // This will make sure the we have all events until next_batch
-        let mutex_insert = Arc::clone(
-            db.globals
-                .roomid_mutex_insert
-                .write()
-                .unwrap()
-                .entry(room_id.clone())
-                .or_default(),
-        );
-        let insert_lock = mutex_insert.lock().unwrap();
-        drop(insert_lock);
+        {
+            // Get and drop the lock to wait for remaining operations to finish
+            // This will make sure the we have all events until next_batch
+            let mutex_insert = Arc::clone(
+                db.globals
+                    .roomid_mutex_insert
+                    .write()
+                    .unwrap()
+                    .entry(room_id.clone())
+                    .or_default(),
+            );
+            let insert_lock = mutex_insert.lock().unwrap();
+            drop(insert_lock);
+        }
 
-        let mut non_timeline_pdus = db
-            .rooms
-            .pdus_until(&sender_user, &room_id, u64::MAX)?
-            .filter_map(|r| {
-                // Filter out buggy events
-                if r.is_err() {
-                    error!("Bad pdu in pdus_since: {:?}", r);
-                }
-                r.ok()
-            })
-            .take_while(|(pduid, _)| {
-                db.rooms
-                    .pdu_count(pduid)
-                    .map_or(false, |count| count > since)
-            });
+        let timeline_pdus;
+        let limited;
+        if db.rooms.last_timeline_count(&sender_user, &room_id)? > since {
+            let mut non_timeline_pdus = db
+                .rooms
+                .pdus_until(&sender_user, &room_id, u64::MAX)?
+                .filter_map(|r| {
+                    // Filter out buggy events
+                    if r.is_err() {
+                        error!("Bad pdu in pdus_since: {:?}", r);
+                    }
+                    r.ok()
+                })
+                .take_while(|(pduid, _)| {
+                    db.rooms
+                        .pdu_count(pduid)
+                        .map_or(false, |count| count > since)
+                });
 
-        // Take the last 10 events for the timeline
-        let timeline_pdus: Vec<_> = non_timeline_pdus
-            .by_ref()
-            .take(10)
-            .collect::<Vec<_>>()
-            .into_iter()
-            .rev()
-            .collect();
+            // Take the last 10 events for the timeline
+            timeline_pdus = non_timeline_pdus
+                .by_ref()
+                .take(10)
+                .collect::<Vec<_>>()
+                .into_iter()
+                .rev()
+                .collect::<Vec<_>>();
+
+            // They /sync response doesn't always return all messages, so we say the output is
+            // limited unless there are events in non_timeline_pdus
+            limited = non_timeline_pdus.next().is_some();
+        } else {
+            timeline_pdus = Vec::new();
+            limited = false;
+        }
 
         let send_notification_counts = !timeline_pdus.is_empty()
             || db
@@ -277,10 +288,6 @@ async fn sync_helper(
                 .last_privateread_update(&sender_user, &room_id)?
                 > since;
 
-        // They /sync response doesn't always return all messages, so we say the output is
-        // limited unless there are events in non_timeline_pdus
-        let limited = non_timeline_pdus.next().is_some();
-
         let mut timeline_users = HashSet::new();
         for (_, event) in &timeline_pdus {
             timeline_users.insert(event.sender.as_str().to_owned());
@@ -291,10 +298,12 @@ async fn sync_helper(
 
         // Database queries:
 
-        let current_shortstatehash = db
-            .rooms
-            .current_shortstatehash(&room_id)?
-            .expect("All rooms have state");
+        let current_shortstatehash = if let Some(s) = db.rooms.current_shortstatehash(&room_id)? {
+            s
+        } else {
+            error!("Room {} has no state", room_id);
+            continue;
+        };
 
         let since_shortstatehash = db.rooms.get_token_shortstatehash(&room_id, since)?;
 
@@ -314,7 +323,7 @@ async fn sync_helper(
                     .rooms
                     .all_pdus(&sender_user, &room_id)?
                     .filter_map(|pdu| pdu.ok()) // Ignore all broken pdus
-                    .filter(|(_, pdu)| pdu.kind == EventType::RoomMember)
+                    .filter(|(_, pdu)| pdu.kind == RoomEventType::RoomMember)
                     .map(|(_, pdu)| {
                         let content: RoomMemberEventContent =
                             serde_json::from_str(pdu.content.get()).map_err(|_| {
@@ -372,15 +381,16 @@ async fn sync_helper(
 
             let (joined_member_count, invited_member_count, heroes) = calculate_counts()?;
 
-            let current_state_ids = db.rooms.state_full_ids(current_shortstatehash)?;
+            let current_state_ids = db.rooms.state_full_ids(current_shortstatehash).await?;
 
             let mut state_events = Vec::new();
             let mut lazy_loaded = HashSet::new();
 
+            let mut i = 0;
             for (shortstatekey, id) in current_state_ids {
                 let (event_type, state_key) = db.rooms.get_statekey_from_short(shortstatekey)?;
 
-                if event_type != EventType::RoomMember {
+                if event_type != StateEventType::RoomMember {
                     let pdu = match db.rooms.get_pdu(&id)? {
                         Some(pdu) => pdu,
                         None => {
@@ -389,6 +399,11 @@ async fn sync_helper(
                         }
                     };
                     state_events.push(pdu);
+
+                    i += 1;
+                    if i % 100 == 0 {
+                        tokio::task::yield_now().await;
+                    }
                 } else if !lazy_load_enabled
                     || body.full_state
                     || timeline_users.contains(&state_key)
@@ -400,11 +415,17 @@ async fn sync_helper(
                             continue;
                         }
                     };
-                    lazy_loaded.insert(
-                        UserId::parse(state_key.as_ref())
-                            .expect("they are in timeline_users, so they should be correct"),
-                    );
+
+                    // This check is in case a bad user ID made it into the database
+                    if let Ok(uid) = UserId::parse(state_key.as_ref()) {
+                        lazy_loaded.insert(uid);
+                    }
                     state_events.push(pdu);
+
+                    i += 1;
+                    if i % 100 == 0 {
+                        tokio::task::yield_now().await;
+                    }
                 }
             }
 
@@ -440,7 +461,7 @@ async fn sync_helper(
                 .rooms
                 .state_get(
                     since_shortstatehash,
-                    &EventType::RoomMember,
+                    &StateEventType::RoomMember,
                     sender_user.as_str(),
                 )?
                 .and_then(|pdu| {
@@ -456,8 +477,8 @@ async fn sync_helper(
             let mut lazy_loaded = HashSet::new();
 
             if since_shortstatehash != current_shortstatehash {
-                let current_state_ids = db.rooms.state_full_ids(current_shortstatehash)?;
-                let since_state_ids = db.rooms.state_full_ids(since_shortstatehash)?;
+                let current_state_ids = db.rooms.state_full_ids(current_shortstatehash).await?;
+                let since_state_ids = db.rooms.state_full_ids(since_shortstatehash).await?;
 
                 for (key, id) in current_state_ids {
                     if body.full_state || since_state_ids.get(&key) != Some(&id) {
@@ -469,7 +490,7 @@ async fn sync_helper(
                             }
                         };
 
-                        if pdu.kind == EventType::RoomMember {
+                        if pdu.kind == RoomEventType::RoomMember {
                             match UserId::parse(
                                 pdu.state_key
                                     .as_ref()
@@ -484,6 +505,7 @@ async fn sync_helper(
                         }
 
                         state_events.push(pdu);
+                        tokio::task::yield_now().await;
                     }
                 }
             }
@@ -502,7 +524,7 @@ async fn sync_helper(
                 {
                     if let Some(member_event) = db.rooms.room_state_get(
                         &room_id,
-                        &EventType::RoomMember,
+                        &StateEventType::RoomMember,
                         event.sender.as_str(),
                     )? {
                         lazy_loaded.insert(event.sender.clone());
@@ -521,23 +543,23 @@ async fn sync_helper(
 
             let encrypted_room = db
                 .rooms
-                .state_get(current_shortstatehash, &EventType::RoomEncryption, "")?
+                .state_get(current_shortstatehash, &StateEventType::RoomEncryption, "")?
                 .is_some();
 
             let since_encryption =
                 db.rooms
-                    .state_get(since_shortstatehash, &EventType::RoomEncryption, "")?;
+                    .state_get(since_shortstatehash, &StateEventType::RoomEncryption, "")?;
 
             // Calculations:
             let new_encrypted_room = encrypted_room && since_encryption.is_none();
 
             let send_member_count = state_events
                 .iter()
-                .any(|event| event.kind == EventType::RoomMember);
+                .any(|event| event.kind == RoomEventType::RoomMember);
 
             if encrypted_room {
                 for state_event in &state_events {
-                    if state_event.kind != EventType::RoomMember {
+                    if state_event.kind != RoomEventType::RoomMember {
                         continue;
                     }
 
@@ -656,10 +678,8 @@ async fn sync_helper(
         if db.rooms.edus.last_typing_update(&room_id, &db.globals)? > since {
             edus.push(
                 serde_json::from_str(
-                    &serde_json::to_string(&AnySyncEphemeralRoomEvent::Typing(
-                        db.rooms.edus.typings_all(&room_id)?,
-                    ))
-                    .expect("event is valid, we just created it"),
+                    &serde_json::to_string(&db.rooms.edus.typings_all(&room_id)?)
+                        .expect("event is valid, we just created it"),
                 )
                 .expect("event is valid, we just created it"),
             );
@@ -669,8 +689,8 @@ async fn sync_helper(
         db.rooms
             .associate_token_shortstatehash(&room_id, next_batch, current_shortstatehash)?;
 
-        let joined_room = sync_events::JoinedRoom {
-            account_data: sync_events::RoomAccountData {
+        let joined_room = JoinedRoom {
+            account_data: RoomAccountData {
                 events: db
                     .account_data
                     .changes_since(Some(&room_id), &sender_user, since)?
@@ -682,27 +702,27 @@ async fn sync_helper(
                     })
                     .collect(),
             },
-            summary: sync_events::RoomSummary {
+            summary: RoomSummary {
                 heroes,
                 joined_member_count: joined_member_count.map(|n| (n as u32).into()),
                 invited_member_count: invited_member_count.map(|n| (n as u32).into()),
             },
-            unread_notifications: sync_events::UnreadNotificationsCount {
+            unread_notifications: UnreadNotificationsCount {
                 highlight_count,
                 notification_count,
             },
-            timeline: sync_events::Timeline {
+            timeline: Timeline {
                 limited: limited || joined_since_last_sync,
                 prev_batch,
                 events: room_events,
             },
-            state: sync_events::State {
+            state: State {
                 events: state_events
                     .iter()
                     .map(|pdu| pdu.to_sync_state_event())
                     .collect(),
             },
-            ephemeral: sync_events::Ephemeral { events: edus },
+            ephemeral: Ephemeral { events: edus },
         };
 
         if !joined_room.is_empty() {
@@ -749,17 +769,19 @@ async fn sync_helper(
     for result in all_left_rooms {
         let (room_id, left_state_events) = result?;
 
-        // Get and drop the lock to wait for remaining operations to finish
-        let mutex_insert = Arc::clone(
-            db.globals
-                .roomid_mutex_insert
-                .write()
-                .unwrap()
-                .entry(room_id.clone())
-                .or_default(),
-        );
-        let insert_lock = mutex_insert.lock().unwrap();
-        drop(insert_lock);
+        {
+            // Get and drop the lock to wait for remaining operations to finish
+            let mutex_insert = Arc::clone(
+                db.globals
+                    .roomid_mutex_insert
+                    .write()
+                    .unwrap()
+                    .entry(room_id.clone())
+                    .or_default(),
+            );
+            let insert_lock = mutex_insert.lock().unwrap();
+            drop(insert_lock);
+        }
 
         let left_count = db.rooms.get_left_count(&room_id, &sender_user)?;
 
@@ -770,14 +792,14 @@ async fn sync_helper(
 
         left_rooms.insert(
             room_id.clone(),
-            sync_events::LeftRoom {
-                account_data: sync_events::RoomAccountData { events: Vec::new() },
-                timeline: sync_events::Timeline {
+            LeftRoom {
+                account_data: RoomAccountData { events: Vec::new() },
+                timeline: Timeline {
                     limited: false,
                     prev_batch: Some(next_batch_string.clone()),
                     events: Vec::new(),
                 },
-                state: sync_events::State {
+                state: State {
                     events: left_state_events,
                 },
             },
@@ -789,17 +811,19 @@ async fn sync_helper(
     for result in all_invited_rooms {
         let (room_id, invite_state_events) = result?;
 
-        // Get and drop the lock to wait for remaining operations to finish
-        let mutex_insert = Arc::clone(
-            db.globals
-                .roomid_mutex_insert
-                .write()
-                .unwrap()
-                .entry(room_id.clone())
-                .or_default(),
-        );
-        let insert_lock = mutex_insert.lock().unwrap();
-        drop(insert_lock);
+        {
+            // Get and drop the lock to wait for remaining operations to finish
+            let mutex_insert = Arc::clone(
+                db.globals
+                    .roomid_mutex_insert
+                    .write()
+                    .unwrap()
+                    .entry(room_id.clone())
+                    .or_default(),
+            );
+            let insert_lock = mutex_insert.lock().unwrap();
+            drop(insert_lock);
+        }
 
         let invite_count = db.rooms.get_invite_count(&room_id, &sender_user)?;
 
@@ -810,8 +834,8 @@ async fn sync_helper(
 
         invited_rooms.insert(
             room_id.clone(),
-            sync_events::InvitedRoom {
-                invite_state: sync_events::InviteState {
+            InvitedRoom {
+                invite_state: InviteState {
                     events: invite_state_events,
                 },
             },
@@ -826,7 +850,7 @@ async fn sync_helper(
             .filter_map(|other_room_id| {
                 Some(
                     db.rooms
-                        .room_state_get(&other_room_id, &EventType::RoomEncryption, "")
+                        .room_state_get(&other_room_id, &StateEventType::RoomEncryption, "")
                         .ok()?
                         .is_some(),
                 )
@@ -843,21 +867,21 @@ async fn sync_helper(
     db.users
         .remove_to_device_events(&sender_user, &sender_device, since)?;
 
-    let response = sync_events::Response {
+    let response = sync_events::v3::Response {
         next_batch: next_batch_string,
-        rooms: sync_events::Rooms {
+        rooms: Rooms {
             leave: left_rooms,
             join: joined_rooms,
             invite: invited_rooms,
             knock: BTreeMap::new(), // TODO
         },
-        presence: sync_events::Presence {
+        presence: Presence {
             events: presence_updates
                 .into_iter()
                 .map(|(_, v)| Raw::new(&v).expect("PresenceEvent always serializes successfully"))
                 .collect(),
         },
-        account_data: sync_events::GlobalAccountData {
+        account_data: GlobalAccountData {
             events: db
                 .account_data
                 .changes_since(None, &sender_user, since)?
@@ -869,12 +893,12 @@ async fn sync_helper(
                 })
                 .collect(),
         },
-        device_lists: sync_events::DeviceLists {
+        device_lists: DeviceLists {
             changed: device_list_updates.into_iter().collect(),
             left: device_list_left.into_iter().collect(),
         },
         device_one_time_keys_count: db.users.count_one_time_keys(&sender_user, &sender_device)?,
-        to_device: sync_events::ToDevice {
+        to_device: ToDevice {
             events: db
                 .users
                 .get_to_device_events(&sender_user, &sender_device)?,
@@ -919,7 +943,7 @@ fn share_encrypted_room(
         .filter_map(|other_room_id| {
             Some(
                 db.rooms
-                    .room_state_get(&other_room_id, &EventType::RoomEncryption, "")
+                    .room_state_get(&other_room_id, &StateEventType::RoomEncryption, "")
                     .ok()?
                     .is_some(),
             )
diff --git a/src/client_server/tag.rs b/src/client_server/tag.rs
index 42bad4cf..98d895cd 100644
--- a/src/client_server/tag.rs
+++ b/src/client_server/tag.rs
@@ -1,35 +1,31 @@
-use crate::{database::DatabaseGuard, ConduitResult, Ruma};
+use crate::{database::DatabaseGuard, Result, Ruma};
 use ruma::{
-    api::client::r0::tag::{create_tag, delete_tag, get_tags},
+    api::client::tag::{create_tag, delete_tag, get_tags},
     events::{
         tag::{TagEvent, TagEventContent},
-        EventType,
+        RoomAccountDataEventType,
     },
 };
 use std::collections::BTreeMap;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{delete, get, put};
-
 /// # `PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}`
 ///
 /// Adds a tag to the room.
 ///
 /// - Inserts the tag into the tag event of the room account data.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/user/<_>/rooms/<_>/tags/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn update_tag_route(
     db: DatabaseGuard,
-    body: Ruma<create_tag::Request<'_>>,
-) -> ConduitResult<create_tag::Response> {
+    body: Ruma<create_tag::v3::IncomingRequest>,
+) -> Result<create_tag::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let mut tags_event = db
         .account_data
-        .get(Some(&body.room_id), sender_user, EventType::Tag)?
+        .get(
+            Some(&body.room_id),
+            sender_user,
+            RoomAccountDataEventType::Tag,
+        )?
         .unwrap_or_else(|| TagEvent {
             content: TagEventContent {
                 tags: BTreeMap::new(),
@@ -43,14 +39,14 @@ pub async fn update_tag_route(
     db.account_data.update(
         Some(&body.room_id),
         sender_user,
-        EventType::Tag,
+        RoomAccountDataEventType::Tag,
         &tags_event,
         &db.globals,
     )?;
 
     db.flush()?;
 
-    Ok(create_tag::Response {}.into())
+    Ok(create_tag::v3::Response {})
 }
 
 /// # `DELETE /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}`
@@ -58,20 +54,19 @@ pub async fn update_tag_route(
 /// Deletes a tag from the room.
 ///
 /// - Removes the tag from the tag event of the room account data.
-#[cfg_attr(
-    feature = "conduit_bin",
-    delete("/_matrix/client/r0/user/<_>/rooms/<_>/tags/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn delete_tag_route(
     db: DatabaseGuard,
-    body: Ruma<delete_tag::Request<'_>>,
-) -> ConduitResult<delete_tag::Response> {
+    body: Ruma<delete_tag::v3::IncomingRequest>,
+) -> Result<delete_tag::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let mut tags_event = db
         .account_data
-        .get(Some(&body.room_id), sender_user, EventType::Tag)?
+        .get(
+            Some(&body.room_id),
+            sender_user,
+            RoomAccountDataEventType::Tag,
+        )?
         .unwrap_or_else(|| TagEvent {
             content: TagEventContent {
                 tags: BTreeMap::new(),
@@ -82,14 +77,14 @@ pub async fn delete_tag_route(
     db.account_data.update(
         Some(&body.room_id),
         sender_user,
-        EventType::Tag,
+        RoomAccountDataEventType::Tag,
         &tags_event,
         &db.globals,
     )?;
 
     db.flush()?;
 
-    Ok(delete_tag::Response {}.into())
+    Ok(delete_tag::v3::Response {})
 }
 
 /// # `GET /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags`
@@ -97,21 +92,20 @@ pub async fn delete_tag_route(
 /// Returns tags on the room.
 ///
 /// - Gets the tag event of the room account data.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/user/<_>/rooms/<_>/tags", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_tags_route(
     db: DatabaseGuard,
-    body: Ruma<get_tags::Request<'_>>,
-) -> ConduitResult<get_tags::Response> {
+    body: Ruma<get_tags::v3::IncomingRequest>,
+) -> Result<get_tags::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    Ok(get_tags::Response {
+    Ok(get_tags::v3::Response {
         tags: db
             .account_data
-            .get(Some(&body.room_id), sender_user, EventType::Tag)?
+            .get(
+                Some(&body.room_id),
+                sender_user,
+                RoomAccountDataEventType::Tag,
+            )?
             .unwrap_or_else(|| TagEvent {
                 content: TagEventContent {
                     tags: BTreeMap::new(),
@@ -119,6 +113,5 @@ pub async fn get_tags_route(
             })
             .content
             .tags,
-    }
-    .into())
+    })
 }
diff --git a/src/client_server/thirdparty.rs b/src/client_server/thirdparty.rs
index 4305902f..5665ad6c 100644
--- a/src/client_server/thirdparty.rs
+++ b/src/client_server/thirdparty.rs
@@ -1,22 +1,16 @@
-use crate::ConduitResult;
-use ruma::api::client::r0::thirdparty::get_protocols;
+use crate::{Result, Ruma};
+use ruma::api::client::thirdparty::get_protocols;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::get;
 use std::collections::BTreeMap;
 
 /// # `GET /_matrix/client/r0/thirdparty/protocols`
 ///
 /// TODO: Fetches all metadata about protocols supported by the homeserver.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/thirdparty/protocols")
-)]
-#[tracing::instrument]
-pub async fn get_protocols_route() -> ConduitResult<get_protocols::Response> {
+pub async fn get_protocols_route(
+    _body: Ruma<get_protocols::v3::IncomingRequest>,
+) -> Result<get_protocols::v3::Response> {
     // TODO
-    Ok(get_protocols::Response {
+    Ok(get_protocols::v3::Response {
         protocols: BTreeMap::new(),
-    }
-    .into())
+    })
 }
diff --git a/src/client_server/to_device.rs b/src/client_server/to_device.rs
index e0aa9e91..51441dd4 100644
--- a/src/client_server/to_device.rs
+++ b/src/client_server/to_device.rs
@@ -1,44 +1,33 @@
+use ruma::events::ToDeviceEventType;
 use std::collections::BTreeMap;
 
-use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
+use crate::{database::DatabaseGuard, Error, Result, Ruma};
 use ruma::{
     api::{
-        client::{error::ErrorKind, r0::to_device::send_event_to_device},
+        client::{error::ErrorKind, to_device::send_event_to_device},
         federation::{self, transactions::edu::DirectDeviceContent},
     },
-    events::EventType,
     to_device::DeviceIdOrAllDevices,
 };
 
-#[cfg(feature = "conduit_bin")]
-use rocket::put;
-
 /// # `PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}`
 ///
 /// Send a to-device event to a set of client devices.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/sendToDevice/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn send_event_to_device_route(
     db: DatabaseGuard,
-    body: Ruma<send_event_to_device::Request<'_>>,
-) -> ConduitResult<send_event_to_device::Response> {
+    body: Ruma<send_event_to_device::v3::IncomingRequest>,
+) -> Result<send_event_to_device::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let sender_device = body.sender_device.as_deref();
 
-    // TODO: uncomment when https://github.com/vector-im/element-android/issues/3589 is solved
     // Check if this is a new transaction id
-    /*
     if db
         .transaction_ids
         .existing_txnid(sender_user, sender_device, &body.txn_id)?
         .is_some()
     {
-        return Ok(send_event_to_device::Response.into());
+        return Ok(send_event_to_device::v3::Response {});
     }
-    */
 
     for (target_user_id, map) in &body.messages {
         for (target_device_id_maybe, event) in map {
@@ -53,8 +42,8 @@ pub async fn send_event_to_device_route(
                     serde_json::to_vec(&federation::transactions::edu::Edu::DirectToDevice(
                         DirectDeviceContent {
                             sender: sender_user.clone(),
-                            ev_type: EventType::from(&*body.event_type),
-                            message_id: body.txn_id.clone(),
+                            ev_type: ToDeviceEventType::from(&*body.event_type),
+                            message_id: body.txn_id.to_owned(),
                             messages,
                         },
                     ))
@@ -69,7 +58,7 @@ pub async fn send_event_to_device_route(
                 DeviceIdOrAllDevices::DeviceId(target_device_id) => db.users.add_to_device_event(
                     sender_user,
                     target_user_id,
-                    target_device_id,
+                    &target_device_id,
                     &body.event_type,
                     event.deserialize_as().map_err(|_| {
                         Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
@@ -101,5 +90,5 @@ pub async fn send_event_to_device_route(
 
     db.flush()?;
 
-    Ok(send_event_to_device::Response {}.into())
+    Ok(send_event_to_device::v3::Response {})
 }
diff --git a/src/client_server/typing.rs b/src/client_server/typing.rs
index 15e74b35..cac5a5fd 100644
--- a/src/client_server/typing.rs
+++ b/src/client_server/typing.rs
@@ -1,24 +1,24 @@
-use crate::{database::DatabaseGuard, utils, ConduitResult, Ruma};
-use create_typing_event::Typing;
-use ruma::api::client::r0::typing::create_typing_event;
-
-#[cfg(feature = "conduit_bin")]
-use rocket::put;
+use crate::{database::DatabaseGuard, utils, Error, Result, Ruma};
+use ruma::api::client::{error::ErrorKind, typing::create_typing_event};
 
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}`
 ///
 /// Sets the typing state of the sender user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/client/r0/rooms/<_>/typing/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn create_typing_event_route(
+pub async fn create_typing_event_route(
     db: DatabaseGuard,
-    body: Ruma<create_typing_event::Request<'_>>,
-) -> ConduitResult<create_typing_event::Response> {
+    body: Ruma<create_typing_event::v3::IncomingRequest>,
+) -> Result<create_typing_event::v3::Response> {
+    use create_typing_event::v3::Typing;
+
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
+    if !db.rooms.is_joined(sender_user, &body.room_id)? {
+        return Err(Error::BadRequest(
+            ErrorKind::Forbidden,
+            "You are not in this room.",
+        ));
+    }
+
     if let Typing::Yes(duration) = body.state {
         db.rooms.edus.typing_add(
             sender_user,
@@ -32,5 +32,5 @@ pub fn create_typing_event_route(
             .typing_remove(sender_user, &body.room_id, &db.globals)?;
     }
 
-    Ok(create_typing_event::Response {}.into())
+    Ok(create_typing_event::v3::Response {})
 }
diff --git a/src/client_server/unversioned.rs b/src/client_server/unversioned.rs
index ea685b4b..8a5c3d25 100644
--- a/src/client_server/unversioned.rs
+++ b/src/client_server/unversioned.rs
@@ -1,10 +1,8 @@
 use std::{collections::BTreeMap, iter::FromIterator};
 
-use crate::ConduitResult;
-use ruma::api::client::unversioned::get_supported_versions;
+use ruma::api::client::discovery::get_supported_versions;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::get;
+use crate::{Result, Ruma};
 
 /// # `GET /_matrix/client/versions`
 ///
@@ -16,13 +14,18 @@ use rocket::get;
 ///
 /// Note: Unstable features are used while developing new features. Clients should avoid using
 /// unstable features in their stable releases
-#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/versions"))]
-#[tracing::instrument]
-pub async fn get_supported_versions_route() -> ConduitResult<get_supported_versions::Response> {
+pub async fn get_supported_versions_route(
+    _body: Ruma<get_supported_versions::IncomingRequest>,
+) -> Result<get_supported_versions::Response> {
     let resp = get_supported_versions::Response {
-        versions: vec!["r0.5.0".to_owned(), "r0.6.0".to_owned()],
+        versions: vec![
+            "r0.5.0".to_owned(),
+            "r0.6.0".to_owned(),
+            "v1.1".to_owned(),
+            "v1.2".to_owned(),
+        ],
         unstable_features: BTreeMap::from_iter([("org.matrix.e2e_cross_signing".to_owned(), true)]),
     };
 
-    Ok(resp.into())
+    Ok(resp)
 }
diff --git a/src/client_server/user_directory.rs b/src/client_server/user_directory.rs
index cfcb9bb9..349c1399 100644
--- a/src/client_server/user_directory.rs
+++ b/src/client_server/user_directory.rs
@@ -1,30 +1,30 @@
-use crate::{database::DatabaseGuard, ConduitResult, Ruma};
-use ruma::api::client::r0::user_directory::search_users;
-
-#[cfg(feature = "conduit_bin")]
-use rocket::post;
+use crate::{database::DatabaseGuard, Result, Ruma};
+use ruma::{
+    api::client::user_directory::search_users,
+    events::{
+        room::join_rules::{JoinRule, RoomJoinRulesEventContent},
+        StateEventType,
+    },
+};
 
 /// # `POST /_matrix/client/r0/user_directory/search`
 ///
 /// Searches all known users for a match.
 ///
-/// - TODO: Hide users that are not in any public rooms?
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/client/r0/user_directory/search", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
+/// - Hides any local users that aren't in any public rooms (i.e. those that have the join rule set to public)
+/// and don't share a room with the sender
 pub async fn search_users_route(
     db: DatabaseGuard,
-    body: Ruma<search_users::Request<'_>>,
-) -> ConduitResult<search_users::Response> {
+    body: Ruma<search_users::v3::IncomingRequest>,
+) -> Result<search_users::v3::Response> {
+    let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let limit = u64::from(body.limit) as usize;
 
     let mut users = db.users.iter().filter_map(|user_id| {
         // Filter out buggy users (they should not exist, but you never know...)
         let user_id = user_id.ok()?;
 
-        let user = search_users::User {
+        let user = search_users::v3::User {
             user_id: user_id.clone(),
             display_name: db.users.displayname(&user_id).ok()?,
             avatar_url: db.users.avatar_url(&user_id).ok()?,
@@ -49,11 +49,43 @@ pub async fn search_users_route(
             return None;
         }
 
-        Some(user)
+        let user_is_in_public_rooms =
+            db.rooms
+                .rooms_joined(&user_id)
+                .filter_map(|r| r.ok())
+                .any(|room| {
+                    db.rooms
+                        .room_state_get(&room, &StateEventType::RoomJoinRules, "")
+                        .map_or(false, |event| {
+                            event.map_or(false, |event| {
+                                serde_json::from_str(event.content.get())
+                                    .map_or(false, |r: RoomJoinRulesEventContent| {
+                                        r.join_rule == JoinRule::Public
+                                    })
+                            })
+                        })
+                });
+
+        if user_is_in_public_rooms {
+            return Some(user);
+        }
+
+        let user_is_in_shared_rooms = db
+            .rooms
+            .get_shared_rooms(vec![sender_user.clone(), user_id.clone()])
+            .ok()?
+            .next()
+            .is_some();
+
+        if user_is_in_shared_rooms {
+            return Some(user);
+        }
+
+        None
     });
 
     let results = users.by_ref().take(limit).collect();
     let limited = users.next().is_some();
 
-    Ok(search_users::Response { results, limited }.into())
+    Ok(search_users::v3::Response { results, limited })
 }
diff --git a/src/client_server/voip.rs b/src/client_server/voip.rs
index 66a85f0f..7e9de31e 100644
--- a/src/client_server/voip.rs
+++ b/src/client_server/voip.rs
@@ -1,27 +1,18 @@
-use crate::{database::DatabaseGuard, ConduitResult, Ruma};
+use crate::{database::DatabaseGuard, Result, Ruma};
 use hmac::{Hmac, Mac, NewMac};
-use ruma::api::client::r0::voip::get_turn_server_info;
-use ruma::SecondsSinceUnixEpoch;
+use ruma::{api::client::voip::get_turn_server_info, SecondsSinceUnixEpoch};
 use sha1::Sha1;
 use std::time::{Duration, SystemTime};
 
 type HmacSha1 = Hmac<Sha1>;
 
-#[cfg(feature = "conduit_bin")]
-use rocket::get;
-
 /// # `GET /_matrix/client/r0/voip/turnServer`
 ///
 /// TODO: Returns information about the recommended turn server.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/client/r0/voip/turnServer", data = "<body>")
-)]
-#[tracing::instrument(skip(body, db))]
 pub async fn turn_server_route(
-    body: Ruma<get_turn_server_info::Request>,
     db: DatabaseGuard,
-) -> ConduitResult<get_turn_server_info::Response> {
+    body: Ruma<get_turn_server_info::v3::IncomingRequest>,
+) -> Result<get_turn_server_info::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
     let turn_secret = db.globals.turn_secret();
@@ -48,11 +39,10 @@ pub async fn turn_server_route(
         )
     };
 
-    Ok(get_turn_server_info::Response {
+    Ok(get_turn_server_info::v3::Response {
         username,
         password,
         uris: db.globals.turn_uris().to_vec(),
         ttl: Duration::from_secs(db.globals.turn_ttl()),
-    }
-    .into())
+    })
 }
diff --git a/src/config.rs b/src/config.rs
index 4c0fcc21..7d81d0f8 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,6 +1,10 @@
-use std::collections::BTreeMap;
+use std::{
+    collections::BTreeMap,
+    fmt,
+    net::{IpAddr, Ipv4Addr},
+};
 
-use ruma::ServerName;
+use ruma::{RoomVersionId, ServerName};
 use serde::{de::IgnoredAny, Deserialize};
 use tracing::warn;
 
@@ -10,12 +14,20 @@ use self::proxy::ProxyConfig;
 
 #[derive(Clone, Debug, Deserialize)]
 pub struct Config {
+    #[serde(default = "default_address")]
+    pub address: IpAddr,
+    #[serde(default = "default_port")]
+    pub port: u16,
+    pub tls: Option<TlsConfig>,
+
     pub server_name: Box<ServerName>,
     #[serde(default = "default_database_backend")]
     pub database_backend: String,
     pub database_path: String,
     #[serde(default = "default_db_cache_capacity_mb")]
     pub db_cache_capacity_mb: f64,
+    #[serde(default = "true_fn")]
+    pub enable_lightning_bolt: bool,
     #[serde(default = "default_conduit_cache_capacity_modifier")]
     pub conduit_cache_capacity_modifier: f64,
     #[serde(default = "default_rocksdb_max_open_files")]
@@ -36,6 +48,10 @@ pub struct Config {
     pub allow_federation: bool,
     #[serde(default = "true_fn")]
     pub allow_room_creation: bool,
+    #[serde(default = "true_fn")]
+    pub allow_unstable_room_versions: bool,
+    #[serde(default = "default_default_room_version")]
+    pub default_room_version: RoomVersionId,
     #[serde(default = "false_fn")]
     pub allow_jaeger: bool,
     #[serde(default = "false_fn")]
@@ -58,10 +74,18 @@ pub struct Config {
     #[serde(default = "default_turn_ttl")]
     pub turn_ttl: u64,
 
+    pub emergency_password: Option<String>,
+
     #[serde(flatten)]
     pub catchall: BTreeMap<String, IgnoredAny>,
 }
 
+#[derive(Clone, Debug, Deserialize)]
+pub struct TlsConfig {
+    pub certs: String,
+    pub key: String,
+}
+
 const DEPRECATED_KEYS: &[&str] = &["cache_capacity"];
 
 impl Config {
@@ -82,6 +106,101 @@ impl Config {
     }
 }
 
+impl fmt::Display for Config {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // Prepare a list of config values to show
+        let lines = [
+            ("Server name", self.server_name.host()),
+            ("Database backend", &self.database_backend),
+            ("Database path", &self.database_path),
+            (
+                "Database cache capacity (MB)",
+                &self.db_cache_capacity_mb.to_string(),
+            ),
+            (
+                "Cache capacity modifier",
+                &self.conduit_cache_capacity_modifier.to_string(),
+            ),
+            #[cfg(feature = "rocksdb")]
+            (
+                "Maximum open files for RocksDB",
+                &self.rocksdb_max_open_files.to_string(),
+            ),
+            ("PDU cache capacity", &self.pdu_cache_capacity.to_string()),
+            (
+                "Cleanup interval in seconds",
+                &self.cleanup_second_interval.to_string(),
+            ),
+            ("Maximum request size", &self.max_request_size.to_string()),
+            (
+                "Maximum concurrent requests",
+                &self.max_concurrent_requests.to_string(),
+            ),
+            ("Allow registration", &self.allow_registration.to_string()),
+            (
+                "Enabled lightning bolt",
+                &self.enable_lightning_bolt.to_string(),
+            ),
+            ("Allow encryption", &self.allow_encryption.to_string()),
+            ("Allow federation", &self.allow_federation.to_string()),
+            ("Allow room creation", &self.allow_room_creation.to_string()),
+            (
+                "JWT secret",
+                match self.jwt_secret {
+                    Some(_) => "set",
+                    None => "not set",
+                },
+            ),
+            ("Trusted servers", {
+                let mut lst = vec![];
+                for server in &self.trusted_servers {
+                    lst.push(server.host());
+                }
+                &lst.join(", ")
+            }),
+            (
+                "TURN username",
+                if self.turn_username.is_empty() {
+                    "not set"
+                } else {
+                    &self.turn_username
+                },
+            ),
+            ("TURN password", {
+                if self.turn_password.is_empty() {
+                    "not set"
+                } else {
+                    "set"
+                }
+            }),
+            ("TURN secret", {
+                if self.turn_secret.is_empty() {
+                    "not set"
+                } else {
+                    "set"
+                }
+            }),
+            ("Turn TTL", &self.turn_ttl.to_string()),
+            ("Turn URIs", {
+                let mut lst = vec![];
+                for item in self.turn_uris.to_vec().into_iter().enumerate() {
+                    let (_, uri): (usize, String) = item;
+                    lst.push(uri);
+                }
+                &lst.join(", ")
+            }),
+        ];
+
+        let mut msg: String = "Active config values:\n\n".to_string();
+
+        for line in lines.into_iter().enumerate() {
+            msg += &format!("{}: {}\n", line.1 .0, line.1 .1);
+        }
+
+        write!(f, "{}", msg)
+    }
+}
+
 fn false_fn() -> bool {
     false
 }
@@ -90,6 +209,14 @@ fn true_fn() -> bool {
     true
 }
 
+fn default_address() -> IpAddr {
+    Ipv4Addr::LOCALHOST.into()
+}
+
+fn default_port() -> u16 {
+    8000
+}
+
 fn default_database_backend() -> String {
     "sqlite".to_owned()
 }
@@ -123,9 +250,14 @@ fn default_max_concurrent_requests() -> u16 {
 }
 
 fn default_log() -> String {
-    "info,state_res=warn,rocket=off,_=off,sled=off".to_owned()
+    "info,state_res=warn,_=off,sled=off".to_owned()
 }
 
 fn default_turn_ttl() -> u64 {
     60 * 60 * 24
 }
+
+// I know, it's a great name
+fn default_default_room_version() -> RoomVersionId {
+    RoomVersionId::V6
+}
diff --git a/src/config/proxy.rs b/src/config/proxy.rs
index fb0387c9..dcf304e9 100644
--- a/src/config/proxy.rs
+++ b/src/config/proxy.rs
@@ -10,13 +10,13 @@ use crate::Result;
 /// ```
 /// - Global proxy
 /// ```toml
-/// [proxy]
+/// [global.proxy]
 /// global = { url = "socks5h://localhost:9050" }
 /// ```
 /// - Proxy some domains
 /// ```toml
-/// [proxy]
-/// [[proxy.by_domain]]
+/// [global.proxy]
+/// [[global.proxy.by_domain]]
 /// url = "socks5h://localhost:9050"
 /// include = ["*.onion", "matrix.myspecial.onion"]
 /// exclude = ["*.myspecial.onion"]
diff --git a/src/database.rs b/src/database.rs
index 2b1671cd..a0937c29 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -13,17 +13,20 @@ pub mod transaction_ids;
 pub mod uiaa;
 pub mod users;
 
+use self::admin::create_admin_room;
 use crate::{utils, Config, Error, Result};
 use abstraction::DatabaseEngine;
 use directories::ProjectDirs;
+use futures_util::{stream::FuturesUnordered, StreamExt};
 use lru_cache::LruCache;
-use rocket::{
-    futures::{channel::mpsc, stream::FuturesUnordered, StreamExt},
-    outcome::{try_outcome, IntoOutcome},
-    request::{FromRequest, Request},
-    Shutdown, State,
+use ruma::{
+    events::{
+        push_rules::PushRulesEventContent, room::message::RoomMessageEventContent,
+        GlobalAccountDataEvent, GlobalAccountDataEventType,
+    },
+    push::Ruleset,
+    DeviceId, EventId, RoomId, UserId,
 };
-use ruma::{DeviceId, EventId, RoomId, UserId};
 use std::{
     collections::{BTreeMap, HashMap, HashSet},
     fs::{self, remove_dir_all},
@@ -33,11 +36,9 @@ use std::{
     path::Path,
     sync::{Arc, Mutex, RwLock},
 };
-use tokio::sync::{OwnedRwLockReadGuard, RwLock as TokioRwLock, Semaphore};
+use tokio::sync::{mpsc, OwnedRwLockReadGuard, RwLock as TokioRwLock, Semaphore};
 use tracing::{debug, error, info, warn};
 
-use self::admin::create_admin_room;
-
 pub struct Database {
     _db: Arc<dyn DatabaseEngine>,
     pub globals: globals::Globals,
@@ -151,8 +152,8 @@ impl Database {
             eprintln!("ERROR: Max request size is less than 1KB. Please increase it.");
         }
 
-        let (admin_sender, admin_receiver) = mpsc::unbounded();
-        let (sending_sender, sending_receiver) = mpsc::unbounded();
+        let (admin_sender, admin_receiver) = mpsc::unbounded_channel();
+        let (sending_sender, sending_receiver) = mpsc::unbounded_channel();
 
         let db = Arc::new(TokioRwLock::from(Self {
             _db: builder.clone(),
@@ -212,6 +213,8 @@ impl Database {
                 userroomid_leftstate: builder.open_tree("userroomid_leftstate")?,
                 roomuserid_leftcount: builder.open_tree("roomuserid_leftcount")?,
 
+                disabledroomids: builder.open_tree("disabledroomids")?,
+
                 lazyloadedids: builder.open_tree("lazyloadedids")?,
 
                 userroomid_notificationcount: builder.open_tree("userroomid_notificationcount")?,
@@ -263,6 +266,7 @@ impl Database {
                 stateinfo_cache: Mutex::new(LruCache::new(
                     (100.0 * config.conduit_cache_capacity_modifier) as usize,
                 )),
+                lasttimelinecount_cache: Mutex::new(HashMap::new()),
             },
             account_data: account_data::AccountData {
                 roomuserdataid_accountdata: builder.open_tree("roomuserdataid_accountdata")?,
@@ -752,6 +756,23 @@ impl Database {
         guard.rooms.edus.presenceid_presence.clear()?;
 
         guard.admin.start_handler(Arc::clone(&db), admin_receiver);
+
+        // Set emergency access for the conduit user
+        match set_emergency_access(&guard) {
+            Ok(pwd_set) => {
+                if pwd_set {
+                    warn!("The Conduit account emergency password is set! Please unset it as soon as you finish admin account recovery!");
+                    guard.admin.send_message(RoomMessageEventContent::text_plain("The Conduit account emergency password is set! Please unset it as soon as you finish admin account recovery!"));
+                }
+            }
+            Err(e) => {
+                error!(
+                    "Could not set the configured emergency password for the conduit user: {}",
+                    e
+                )
+            }
+        };
+
         guard
             .sending
             .start_handler(Arc::clone(&db), sending_receiver);
@@ -764,14 +785,9 @@ impl Database {
     }
 
     #[cfg(feature = "conduit_bin")]
-    pub async fn start_on_shutdown_tasks(db: Arc<TokioRwLock<Self>>, shutdown: Shutdown) {
-        tokio::spawn(async move {
-            shutdown.await;
-
-            info!(target: "shutdown-sync", "Received shutdown notification, notifying sync helpers...");
-
-            db.read().await.globals.rotate.fire();
-        });
+    pub async fn on_shutdown(db: Arc<TokioRwLock<Self>>) {
+        info!(target: "shutdown-sync", "Received shutdown notification, notifying sync helpers...");
+        db.read().await.globals.rotate.fire();
     }
 
     pub async fn watch(&self, user_id: &UserId, device_id: &DeviceId) {
@@ -938,6 +954,32 @@ impl Database {
     }
 }
 
+/// Sets the emergency password and push rules for the @conduit account in case emergency password is set
+fn set_emergency_access(db: &Database) -> Result<bool> {
+    let conduit_user = UserId::parse_with_server_name("conduit", db.globals.server_name())
+        .expect("@conduit:server_name is a valid UserId");
+
+    db.users
+        .set_password(&conduit_user, db.globals.emergency_password().as_deref())?;
+
+    let (ruleset, res) = match db.globals.emergency_password() {
+        Some(_) => (Ruleset::server_default(&conduit_user), Ok(true)),
+        None => (Ruleset::new(), Ok(false)),
+    };
+
+    db.account_data.update(
+        None,
+        &conduit_user,
+        GlobalAccountDataEventType::PushRules.to_string().into(),
+        &GlobalAccountDataEvent {
+            content: PushRulesEventContent { global: ruleset },
+        },
+        &db.globals,
+    )?;
+
+    res
+}
+
 pub struct DatabaseGuard(OwnedRwLockReadGuard<Database>);
 
 impl Deref for DatabaseGuard {
@@ -948,14 +990,23 @@ impl Deref for DatabaseGuard {
     }
 }
 
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for DatabaseGuard {
-    type Error = ();
+#[cfg(feature = "conduit_bin")]
+#[axum::async_trait]
+impl<B> axum::extract::FromRequest<B> for DatabaseGuard
+where
+    B: Send,
+{
+    type Rejection = axum::extract::rejection::ExtensionRejection;
 
-    async fn from_request(req: &'r Request<'_>) -> rocket::request::Outcome<Self, ()> {
-        let db = try_outcome!(req.guard::<&State<Arc<TokioRwLock<Database>>>>().await);
+    async fn from_request(
+        req: &mut axum::extract::RequestParts<B>,
+    ) -> Result<Self, Self::Rejection> {
+        use axum::extract::Extension;
 
-        Ok(DatabaseGuard(Arc::clone(db).read_owned().await)).or_forward(())
+        let Extension(db): Extension<Arc<TokioRwLock<Database>>> =
+            Extension::from_request(req).await?;
+
+        Ok(DatabaseGuard(db.read_owned().await))
     }
 }
 
diff --git a/src/database/abstraction/heed.rs b/src/database/abstraction/heed.rs
index 83dafc57..9cca0975 100644
--- a/src/database/abstraction/heed.rs
+++ b/src/database/abstraction/heed.rs
@@ -69,7 +69,6 @@ impl DatabaseEngine for Engine {
 }
 
 impl EngineTree {
-    #[tracing::instrument(skip(self, tree, from, backwards))]
     fn iter_from_thread(
         &self,
         tree: Arc<heed::UntypedDatabase>,
@@ -94,7 +93,6 @@ impl EngineTree {
     }
 }
 
-#[tracing::instrument(skip(tree, txn, from, backwards))]
 fn iter_from_thread_work(
     tree: Arc<heed::UntypedDatabase>,
     txn: &heed::RoTxn<'_>,
@@ -126,7 +124,6 @@ fn iter_from_thread_work(
 }
 
 impl Tree for EngineTree {
-    #[tracing::instrument(skip(self, key))]
     fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
         let txn = self.engine.env.read_txn().map_err(convert_error)?;
         Ok(self
@@ -136,7 +133,6 @@ impl Tree for EngineTree {
             .map(|s| s.to_vec()))
     }
 
-    #[tracing::instrument(skip(self, key, value))]
     fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
         let mut txn = self.engine.env.write_txn().map_err(convert_error)?;
         self.tree
@@ -147,7 +143,6 @@ impl Tree for EngineTree {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self, key))]
     fn remove(&self, key: &[u8]) -> Result<()> {
         let mut txn = self.engine.env.write_txn().map_err(convert_error)?;
         self.tree.delete(&mut txn, &key).map_err(convert_error)?;
@@ -155,12 +150,10 @@ impl Tree for EngineTree {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self))]
     fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + Send + 'a> {
         self.iter_from(&[], false)
     }
 
-    #[tracing::instrument(skip(self, from, backwards))]
     fn iter_from(
         &self,
         from: &[u8],
@@ -169,7 +162,6 @@ impl Tree for EngineTree {
         self.iter_from_thread(Arc::clone(&self.tree), from.to_vec(), backwards)
     }
 
-    #[tracing::instrument(skip(self, key))]
     fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
         let mut txn = self.engine.env.write_txn().map_err(convert_error)?;
 
@@ -186,7 +178,6 @@ impl Tree for EngineTree {
         Ok(new)
     }
 
-    #[tracing::instrument(skip(self, prefix))]
     fn scan_prefix<'a>(
         &'a self,
         prefix: Vec<u8>,
@@ -197,7 +188,6 @@ impl Tree for EngineTree {
         )
     }
 
-    #[tracing::instrument(skip(self, prefix))]
     fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
         self.watchers.watch(prefix)
     }
diff --git a/src/database/abstraction/persy.rs b/src/database/abstraction/persy.rs
index 628cf32b..e78e731d 100644
--- a/src/database/abstraction/persy.rs
+++ b/src/database/abstraction/persy.rs
@@ -62,7 +62,6 @@ impl PersyTree {
 }
 
 impl Tree for PersyTree {
-    #[tracing::instrument(skip(self, key))]
     fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
         let result = self
             .persy
@@ -72,14 +71,12 @@ impl Tree for PersyTree {
         Ok(result)
     }
 
-    #[tracing::instrument(skip(self, key, value))]
     fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
         self.insert_batch(&mut Some((key.to_owned(), value.to_owned())).into_iter())?;
         self.watchers.wake(key);
         Ok(())
     }
 
-    #[tracing::instrument(skip(self, iter))]
     fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
         let mut tx = self.begin()?;
         for (key, value) in iter {
@@ -93,7 +90,6 @@ impl Tree for PersyTree {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self, iter))]
     fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
         let mut tx = self.begin()?;
         for key in iter {
@@ -108,7 +104,6 @@ impl Tree for PersyTree {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self, key))]
     fn remove(&self, key: &[u8]) -> Result<()> {
         let mut tx = self.begin()?;
         tx.remove::<ByteVec, ByteVec>(&self.name, ByteVec::from(key), None)?;
@@ -116,7 +111,6 @@ impl Tree for PersyTree {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self))]
     fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
         let iter = self.persy.range::<ByteVec, ByteVec, _>(&self.name, ..);
         match iter {
@@ -132,7 +126,6 @@ impl Tree for PersyTree {
         }
     }
 
-    #[tracing::instrument(skip(self, from, backwards))]
     fn iter_from<'a>(
         &'a self,
         from: &[u8],
@@ -165,13 +158,11 @@ impl Tree for PersyTree {
         }
     }
 
-    #[tracing::instrument(skip(self, key))]
     fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
         self.increment_batch(&mut Some(key.to_owned()).into_iter())?;
         Ok(self.get(key)?.unwrap())
     }
 
-    #[tracing::instrument(skip(self, prefix))]
     fn scan_prefix<'a>(
         &'a self,
         prefix: Vec<u8>,
@@ -200,7 +191,6 @@ impl Tree for PersyTree {
         }
     }
 
-    #[tracing::instrument(skip(self, prefix))]
     fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
         self.watchers.watch(prefix)
     }
diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs
index d6157135..2cf9d5ee 100644
--- a/src/database/abstraction/rocksdb.rs
+++ b/src/database/abstraction/rocksdb.rs
@@ -1,6 +1,10 @@
 use super::{super::Config, watchers::Watchers, DatabaseEngine, Tree};
 use crate::{utils, Result};
-use std::{future::Future, pin::Pin, sync::Arc, sync::RwLock};
+use std::{
+    future::Future,
+    pin::Pin,
+    sync::{Arc, RwLock},
+};
 
 pub struct Engine {
     rocks: rocksdb::DBWithThreadMode<rocksdb::MultiThreaded>,
diff --git a/src/database/abstraction/sled.rs b/src/database/abstraction/sled.rs
index 35ba1b29..87defc57 100644
--- a/src/database/abstraction/sled.rs
+++ b/src/database/abstraction/sled.rs
@@ -39,7 +39,6 @@ impl Tree for SledEngineTree {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self, iter))]
     fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
         for (key, value) in iter {
             self.0.insert(key, value)?;
diff --git a/src/database/abstraction/sqlite.rs b/src/database/abstraction/sqlite.rs
index d4aab7dd..7cfa81af 100644
--- a/src/database/abstraction/sqlite.rs
+++ b/src/database/abstraction/sqlite.rs
@@ -19,7 +19,7 @@ thread_local! {
 
 struct PreparedStatementIterator<'a> {
     pub iterator: Box<dyn Iterator<Item = TupleOfBytes> + 'a>,
-    pub statement_ref: NonAliasingBox<rusqlite::Statement<'a>>,
+    pub _statement_ref: NonAliasingBox<rusqlite::Statement<'a>>,
 }
 
 impl Iterator for PreparedStatementIterator<'_> {
@@ -134,7 +134,6 @@ pub struct SqliteTable {
 type TupleOfBytes = (Vec<u8>, Vec<u8>);
 
 impl SqliteTable {
-    #[tracing::instrument(skip(self, guard, key))]
     fn get_with_guard(&self, guard: &Connection, key: &[u8]) -> Result<Option<Vec<u8>>> {
         //dbg!(&self.name);
         Ok(guard
@@ -143,7 +142,6 @@ impl SqliteTable {
             .optional()?)
     }
 
-    #[tracing::instrument(skip(self, guard, key, value))]
     fn insert_with_guard(&self, guard: &Connection, key: &[u8], value: &[u8]) -> Result<()> {
         //dbg!(&self.name);
         guard.execute(
@@ -186,18 +184,16 @@ impl SqliteTable {
 
         Box::new(PreparedStatementIterator {
             iterator,
-            statement_ref,
+            _statement_ref: statement_ref,
         })
     }
 }
 
 impl Tree for SqliteTable {
-    #[tracing::instrument(skip(self, key))]
     fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
         self.get_with_guard(self.engine.read_lock(), key)
     }
 
-    #[tracing::instrument(skip(self, key, value))]
     fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
         let guard = self.engine.write_lock();
         self.insert_with_guard(&guard, key, value)?;
@@ -206,7 +202,6 @@ impl Tree for SqliteTable {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self, iter))]
     fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
         let guard = self.engine.write_lock();
 
@@ -221,7 +216,6 @@ impl Tree for SqliteTable {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self, iter))]
     fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
         let guard = self.engine.write_lock();
 
@@ -239,7 +233,6 @@ impl Tree for SqliteTable {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self, key))]
     fn remove(&self, key: &[u8]) -> Result<()> {
         let guard = self.engine.write_lock();
 
@@ -251,14 +244,12 @@ impl Tree for SqliteTable {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self))]
     fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
         let guard = self.engine.read_lock_iterator();
 
         self.iter_with_guard(guard)
     }
 
-    #[tracing::instrument(skip(self, from, backwards))]
     fn iter_from<'a>(
         &'a self,
         from: &[u8],
@@ -292,7 +283,7 @@ impl Tree for SqliteTable {
             );
             Box::new(PreparedStatementIterator {
                 iterator,
-                statement_ref,
+                _statement_ref: statement_ref,
             })
         } else {
             let statement = Box::leak(Box::new(
@@ -318,12 +309,11 @@ impl Tree for SqliteTable {
 
             Box::new(PreparedStatementIterator {
                 iterator,
-                statement_ref,
+                _statement_ref: statement_ref,
             })
         }
     }
 
-    #[tracing::instrument(skip(self, key))]
     fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
         let guard = self.engine.write_lock();
 
@@ -337,7 +327,6 @@ impl Tree for SqliteTable {
         Ok(new)
     }
 
-    #[tracing::instrument(skip(self, prefix))]
     fn scan_prefix<'a>(&'a self, prefix: Vec<u8>) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
         Box::new(
             self.iter_from(&prefix, false)
@@ -345,12 +334,10 @@ impl Tree for SqliteTable {
         )
     }
 
-    #[tracing::instrument(skip(self, prefix))]
     fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
         self.watchers.watch(prefix)
     }
 
-    #[tracing::instrument(skip(self))]
     fn clear(&self) -> Result<()> {
         debug!("clear: running");
         self.engine
diff --git a/src/database/account_data.rs b/src/database/account_data.rs
index ec9d09e8..d85918f6 100644
--- a/src/database/account_data.rs
+++ b/src/database/account_data.rs
@@ -1,7 +1,7 @@
 use crate::{utils, Error, Result};
 use ruma::{
     api::client::error::ErrorKind,
-    events::{AnyEphemeralRoomEvent, EventType},
+    events::{AnyEphemeralRoomEvent, RoomAccountDataEventType},
     serde::Raw,
     RoomId, UserId,
 };
@@ -22,7 +22,7 @@ impl AccountData {
         &self,
         room_id: Option<&RoomId>,
         user_id: &UserId,
-        event_type: EventType,
+        event_type: RoomAccountDataEventType,
         data: &T,
         globals: &super::globals::Globals,
     ) -> Result<()> {
@@ -38,10 +38,10 @@ impl AccountData {
         let mut roomuserdataid = prefix.clone();
         roomuserdataid.extend_from_slice(&globals.next_count()?.to_be_bytes());
         roomuserdataid.push(0xff);
-        roomuserdataid.extend_from_slice(event_type.as_bytes());
+        roomuserdataid.extend_from_slice(event_type.to_string().as_bytes());
 
         let mut key = prefix;
-        key.extend_from_slice(event_type.as_bytes());
+        key.extend_from_slice(event_type.to_string().as_bytes());
 
         let json = serde_json::to_value(data).expect("all types here can be serialized"); // TODO: maybe add error handling
         if json.get("type").is_none() || json.get("content").is_none() {
@@ -75,7 +75,7 @@ impl AccountData {
         &self,
         room_id: Option<&RoomId>,
         user_id: &UserId,
-        kind: EventType,
+        kind: RoomAccountDataEventType,
     ) -> Result<Option<T>> {
         let mut key = room_id
             .map(|r| r.to_string())
@@ -85,7 +85,7 @@ impl AccountData {
         key.push(0xff);
         key.extend_from_slice(user_id.as_bytes());
         key.push(0xff);
-        key.extend_from_slice(kind.as_ref().as_bytes());
+        key.extend_from_slice(kind.to_string().as_bytes());
 
         self.roomusertype_roomuserdataid
             .get(&key)?
@@ -109,7 +109,7 @@ impl AccountData {
         room_id: Option<&RoomId>,
         user_id: &UserId,
         since: u64,
-    ) -> Result<HashMap<EventType, Raw<AnyEphemeralRoomEvent>>> {
+    ) -> Result<HashMap<RoomAccountDataEventType, Raw<AnyEphemeralRoomEvent>>> {
         let mut userdata = HashMap::new();
 
         let mut prefix = room_id
@@ -131,7 +131,7 @@ impl AccountData {
             .take_while(move |(k, _)| k.starts_with(&prefix))
             .map(|(k, v)| {
                 Ok::<_, Error>((
-                    EventType::try_from(
+                    RoomAccountDataEventType::try_from(
                         utils::string_from_bytes(k.rsplit(|&b| b == 0xff).next().ok_or_else(
                             || Error::bad_database("RoomUserData ID in db is invalid."),
                         )?)
diff --git a/src/database/admin.rs b/src/database/admin.rs
index 9bbfd4ea..edc76914 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -1,34 +1,42 @@
-use std::{collections::BTreeMap, convert::TryFrom, convert::TryInto, sync::Arc, time::Instant};
+use std::{
+    collections::BTreeMap,
+    convert::{TryFrom, TryInto},
+    sync::Arc,
+    time::Instant,
+};
 
 use crate::{
+    client_server::AUTO_GEN_PASSWORD_LENGTH,
     error::{Error, Result},
     pdu::PduBuilder,
-    server_server, Database, PduEvent,
+    server_server, utils,
+    utils::HtmlEscape,
+    Database, PduEvent,
 };
 use clap::Parser;
 use regex::Regex;
-use rocket::{
-    futures::{channel::mpsc, stream::StreamExt},
-    http::RawStr,
-};
 use ruma::{
-    events::room::{
-        canonical_alias::RoomCanonicalAliasEventContent,
-        create::RoomCreateEventContent,
-        guest_access::{GuestAccess, RoomGuestAccessEventContent},
-        history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
-        join_rules::{JoinRule, RoomJoinRulesEventContent},
-        member::{MembershipState, RoomMemberEventContent},
-        name::RoomNameEventContent,
-        power_levels::RoomPowerLevelsEventContent,
-        topic::RoomTopicEventContent,
+    events::{
+        room::{
+            canonical_alias::RoomCanonicalAliasEventContent,
+            create::RoomCreateEventContent,
+            guest_access::{GuestAccess, RoomGuestAccessEventContent},
+            history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
+            join_rules::{JoinRule, RoomJoinRulesEventContent},
+            member::{MembershipState, RoomMemberEventContent},
+            message::RoomMessageEventContent,
+            name::RoomNameEventContent,
+            power_levels::RoomPowerLevelsEventContent,
+            topic::RoomTopicEventContent,
+        },
+        RoomEventType,
     },
-    events::{room::message::RoomMessageEventContent, EventType},
-    identifiers::{EventId, RoomAliasId, RoomId, RoomName, RoomVersionId, ServerName, UserId},
+    EventId, RoomAliasId, RoomId, RoomName, RoomVersionId, ServerName, UserId,
 };
 use serde_json::value::to_raw_value;
-use tokio::sync::{MutexGuard, RwLock, RwLockReadGuard};
+use tokio::sync::{mpsc, MutexGuard, RwLock, RwLockReadGuard};
 
+#[derive(Debug)]
 pub enum AdminRoomEvent {
     ProcessMessage(String),
     SendMessage(RoomMessageEventContent),
@@ -74,7 +82,7 @@ impl Admin {
                     .rooms
                     .build_and_append_pdu(
                         PduBuilder {
-                            event_type: EventType::RoomMessage,
+                            event_type: RoomEventType::RoomMessage,
                             content: to_raw_value(&message)
                                 .expect("event is valid, we just created it"),
                             unsigned: None,
@@ -91,8 +99,14 @@ impl Admin {
 
             loop {
                 tokio::select! {
-                    Some(event) = receiver.next() => {
+                    Some(event) = receiver.recv() => {
                         let guard = db.read().await;
+
+                        let message_content = match event {
+                            AdminRoomEvent::SendMessage(content) => content,
+                            AdminRoomEvent::ProcessMessage(room_message) => process_admin_message(&*guard, room_message).await
+                        };
+
                         let mutex_state = Arc::clone(
                             guard.globals
                                 .roomid_mutex_state
@@ -101,18 +115,10 @@ impl Admin {
                                 .entry(conduit_room.clone())
                                 .or_default(),
                         );
+
                         let state_lock = mutex_state.lock().await;
 
-                        match event {
-                            AdminRoomEvent::SendMessage(content) => {
-                                send_message(content, guard, &state_lock);
-                            }
-                            AdminRoomEvent::ProcessMessage(room_message) => {
-                                let reply_message = process_admin_message(&*guard, room_message);
-
-                                send_message(reply_message, guard, &state_lock);
-                            }
-                        }
+                        send_message(message_content, guard, &state_lock);
 
                         drop(state_lock);
                     }
@@ -123,19 +129,19 @@ impl Admin {
 
     pub fn process_message(&self, room_message: String) {
         self.sender
-            .unbounded_send(AdminRoomEvent::ProcessMessage(room_message))
+            .send(AdminRoomEvent::ProcessMessage(room_message))
             .unwrap();
     }
 
     pub fn send_message(&self, message_content: RoomMessageEventContent) {
         self.sender
-            .unbounded_send(AdminRoomEvent::SendMessage(message_content))
+            .send(AdminRoomEvent::SendMessage(message_content))
             .unwrap();
     }
 }
 
 // Parse and process a message from the admin room
-fn process_admin_message(db: &Database, room_message: String) -> RoomMessageEventContent {
+async fn process_admin_message(db: &Database, room_message: String) -> RoomMessageEventContent {
     let mut lines = room_message.lines();
     let command_line = lines.next().expect("each string has at least one line");
     let body: Vec<_> = lines.collect();
@@ -153,7 +159,7 @@ fn process_admin_message(db: &Database, room_message: String) -> RoomMessageEven
         }
     };
 
-    match process_admin_command(db, admin_command, body) {
+    match process_admin_command(db, admin_command, body).await {
         Ok(reply_message) => reply_message,
         Err(error) => {
             let markdown_message = format!(
@@ -223,9 +229,48 @@ enum AdminCommand {
     /// List all the currently registered appservices
     ListAppservices,
 
+    /// List all rooms the server knows about
+    ListRooms,
+
     /// List users in the database
     ListLocalUsers,
 
+    /// List all rooms we are currently handling an incoming pdu from
+    IncomingFederation,
+
+    /// Deactivate a user
+    ///
+    /// User will not be removed from all rooms by default.
+    /// Use --leave-rooms to force the user to leave all rooms
+    DeactivateUser {
+        #[clap(short, long)]
+        leave_rooms: bool,
+        user_id: Box<UserId>,
+    },
+
+    #[clap(verbatim_doc_comment)]
+    /// Deactivate a list of users
+    ///
+    /// Recommended to use in conjunction with list-local-users.
+    ///
+    /// Users will not be removed from joined rooms by default.
+    /// Can be overridden with --leave-rooms flag.
+    /// Removing a mass amount of users from a room may cause a significant amount of leave events.
+    /// The time to leave rooms may depend significantly on joined rooms and servers.
+    ///
+    /// [commandbody]
+    /// # ```
+    /// # User list here
+    /// # ```
+    DeactivateAll {
+        #[clap(short, long)]
+        /// Remove users from their joined rooms
+        leave_rooms: bool,
+        #[clap(short, long)]
+        /// Also deactivate admin accounts
+        force: bool,
+    },
+
     /// Get the auth_chain of a PDU
     GetAuthChain {
         /// An event ID (the $ character followed by the base64 reference hash)
@@ -252,9 +297,31 @@ enum AdminCommand {
 
     /// Print database memory usage statistics
     DatabaseMemoryUsage,
+
+    /// Show configuration values
+    ShowConfig,
+
+    /// Reset user password
+    ResetPassword {
+        /// Username of the user for whom the password should be reset
+        username: String,
+    },
+
+    /// Create a new user
+    CreateUser {
+        /// Username of the new user
+        username: String,
+        /// Password of the new user, if unspecified one is generated
+        password: Option<String>,
+    },
+
+    /// Disables incoming federation handling for a room.
+    DisableRoom { room_id: Box<RoomId> },
+    /// Enables incoming federation handling for a room again.
+    EnableRoom { room_id: Box<RoomId> },
 }
 
-fn process_admin_command(
+async fn process_admin_command(
     db: &Database,
     command: AdminCommand,
     body: Vec<&str>,
@@ -312,6 +379,26 @@ fn process_admin_command(
                 RoomMessageEventContent::text_plain("Failed to get appservices.")
             }
         }
+        AdminCommand::ListRooms => {
+            let room_ids = db.rooms.iter_ids();
+            let output = format!(
+                "Rooms:\n{}",
+                room_ids
+                    .filter_map(|r| r.ok())
+                    .map(|id| id.to_string()
+                        + "\tMembers: "
+                        + &db
+                            .rooms
+                            .room_joined_count(&id)
+                            .ok()
+                            .flatten()
+                            .unwrap_or(0)
+                            .to_string())
+                    .collect::<Vec<_>>()
+                    .join("\n")
+            );
+            RoomMessageEventContent::text_plain(output)
+        }
         AdminCommand::ListLocalUsers => match db.users.list_local_users() {
             Ok(users) => {
                 let mut msg: String = format!("Found {} local user account(s):\n", users.len());
@@ -320,6 +407,22 @@ fn process_admin_command(
             }
             Err(e) => RoomMessageEventContent::text_plain(e.to_string()),
         },
+        AdminCommand::IncomingFederation => {
+            let map = db.globals.roomid_federationhandletime.read().unwrap();
+            let mut msg: String = format!("Handling {} incoming pdus:\n", map.len());
+
+            for (r, (e, i)) in map.iter() {
+                let elapsed = i.elapsed();
+                msg += &format!(
+                    "{} {}: {}m{}s\n",
+                    r,
+                    e,
+                    elapsed.as_secs() / 60,
+                    elapsed.as_secs() % 60
+                );
+            }
+            RoomMessageEventContent::text_plain(&msg)
+        }
         AdminCommand::GetAuthChain { event_id } => {
             let event_id = Arc::<EventId>::from(event_id);
             if let Some(event) = db.rooms.get_pdu_json(&event_id)? {
@@ -332,7 +435,9 @@ fn process_admin_command(
                     Error::bad_database("Invalid room id field in event in database")
                 })?;
                 let start = Instant::now();
-                let count = server_server::get_auth_chain(room_id, vec![event_id], db)?.count();
+                let count = server_server::get_auth_chain(room_id, vec![event_id], db)
+                    .await?
+                    .count();
                 let elapsed = start.elapsed();
                 RoomMessageEventContent::text_plain(format!(
                     "Loaded auth chain with length {} in {:?}",
@@ -347,24 +452,26 @@ fn process_admin_command(
                 let string = body[1..body.len() - 1].join("\n");
                 match serde_json::from_str(&string) {
                     Ok(value) => {
-                        let event_id = EventId::parse(format!(
-                            "${}",
-                            // Anything higher than version3 behaves the same
-                            ruma::signatures::reference_hash(&value, &RoomVersionId::V6)
-                                .expect("ruma can calculate reference hashes")
-                        ))
-                        .expect("ruma's reference hashes are valid event ids");
+                        match ruma::signatures::reference_hash(&value, &RoomVersionId::V6) {
+                            Ok(hash) => {
+                                let event_id = EventId::parse(format!("${}", hash));
 
-                        match serde_json::from_value::<PduEvent>(
-                            serde_json::to_value(value).expect("value is json"),
-                        ) {
-                            Ok(pdu) => RoomMessageEventContent::text_plain(format!(
-                                "EventId: {:?}\n{:#?}",
-                                event_id, pdu
-                            )),
+                                match serde_json::from_value::<PduEvent>(
+                                    serde_json::to_value(value).expect("value is json"),
+                                ) {
+                                    Ok(pdu) => RoomMessageEventContent::text_plain(format!(
+                                        "EventId: {:?}\n{:#?}",
+                                        event_id, pdu
+                                    )),
+                                    Err(e) => RoomMessageEventContent::text_plain(format!(
+                                        "EventId: {:?}\nCould not parse event: {}",
+                                        event_id, e
+                                    )),
+                                }
+                            }
                             Err(e) => RoomMessageEventContent::text_plain(format!(
-                                "EventId: {:?}\nCould not parse event: {}",
-                                event_id, e
+                                "Could not parse PDU JSON: {:?}",
+                                e
                             )),
                         }
                     }
@@ -405,7 +512,7 @@ fn process_admin_command(
                             } else {
                                 "PDU was accepted"
                             },
-                            RawStr::new(&json_text).html_escape()
+                            HtmlEscape(&json_text)
                         ),
                     )
                 }
@@ -419,6 +526,211 @@ fn process_admin_command(
                 e
             )),
         },
+        AdminCommand::ShowConfig => {
+            // Construct and send the response
+            RoomMessageEventContent::text_plain(format!("{}", db.globals.config))
+        }
+        AdminCommand::ResetPassword { username } => {
+            let user_id = match UserId::parse_with_server_name(
+                username.as_str().to_lowercase(),
+                db.globals.server_name(),
+            ) {
+                Ok(id) => id,
+                Err(e) => {
+                    return Ok(RoomMessageEventContent::text_plain(format!(
+                        "The supplied username is not a valid username: {}",
+                        e
+                    )))
+                }
+            };
+
+            // Check if the specified user is valid
+            if !db.users.exists(&user_id)?
+                || db.users.is_deactivated(&user_id)?
+                || user_id
+                    == UserId::parse_with_server_name("conduit", db.globals.server_name())
+                        .expect("conduit user exists")
+            {
+                return Ok(RoomMessageEventContent::text_plain(
+                    "The specified user does not exist or is deactivated!",
+                ));
+            }
+
+            let new_password = utils::random_string(AUTO_GEN_PASSWORD_LENGTH);
+
+            match db.users.set_password(&user_id, Some(new_password.as_str())) {
+                Ok(()) => RoomMessageEventContent::text_plain(format!(
+                    "Successfully reset the password for user {}: {}",
+                    user_id, new_password
+                )),
+                Err(e) => RoomMessageEventContent::text_plain(format!(
+                    "Couldn't reset the password for user {}: {}",
+                    user_id, e
+                )),
+            }
+        }
+        AdminCommand::CreateUser { username, password } => {
+            let password = password.unwrap_or(utils::random_string(AUTO_GEN_PASSWORD_LENGTH));
+            // Validate user id
+            let user_id = match UserId::parse_with_server_name(
+                username.as_str().to_lowercase(),
+                db.globals.server_name(),
+            ) {
+                Ok(id) => id,
+                Err(e) => {
+                    return Ok(RoomMessageEventContent::text_plain(format!(
+                        "The supplied username is not a valid username: {}",
+                        e
+                    )))
+                }
+            };
+            if user_id.is_historical() {
+                return Ok(RoomMessageEventContent::text_plain(format!(
+                    "userid {user_id} is not allowed due to historical"
+                )));
+            }
+            if db.users.exists(&user_id)? {
+                return Ok(RoomMessageEventContent::text_plain(format!(
+                    "userid {user_id} already exists"
+                )));
+            }
+            // Create user
+            db.users.create(&user_id, Some(password.as_str()))?;
+
+            // Default to pretty displayname
+            let mut displayname = user_id.localpart().to_owned();
+
+            // If enabled append lightning bolt to display name (default true)
+            if db.globals.enable_lightning_bolt() {
+                displayname.push_str(" ⚡️");
+            }
+
+            db.users
+                .set_displayname(&user_id, Some(displayname.clone()))?;
+
+            // Initial account data
+            db.account_data.update(
+                None,
+                &user_id,
+                ruma::events::GlobalAccountDataEventType::PushRules
+                    .to_string()
+                    .into(),
+                &ruma::events::push_rules::PushRulesEvent {
+                    content: ruma::events::push_rules::PushRulesEventContent {
+                        global: ruma::push::Ruleset::server_default(&user_id),
+                    },
+                },
+                &db.globals,
+            )?;
+
+            // we dont add a device since we're not the user, just the creator
+
+            db.flush()?;
+
+            // Inhibit login does not work for guests
+            RoomMessageEventContent::text_plain(format!(
+                "Created user with user_id: {user_id} and password: {password}"
+            ))
+        }
+        AdminCommand::DisableRoom { room_id } => {
+            db.rooms.disabledroomids.insert(room_id.as_bytes(), &[])?;
+            RoomMessageEventContent::text_plain("Room disabled.")
+        }
+        AdminCommand::EnableRoom { room_id } => {
+            db.rooms.disabledroomids.remove(room_id.as_bytes())?;
+            RoomMessageEventContent::text_plain("Room enabled.")
+        }
+        AdminCommand::DeactivateUser {
+            leave_rooms,
+            user_id,
+        } => {
+            let user_id = Arc::<UserId>::from(user_id);
+            if db.users.exists(&user_id)? {
+                RoomMessageEventContent::text_plain(format!(
+                    "Making {} leave all rooms before deactivation...",
+                    user_id
+                ));
+
+                db.users.deactivate_account(&user_id)?;
+
+                if leave_rooms {
+                    db.rooms.leave_all_rooms(&user_id, &db).await?;
+                }
+
+                RoomMessageEventContent::text_plain(format!(
+                    "User {} has been deactivated",
+                    user_id
+                ))
+            } else {
+                RoomMessageEventContent::text_plain(format!(
+                    "User {} doesn't exist on this server",
+                    user_id
+                ))
+            }
+        }
+        AdminCommand::DeactivateAll { leave_rooms, force } => {
+            if body.len() > 2 && body[0].trim() == "```" && body.last().unwrap().trim() == "```" {
+                let usernames = body.clone().drain(1..body.len() - 1).collect::<Vec<_>>();
+
+                let mut user_ids: Vec<&UserId> = Vec::new();
+
+                for &username in &usernames {
+                    match <&UserId>::try_from(username) {
+                        Ok(user_id) => user_ids.push(user_id),
+                        Err(_) => {
+                            return Ok(RoomMessageEventContent::text_plain(format!(
+                                "{} is not a valid username",
+                                username
+                            )))
+                        }
+                    }
+                }
+
+                let mut deactivation_count = 0;
+                let mut admins = Vec::new();
+
+                if !force {
+                    user_ids.retain(|&user_id| {
+                        match db.users.is_admin(user_id, &db.rooms, &db.globals) {
+                            Ok(is_admin) => match is_admin {
+                                true => {
+                                    admins.push(user_id.localpart());
+                                    false
+                                }
+                                false => true,
+                            },
+                            Err(_) => false,
+                        }
+                    })
+                }
+
+                for &user_id in &user_ids {
+                    match db.users.deactivate_account(user_id) {
+                        Ok(_) => deactivation_count += 1,
+                        Err(_) => {}
+                    }
+                }
+
+                if leave_rooms {
+                    for &user_id in &user_ids {
+                        let _ = db.rooms.leave_all_rooms(user_id, &db).await;
+                    }
+                }
+
+                if admins.is_empty() {
+                    RoomMessageEventContent::text_plain(format!(
+                        "Deactivated {} accounts.",
+                        deactivation_count
+                    ))
+                } else {
+                    RoomMessageEventContent::text_plain(format!("Deactivated {} accounts.\nSkipped admin accounts: {:?}. Use --force to deactivate admin accounts", deactivation_count, admins.join(", ")))
+                }
+            } else {
+                RoomMessageEventContent::text_plain(
+                    "Expected code block in command body. Add --help for details.",
+                )
+            }
+        }
     };
 
     Ok(reply_message_content)
@@ -537,7 +849,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
     // 1. The room create event
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomCreate,
+            event_type: RoomEventType::RoomCreate,
             content: to_raw_value(&content).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some("".to_owned()),
@@ -552,7 +864,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
     // 2. Make conduit bot join
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&RoomMemberEventContent {
                 membership: MembershipState::Join,
                 displayname: None,
@@ -580,7 +892,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomPowerLevels,
+            event_type: RoomEventType::RoomPowerLevels,
             content: to_raw_value(&RoomPowerLevelsEventContent {
                 users,
                 ..Default::default()
@@ -599,7 +911,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
     // 4.1 Join Rules
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomJoinRules,
+            event_type: RoomEventType::RoomJoinRules,
             content: to_raw_value(&RoomJoinRulesEventContent::new(JoinRule::Invite))
                 .expect("event is valid, we just created it"),
             unsigned: None,
@@ -615,7 +927,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
     // 4.2 History Visibility
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomHistoryVisibility,
+            event_type: RoomEventType::RoomHistoryVisibility,
             content: to_raw_value(&RoomHistoryVisibilityEventContent::new(
                 HistoryVisibility::Shared,
             ))
@@ -633,7 +945,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
     // 4.3 Guest Access
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomGuestAccess,
+            event_type: RoomEventType::RoomGuestAccess,
             content: to_raw_value(&RoomGuestAccessEventContent::new(GuestAccess::Forbidden))
                 .expect("event is valid, we just created it"),
             unsigned: None,
@@ -651,7 +963,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
         .expect("Room name is valid");
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomName,
+            event_type: RoomEventType::RoomName,
             content: to_raw_value(&RoomNameEventContent::new(Some(room_name)))
                 .expect("event is valid, we just created it"),
             unsigned: None,
@@ -666,7 +978,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomTopic,
+            event_type: RoomEventType::RoomTopic,
             content: to_raw_value(&RoomTopicEventContent {
                 topic: format!("Manage {}", db.globals.server_name()),
             })
@@ -688,7 +1000,7 @@ pub(crate) async fn create_admin_room(db: &Database) -> Result<()> {
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomCanonicalAlias,
+            event_type: RoomEventType::RoomCanonicalAlias,
             content: to_raw_value(&RoomCanonicalAliasEventContent {
                 alias: Some(alias.clone()),
                 alt_aliases: Vec::new(),
@@ -742,7 +1054,7 @@ pub(crate) async fn make_user_admin(
     // Invite and join the real user
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&RoomMemberEventContent {
                 membership: MembershipState::Invite,
                 displayname: None,
@@ -765,7 +1077,7 @@ pub(crate) async fn make_user_admin(
     )?;
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMember,
+            event_type: RoomEventType::RoomMember,
             content: to_raw_value(&RoomMemberEventContent {
                 membership: MembershipState::Join,
                 displayname: Some(displayname),
@@ -794,7 +1106,7 @@ pub(crate) async fn make_user_admin(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomPowerLevels,
+            event_type: RoomEventType::RoomPowerLevels,
             content: to_raw_value(&RoomPowerLevelsEventContent {
                 users,
                 ..Default::default()
@@ -813,10 +1125,10 @@ pub(crate) async fn make_user_admin(
     // Send welcome message
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            event_type: EventType::RoomMessage,
+            event_type: RoomEventType::RoomMessage,
             content: to_raw_value(&RoomMessageEventContent::text_html(
-                    "## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:fachschaften.org`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`".to_owned(),
-                    "<h2>Thank you for trying out Conduit!</h2>\n<p>Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.</p>\n<p>Helpful links:</p>\n<blockquote>\n<p>Website: https://conduit.rs<br>Git and Documentation: https://gitlab.com/famedly/conduit<br>Report issues: https://gitlab.com/famedly/conduit/-/issues</p>\n</blockquote>\n<p>Here are some rooms you can join (by typing the command):</p>\n<p>Conduit room (Ask questions and get notified on updates):<br><code>/join #conduit:fachschaften.org</code></p>\n<p>Conduit lounge (Off-topic, only Conduit users are allowed to join)<br><code>/join #conduit-lounge:conduit.rs</code></p>\n".to_owned(),
+                    format!("## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nFor a list of available commands, send the following message in this room: `@conduit:{}: --help`\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:fachschaften.org`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`", db.globals.server_name()).to_owned(),
+                    format!("<h2>Thank you for trying out Conduit!</h2>\n<p>Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.</p>\n<p>Helpful links:</p>\n<blockquote>\n<p>Website: https://conduit.rs<br>Git and Documentation: https://gitlab.com/famedly/conduit<br>Report issues: https://gitlab.com/famedly/conduit/-/issues</p>\n</blockquote>\n<p>For a list of available commands, send the following message in this room: <code>@conduit:{}: --help</code></p>\n<p>Here are some rooms you can join (by typing the command):</p>\n<p>Conduit room (Ask questions and get notified on updates):<br><code>/join #conduit:fachschaften.org</code></p>\n<p>Conduit lounge (Off-topic, only Conduit users are allowed to join)<br><code>/join #conduit-lounge:conduit.rs</code></p>\n", db.globals.server_name()).to_owned(),
             ))
             .expect("event is valid, we just created it"),
             unsigned: None,
diff --git a/src/database/globals.rs b/src/database/globals.rs
index decd84c3..7d7b7fd6 100644
--- a/src/database/globals.rs
+++ b/src/database/globals.rs
@@ -1,10 +1,11 @@
-use crate::{database::Config, server_server::FedDest, utils, ConduitResult, Error, Result};
+use crate::{database::Config, server_server::FedDest, utils, Error, Result};
 use ruma::{
     api::{
-        client::r0::sync::sync_events,
+        client::sync::sync_events,
         federation::discovery::{ServerSigningKeys, VerifyKey},
     },
-    DeviceId, EventId, MilliSecondsSinceUnixEpoch, RoomId, ServerName, ServerSigningKeyId, UserId,
+    DeviceId, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, ServerName,
+    ServerSigningKeyId, UserId,
 };
 use std::{
     collections::{BTreeMap, HashMap},
@@ -27,20 +28,22 @@ type WellKnownMap = HashMap<Box<ServerName>, (FedDest, String)>;
 type TlsNameMap = HashMap<String, (Vec<IpAddr>, u16)>;
 type RateLimitState = (Instant, u32); // Time if last failed try, number of failed tries
 type SyncHandle = (
-    Option<String>,                                         // since
-    Receiver<Option<ConduitResult<sync_events::Response>>>, // rx
+    Option<String>,                                      // since
+    Receiver<Option<Result<sync_events::v3::Response>>>, // rx
 );
 
 pub struct Globals {
     pub actual_destination_cache: Arc<RwLock<WellKnownMap>>, // actual_destination, host
     pub tls_name_override: Arc<RwLock<TlsNameMap>>,
     pub(super) globals: Arc<dyn Tree>,
-    config: Config,
+    pub config: Config,
     keypair: Arc<ruma::signatures::Ed25519KeyPair>,
     dns_resolver: TokioAsyncResolver,
     jwt_decoding_key: Option<jsonwebtoken::DecodingKey<'static>>,
     federation_client: reqwest::Client,
     default_client: reqwest::Client,
+    pub stable_room_versions: Vec<RoomVersionId>,
+    pub unstable_room_versions: Vec<RoomVersionId>,
     pub(super) server_signingkeys: Arc<dyn Tree>,
     pub bad_event_ratelimiter: Arc<RwLock<HashMap<Box<EventId>, RateLimitState>>>,
     pub bad_signature_ratelimiter: Arc<RwLock<HashMap<Vec<String>, RateLimitState>>>,
@@ -49,6 +52,8 @@ pub struct Globals {
     pub roomid_mutex_insert: RwLock<HashMap<Box<RoomId>, Arc<Mutex<()>>>>,
     pub roomid_mutex_state: RwLock<HashMap<Box<RoomId>, Arc<TokioMutex<()>>>>,
     pub roomid_mutex_federation: RwLock<HashMap<Box<RoomId>, Arc<TokioMutex<()>>>>, // this lock will be held longer
+    pub roomid_federationhandletime: RwLock<HashMap<Box<RoomId>, (Box<EventId>, Instant)>>,
+    pub stateres_mutex: Arc<Mutex<()>>,
     pub rotate: RotationHandler,
 }
 
@@ -145,11 +150,25 @@ impl Globals {
             })
             .build()?;
 
-        let s = Self {
+        // Supported and stable room versions
+        let stable_room_versions = vec![
+            RoomVersionId::V6,
+            RoomVersionId::V7,
+            RoomVersionId::V8,
+            RoomVersionId::V9,
+        ];
+        // Experimental, partially supported room versions
+        let unstable_room_versions = vec![RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5];
+
+        let mut s = Self {
             globals,
             config,
             keypair: Arc::new(keypair),
-            dns_resolver: TokioAsyncResolver::tokio_from_system_conf().map_err(|_| {
+            dns_resolver: TokioAsyncResolver::tokio_from_system_conf().map_err(|e| {
+                error!(
+                    "Failed to set up trust dns resolver with system config: {}",
+                    e
+                );
                 Error::bad_config("Failed to set up trust dns resolver with system config.")
             })?,
             actual_destination_cache: Arc::new(RwLock::new(WellKnownMap::new())),
@@ -158,18 +177,30 @@ impl Globals {
             default_client,
             server_signingkeys,
             jwt_decoding_key,
+            stable_room_versions,
+            unstable_room_versions,
             bad_event_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
             bad_signature_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
             servername_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
             roomid_mutex_state: RwLock::new(HashMap::new()),
             roomid_mutex_insert: RwLock::new(HashMap::new()),
             roomid_mutex_federation: RwLock::new(HashMap::new()),
+            roomid_federationhandletime: RwLock::new(HashMap::new()),
+            stateres_mutex: Arc::new(Mutex::new(())),
             sync_receivers: RwLock::new(HashMap::new()),
             rotate: RotationHandler::new(),
         };
 
         fs::create_dir_all(s.get_media_folder())?;
 
+        if !s
+            .supported_room_versions()
+            .contains(&s.config.default_room_version)
+        {
+            error!("Room version in config isn't supported, falling back to Version 6");
+            s.config.default_room_version = RoomVersionId::V6;
+        };
+
         Ok(s)
     }
 
@@ -228,6 +259,18 @@ impl Globals {
         self.config.allow_room_creation
     }
 
+    pub fn allow_unstable_room_versions(&self) -> bool {
+        self.config.allow_unstable_room_versions
+    }
+
+    pub fn default_room_version(&self) -> RoomVersionId {
+        self.config.default_room_version.clone()
+    }
+
+    pub fn enable_lightning_bolt(&self) -> bool {
+        self.config.enable_lightning_bolt
+    }
+
     pub fn trusted_servers(&self) -> &[Box<ServerName>] {
         &self.config.trusted_servers
     }
@@ -260,6 +303,19 @@ impl Globals {
         &self.config.turn_secret
     }
 
+    pub fn emergency_password(&self) -> &Option<String> {
+        &self.config.emergency_password
+    }
+
+    pub fn supported_room_versions(&self) -> Vec<RoomVersionId> {
+        let mut room_versions: Vec<RoomVersionId> = vec![];
+        room_versions.extend(self.stable_room_versions.clone());
+        if self.allow_unstable_room_versions() {
+            room_versions.extend(self.unstable_room_versions.clone());
+        };
+        room_versions
+    }
+
     /// TODO: the key valid until timestamp is only honored in room version > 4
     /// Remove the outdated keys and insert the new ones.
     ///
diff --git a/src/database/key_backups.rs b/src/database/key_backups.rs
index 2eefe481..10443f6b 100644
--- a/src/database/key_backups.rs
+++ b/src/database/key_backups.rs
@@ -1,8 +1,8 @@
 use crate::{utils, Error, Result};
 use ruma::{
     api::client::{
+        backup::{BackupAlgorithm, KeyBackupData, RoomKeyBackup},
         error::ErrorKind,
-        r0::backup::{BackupAlgorithm, KeyBackupData, RoomKeyBackup},
     },
     serde::Raw,
     RoomId, UserId,
diff --git a/src/database/pusher.rs b/src/database/pusher.rs
index e73ab061..6b906c24 100644
--- a/src/database/pusher.rs
+++ b/src/database/pusher.rs
@@ -2,16 +2,16 @@ use crate::{Database, Error, PduEvent, Result};
 use bytes::BytesMut;
 use ruma::{
     api::{
-        client::r0::push::{get_pushers, set_pusher, PusherKind},
+        client::push::{get_pushers, set_pusher, PusherKind},
         push_gateway::send_event_notification::{
             self,
             v1::{Device, Notification, NotificationCounts, NotificationPriority},
         },
-        IncomingResponse, OutgoingRequest, SendAccessToken,
+        IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken,
     },
     events::{
         room::{name::RoomNameEventContent, power_levels::RoomPowerLevelsEventContent},
-        AnySyncRoomEvent, EventType,
+        AnySyncRoomEvent, RoomEventType, StateEventType,
     },
     push::{Action, PushConditionRoomCtx, PushFormat, Ruleset, Tweak},
     serde::Raw,
@@ -30,7 +30,7 @@ pub struct PushData {
 
 impl PushData {
     #[tracing::instrument(skip(self, sender, pusher))]
-    pub fn set_pusher(&self, sender: &UserId, pusher: set_pusher::Pusher) -> Result<()> {
+    pub fn set_pusher(&self, sender: &UserId, pusher: set_pusher::v3::Pusher) -> Result<()> {
         let mut key = sender.as_bytes().to_vec();
         key.push(0xff);
         key.extend_from_slice(pusher.pushkey.as_bytes());
@@ -53,7 +53,7 @@ impl PushData {
     }
 
     #[tracing::instrument(skip(self, senderkey))]
-    pub fn get_pusher(&self, senderkey: &[u8]) -> Result<Option<get_pushers::Pusher>> {
+    pub fn get_pusher(&self, senderkey: &[u8]) -> Result<Option<get_pushers::v3::Pusher>> {
         self.senderkey_pusher
             .get(senderkey)?
             .map(|push| {
@@ -64,7 +64,7 @@ impl PushData {
     }
 
     #[tracing::instrument(skip(self, sender))]
-    pub fn get_pushers(&self, sender: &UserId) -> Result<Vec<get_pushers::Pusher>> {
+    pub fn get_pushers(&self, sender: &UserId) -> Result<Vec<get_pushers::v3::Pusher>> {
         let mut prefix = sender.as_bytes().to_vec();
         prefix.push(0xff);
 
@@ -101,7 +101,11 @@ where
     let destination = destination.replace("/_matrix/push/v1/notify", "");
 
     let http_request = request
-        .try_into_http_request::<BytesMut>(&destination, SendAccessToken::IfRequired(""))
+        .try_into_http_request::<BytesMut>(
+            &destination,
+            SendAccessToken::IfRequired(""),
+            &[MatrixVersion::V1_0],
+        )
         .map_err(|e| {
             warn!("Failed to find destination {}: {}", destination, e);
             Error::BadServerResponse("Invalid destination")
@@ -167,7 +171,7 @@ where
 pub async fn send_push_notice(
     user: &UserId,
     unread: UInt,
-    pusher: &get_pushers::Pusher,
+    pusher: &get_pushers::v3::Pusher,
     ruleset: Ruleset,
     pdu: &PduEvent,
     db: &Database,
@@ -177,7 +181,7 @@ pub async fn send_push_notice(
 
     let power_levels: RoomPowerLevelsEventContent = db
         .rooms
-        .room_state_get(&pdu.room_id, &EventType::RoomPowerLevels, "")?
+        .room_state_get(&pdu.room_id, &StateEventType::RoomPowerLevels, "")?
         .map(|ev| {
             serde_json::from_str(ev.content.get())
                 .map_err(|_| Error::bad_database("invalid m.room.power_levels event"))
@@ -247,7 +251,7 @@ pub fn get_actions<'a>(
 #[tracing::instrument(skip(unread, pusher, tweaks, event, db))]
 async fn send_notice(
     unread: UInt,
-    pusher: &get_pushers::Pusher,
+    pusher: &get_pushers::v3::Pusher,
     tweaks: Vec<Tweak>,
     event: &PduEvent,
     db: &Database,
@@ -289,7 +293,7 @@ async fn send_notice(
     // TODO: missed calls
     notifi.counts = NotificationCounts::new(unread, uint!(0));
 
-    if event.kind == EventType::RoomEncrypted
+    if event.kind == RoomEventType::RoomEncrypted
         || tweaks
             .iter()
             .any(|t| matches!(t, Tweak::Highlight(true) | Tweak::Sound(_)))
@@ -310,7 +314,7 @@ async fn send_notice(
         let content = serde_json::value::to_raw_value(&event.content).ok();
         notifi.content = content.as_deref();
 
-        if event.kind == EventType::RoomMember {
+        if event.kind == RoomEventType::RoomMember {
             notifi.user_is_target = event.state_key.as_deref() == Some(event.sender.as_str());
         }
 
@@ -319,7 +323,7 @@ async fn send_notice(
 
         let room_name = if let Some(room_name_pdu) =
             db.rooms
-                .room_state_get(&event.room_id, &EventType::RoomName, "")?
+                .room_state_get(&event.room_id, &StateEventType::RoomName, "")?
         {
             serde_json::from_str::<RoomNameEventContent>(room_name_pdu.content.get())
                 .map_err(|_| Error::bad_database("Invalid room name event in database."))?
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 0abd2e79..4ad815e3 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -21,7 +21,8 @@ use ruma::{
             power_levels::RoomPowerLevelsEventContent,
         },
         tag::TagEvent,
-        AnyStrippedStateEvent, AnySyncStateEvent, EventType,
+        AnyStrippedStateEvent, AnySyncStateEvent, GlobalAccountDataEventType,
+        RoomAccountDataEventType, RoomEventType, StateEventType,
     },
     push::{Action, Ruleset, Tweak},
     serde::{CanonicalJsonObject, CanonicalJsonValue, Raw},
@@ -32,7 +33,7 @@ use serde::Deserialize;
 use serde_json::value::to_raw_value;
 use std::{
     borrow::Cow,
-    collections::{BTreeMap, HashMap, HashSet},
+    collections::{hash_map, BTreeMap, HashMap, HashSet},
     fmt::Debug,
     iter,
     mem::size_of,
@@ -75,6 +76,8 @@ pub struct Rooms {
     pub(super) userroomid_leftstate: Arc<dyn Tree>,
     pub(super) roomuserid_leftcount: Arc<dyn Tree>,
 
+    pub(super) disabledroomids: Arc<dyn Tree>, // Rooms where incoming federation handling is disabled
+
     pub(super) lazyloadedids: Arc<dyn Tree>, // LazyLoadedIds = UserId + DeviceId + RoomId + LazyLoadedUserId
 
     pub(super) userroomid_notificationcount: Arc<dyn Tree>, // NotifyCount = u64
@@ -111,8 +114,8 @@ pub struct Rooms {
     pub(super) shorteventid_cache: Mutex<LruCache<u64, Arc<EventId>>>,
     pub(super) auth_chain_cache: Mutex<LruCache<Vec<u64>, Arc<HashSet<u64>>>>,
     pub(super) eventidshort_cache: Mutex<LruCache<Box<EventId>, u64>>,
-    pub(super) statekeyshort_cache: Mutex<LruCache<(EventType, String), u64>>,
-    pub(super) shortstatekey_cache: Mutex<LruCache<u64, (EventType, String)>>,
+    pub(super) statekeyshort_cache: Mutex<LruCache<(StateEventType, String), u64>>,
+    pub(super) shortstatekey_cache: Mutex<LruCache<u64, (StateEventType, String)>>,
     pub(super) our_real_users_cache: RwLock<HashMap<Box<RoomId>, Arc<HashSet<Box<UserId>>>>>,
     pub(super) appservice_in_room_cache: RwLock<HashMap<Box<RoomId>, HashMap<String, bool>>>,
     pub(super) lazy_load_waiting:
@@ -128,54 +131,74 @@ pub struct Rooms {
             )>,
         >,
     >,
+    pub(super) lasttimelinecount_cache: Mutex<HashMap<Box<RoomId>, u64>>,
 }
 
 impl Rooms {
+    /// Returns true if a given room version is supported
+    #[tracing::instrument(skip(self, db))]
+    pub fn is_supported_version(&self, db: &Database, room_version: &RoomVersionId) -> bool {
+        db.globals.supported_room_versions().contains(room_version)
+    }
+
     /// Builds a StateMap by iterating over all keys that start
     /// with state_hash, this gives the full state for the given state_hash.
     #[tracing::instrument(skip(self))]
-    pub fn state_full_ids(&self, shortstatehash: u64) -> Result<BTreeMap<u64, Arc<EventId>>> {
+    pub async fn state_full_ids(&self, shortstatehash: u64) -> Result<BTreeMap<u64, Arc<EventId>>> {
         let full_state = self
             .load_shortstatehash_info(shortstatehash)?
             .pop()
             .expect("there is always one layer")
             .1;
-        full_state
-            .into_iter()
-            .map(|compressed| self.parse_compressed_state_event(compressed))
-            .collect()
+        let mut result = BTreeMap::new();
+        let mut i = 0;
+        for compressed in full_state.into_iter() {
+            let parsed = self.parse_compressed_state_event(compressed)?;
+            result.insert(parsed.0, parsed.1);
+
+            i += 1;
+            if i % 100 == 0 {
+                tokio::task::yield_now().await;
+            }
+        }
+        Ok(result)
     }
 
     #[tracing::instrument(skip(self))]
-    pub fn state_full(
+    pub async fn state_full(
         &self,
         shortstatehash: u64,
-    ) -> Result<HashMap<(EventType, String), Arc<PduEvent>>> {
+    ) -> Result<HashMap<(StateEventType, String), Arc<PduEvent>>> {
         let full_state = self
             .load_shortstatehash_info(shortstatehash)?
             .pop()
             .expect("there is always one layer")
             .1;
-        Ok(full_state
-            .into_iter()
-            .map(|compressed| self.parse_compressed_state_event(compressed))
-            .filter_map(|r| r.ok())
-            .map(|(_, eventid)| self.get_pdu(&eventid))
-            .filter_map(|r| r.ok().flatten())
-            .map(|pdu| {
-                Ok::<_, Error>((
+
+        let mut result = HashMap::new();
+        let mut i = 0;
+        for compressed in full_state {
+            let (_, eventid) = self.parse_compressed_state_event(compressed)?;
+            if let Some(pdu) = self.get_pdu(&eventid)? {
+                result.insert(
                     (
-                        pdu.kind.clone(),
+                        pdu.kind.to_string().into(),
                         pdu.state_key
                             .as_ref()
                             .ok_or_else(|| Error::bad_database("State event has no state key."))?
                             .clone(),
                     ),
                     pdu,
-                ))
-            })
-            .filter_map(|r| r.ok())
-            .collect())
+                );
+            }
+
+            i += 1;
+            if i % 100 == 0 {
+                tokio::task::yield_now().await;
+            }
+        }
+
+        Ok(result)
     }
 
     /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
@@ -183,7 +206,7 @@ impl Rooms {
     pub fn state_get_id(
         &self,
         shortstatehash: u64,
-        event_type: &EventType,
+        event_type: &StateEventType,
         state_key: &str,
     ) -> Result<Option<Arc<EventId>>> {
         let shortstatekey = match self.get_shortstatekey(event_type, state_key)? {
@@ -210,7 +233,7 @@ impl Rooms {
     pub fn state_get(
         &self,
         shortstatehash: u64,
-        event_type: &EventType,
+        event_type: &StateEventType,
         state_key: &str,
     ) -> Result<Option<Arc<PduEvent>>> {
         self.state_get_id(shortstatehash, event_type, state_key)?
@@ -218,7 +241,6 @@ impl Rooms {
     }
 
     /// Returns the state hash for this pdu.
-    #[tracing::instrument(skip(self))]
     pub fn pdu_shortstatehash(&self, event_id: &EventId) -> Result<Option<u64>> {
         self.eventid_shorteventid
             .get(event_id.as_bytes())?
@@ -253,7 +275,7 @@ impl Rooms {
     pub fn get_auth_events(
         &self,
         room_id: &RoomId,
-        kind: &EventType,
+        kind: &RoomEventType,
         sender: &UserId,
         state_key: Option<&str>,
         content: &serde_json::value::RawValue,
@@ -271,7 +293,7 @@ impl Rooms {
         let mut sauthevents = auth_events
             .into_iter()
             .filter_map(|(event_type, state_key)| {
-                self.get_shortstatekey(&event_type, &state_key)
+                self.get_shortstatekey(&event_type.to_string().into(), &state_key)
                     .ok()
                     .flatten()
                     .map(|s| (s, (event_type, state_key)))
@@ -521,7 +543,6 @@ impl Rooms {
         }
     }
 
-    #[tracing::instrument(skip(self, globals))]
     pub fn compress_state_event(
         &self,
         shortstatekey: u64,
@@ -538,7 +559,6 @@ impl Rooms {
     }
 
     /// Returns shortstatekey, event id
-    #[tracing::instrument(skip(self, compressed_event))]
     pub fn parse_compressed_state_event(
         &self,
         compressed_event: CompressedStateEvent,
@@ -697,7 +717,6 @@ impl Rooms {
     }
 
     /// Returns (shortstatehash, already_existed)
-    #[tracing::instrument(skip(self, globals))]
     fn get_or_create_shortstatehash(
         &self,
         state_hash: &StateHashId,
@@ -718,7 +737,6 @@ impl Rooms {
         })
     }
 
-    #[tracing::instrument(skip(self, globals))]
     pub fn get_or_create_shorteventid(
         &self,
         event_id: &EventId,
@@ -749,7 +767,6 @@ impl Rooms {
         Ok(short)
     }
 
-    #[tracing::instrument(skip(self))]
     pub fn get_shortroomid(&self, room_id: &RoomId) -> Result<Option<u64>> {
         self.roomid_shortroomid
             .get(room_id.as_bytes())?
@@ -760,10 +777,9 @@ impl Rooms {
             .transpose()
     }
 
-    #[tracing::instrument(skip(self))]
     pub fn get_shortstatekey(
         &self,
-        event_type: &EventType,
+        event_type: &StateEventType,
         state_key: &str,
     ) -> Result<Option<u64>> {
         if let Some(short) = self
@@ -775,7 +791,7 @@ impl Rooms {
             return Ok(Some(*short));
         }
 
-        let mut statekey = event_type.as_ref().as_bytes().to_vec();
+        let mut statekey = event_type.to_string().as_bytes().to_vec();
         statekey.push(0xff);
         statekey.extend_from_slice(state_key.as_bytes());
 
@@ -798,7 +814,6 @@ impl Rooms {
         Ok(short)
     }
 
-    #[tracing::instrument(skip(self, globals))]
     pub fn get_or_create_shortroomid(
         &self,
         room_id: &RoomId,
@@ -816,10 +831,9 @@ impl Rooms {
         })
     }
 
-    #[tracing::instrument(skip(self, globals))]
     pub fn get_or_create_shortstatekey(
         &self,
-        event_type: &EventType,
+        event_type: &StateEventType,
         state_key: &str,
         globals: &super::globals::Globals,
     ) -> Result<u64> {
@@ -832,7 +846,7 @@ impl Rooms {
             return Ok(*short);
         }
 
-        let mut statekey = event_type.as_ref().as_bytes().to_vec();
+        let mut statekey = event_type.to_string().as_bytes().to_vec();
         statekey.push(0xff);
         statekey.extend_from_slice(state_key.as_bytes());
 
@@ -857,7 +871,6 @@ impl Rooms {
         Ok(short)
     }
 
-    #[tracing::instrument(skip(self))]
     pub fn get_eventid_from_short(&self, shorteventid: u64) -> Result<Arc<EventId>> {
         if let Some(id) = self
             .shorteventid_cache
@@ -886,8 +899,7 @@ impl Rooms {
         Ok(event_id)
     }
 
-    #[tracing::instrument(skip(self))]
-    pub fn get_statekey_from_short(&self, shortstatekey: u64) -> Result<(EventType, String)> {
+    pub fn get_statekey_from_short(&self, shortstatekey: u64) -> Result<(StateEventType, String)> {
         if let Some(id) = self
             .shortstatekey_cache
             .lock()
@@ -909,7 +921,7 @@ impl Rooms {
             .ok_or_else(|| Error::bad_database("Invalid statekey in shortstatekey_statekey."))?;
 
         let event_type =
-            EventType::try_from(utils::string_from_bytes(eventtype_bytes).map_err(|_| {
+            StateEventType::try_from(utils::string_from_bytes(eventtype_bytes).map_err(|_| {
                 Error::bad_database("Event type in shortstatekey_statekey is invalid unicode.")
             })?)
             .map_err(|_| Error::bad_database("Event type in shortstatekey_statekey is invalid."))?;
@@ -930,12 +942,12 @@ impl Rooms {
 
     /// Returns the full room state.
     #[tracing::instrument(skip(self))]
-    pub fn room_state_full(
+    pub async fn room_state_full(
         &self,
         room_id: &RoomId,
-    ) -> Result<HashMap<(EventType, String), Arc<PduEvent>>> {
+    ) -> Result<HashMap<(StateEventType, String), Arc<PduEvent>>> {
         if let Some(current_shortstatehash) = self.current_shortstatehash(room_id)? {
-            self.state_full(current_shortstatehash)
+            self.state_full(current_shortstatehash).await
         } else {
             Ok(HashMap::new())
         }
@@ -946,7 +958,7 @@ impl Rooms {
     pub fn room_state_get_id(
         &self,
         room_id: &RoomId,
-        event_type: &EventType,
+        event_type: &StateEventType,
         state_key: &str,
     ) -> Result<Option<Arc<EventId>>> {
         if let Some(current_shortstatehash) = self.current_shortstatehash(room_id)? {
@@ -961,7 +973,7 @@ impl Rooms {
     pub fn room_state_get(
         &self,
         room_id: &RoomId,
-        event_type: &EventType,
+        event_type: &StateEventType,
         state_key: &str,
     ) -> Result<Option<Arc<PduEvent>>> {
         if let Some(current_shortstatehash) = self.current_shortstatehash(room_id)? {
@@ -972,14 +984,12 @@ impl Rooms {
     }
 
     /// Returns the `count` of this pdu's id.
-    #[tracing::instrument(skip(self))]
     pub fn pdu_count(&self, pdu_id: &[u8]) -> Result<u64> {
         utils::u64_from_bytes(&pdu_id[pdu_id.len() - size_of::<u64>()..])
             .map_err(|_| Error::bad_database("PDU has invalid count bytes."))
     }
 
     /// Returns the `count` of this pdu's id.
-    #[tracing::instrument(skip(self))]
     pub fn get_pdu_count(&self, event_id: &EventId) -> Result<Option<u64>> {
         self.eventid_pduid
             .get(event_id.as_bytes())?
@@ -1008,7 +1018,6 @@ impl Rooms {
     }
 
     /// Returns the json of a pdu.
-    #[tracing::instrument(skip(self))]
     pub fn get_pdu_json(&self, event_id: &EventId) -> Result<Option<CanonicalJsonObject>> {
         self.eventid_pduid
             .get(event_id.as_bytes())?
@@ -1027,7 +1036,6 @@ impl Rooms {
     }
 
     /// Returns the json of a pdu.
-    #[tracing::instrument(skip(self))]
     pub fn get_outlier_pdu_json(&self, event_id: &EventId) -> Result<Option<CanonicalJsonObject>> {
         self.eventid_outlierpdu
             .get(event_id.as_bytes())?
@@ -1038,7 +1046,6 @@ impl Rooms {
     }
 
     /// Returns the json of a pdu.
-    #[tracing::instrument(skip(self))]
     pub fn get_non_outlier_pdu_json(
         &self,
         event_id: &EventId,
@@ -1058,7 +1065,6 @@ impl Rooms {
     }
 
     /// Returns the pdu's id.
-    #[tracing::instrument(skip(self))]
     pub fn get_pdu_id(&self, event_id: &EventId) -> Result<Option<Vec<u8>>> {
         self.eventid_pduid.get(event_id.as_bytes())
     }
@@ -1066,7 +1072,6 @@ impl Rooms {
     /// Returns the pdu.
     ///
     /// Checks the `eventid_outlierpdu` Tree if not found in the timeline.
-    #[tracing::instrument(skip(self))]
     pub fn get_non_outlier_pdu(&self, event_id: &EventId) -> Result<Option<PduEvent>> {
         self.eventid_pduid
             .get(event_id.as_bytes())?
@@ -1085,7 +1090,6 @@ impl Rooms {
     /// Returns the pdu.
     ///
     /// Checks the `eventid_outlierpdu` Tree if not found in the timeline.
-    #[tracing::instrument(skip(self))]
     pub fn get_pdu(&self, event_id: &EventId) -> Result<Option<Arc<PduEvent>>> {
         if let Some(p) = self.pdu_cache.lock().unwrap().get_mut(event_id) {
             return Ok(Some(Arc::clone(p)));
@@ -1122,7 +1126,6 @@ impl Rooms {
     /// Returns the pdu.
     ///
     /// This does __NOT__ check the outliers `Tree`.
-    #[tracing::instrument(skip(self))]
     pub fn get_pdu_from_id(&self, pdu_id: &[u8]) -> Result<Option<PduEvent>> {
         self.pduid_pdu.get(pdu_id)?.map_or(Ok(None), |pdu| {
             Ok(Some(
@@ -1133,7 +1136,6 @@ impl Rooms {
     }
 
     /// Returns the pdu as a `BTreeMap<String, CanonicalJsonValue>`.
-    #[tracing::instrument(skip(self))]
     pub fn get_pdu_json_from_id(&self, pdu_id: &[u8]) -> Result<Option<CanonicalJsonObject>> {
         self.pduid_pdu.get(pdu_id)?.map_or(Ok(None), |pdu| {
             Ok(Some(
@@ -1222,7 +1224,6 @@ impl Rooms {
     }
 
     /// Returns the pdu from the outlier tree.
-    #[tracing::instrument(skip(self))]
     pub fn get_pdu_outlier(&self, event_id: &EventId) -> Result<Option<PduEvent>> {
         self.eventid_outlierpdu
             .get(event_id.as_bytes())?
@@ -1280,7 +1281,7 @@ impl Rooms {
             {
                 if let Some(shortstatehash) = self.pdu_shortstatehash(&pdu.event_id).unwrap() {
                     if let Some(prev_state) = self
-                        .state_get(shortstatehash, &pdu.kind, state_key)
+                        .state_get(shortstatehash, &pdu.kind.to_string().into(), state_key)
                         .unwrap()
                     {
                         unsigned.insert(
@@ -1331,6 +1332,10 @@ impl Rooms {
             &pdu_id,
             &serde_json::to_vec(&pdu_json).expect("CanonicalJsonObject is always a valid"),
         )?;
+        self.lasttimelinecount_cache
+            .lock()
+            .unwrap()
+            .insert(pdu.room_id.clone(), count2);
 
         self.eventid_pduid
             .insert(pdu.event_id.as_bytes(), &pdu_id)?;
@@ -1341,7 +1346,7 @@ impl Rooms {
         // See if the event matches any known pushers
         let power_levels: RoomPowerLevelsEventContent = db
             .rooms
-            .room_state_get(&pdu.room_id, &EventType::RoomPowerLevels, "")?
+            .room_state_get(&pdu.room_id, &StateEventType::RoomPowerLevels, "")?
             .map(|ev| {
                 serde_json::from_str(ev.content.get())
                     .map_err(|_| Error::bad_database("invalid m.room.power_levels event"))
@@ -1362,7 +1367,11 @@ impl Rooms {
 
             let rules_for_user = db
                 .account_data
-                .get(None, user, EventType::PushRules)?
+                .get(
+                    None,
+                    user,
+                    GlobalAccountDataEventType::PushRules.to_string().into(),
+                )?
                 .map(|ev: PushRulesEvent| ev.content.global)
                 .unwrap_or_else(|| Ruleset::server_default(user));
 
@@ -1411,12 +1420,12 @@ impl Rooms {
             .increment_batch(&mut highlights.into_iter())?;
 
         match pdu.kind {
-            EventType::RoomRedaction => {
+            RoomEventType::RoomRedaction => {
                 if let Some(redact_id) = &pdu.redacts {
                     self.redact_pdu(redact_id, pdu)?;
                 }
             }
-            EventType::RoomMember => {
+            RoomEventType::RoomMember => {
                 if let Some(state_key) = &pdu.state_key {
                     #[derive(Deserialize)]
                     struct ExtractMembership {
@@ -1451,7 +1460,7 @@ impl Rooms {
                     )?;
                 }
             }
-            EventType::RoomMessage => {
+            RoomEventType::RoomMessage => {
                 #[derive(Deserialize)]
                 struct ExtractBody<'a> {
                     #[serde(borrow)]
@@ -1477,17 +1486,22 @@ impl Rooms {
 
                     self.tokenids.insert_batch(&mut batch)?;
 
-                    if body.starts_with(&format!("@conduit:{}: ", db.globals.server_name()))
-                        && self
-                            .id_from_alias(
-                                <&RoomAliasId>::try_from(
-                                    format!("#admins:{}", db.globals.server_name()).as_str(),
-                                )
-                                .expect("#admins:server_name is a valid room alias"),
-                            )?
-                            .as_ref()
-                            == Some(&pdu.room_id)
-                    {
+                    let admin_room = self.id_from_alias(
+                        <&RoomAliasId>::try_from(
+                            format!("#admins:{}", db.globals.server_name()).as_str(),
+                        )
+                        .expect("#admins:server_name is a valid room alias"),
+                    )?;
+                    let server_user = format!("@conduit:{}", db.globals.server_name());
+
+                    let to_conduit = body.starts_with(&format!("{}: ", server_user));
+
+                    // This will evaluate to false if the emergency password is set up so that
+                    // the administrator can execute commands as conduit
+                    let from_conduit =
+                        pdu.sender == server_user && db.globals.emergency_password().is_none();
+
+                    if to_conduit && !from_conduit && admin_room.as_ref() == Some(&pdu.room_id) {
                         db.admin.process_message(body.to_string());
                     }
                 }
@@ -1498,6 +1512,36 @@ impl Rooms {
         Ok(pdu_id)
     }
 
+    #[tracing::instrument(skip(self))]
+    pub fn last_timeline_count(&self, sender_user: &UserId, room_id: &RoomId) -> Result<u64> {
+        match self
+            .lasttimelinecount_cache
+            .lock()
+            .unwrap()
+            .entry(room_id.to_owned())
+        {
+            hash_map::Entry::Vacant(v) => {
+                if let Some(last_count) = self
+                    .pdus_until(&sender_user, &room_id, u64::MAX)?
+                    .filter_map(|r| {
+                        // Filter out buggy events
+                        if r.is_err() {
+                            error!("Bad pdu in pdus_since: {:?}", r);
+                        }
+                        r.ok()
+                    })
+                    .map(|(pduid, _)| self.pdu_count(&pduid))
+                    .next()
+                {
+                    Ok(*v.insert(last_count?))
+                } else {
+                    Ok(0)
+                }
+            }
+            hash_map::Entry::Occupied(o) => Ok(*o.get()),
+        }
+    }
+
     #[tracing::instrument(skip(self))]
     pub fn reset_notification_counts(&self, user_id: &UserId, room_id: &RoomId) -> Result<()> {
         let mut userroom_id = user_id.as_bytes().to_vec();
@@ -1627,8 +1671,11 @@ impl Rooms {
             let states_parents = previous_shortstatehash
                 .map_or_else(|| Ok(Vec::new()), |p| self.load_shortstatehash_info(p))?;
 
-            let shortstatekey =
-                self.get_or_create_shortstatekey(&new_pdu.kind, state_key, globals)?;
+            let shortstatekey = self.get_or_create_shortstatekey(
+                &new_pdu.kind.to_string().into(),
+                state_key,
+                globals,
+            )?;
 
             let new = self.compress_state_event(shortstatekey, &new_pdu.event_id, globals)?;
 
@@ -1677,28 +1724,36 @@ impl Rooms {
     ) -> Result<Vec<Raw<AnyStrippedStateEvent>>> {
         let mut state = Vec::new();
         // Add recommended events
-        if let Some(e) = self.room_state_get(&invite_event.room_id, &EventType::RoomCreate, "")? {
-            state.push(e.to_stripped_state_event());
-        }
         if let Some(e) =
-            self.room_state_get(&invite_event.room_id, &EventType::RoomJoinRules, "")?
+            self.room_state_get(&invite_event.room_id, &StateEventType::RoomCreate, "")?
         {
             state.push(e.to_stripped_state_event());
         }
         if let Some(e) =
-            self.room_state_get(&invite_event.room_id, &EventType::RoomCanonicalAlias, "")?
+            self.room_state_get(&invite_event.room_id, &StateEventType::RoomJoinRules, "")?
         {
             state.push(e.to_stripped_state_event());
         }
-        if let Some(e) = self.room_state_get(&invite_event.room_id, &EventType::RoomAvatar, "")? {
-            state.push(e.to_stripped_state_event());
-        }
-        if let Some(e) = self.room_state_get(&invite_event.room_id, &EventType::RoomName, "")? {
-            state.push(e.to_stripped_state_event());
-        }
         if let Some(e) = self.room_state_get(
             &invite_event.room_id,
-            &EventType::RoomMember,
+            &StateEventType::RoomCanonicalAlias,
+            "",
+        )? {
+            state.push(e.to_stripped_state_event());
+        }
+        if let Some(e) =
+            self.room_state_get(&invite_event.room_id, &StateEventType::RoomAvatar, "")?
+        {
+            state.push(e.to_stripped_state_event());
+        }
+        if let Some(e) =
+            self.room_state_get(&invite_event.room_id, &StateEventType::RoomName, "")?
+        {
+            state.push(e.to_stripped_state_event());
+        }
+        if let Some(e) = self.room_state_get(
+            &invite_event.room_id,
+            &StateEventType::RoomMember,
             invite_event.sender.as_str(),
         )? {
             state.push(e.to_stripped_state_event());
@@ -1771,7 +1826,7 @@ impl Rooms {
             .take(20)
             .collect::<Vec<_>>();
 
-        let create_event = self.room_state_get(room_id, &EventType::RoomCreate, "")?;
+        let create_event = self.room_state_get(room_id, &StateEventType::RoomCreate, "")?;
 
         let create_event_content: Option<RoomCreateEventContent> = create_event
             .as_ref()
@@ -1783,17 +1838,12 @@ impl Rooms {
             })
             .transpose()?;
 
-        let create_prev_event = if prev_events.len() == 1
-            && Some(&prev_events[0]) == create_event.as_ref().map(|c| &c.event_id)
-        {
-            create_event
-        } else {
-            None
-        };
-
-        // If there was no create event yet, assume we are creating a version 6 room right now
+        // If there was no create event yet, assume we are creating a room with the default
+        // version right now
         let room_version_id = create_event_content
-            .map_or(RoomVersionId::V6, |create_event| create_event.room_version);
+            .map_or(db.globals.default_room_version(), |create_event| {
+                create_event.room_version
+            });
         let room_version = RoomVersion::new(&room_version_id).expect("room version is supported");
 
         let auth_events =
@@ -1809,7 +1859,9 @@ impl Rooms {
 
         let mut unsigned = unsigned.unwrap_or_default();
         if let Some(state_key) = &state_key {
-            if let Some(prev_pdu) = self.room_state_get(room_id, &event_type, state_key)? {
+            if let Some(prev_pdu) =
+                self.room_state_get(room_id, &event_type.to_string().into(), state_key)?
+            {
                 unsigned.insert(
                     "prev_content".to_owned(),
                     serde_json::from_str(prev_pdu.content.get()).expect("string is valid json"),
@@ -1852,7 +1904,6 @@ impl Rooms {
         let auth_check = state_res::auth_check(
             &room_version,
             &pdu,
-            create_prev_event,
             None::<PduEvent>, // TODO: third_party_invite
             |k, s| auth_events.get(&(k.clone(), s.to_owned())),
         )
@@ -1880,13 +1931,26 @@ impl Rooms {
             CanonicalJsonValue::String(db.globals.server_name().as_ref().to_owned()),
         );
 
-        ruma::signatures::hash_and_sign_event(
+        match ruma::signatures::hash_and_sign_event(
             db.globals.server_name().as_str(),
             db.globals.keypair(),
             &mut pdu_json,
             &room_version_id,
-        )
-        .expect("event is valid, we just created it");
+        ) {
+            Ok(_) => {}
+            Err(e) => {
+                return match e {
+                    ruma::signatures::Error::PduSize => Err(Error::BadRequest(
+                        ErrorKind::TooLarge,
+                        "Message is too long",
+                    )),
+                    _ => Err(Error::BadRequest(
+                        ErrorKind::Unknown,
+                        "Signing event failed",
+                    )),
+                }
+            }
+        }
 
         // Generate event id
         pdu.event_id = EventId::parse_arc(format!(
@@ -1921,12 +1985,24 @@ impl Rooms {
         // where events in the current room state do not exist
         self.set_room_state(room_id, statehashid)?;
 
-        let servers = self
-            .room_servers(room_id)
-            .filter_map(|r| r.ok())
-            .filter(|server| &**server != db.globals.server_name());
+        let mut servers: HashSet<Box<ServerName>> =
+            self.room_servers(room_id).filter_map(|r| r.ok()).collect();
 
-        db.sending.send_pdu(servers, &pdu_id)?;
+        // In case we are kicking or banning a user, we need to inform their server of the change
+        if pdu.kind == RoomEventType::RoomMember {
+            if let Some(state_key_uid) = &pdu
+                .state_key
+                .as_ref()
+                .and_then(|state_key| UserId::parse(state_key.as_str()).ok())
+            {
+                servers.insert(Box::from(state_key_uid.server_name()));
+            }
+        }
+
+        // Remove our server from the server list since it will be added to it by room_servers() and/or the if statement above
+        servers.remove(db.globals.server_name());
+
+        db.sending.send_pdu(servers.into_iter(), &pdu_id)?;
 
         for appservice in db.appservice.all()? {
             if self.appservice_in_room(room_id, &appservice, db)? {
@@ -1934,6 +2010,30 @@ impl Rooms {
                 continue;
             }
 
+            // If the RoomMember event has a non-empty state_key, it is targeted at someone.
+            // If it is our appservice user, we send this PDU to it.
+            if pdu.kind == RoomEventType::RoomMember {
+                if let Some(state_key_uid) = &pdu
+                    .state_key
+                    .as_ref()
+                    .and_then(|state_key| UserId::parse(state_key.as_str()).ok())
+                {
+                    if let Some(appservice_uid) = appservice
+                        .1
+                        .get("sender_localpart")
+                        .and_then(|string| string.as_str())
+                        .and_then(|string| {
+                            UserId::parse_with_server_name(string, db.globals.server_name()).ok()
+                        })
+                    {
+                        if state_key_uid == &appservice_uid {
+                            db.sending.send_pdu_appservice(&appservice.0, &pdu_id)?;
+                            continue;
+                        }
+                    }
+                }
+            }
+
             if let Some(namespaces) = appservice.1.get("namespaces") {
                 let users = namespaces
                     .get("users")
@@ -1959,7 +2059,7 @@ impl Rooms {
 
                 let matching_users = |users: &Regex| {
                     users.is_match(pdu.sender.as_str())
-                        || pdu.kind == EventType::RoomMember
+                        || pdu.kind == RoomEventType::RoomMember
                             && pdu
                                 .state_key
                                 .as_ref()
@@ -2111,13 +2211,9 @@ impl Rooms {
                 .ok_or_else(|| Error::bad_database("PDU ID points to invalid PDU."))?;
             pdu.redact(reason)?;
             self.replace_pdu(&pdu_id, &pdu)?;
-            Ok(())
-        } else {
-            Err(Error::BadRequest(
-                ErrorKind::NotFound,
-                "Event ID does not exist.",
-            ))
         }
+        // If event does not exist, just noop
+        Ok(())
     }
 
     /// Update current membership data.
@@ -2163,7 +2259,7 @@ impl Rooms {
 
                     // Check if the room has a predecessor
                     if let Some(predecessor) = self
-                        .room_state_get(room_id, &EventType::RoomCreate, "")?
+                        .room_state_get(room_id, &StateEventType::RoomCreate, "")?
                         .and_then(|create| serde_json::from_str(create.content.get()).ok())
                         .and_then(|content: RoomCreateEventContent| content.predecessor)
                     {
@@ -2196,13 +2292,13 @@ impl Rooms {
                         if let Some(tag_event) = db.account_data.get::<TagEvent>(
                             Some(&predecessor.room_id),
                             user_id,
-                            EventType::Tag,
+                            RoomAccountDataEventType::Tag,
                         )? {
                             db.account_data
                                 .update(
                                     Some(room_id),
                                     user_id,
-                                    EventType::Tag,
+                                    RoomAccountDataEventType::Tag,
                                     &tag_event,
                                     &db.globals,
                                 )
@@ -2210,10 +2306,11 @@ impl Rooms {
                         };
 
                         // Copy direct chat flag
-                        if let Some(mut direct_event) =
-                            db.account_data
-                                .get::<DirectEvent>(None, user_id, EventType::Direct)?
-                        {
+                        if let Some(mut direct_event) = db.account_data.get::<DirectEvent>(
+                            None,
+                            user_id,
+                            GlobalAccountDataEventType::Direct.to_string().into(),
+                        )? {
                             let mut room_ids_updated = false;
 
                             for room_ids in direct_event.content.0.values_mut() {
@@ -2227,7 +2324,7 @@ impl Rooms {
                                 db.account_data.update(
                                     None,
                                     user_id,
-                                    EventType::Direct,
+                                    GlobalAccountDataEventType::Direct.to_string().into(),
                                     &direct_event,
                                     &db.globals,
                                 )?;
@@ -2254,7 +2351,9 @@ impl Rooms {
                     .get::<IgnoredUserListEvent>(
                         None,    // Ignored users are in global account data
                         user_id, // Receiver
-                        EventType::IgnoredUserList,
+                        GlobalAccountDataEventType::IgnoredUserList
+                            .to_string()
+                            .into(),
                     )?
                     .map_or(false, |ignored| {
                         ignored
@@ -2470,6 +2569,27 @@ impl Rooms {
         }
     }
 
+    // Make a user leave all their joined rooms
+    #[tracing::instrument(skip(self, db))]
+    pub async fn leave_all_rooms(&self, user_id: &UserId, db: &Database) -> Result<()> {
+        let all_rooms = db
+            .rooms
+            .rooms_joined(user_id)
+            .chain(db.rooms.rooms_invited(user_id).map(|t| t.map(|(r, _)| r)))
+            .collect::<Vec<_>>();
+
+        for room_id in all_rooms {
+            let room_id = match room_id {
+                Ok(room_id) => room_id,
+                Err(_) => continue,
+            };
+
+            let _ = self.leave_room(user_id, &room_id, db).await;
+        }
+
+        Ok(())
+    }
+
     #[tracing::instrument(skip(self, db))]
     pub async fn leave_room(
         &self,
@@ -2510,7 +2630,7 @@ impl Rooms {
             let state_lock = mutex_state.lock().await;
 
             let mut event: RoomMemberEventContent = serde_json::from_str(
-                self.room_state_get(room_id, &EventType::RoomMember, user_id.as_str())?
+                self.room_state_get(room_id, &StateEventType::RoomMember, user_id.as_str())?
                     .ok_or(Error::BadRequest(
                         ErrorKind::BadState,
                         "Cannot leave a room you are not a member of.",
@@ -2524,7 +2644,7 @@ impl Rooms {
 
             self.build_and_append_pdu(
                 PduBuilder {
-                    event_type: EventType::RoomMember,
+                    event_type: RoomEventType::RoomMember,
                     content: to_raw_value(&event).expect("event is valid, we just created it"),
                     unsigned: None,
                     state_key: Some(user_id.to_string()),
@@ -2574,7 +2694,7 @@ impl Rooms {
                 .send_federation_request(
                     &db.globals,
                     &remote_server,
-                    federation::membership::get_leave_event::v1::Request { room_id, user_id },
+                    federation::membership::prepare_leave_event::v1::Request { room_id, user_id },
                 )
                 .await;
 
@@ -2588,9 +2708,7 @@ impl Rooms {
         let (make_leave_response, remote_server) = make_leave_response_and_server?;
 
         let room_version_id = match make_leave_response.room_version {
-            Some(version) if version == RoomVersionId::V5 || version == RoomVersionId::V6 => {
-                version
-            }
+            Some(version) if self.is_supported_version(&db, &version) => version,
             _ => return Err(Error::BadServerResponse("Room version is not supported")),
         };
 
@@ -2754,6 +2872,18 @@ impl Rooms {
         Ok(self.publicroomids.get(room_id.as_bytes())?.is_some())
     }
 
+    #[tracing::instrument(skip(self))]
+    pub fn iter_ids(&self) -> impl Iterator<Item = Result<Box<RoomId>>> + '_ {
+        self.roomid_shortroomid.iter().map(|(bytes, _)| {
+            RoomId::parse(
+                utils::string_from_bytes(&bytes).map_err(|_| {
+                    Error::bad_database("Room ID in publicroomids is invalid unicode.")
+                })?,
+            )
+            .map_err(|_| Error::bad_database("Room ID in roomid_shortroomid is invalid."))
+        })
+    }
+
     #[tracing::instrument(skip(self))]
     pub fn public_rooms(&self) -> impl Iterator<Item = Result<Box<RoomId>>> + '_ {
         self.publicroomids.iter().map(|(bytes, _)| {
@@ -3036,6 +3166,10 @@ impl Rooms {
             .transpose()
     }
 
+    pub fn is_disabled(&self, room_id: &RoomId) -> Result<bool> {
+        Ok(self.disabledroomids.get(room_id.as_bytes())?.is_some())
+    }
+
     /// Returns an iterator over all rooms this user joined.
     #[tracing::instrument(skip(self))]
     pub fn rooms_joined<'a>(
@@ -3346,4 +3480,24 @@ impl Rooms {
 
         Ok(())
     }
+
+    /// Returns the room's version.
+    #[tracing::instrument(skip(self))]
+    pub fn get_room_version(&self, room_id: &RoomId) -> Result<RoomVersionId> {
+        let create_event = self.room_state_get(room_id, &StateEventType::RoomCreate, "")?;
+
+        let create_event_content: Option<RoomCreateEventContent> = create_event
+            .as_ref()
+            .map(|create_event| {
+                serde_json::from_str(create_event.content.get()).map_err(|e| {
+                    warn!("Invalid create event: {}", e);
+                    Error::bad_database("Invalid create event in db.")
+                })
+            })
+            .transpose()?;
+        let room_version = create_event_content
+            .map(|create_event| create_event.room_version)
+            .ok_or_else(|| Error::BadDatabase("Invalid room version"))?;
+        Ok(room_version)
+    }
 }
diff --git a/src/database/rooms/edus.rs b/src/database/rooms/edus.rs
index 289a00a1..118efd4c 100644
--- a/src/database/rooms/edus.rs
+++ b/src/database/rooms/edus.rs
@@ -2,7 +2,8 @@ use crate::{database::abstraction::Tree, utils, Error, Result};
 use ruma::{
     events::{
         presence::{PresenceEvent, PresenceEventContent},
-        AnyEphemeralRoomEvent, SyncEphemeralRoomEvent,
+        receipt::ReceiptEvent,
+        SyncEphemeralRoomEvent,
     },
     presence::PresenceState,
     serde::Raw,
@@ -31,7 +32,7 @@ impl RoomEdus {
         &self,
         user_id: &UserId,
         room_id: &RoomId,
-        event: AnyEphemeralRoomEvent,
+        event: ReceiptEvent,
         globals: &super::super::globals::Globals,
     ) -> Result<()> {
         let mut prefix = room_id.as_bytes().to_vec();
diff --git a/src/database/sending.rs b/src/database/sending.rs
index 4a032855..4c830d6f 100644
--- a/src/database/sending.rs
+++ b/src/database/sending.rs
@@ -9,11 +9,8 @@ use crate::{
     appservice_server, database::pusher, server_server, utils, Database, Error, PduEvent, Result,
 };
 use federation::transactions::send_transaction_message;
+use futures_util::{stream::FuturesUnordered, StreamExt};
 use ring::digest;
-use rocket::futures::{
-    channel::mpsc,
-    stream::{FuturesUnordered, StreamExt},
-};
 use ruma::{
     api::{
         appservice,
@@ -26,14 +23,14 @@ use ruma::{
         OutgoingRequest,
     },
     device_id,
-    events::{push_rules::PushRulesEvent, AnySyncEphemeralRoomEvent, EventType},
+    events::{push_rules::PushRulesEvent, AnySyncEphemeralRoomEvent, GlobalAccountDataEventType},
     push,
     receipt::ReceiptType,
     uint, MilliSecondsSinceUnixEpoch, ServerName, UInt, UserId,
 };
 use tokio::{
     select,
-    sync::{RwLock, Semaphore},
+    sync::{mpsc, RwLock, Semaphore},
 };
 use tracing::{error, warn};
 
@@ -41,7 +38,7 @@ use super::abstraction::Tree;
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub enum OutgoingKind {
-    Appservice(Box<ServerName>),
+    Appservice(String),
     Push(Vec<u8>, Vec<u8>), // user and pushkey
     Normal(Box<ServerName>),
 }
@@ -170,7 +167,7 @@ impl Sending {
                                         Self::parse_servercurrentevent(&k, v).ok().map(|ev| (ev, k))
                                     })
                                     .take(30)
-                                    .collect::<>();
+                                    .collect();
 
                                 // TODO: find edus
 
@@ -207,7 +204,7 @@ impl Sending {
                             }
                         };
                     },
-                    Some((key, value)) = receiver.next() => {
+                    Some((key, value)) = receiver.recv() => {
                         if let Ok((outgoing_kind, event)) = Self::parse_servercurrentevent(&key, value) {
                             let guard = db.read().await;
 
@@ -417,7 +414,7 @@ impl Sending {
         key.push(0xff);
         key.extend_from_slice(pdu_id);
         self.servernameevent_data.insert(&key, &[])?;
-        self.sender.unbounded_send((key, vec![])).unwrap();
+        self.sender.send((key, vec![])).unwrap();
 
         Ok(())
     }
@@ -433,7 +430,7 @@ impl Sending {
             key.push(0xff);
             key.extend_from_slice(pdu_id);
 
-            self.sender.unbounded_send((key.clone(), vec![])).unwrap();
+            self.sender.send((key.clone(), vec![])).unwrap();
 
             (key, Vec::new())
         });
@@ -454,7 +451,7 @@ impl Sending {
         key.push(0xff);
         key.extend_from_slice(&id.to_be_bytes());
         self.servernameevent_data.insert(&key, &serialized)?;
-        self.sender.unbounded_send((key, serialized)).unwrap();
+        self.sender.send((key, serialized)).unwrap();
 
         Ok(())
     }
@@ -466,7 +463,7 @@ impl Sending {
         key.push(0xff);
         key.extend_from_slice(pdu_id);
         self.servernameevent_data.insert(&key, &[])?;
-        self.sender.unbounded_send((key, vec![])).unwrap();
+        self.sender.send((key, vec![])).unwrap();
 
         Ok(())
     }
@@ -508,7 +505,7 @@ impl Sending {
         let db = db.read().await;
 
         match &kind {
-            OutgoingKind::Appservice(server) => {
+            OutgoingKind::Appservice(id) => {
                 let mut pdu_jsons = Vec::new();
 
                 for event in &events {
@@ -538,7 +535,7 @@ impl Sending {
                 let response = appservice_server::send_request(
                     &db.globals,
                     db.appservice
-                        .get_registration(server.as_str())
+                        .get_registration(&id)
                         .map_err(|e| (kind.clone(), e))?
                         .ok_or_else(|| {
                             (
@@ -638,7 +635,11 @@ impl Sending {
 
                     let rules_for_user = db
                         .account_data
-                        .get(None, &userid, EventType::PushRules)
+                        .get(
+                            None,
+                            &userid,
+                            GlobalAccountDataEventType::PushRules.to_string().into(),
+                        )
                         .unwrap_or_default()
                         .map(|ev: PushRulesEvent| ev.content.global)
                         .unwrap_or_else(|| push::Ruleset::server_default(&userid));
@@ -759,9 +760,7 @@ impl Sending {
             })?;
 
             (
-                OutgoingKind::Appservice(ServerName::parse(server).map_err(|_| {
-                    Error::bad_database("Invalid server string in server_currenttransaction")
-                })?),
+                OutgoingKind::Appservice(server),
                 if value.is_empty() {
                     SendingEventType::Pdu(event.to_vec())
                 } else {
diff --git a/src/database/transaction_ids.rs b/src/database/transaction_ids.rs
index 12b838ba..ed0970d1 100644
--- a/src/database/transaction_ids.rs
+++ b/src/database/transaction_ids.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use crate::Result;
-use ruma::{identifiers::TransactionId, DeviceId, UserId};
+use ruma::{DeviceId, TransactionId, UserId};
 
 use super::abstraction::Tree;
 
diff --git a/src/database/uiaa.rs b/src/database/uiaa.rs
index b0c8d6dd..12373139 100644
--- a/src/database/uiaa.rs
+++ b/src/database/uiaa.rs
@@ -1,14 +1,15 @@
-use std::collections::BTreeMap;
-use std::sync::Arc;
-use std::sync::RwLock;
+use std::{
+    collections::BTreeMap,
+    sync::{Arc, RwLock},
+};
 
 use crate::{client_server::SESSION_ID_LENGTH, utils, Error, Result};
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::uiaa::{
-            AuthType, IncomingAuthData, IncomingPassword, IncomingUserIdentifier::MatrixId,
-            UiaaInfo,
+        uiaa::{
+            AuthType, IncomingAuthData, IncomingPassword,
+            IncomingUserIdentifier::UserIdOrLocalpart, UiaaInfo,
         },
     },
     signatures::CanonicalJsonValue,
@@ -73,7 +74,7 @@ impl Uiaa {
                 ..
             }) => {
                 let username = match identifier {
-                    MatrixId(username) => username,
+                    UserIdOrLocalpart(username) => username,
                     _ => {
                         return Err(Error::BadRequest(
                             ErrorKind::Unrecognized,
diff --git a/src/database/users.rs b/src/database/users.rs
index 681ee284..7c15f1d8 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -1,15 +1,11 @@
 use crate::{utils, Error, Result};
 use ruma::{
-    api::client::{
-        error::ErrorKind,
-        r0::{device::Device, filter::IncomingFilterDefinition},
-    },
+    api::client::{device::Device, error::ErrorKind, filter::IncomingFilterDefinition},
     encryption::{CrossSigningKey, DeviceKeys, OneTimeKey},
-    events::{AnyToDeviceEvent, EventType},
-    identifiers::MxcUri,
+    events::{AnyToDeviceEvent, StateEventType},
     serde::Raw,
-    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, RoomAliasId, UInt,
-    UserId,
+    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, MxcUri, RoomAliasId,
+    UInt, UserId,
 };
 use std::{collections::BTreeMap, mem, sync::Arc};
 use tracing::warn;
@@ -757,7 +753,7 @@ impl Users {
         for room_id in rooms.rooms_joined(user_id).filter_map(|r| r.ok()) {
             // Don't send key updates to unencrypted rooms
             if rooms
-                .room_state_get(&room_id, &EventType::RoomEncryption, "")?
+                .room_state_get(&room_id, &StateEventType::RoomEncryption, "")?
                 .is_none()
             {
                 continue;
diff --git a/src/error.rs b/src/error.rs
index 5ffe48c9..206a055f 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,27 +1,20 @@
+use std::convert::Infallible;
+
+use http::StatusCode;
 use ruma::{
     api::client::{
         error::{Error as RumaError, ErrorKind},
-        r0::uiaa::UiaaInfo,
+        uiaa::{UiaaInfo, UiaaResponse},
     },
     ServerName,
 };
 use thiserror::Error;
-use tracing::warn;
+use tracing::{error, warn};
 
 #[cfg(feature = "persy")]
 use persy::PersyError;
 
-#[cfg(feature = "conduit_bin")]
-use {
-    crate::RumaResponse,
-    http::StatusCode,
-    rocket::{
-        response::{self, Responder},
-        Request,
-    },
-    ruma::api::client::r0::uiaa::UiaaResponse,
-    tracing::error,
-};
+use crate::RumaResponse;
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
@@ -81,6 +74,12 @@ pub enum Error {
     BadRequest(ErrorKind, &'static str),
     #[error("{0}")]
     Conflict(&'static str), // This is only needed for when a room alias already exists
+    #[cfg(feature = "conduit_bin")]
+    #[error("{0}")]
+    ExtensionError(#[from] axum::extract::rejection::ExtensionRejection),
+    #[cfg(feature = "conduit_bin")]
+    #[error("{0}")]
+    PathError(#[from] axum::extract::rejection::PathRejection),
 }
 
 impl Error {
@@ -139,16 +138,6 @@ impl Error {
     }
 }
 
-#[cfg(feature = "conduit_bin")]
-impl<'r, 'o> Responder<'r, 'o> for Error
-where
-    'o: 'r,
-{
-    fn respond_to(self, r: &'r Request<'_>) -> response::Result<'o> {
-        self.to_response().respond_to(r)
-    }
-}
-
 #[cfg(feature = "persy")]
 impl<T: Into<PersyError>> From<persy::PE<T>> for Error {
     fn from(err: persy::PE<T>) -> Self {
@@ -157,3 +146,16 @@ impl<T: Into<PersyError>> From<persy::PE<T>> for Error {
         }
     }
 }
+
+impl From<Infallible> for Error {
+    fn from(i: Infallible) -> Self {
+        match i {}
+    }
+}
+
+#[cfg(feature = "conduit_bin")]
+impl axum::response::IntoResponse for Error {
+    fn into_response(self) -> axum::response::Response {
+        self.to_response().into_response()
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 030dfc3a..c35a1293 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,8 +7,6 @@
 #![allow(clippy::suspicious_else_formatting)]
 #![deny(clippy::dbg_macro)]
 
-use std::ops::Deref;
-
 mod config;
 mod database;
 mod error;
@@ -24,16 +22,4 @@ pub use config::Config;
 pub use database::Database;
 pub use error::{Error, Result};
 pub use pdu::PduEvent;
-pub use rocket::Config as RocketConfig;
-pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
-
-pub struct State<'r, T: Send + Sync + 'static>(pub &'r T);
-
-impl<'r, T: Send + Sync + 'static> Deref for State<'r, T> {
-    type Target = T;
-
-    #[inline(always)]
-    fn deref(&self) -> &T {
-        self.0
-    }
-}
+pub use ruma_wrapper::{Ruma, RumaResponse};
diff --git a/src/main.rs b/src/main.rs
index ea09dd5b..9a0928a0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,24 +7,37 @@
 #![allow(clippy::suspicious_else_formatting)]
 #![deny(clippy::dbg_macro)]
 
-use std::sync::Arc;
+use std::{future::Future, io, net::SocketAddr, sync::Arc, time::Duration};
 
-use maplit::hashset;
-use opentelemetry::trace::{FutureExt, Tracer};
-use rocket::{
-    catch, catchers,
-    figment::{
-        providers::{Env, Format, Toml},
-        Figment,
-    },
-    routes, Request,
+use axum::{
+    extract::{FromRequest, MatchedPath},
+    handler::Handler,
+    response::IntoResponse,
+    routing::{get, on, MethodFilter},
+    Router,
 };
-use ruma::api::client::error::ErrorKind;
-use tokio::sync::RwLock;
+use axum_server::{bind, bind_rustls, tls_rustls::RustlsConfig, Handle as ServerHandle};
+use figment::{
+    providers::{Env, Format, Toml},
+    Figment,
+};
+use http::{
+    header::{self, HeaderName},
+    Method, Uri,
+};
+use opentelemetry::trace::{FutureExt, Tracer};
+use ruma::api::{client::error::ErrorKind, IncomingRequest};
+use tokio::{signal, sync::RwLock};
+use tower::ServiceBuilder;
+use tower_http::{
+    cors::{self, CorsLayer},
+    trace::TraceLayer,
+    ServiceBuilderExt as _,
+};
+use tracing::warn;
 use tracing_subscriber::{prelude::*, EnvFilter};
 
 pub use conduit::*; // Re-export everything from the library crate
-pub use rocket::State;
 
 #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
 use tikv_jemallocator::Jemalloc;
@@ -33,160 +46,10 @@ use tikv_jemallocator::Jemalloc;
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
 
-fn setup_rocket(config: Figment, data: Arc<RwLock<Database>>) -> rocket::Rocket<rocket::Build> {
-    rocket::custom(config)
-        .manage(data)
-        .mount(
-            "/",
-            routes![
-                client_server::get_supported_versions_route,
-                client_server::get_register_available_route,
-                client_server::register_route,
-                client_server::get_login_types_route,
-                client_server::login_route,
-                client_server::whoami_route,
-                client_server::logout_route,
-                client_server::logout_all_route,
-                client_server::change_password_route,
-                client_server::deactivate_route,
-                client_server::third_party_route,
-                client_server::get_capabilities_route,
-                client_server::get_pushrules_all_route,
-                client_server::set_pushrule_route,
-                client_server::get_pushrule_route,
-                client_server::set_pushrule_enabled_route,
-                client_server::get_pushrule_enabled_route,
-                client_server::get_pushrule_actions_route,
-                client_server::set_pushrule_actions_route,
-                client_server::delete_pushrule_route,
-                client_server::get_room_event_route,
-                client_server::get_room_aliases_route,
-                client_server::get_filter_route,
-                client_server::create_filter_route,
-                client_server::set_global_account_data_route,
-                client_server::set_room_account_data_route,
-                client_server::get_global_account_data_route,
-                client_server::get_room_account_data_route,
-                client_server::set_displayname_route,
-                client_server::get_displayname_route,
-                client_server::set_avatar_url_route,
-                client_server::get_avatar_url_route,
-                client_server::get_profile_route,
-                client_server::set_presence_route,
-                client_server::get_presence_route,
-                client_server::upload_keys_route,
-                client_server::get_keys_route,
-                client_server::claim_keys_route,
-                client_server::create_backup_route,
-                client_server::update_backup_route,
-                client_server::delete_backup_route,
-                client_server::get_latest_backup_route,
-                client_server::get_backup_route,
-                client_server::add_backup_key_sessions_route,
-                client_server::add_backup_keys_route,
-                client_server::delete_backup_key_session_route,
-                client_server::delete_backup_key_sessions_route,
-                client_server::delete_backup_keys_route,
-                client_server::get_backup_key_session_route,
-                client_server::get_backup_key_sessions_route,
-                client_server::get_backup_keys_route,
-                client_server::set_read_marker_route,
-                client_server::create_receipt_route,
-                client_server::create_typing_event_route,
-                client_server::create_room_route,
-                client_server::redact_event_route,
-                client_server::report_event_route,
-                client_server::create_alias_route,
-                client_server::delete_alias_route,
-                client_server::get_alias_route,
-                client_server::join_room_by_id_route,
-                client_server::join_room_by_id_or_alias_route,
-                client_server::joined_members_route,
-                client_server::leave_room_route,
-                client_server::forget_room_route,
-                client_server::joined_rooms_route,
-                client_server::kick_user_route,
-                client_server::ban_user_route,
-                client_server::unban_user_route,
-                client_server::invite_user_route,
-                client_server::set_room_visibility_route,
-                client_server::get_room_visibility_route,
-                client_server::get_public_rooms_route,
-                client_server::get_public_rooms_filtered_route,
-                client_server::search_users_route,
-                client_server::get_member_events_route,
-                client_server::get_protocols_route,
-                client_server::send_message_event_route,
-                client_server::send_state_event_for_key_route,
-                client_server::send_state_event_for_empty_key_route,
-                client_server::get_state_events_route,
-                client_server::get_state_events_for_key_route,
-                client_server::get_state_events_for_empty_key_route,
-                client_server::sync_events_route,
-                client_server::get_context_route,
-                client_server::get_message_events_route,
-                client_server::search_events_route,
-                client_server::turn_server_route,
-                client_server::send_event_to_device_route,
-                client_server::get_media_config_route,
-                client_server::create_content_route,
-                client_server::get_content_as_filename_route,
-                client_server::get_content_route,
-                client_server::get_content_thumbnail_route,
-                client_server::get_devices_route,
-                client_server::get_device_route,
-                client_server::update_device_route,
-                client_server::delete_device_route,
-                client_server::delete_devices_route,
-                client_server::get_tags_route,
-                client_server::update_tag_route,
-                client_server::delete_tag_route,
-                client_server::options_route,
-                client_server::upload_signing_keys_route,
-                client_server::upload_signatures_route,
-                client_server::get_key_changes_route,
-                client_server::get_pushers_route,
-                client_server::set_pushers_route,
-                // client_server::third_party_route,
-                client_server::upgrade_room_route,
-                server_server::get_server_version_route,
-                server_server::get_server_keys_route,
-                server_server::get_server_keys_deprecated_route,
-                server_server::get_public_rooms_route,
-                server_server::get_public_rooms_filtered_route,
-                server_server::send_transaction_message_route,
-                server_server::get_event_route,
-                server_server::get_missing_events_route,
-                server_server::get_event_authorization_route,
-                server_server::get_room_state_route,
-                server_server::get_room_state_ids_route,
-                server_server::create_join_event_template_route,
-                server_server::create_join_event_v1_route,
-                server_server::create_join_event_v2_route,
-                server_server::create_invite_route,
-                server_server::get_devices_route,
-                server_server::get_room_information_route,
-                server_server::get_profile_information_route,
-                server_server::get_keys_route,
-                server_server::claim_keys_route,
-            ],
-        )
-        .register(
-            "/",
-            catchers![
-                not_found_catcher,
-                forbidden_catcher,
-                unknown_token_catcher,
-                missing_token_catcher,
-                bad_json_catcher
-            ],
-        )
-}
-
-#[rocket::main]
+#[tokio::main]
 async fn main() {
     let raw_config =
-        Figment::from(default_config())
+        Figment::new()
             .merge(
                 Toml::file(Env::var("CONDUIT_CONFIG").expect(
                     "The CONDUIT_CONFIG env var needs to be set. Example: /etc/conduit.toml",
@@ -217,14 +80,7 @@ async fn main() {
             }
         };
 
-        let rocket = setup_rocket(raw_config, Arc::clone(&db))
-            .ignite()
-            .await
-            .unwrap();
-
-        Database::start_on_shutdown_tasks(db, rocket.shutdown()).await;
-
-        rocket.launch().await.unwrap();
+        run_server(&config, db).await.unwrap();
     };
 
     if config.allow_jaeger {
@@ -264,55 +120,338 @@ async fn main() {
     }
 }
 
-#[catch(404)]
-fn not_found_catcher(_: &Request<'_>) -> String {
-    "404 Not Found".to_owned()
+async fn run_server(config: &Config, db: Arc<RwLock<Database>>) -> io::Result<()> {
+    let addr = SocketAddr::from((config.address, config.port));
+
+    let x_requested_with = HeaderName::from_static("x-requested-with");
+
+    let middlewares = ServiceBuilder::new()
+        .sensitive_headers([header::AUTHORIZATION])
+        .layer(
+            TraceLayer::new_for_http().make_span_with(|request: &http::Request<_>| {
+                let path = if let Some(path) = request.extensions().get::<MatchedPath>() {
+                    path.as_str()
+                } else {
+                    request.uri().path()
+                };
+
+                tracing::info_span!("http_request", %path)
+            }),
+        )
+        .compression()
+        .layer(
+            CorsLayer::new()
+                .allow_origin(cors::Any)
+                .allow_methods([
+                    Method::GET,
+                    Method::POST,
+                    Method::PUT,
+                    Method::DELETE,
+                    Method::OPTIONS,
+                ])
+                .allow_headers([
+                    header::ORIGIN,
+                    x_requested_with,
+                    header::CONTENT_TYPE,
+                    header::ACCEPT,
+                    header::AUTHORIZATION,
+                ])
+                .max_age(Duration::from_secs(86400)),
+        )
+        .add_extension(db.clone());
+
+    let app = routes().layer(middlewares).into_make_service();
+    let handle = ServerHandle::new();
+
+    tokio::spawn(shutdown_signal(handle.clone()));
+
+    match &config.tls {
+        Some(tls) => {
+            let conf = RustlsConfig::from_pem_file(&tls.certs, &tls.key).await?;
+            bind_rustls(addr, conf).handle(handle).serve(app).await?;
+        }
+        None => {
+            bind(addr).handle(handle).serve(app).await?;
+        }
+    }
+
+    // After serve exits and before exiting, shutdown the DB
+    Database::on_shutdown(db).await;
+
+    Ok(())
 }
 
-#[catch(580)]
-fn forbidden_catcher() -> Result<()> {
-    Err(Error::BadRequest(ErrorKind::Forbidden, "Forbidden."))
+fn routes() -> Router {
+    Router::new()
+        .ruma_route(client_server::get_supported_versions_route)
+        .ruma_route(client_server::get_register_available_route)
+        .ruma_route(client_server::register_route)
+        .ruma_route(client_server::get_login_types_route)
+        .ruma_route(client_server::login_route)
+        .ruma_route(client_server::whoami_route)
+        .ruma_route(client_server::logout_route)
+        .ruma_route(client_server::logout_all_route)
+        .ruma_route(client_server::change_password_route)
+        .ruma_route(client_server::deactivate_route)
+        .ruma_route(client_server::third_party_route)
+        .ruma_route(client_server::get_capabilities_route)
+        .ruma_route(client_server::get_pushrules_all_route)
+        .ruma_route(client_server::set_pushrule_route)
+        .ruma_route(client_server::get_pushrule_route)
+        .ruma_route(client_server::set_pushrule_enabled_route)
+        .ruma_route(client_server::get_pushrule_enabled_route)
+        .ruma_route(client_server::get_pushrule_actions_route)
+        .ruma_route(client_server::set_pushrule_actions_route)
+        .ruma_route(client_server::delete_pushrule_route)
+        .ruma_route(client_server::get_room_event_route)
+        .ruma_route(client_server::get_room_aliases_route)
+        .ruma_route(client_server::get_filter_route)
+        .ruma_route(client_server::create_filter_route)
+        .ruma_route(client_server::set_global_account_data_route)
+        .ruma_route(client_server::set_room_account_data_route)
+        .ruma_route(client_server::get_global_account_data_route)
+        .ruma_route(client_server::get_room_account_data_route)
+        .ruma_route(client_server::set_displayname_route)
+        .ruma_route(client_server::get_displayname_route)
+        .ruma_route(client_server::set_avatar_url_route)
+        .ruma_route(client_server::get_avatar_url_route)
+        .ruma_route(client_server::get_profile_route)
+        .ruma_route(client_server::set_presence_route)
+        .ruma_route(client_server::get_presence_route)
+        .ruma_route(client_server::upload_keys_route)
+        .ruma_route(client_server::get_keys_route)
+        .ruma_route(client_server::claim_keys_route)
+        .ruma_route(client_server::create_backup_version_route)
+        .ruma_route(client_server::update_backup_version_route)
+        .ruma_route(client_server::delete_backup_version_route)
+        .ruma_route(client_server::get_latest_backup_info_route)
+        .ruma_route(client_server::get_backup_info_route)
+        .ruma_route(client_server::add_backup_keys_route)
+        .ruma_route(client_server::add_backup_keys_for_room_route)
+        .ruma_route(client_server::add_backup_keys_for_session_route)
+        .ruma_route(client_server::delete_backup_keys_for_room_route)
+        .ruma_route(client_server::delete_backup_keys_for_session_route)
+        .ruma_route(client_server::delete_backup_keys_route)
+        .ruma_route(client_server::get_backup_keys_for_room_route)
+        .ruma_route(client_server::get_backup_keys_for_session_route)
+        .ruma_route(client_server::get_backup_keys_route)
+        .ruma_route(client_server::set_read_marker_route)
+        .ruma_route(client_server::create_receipt_route)
+        .ruma_route(client_server::create_typing_event_route)
+        .ruma_route(client_server::create_room_route)
+        .ruma_route(client_server::redact_event_route)
+        .ruma_route(client_server::report_event_route)
+        .ruma_route(client_server::create_alias_route)
+        .ruma_route(client_server::delete_alias_route)
+        .ruma_route(client_server::get_alias_route)
+        .ruma_route(client_server::join_room_by_id_route)
+        .ruma_route(client_server::join_room_by_id_or_alias_route)
+        .ruma_route(client_server::joined_members_route)
+        .ruma_route(client_server::leave_room_route)
+        .ruma_route(client_server::forget_room_route)
+        .ruma_route(client_server::joined_rooms_route)
+        .ruma_route(client_server::kick_user_route)
+        .ruma_route(client_server::ban_user_route)
+        .ruma_route(client_server::unban_user_route)
+        .ruma_route(client_server::invite_user_route)
+        .ruma_route(client_server::set_room_visibility_route)
+        .ruma_route(client_server::get_room_visibility_route)
+        .ruma_route(client_server::get_public_rooms_route)
+        .ruma_route(client_server::get_public_rooms_filtered_route)
+        .ruma_route(client_server::search_users_route)
+        .ruma_route(client_server::get_member_events_route)
+        .ruma_route(client_server::get_protocols_route)
+        .ruma_route(client_server::send_message_event_route)
+        .ruma_route(client_server::send_state_event_for_key_route)
+        .ruma_route(client_server::get_state_events_route)
+        .ruma_route(client_server::get_state_events_for_key_route)
+        // Ruma doesn't have support for multiple paths for a single endpoint yet, and these routes
+        // share one Ruma request / response type pair with {get,send}_state_event_for_key_route
+        .route(
+            "/_matrix/client/r0/rooms/:room_id/state/:event_type",
+            get(client_server::get_state_events_for_empty_key_route)
+                .put(client_server::send_state_event_for_empty_key_route),
+        )
+        .route(
+            "/_matrix/client/v3/rooms/:room_id/state/:event_type",
+            get(client_server::get_state_events_for_empty_key_route)
+                .put(client_server::send_state_event_for_empty_key_route),
+        )
+        // These two endpoints allow trailing slashes
+        .route(
+            "/_matrix/client/r0/rooms/:room_id/state/:event_type/",
+            get(client_server::get_state_events_for_empty_key_route)
+                .put(client_server::send_state_event_for_empty_key_route),
+        )
+        .route(
+            "/_matrix/client/v3/rooms/:room_id/state/:event_type/",
+            get(client_server::get_state_events_for_empty_key_route)
+                .put(client_server::send_state_event_for_empty_key_route),
+        )
+        .ruma_route(client_server::sync_events_route)
+        .ruma_route(client_server::get_context_route)
+        .ruma_route(client_server::get_message_events_route)
+        .ruma_route(client_server::search_events_route)
+        .ruma_route(client_server::turn_server_route)
+        .ruma_route(client_server::send_event_to_device_route)
+        .ruma_route(client_server::get_media_config_route)
+        .ruma_route(client_server::create_content_route)
+        .ruma_route(client_server::get_content_route)
+        .ruma_route(client_server::get_content_as_filename_route)
+        .ruma_route(client_server::get_content_thumbnail_route)
+        .ruma_route(client_server::get_devices_route)
+        .ruma_route(client_server::get_device_route)
+        .ruma_route(client_server::update_device_route)
+        .ruma_route(client_server::delete_device_route)
+        .ruma_route(client_server::delete_devices_route)
+        .ruma_route(client_server::get_tags_route)
+        .ruma_route(client_server::update_tag_route)
+        .ruma_route(client_server::delete_tag_route)
+        .ruma_route(client_server::upload_signing_keys_route)
+        .ruma_route(client_server::upload_signatures_route)
+        .ruma_route(client_server::get_key_changes_route)
+        .ruma_route(client_server::get_pushers_route)
+        .ruma_route(client_server::set_pushers_route)
+        // .ruma_route(client_server::third_party_route)
+        .ruma_route(client_server::upgrade_room_route)
+        .ruma_route(server_server::get_server_version_route)
+        .route(
+            "/_matrix/key/v2/server",
+            get(server_server::get_server_keys_route),
+        )
+        .route(
+            "/_matrix/key/v2/server/:key_id",
+            get(server_server::get_server_keys_deprecated_route),
+        )
+        .ruma_route(server_server::get_public_rooms_route)
+        .ruma_route(server_server::get_public_rooms_filtered_route)
+        .ruma_route(server_server::send_transaction_message_route)
+        .ruma_route(server_server::get_event_route)
+        .ruma_route(server_server::get_missing_events_route)
+        .ruma_route(server_server::get_event_authorization_route)
+        .ruma_route(server_server::get_room_state_route)
+        .ruma_route(server_server::get_room_state_ids_route)
+        .ruma_route(server_server::create_join_event_template_route)
+        .ruma_route(server_server::create_join_event_v1_route)
+        .ruma_route(server_server::create_join_event_v2_route)
+        .ruma_route(server_server::create_invite_route)
+        .ruma_route(server_server::get_devices_route)
+        .ruma_route(server_server::get_room_information_route)
+        .ruma_route(server_server::get_profile_information_route)
+        .ruma_route(server_server::get_keys_route)
+        .ruma_route(server_server::claim_keys_route)
+        .fallback(not_found.into_service())
 }
 
-#[catch(581)]
-fn unknown_token_catcher() -> Result<()> {
-    Err(Error::BadRequest(
-        ErrorKind::UnknownToken { soft_logout: false },
-        "Unknown token.",
-    ))
+async fn shutdown_signal(handle: ServerHandle) {
+    let ctrl_c = async {
+        signal::ctrl_c()
+            .await
+            .expect("failed to install Ctrl+C handler");
+    };
+
+    #[cfg(unix)]
+    let terminate = async {
+        signal::unix::signal(signal::unix::SignalKind::terminate())
+            .expect("failed to install signal handler")
+            .recv()
+            .await;
+    };
+
+    #[cfg(not(unix))]
+    let terminate = std::future::pending::<()>();
+
+    let sig: &str;
+
+    tokio::select! {
+        _ = ctrl_c => { sig = "Ctrl+C"; },
+        _ = terminate => { sig = "SIGTERM"; },
+    }
+
+    warn!("Received {}, shutting down...", sig);
+    handle.graceful_shutdown(Some(Duration::from_secs(30)));
 }
 
-#[catch(582)]
-fn missing_token_catcher() -> Result<()> {
-    Err(Error::BadRequest(ErrorKind::MissingToken, "Missing token."))
+async fn not_found(_uri: Uri) -> impl IntoResponse {
+    Error::BadRequest(ErrorKind::NotFound, "Unknown or unimplemented route")
 }
 
-#[catch(583)]
-fn bad_json_catcher() -> Result<()> {
-    Err(Error::BadRequest(ErrorKind::BadJson, "Bad json."))
+trait RouterExt {
+    fn ruma_route<H, T>(self, handler: H) -> Self
+    where
+        H: RumaHandler<T>,
+        T: 'static;
 }
 
-fn default_config() -> rocket::Config {
-    use rocket::config::{LogLevel, Shutdown, Sig};
-
-    rocket::Config {
-        // Disable rocket's logging to get only tracing-subscriber's log output
-        log_level: LogLevel::Off,
-        shutdown: Shutdown {
-            // Once shutdown is triggered, this is the amount of seconds before rocket
-            // will forcefully start shutting down connections, this gives enough time to /sync
-            // requests and the like (which havent gotten the memo, somehow) to still complete gracefully.
-            grace: 35,
-
-            // After the grace period, rocket starts shutting down connections, and waits at least this
-            // many seconds before forcefully shutting all of them down.
-            mercy: 10,
-
-            #[cfg(unix)]
-            signals: hashset![Sig::Term, Sig::Int],
-
-            ..Shutdown::default()
-        },
-        ..rocket::Config::release_default()
+impl RouterExt for Router {
+    fn ruma_route<H, T>(self, handler: H) -> Self
+    where
+        H: RumaHandler<T>,
+        T: 'static,
+    {
+        handler.add_to_router(self)
     }
 }
+
+pub trait RumaHandler<T> {
+    // Can't transform to a handler without boxing or relying on the nightly-only
+    // impl-trait-in-traits feature. Moving a small amount of extra logic into the trait
+    // allows bypassing both.
+    fn add_to_router(self, router: Router) -> Router;
+}
+
+macro_rules! impl_ruma_handler {
+    ( $($ty:ident),* $(,)? ) => {
+        #[axum::async_trait]
+        #[allow(non_snake_case)]
+        impl<Req, E, F, Fut, $($ty,)*> RumaHandler<($($ty,)* Ruma<Req>,)> for F
+        where
+            Req: IncomingRequest + Send + 'static,
+            F: FnOnce($($ty,)* Ruma<Req>) -> Fut + Clone + Send + 'static,
+            Fut: Future<Output = Result<Req::OutgoingResponse, E>>
+                + Send,
+            E: IntoResponse,
+            $( $ty: FromRequest<axum::body::Body> + Send + 'static, )*
+        {
+            fn add_to_router(self, mut router: Router) -> Router {
+                let meta = Req::METADATA;
+                let method_filter = method_to_filter(meta.method);
+
+                for path in IntoIterator::into_iter([meta.unstable_path, meta.r0_path, meta.stable_path]).flatten() {
+                    let handler = self.clone();
+
+                    router = router.route(path, on(method_filter, |$( $ty: $ty, )* req| async move {
+                        handler($($ty,)* req).await.map(RumaResponse)
+                    }))
+                }
+
+                router
+            }
+        }
+    };
+}
+
+impl_ruma_handler!();
+impl_ruma_handler!(T1);
+impl_ruma_handler!(T1, T2);
+impl_ruma_handler!(T1, T2, T3);
+impl_ruma_handler!(T1, T2, T3, T4);
+impl_ruma_handler!(T1, T2, T3, T4, T5);
+impl_ruma_handler!(T1, T2, T3, T4, T5, T6);
+impl_ruma_handler!(T1, T2, T3, T4, T5, T6, T7);
+impl_ruma_handler!(T1, T2, T3, T4, T5, T6, T7, T8);
+
+fn method_to_filter(method: Method) -> MethodFilter {
+    let method_filter = match method {
+        Method::DELETE => MethodFilter::DELETE,
+        Method::GET => MethodFilter::GET,
+        Method::HEAD => MethodFilter::HEAD,
+        Method::OPTIONS => MethodFilter::OPTIONS,
+        Method::PATCH => MethodFilter::PATCH,
+        Method::POST => MethodFilter::POST,
+        Method::PUT => MethodFilter::PUT,
+        Method::TRACE => MethodFilter::TRACE,
+        m => panic!("Unsupported HTTP method: {:?}", m),
+    };
+    method_filter
+}
diff --git a/src/pdu.rs b/src/pdu.rs
index ec6c961b..20ec01ea 100644
--- a/src/pdu.rs
+++ b/src/pdu.rs
@@ -1,11 +1,11 @@
-use crate::Error;
+use crate::{Database, Error};
 use ruma::{
     events::{
         room::member::RoomMemberEventContent, AnyEphemeralRoomEvent, AnyRoomEvent, AnyStateEvent,
-        AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent, EventType, StateEvent,
+        AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent, RoomEventType, StateEvent,
     },
     serde::{CanonicalJsonObject, CanonicalJsonValue, Raw},
-    state_res, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, UInt, UserId,
+    state_res, EventId, MilliSecondsSinceUnixEpoch, RoomId, UInt, UserId,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::{
@@ -29,7 +29,7 @@ pub struct PduEvent {
     pub sender: Box<UserId>,
     pub origin_server_ts: UInt,
     #[serde(rename = "type")]
-    pub kind: EventType,
+    pub kind: RoomEventType,
     pub content: Box<RawJsonValue>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub state_key: Option<String>,
@@ -51,10 +51,10 @@ impl PduEvent {
         self.unsigned = None;
 
         let allowed: &[&str] = match self.kind {
-            EventType::RoomMember => &["membership"],
-            EventType::RoomCreate => &["creator"],
-            EventType::RoomJoinRules => &["join_rule"],
-            EventType::RoomPowerLevels => &[
+            RoomEventType::RoomMember => &["join_authorised_via_users_server", "membership"],
+            RoomEventType::RoomCreate => &["creator"],
+            RoomEventType::RoomJoinRules => &["join_rule"],
+            RoomEventType::RoomPowerLevels => &[
                 "ban",
                 "events",
                 "events_default",
@@ -64,7 +64,7 @@ impl PduEvent {
                 "users",
                 "users_default",
             ],
-            EventType::RoomHistoryVisibility => &["history_visibility"],
+            RoomEventType::RoomHistoryVisibility => &["history_visibility"],
             _ => &[],
         };
 
@@ -279,7 +279,7 @@ impl state_res::Event for PduEvent {
         &self.sender
     }
 
-    fn event_type(&self) -> &EventType {
+    fn event_type(&self) -> &RoomEventType {
         &self.kind
     }
 
@@ -332,16 +332,24 @@ impl Ord for PduEvent {
 /// Returns a tuple of the new `EventId` and the PDU as a `BTreeMap<String, CanonicalJsonValue>`.
 pub(crate) fn gen_event_id_canonical_json(
     pdu: &RawJsonValue,
+    db: &Database,
 ) -> crate::Result<(Box<EventId>, CanonicalJsonObject)> {
-    let value = serde_json::from_str(pdu.get()).map_err(|e| {
+    let value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| {
         warn!("Error parsing incoming event {:?}: {:?}", pdu, e);
         Error::BadServerResponse("Invalid PDU in server response")
     })?;
 
+    let room_id = value
+        .get("room_id")
+        .and_then(|id| RoomId::parse(id.as_str()?).ok())
+        .ok_or_else(|| Error::bad_database("PDU in db has invalid room_id."))?;
+
+    let room_version_id = db.rooms.get_room_version(&room_id);
+
     let event_id = format!(
         "${}",
         // Anything higher than version3 behaves the same
-        ruma::signatures::reference_hash(&value, &RoomVersionId::V6)
+        ruma::signatures::reference_hash(&value, &room_version_id?)
             .expect("ruma can calculate reference hashes")
     )
     .try_into()
@@ -354,7 +362,7 @@ pub(crate) fn gen_event_id_canonical_json(
 #[derive(Debug, Deserialize)]
 pub struct PduBuilder {
     #[serde(rename = "type")]
-    pub event_type: EventType,
+    pub event_type: RoomEventType,
     pub content: Box<RawJsonValue>,
     pub unsigned: Option<BTreeMap<String, serde_json::Value>>,
     pub state_key: Option<String>,
diff --git a/src/ruma_wrapper.rs b/src/ruma_wrapper.rs
index 1bd921d9..15360e58 100644
--- a/src/ruma_wrapper.rs
+++ b/src/ruma_wrapper.rs
@@ -1,33 +1,15 @@
-use crate::{database::DatabaseGuard, Error};
+use crate::Error;
 use ruma::{
-    api::{client::r0::uiaa::UiaaResponse, OutgoingResponse},
-    identifiers::{DeviceId, UserId},
-    signatures::CanonicalJsonValue,
-    Outgoing, ServerName,
+    api::client::uiaa::UiaaResponse, signatures::CanonicalJsonValue, DeviceId, ServerName, UserId,
 };
 use std::ops::Deref;
 
 #[cfg(feature = "conduit_bin")]
-use {
-    crate::server_server,
-    rocket::{
-        data::{self, ByteUnit, Data, FromData},
-        http::Status,
-        outcome::Outcome::*,
-        response::{self, Responder},
-        tokio::io::AsyncReadExt,
-        Request,
-    },
-    ruma::api::{AuthScheme, IncomingRequest},
-    std::collections::BTreeMap,
-    std::io::Cursor,
-    tracing::{debug, warn},
-};
+mod axum;
 
-/// This struct converts rocket requests into ruma structs by converting them into http requests
-/// first.
-pub struct Ruma<T: Outgoing> {
-    pub body: T::Incoming,
+/// Extractor for Ruma request structs
+pub struct Ruma<T> {
+    pub body: T,
     pub sender_user: Option<Box<UserId>>,
     pub sender_device: Option<Box<DeviceId>>,
     pub sender_servername: Option<Box<ServerName>>,
@@ -36,343 +18,14 @@ pub struct Ruma<T: Outgoing> {
     pub from_appservice: bool,
 }
 
-#[cfg(feature = "conduit_bin")]
-#[rocket::async_trait]
-impl<'a, T: Outgoing> FromData<'a> for Ruma<T>
-where
-    T::Incoming: IncomingRequest,
-{
-    type Error = ();
-
-    #[tracing::instrument(skip(request, data))]
-    async fn from_data(
-        request: &'a Request<'_>,
-        data: Data<'a>,
-    ) -> data::Outcome<'a, Self, Self::Error> {
-        let metadata = T::Incoming::METADATA;
-        let db = request
-            .guard::<DatabaseGuard>()
-            .await
-            .expect("database was loaded");
-
-        // Get token from header or query value
-        let token = request
-            .headers()
-            .get_one("Authorization")
-            .and_then(|s| s.get(7..)) // Split off "Bearer "
-            .or_else(|| request.query_value("access_token").and_then(|r| r.ok()));
-
-        let limit = db.globals.max_request_size();
-        let mut handle = data.open(ByteUnit::Byte(limit.into()));
-        let mut body = Vec::new();
-        if handle.read_to_end(&mut body).await.is_err() {
-            // Client disconnected
-            // Missing Token
-            return Failure((Status::new(582), ()));
-        }
-
-        let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();
-
-        let (sender_user, sender_device, sender_servername, from_appservice) = if let Some((
-            _id,
-            registration,
-        )) = db
-            .appservice
-            .all()
-            .unwrap()
-            .iter()
-            .find(|(_id, registration)| {
-                registration
-                    .get("as_token")
-                    .and_then(|as_token| as_token.as_str())
-                    .map_or(false, |as_token| token == Some(as_token))
-            }) {
-            match metadata.authentication {
-                AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
-                    let user_id = request.query_value::<String>("user_id").map_or_else(
-                        || {
-                            UserId::parse_with_server_name(
-                                registration
-                                    .get("sender_localpart")
-                                    .unwrap()
-                                    .as_str()
-                                    .unwrap(),
-                                db.globals.server_name(),
-                            )
-                            .unwrap()
-                        },
-                        |string| {
-                            UserId::parse(string.expect("parsing to string always works")).unwrap()
-                        },
-                    );
-
-                    if !db.users.exists(&user_id).unwrap() {
-                        // Forbidden
-                        return Failure((Status::new(580), ()));
-                    }
-
-                    // TODO: Check if appservice is allowed to be that user
-                    (Some(user_id), None, None, true)
-                }
-                AuthScheme::ServerSignatures => (None, None, None, true),
-                AuthScheme::None => (None, None, None, true),
-            }
-        } else {
-            match metadata.authentication {
-                AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
-                    if let Some(token) = token {
-                        match db.users.find_from_token(token).unwrap() {
-                            // Unknown Token
-                            None => return Failure((Status::new(581), ())),
-                            Some((user_id, device_id)) => (
-                                Some(user_id),
-                                Some(Box::<DeviceId>::from(device_id)),
-                                None,
-                                false,
-                            ),
-                        }
-                    } else {
-                        // Missing Token
-                        return Failure((Status::new(582), ()));
-                    }
-                }
-                AuthScheme::ServerSignatures => {
-                    // Get origin from header
-                    let x_matrix = match request
-                        .headers()
-                        .get_one("Authorization")
-                        .and_then(|s| s.get(9..)) // Split off "X-Matrix " and parse the rest
-                        .map(|s| {
-                            s.split_terminator(',')
-                                .map(|field| {
-                                    let mut splits = field.splitn(2, '=');
-                                    (splits.next(), splits.next().map(|s| s.trim_matches('"')))
-                                })
-                                .collect::<BTreeMap<_, _>>()
-                        }) {
-                        Some(t) => t,
-                        None => {
-                            warn!("No Authorization header");
-
-                            // Forbidden
-                            return Failure((Status::new(580), ()));
-                        }
-                    };
-
-                    let origin_str = match x_matrix.get(&Some("origin")) {
-                        Some(Some(o)) => *o,
-                        _ => {
-                            warn!("Invalid X-Matrix header origin field: {:?}", x_matrix);
-
-                            // Forbidden
-                            return Failure((Status::new(580), ()));
-                        }
-                    };
-
-                    let origin = match ServerName::parse(origin_str) {
-                        Ok(s) => s,
-                        _ => {
-                            warn!(
-                                "Invalid server name in X-Matrix header origin field: {:?}",
-                                x_matrix
-                            );
-
-                            // Forbidden
-                            return Failure((Status::new(580), ()));
-                        }
-                    };
-
-                    let key = match x_matrix.get(&Some("key")) {
-                        Some(Some(k)) => *k,
-                        _ => {
-                            warn!("Invalid X-Matrix header key field: {:?}", x_matrix);
-
-                            // Forbidden
-                            return Failure((Status::new(580), ()));
-                        }
-                    };
-
-                    let sig = match x_matrix.get(&Some("sig")) {
-                        Some(Some(s)) => *s,
-                        _ => {
-                            warn!("Invalid X-Matrix header sig field: {:?}", x_matrix);
-
-                            // Forbidden
-                            return Failure((Status::new(580), ()));
-                        }
-                    };
-
-                    let mut request_map = BTreeMap::<String, CanonicalJsonValue>::new();
-
-                    if let Some(json_body) = &json_body {
-                        request_map.insert("content".to_owned(), json_body.clone());
-                    };
-
-                    request_map.insert(
-                        "method".to_owned(),
-                        CanonicalJsonValue::String(request.method().to_string()),
-                    );
-                    request_map.insert(
-                        "uri".to_owned(),
-                        CanonicalJsonValue::String(request.uri().to_string()),
-                    );
-                    request_map.insert(
-                        "origin".to_owned(),
-                        CanonicalJsonValue::String(origin.as_str().to_owned()),
-                    );
-                    request_map.insert(
-                        "destination".to_owned(),
-                        CanonicalJsonValue::String(db.globals.server_name().as_str().to_owned()),
-                    );
-
-                    let mut origin_signatures = BTreeMap::new();
-                    origin_signatures
-                        .insert(key.to_owned(), CanonicalJsonValue::String(sig.to_owned()));
-
-                    let mut signatures = BTreeMap::new();
-                    signatures.insert(
-                        origin.as_str().to_owned(),
-                        CanonicalJsonValue::Object(origin_signatures),
-                    );
-
-                    request_map.insert(
-                        "signatures".to_owned(),
-                        CanonicalJsonValue::Object(signatures),
-                    );
-
-                    let keys =
-                        match server_server::fetch_signing_keys(&db, &origin, vec![key.to_owned()])
-                            .await
-                        {
-                            Ok(b) => b,
-                            Err(e) => {
-                                warn!("Failed to fetch signing keys: {}", e);
-
-                                // Forbidden
-                                return Failure((Status::new(580), ()));
-                            }
-                        };
-
-                    let mut pub_key_map = BTreeMap::new();
-                    pub_key_map.insert(origin.as_str().to_owned(), keys);
-
-                    match ruma::signatures::verify_json(&pub_key_map, &request_map) {
-                        Ok(()) => (None, None, Some(origin), false),
-                        Err(e) => {
-                            warn!(
-                                "Failed to verify json request from {}: {}\n{:?}",
-                                origin, e, request_map
-                            );
-
-                            if request.uri().to_string().contains('@') {
-                                warn!("Request uri contained '@' character. Make sure your reverse proxy gives Conduit the raw uri (apache: use nocanon)");
-                            }
-
-                            // Forbidden
-                            return Failure((Status::new(580), ()));
-                        }
-                    }
-                }
-                AuthScheme::None => (None, None, None, false),
-            }
-        };
-
-        let mut http_request = http::Request::builder()
-            .uri(request.uri().to_string())
-            .method(&*request.method().to_string());
-        for header in request.headers().iter() {
-            http_request = http_request.header(header.name.as_str(), &*header.value);
-        }
-
-        if let Some(json_body) = json_body.as_mut().and_then(|val| val.as_object_mut()) {
-            let user_id = sender_user.clone().unwrap_or_else(|| {
-                UserId::parse_with_server_name("", db.globals.server_name())
-                    .expect("we know this is valid")
-            });
-
-            if let Some(CanonicalJsonValue::Object(initial_request)) = json_body
-                .get("auth")
-                .and_then(|auth| auth.as_object())
-                .and_then(|auth| auth.get("session"))
-                .and_then(|session| session.as_str())
-                .and_then(|session| {
-                    db.uiaa.get_uiaa_request(
-                        &user_id,
-                        &sender_device.clone().unwrap_or_else(|| "".into()),
-                        session,
-                    )
-                })
-            {
-                for (key, value) in initial_request {
-                    json_body.entry(key).or_insert(value);
-                }
-            }
-            body = serde_json::to_vec(json_body).expect("value to bytes can't fail");
-        }
-
-        let http_request = http_request.body(&*body).unwrap();
-        debug!("{:?}", http_request);
-        match <T::Incoming as IncomingRequest>::try_from_http_request(http_request) {
-            Ok(t) => Success(Ruma {
-                body: t,
-                sender_user,
-                sender_device,
-                sender_servername,
-                from_appservice,
-                json_body,
-            }),
-            Err(e) => {
-                warn!("{:?}", e);
-                // Bad Json
-                Failure((Status::new(583), ()))
-            }
-        }
-    }
-}
-
-impl<T: Outgoing> Deref for Ruma<T> {
-    type Target = T::Incoming;
+impl<T> Deref for Ruma<T> {
+    type Target = T;
 
     fn deref(&self) -> &Self::Target {
         &self.body
     }
 }
 
-/// This struct converts ruma responses into rocket http responses.
-pub type ConduitResult<T> = Result<RumaResponse<T>, Error>;
-
-pub fn response<T: OutgoingResponse>(response: RumaResponse<T>) -> response::Result<'static> {
-    let http_response = response
-        .0
-        .try_into_http_response::<Vec<u8>>()
-        .map_err(|_| Status::InternalServerError)?;
-
-    let mut response = rocket::response::Response::build();
-
-    let status = http_response.status();
-    response.status(Status::new(status.as_u16()));
-
-    for header in http_response.headers() {
-        response.raw_header(header.0.to_string(), header.1.to_str().unwrap().to_owned());
-    }
-
-    let http_body = http_response.into_body();
-
-    response.sized_body(http_body.len(), Cursor::new(http_body));
-
-    response.raw_header("Access-Control-Allow-Origin", "*");
-    response.raw_header(
-        "Access-Control-Allow-Methods",
-        "GET, POST, PUT, DELETE, OPTIONS",
-    );
-    response.raw_header(
-        "Access-Control-Allow-Headers",
-        "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-    );
-    response.raw_header("Access-Control-Max-Age", "86400");
-    response.ok()
-}
-
 #[derive(Clone)]
 pub struct RumaResponse<T>(pub T);
 
@@ -387,14 +40,3 @@ impl From<Error> for RumaResponse<UiaaResponse> {
         t.to_response()
     }
 }
-
-#[cfg(feature = "conduit_bin")]
-impl<'r, 'o, T> Responder<'r, 'o> for RumaResponse<T>
-where
-    'o: 'r,
-    T: OutgoingResponse,
-{
-    fn respond_to(self, _: &'r Request<'_>) -> response::Result<'o> {
-        response(self)
-    }
-}
diff --git a/src/ruma_wrapper/axum.rs b/src/ruma_wrapper/axum.rs
new file mode 100644
index 00000000..45e9d9a8
--- /dev/null
+++ b/src/ruma_wrapper/axum.rs
@@ -0,0 +1,367 @@
+use std::{collections::BTreeMap, iter::FromIterator, str};
+
+use axum::{
+    async_trait,
+    body::{Full, HttpBody},
+    extract::{
+        rejection::TypedHeaderRejectionReason, FromRequest, Path, RequestParts, TypedHeader,
+    },
+    headers::{
+        authorization::{Bearer, Credentials},
+        Authorization,
+    },
+    response::{IntoResponse, Response},
+    BoxError,
+};
+use bytes::{BufMut, Bytes, BytesMut};
+use http::StatusCode;
+use ruma::{
+    api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse},
+    signatures::CanonicalJsonValue,
+    DeviceId, ServerName, UserId,
+};
+use serde::Deserialize;
+use tracing::{debug, error, warn};
+
+use super::{Ruma, RumaResponse};
+use crate::{database::DatabaseGuard, server_server, Error, Result};
+
+#[async_trait]
+impl<T, B> FromRequest<B> for Ruma<T>
+where
+    T: IncomingRequest,
+    B: HttpBody + Send,
+    B::Data: Send,
+    B::Error: Into<BoxError>,
+{
+    type Rejection = Error;
+
+    async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
+        #[derive(Deserialize)]
+        struct QueryParams {
+            access_token: Option<String>,
+            user_id: Option<String>,
+        }
+
+        let metadata = T::METADATA;
+        let db = DatabaseGuard::from_request(req).await?;
+        let auth_header = Option::<TypedHeader<Authorization<Bearer>>>::from_request(req).await?;
+        let path_params = Path::<Vec<String>>::from_request(req).await?;
+
+        let query = req.uri().query().unwrap_or_default();
+        let query_params: QueryParams = match ruma::serde::urlencoded::from_str(query) {
+            Ok(params) => params,
+            Err(e) => {
+                error!(%query, "Failed to deserialize query parameters: {}", e);
+                return Err(Error::BadRequest(
+                    ErrorKind::Unknown,
+                    "Failed to read query parameters",
+                ));
+            }
+        };
+
+        let token = match &auth_header {
+            Some(TypedHeader(Authorization(bearer))) => Some(bearer.token()),
+            None => query_params.access_token.as_deref(),
+        };
+
+        let mut body = Bytes::from_request(req)
+            .await
+            .map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
+
+        let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();
+
+        let appservices = db.appservice.all().unwrap();
+        let appservice_registration = appservices.iter().find(|(_id, registration)| {
+            registration
+                .get("as_token")
+                .and_then(|as_token| as_token.as_str())
+                .map_or(false, |as_token| token == Some(as_token))
+        });
+
+        let (sender_user, sender_device, sender_servername, from_appservice) =
+            if let Some((_id, registration)) = appservice_registration {
+                match metadata.authentication {
+                    AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
+                        let user_id = query_params.user_id.map_or_else(
+                            || {
+                                UserId::parse_with_server_name(
+                                    registration
+                                        .get("sender_localpart")
+                                        .unwrap()
+                                        .as_str()
+                                        .unwrap(),
+                                    db.globals.server_name(),
+                                )
+                                .unwrap()
+                            },
+                            |s| UserId::parse(s).unwrap(),
+                        );
+
+                        if !db.users.exists(&user_id).unwrap() {
+                            return Err(Error::BadRequest(
+                                ErrorKind::Forbidden,
+                                "User does not exist.",
+                            ));
+                        }
+
+                        // TODO: Check if appservice is allowed to be that user
+                        (Some(user_id), None, None, true)
+                    }
+                    AuthScheme::ServerSignatures => (None, None, None, true),
+                    AuthScheme::None => (None, None, None, true),
+                }
+            } else {
+                match metadata.authentication {
+                    AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
+                        let token = match token {
+                            Some(token) => token,
+                            _ => {
+                                return Err(Error::BadRequest(
+                                    ErrorKind::MissingToken,
+                                    "Missing access token.",
+                                ))
+                            }
+                        };
+
+                        match db.users.find_from_token(token).unwrap() {
+                            None => {
+                                return Err(Error::BadRequest(
+                                    ErrorKind::UnknownToken { soft_logout: false },
+                                    "Unknown access token.",
+                                ))
+                            }
+                            Some((user_id, device_id)) => (
+                                Some(user_id),
+                                Some(Box::<DeviceId>::from(device_id)),
+                                None,
+                                false,
+                            ),
+                        }
+                    }
+                    AuthScheme::ServerSignatures => {
+                        let TypedHeader(Authorization(x_matrix)) =
+                            TypedHeader::<Authorization<XMatrix>>::from_request(req)
+                                .await
+                                .map_err(|e| {
+                                    warn!("Missing or invalid Authorization header: {}", e);
+
+                                    let msg = match e.reason() {
+                                        TypedHeaderRejectionReason::Missing => {
+                                            "Missing Authorization header."
+                                        }
+                                        TypedHeaderRejectionReason::Error(_) => {
+                                            "Invalid X-Matrix signatures."
+                                        }
+                                        _ => "Unknown header-related error",
+                                    };
+
+                                    Error::BadRequest(ErrorKind::Forbidden, msg)
+                                })?;
+
+                        let origin_signatures = BTreeMap::from_iter([(
+                            x_matrix.key.clone(),
+                            CanonicalJsonValue::String(x_matrix.sig),
+                        )]);
+
+                        let signatures = BTreeMap::from_iter([(
+                            x_matrix.origin.as_str().to_owned(),
+                            CanonicalJsonValue::Object(origin_signatures),
+                        )]);
+
+                        let mut request_map = BTreeMap::from_iter([
+                            (
+                                "method".to_owned(),
+                                CanonicalJsonValue::String(req.method().to_string()),
+                            ),
+                            (
+                                "uri".to_owned(),
+                                CanonicalJsonValue::String(req.uri().to_string()),
+                            ),
+                            (
+                                "origin".to_owned(),
+                                CanonicalJsonValue::String(x_matrix.origin.as_str().to_owned()),
+                            ),
+                            (
+                                "destination".to_owned(),
+                                CanonicalJsonValue::String(
+                                    db.globals.server_name().as_str().to_owned(),
+                                ),
+                            ),
+                            (
+                                "signatures".to_owned(),
+                                CanonicalJsonValue::Object(signatures),
+                            ),
+                        ]);
+
+                        if let Some(json_body) = &json_body {
+                            request_map.insert("content".to_owned(), json_body.clone());
+                        };
+
+                        let keys_result = server_server::fetch_signing_keys(
+                            &db,
+                            &x_matrix.origin,
+                            vec![x_matrix.key.to_owned()],
+                        )
+                        .await;
+
+                        let keys = match keys_result {
+                            Ok(b) => b,
+                            Err(e) => {
+                                warn!("Failed to fetch signing keys: {}", e);
+                                return Err(Error::BadRequest(
+                                    ErrorKind::Forbidden,
+                                    "Failed to fetch signing keys.",
+                                ));
+                            }
+                        };
+
+                        let pub_key_map =
+                            BTreeMap::from_iter([(x_matrix.origin.as_str().to_owned(), keys)]);
+
+                        match ruma::signatures::verify_json(&pub_key_map, &request_map) {
+                            Ok(()) => (None, None, Some(x_matrix.origin), false),
+                            Err(e) => {
+                                warn!(
+                                    "Failed to verify json request from {}: {}\n{:?}",
+                                    x_matrix.origin, e, request_map
+                                );
+
+                                if req.uri().to_string().contains('@') {
+                                    warn!(
+                                        "Request uri contained '@' character. Make sure your \
+                                         reverse proxy gives Conduit the raw uri (apache: use \
+                                         nocanon)"
+                                    );
+                                }
+
+                                return Err(Error::BadRequest(
+                                    ErrorKind::Forbidden,
+                                    "Failed to verify X-Matrix signatures.",
+                                ));
+                            }
+                        }
+                    }
+                    AuthScheme::None => (None, None, None, false),
+                }
+            };
+
+        let mut http_request = http::Request::builder().uri(req.uri()).method(req.method());
+        *http_request.headers_mut().unwrap() = req.headers().clone();
+
+        if let Some(CanonicalJsonValue::Object(json_body)) = &mut json_body {
+            let user_id = sender_user.clone().unwrap_or_else(|| {
+                UserId::parse_with_server_name("", db.globals.server_name())
+                    .expect("we know this is valid")
+            });
+
+            let uiaa_request = json_body
+                .get("auth")
+                .and_then(|auth| auth.as_object())
+                .and_then(|auth| auth.get("session"))
+                .and_then(|session| session.as_str())
+                .and_then(|session| {
+                    db.uiaa.get_uiaa_request(
+                        &user_id,
+                        &sender_device.clone().unwrap_or_else(|| "".into()),
+                        session,
+                    )
+                });
+
+            if let Some(CanonicalJsonValue::Object(initial_request)) = uiaa_request {
+                for (key, value) in initial_request {
+                    json_body.entry(key).or_insert(value);
+                }
+            }
+
+            let mut buf = BytesMut::new().writer();
+            serde_json::to_writer(&mut buf, json_body).expect("value serialization can't fail");
+            body = buf.into_inner().freeze();
+        }
+
+        let http_request = http_request.body(&*body).unwrap();
+
+        debug!("{:?}", http_request);
+
+        let body = T::try_from_http_request(http_request, &path_params).map_err(|e| {
+            warn!("{:?}", e);
+            Error::BadRequest(ErrorKind::BadJson, "Failed to deserialize request.")
+        })?;
+
+        Ok(Ruma {
+            body,
+            sender_user,
+            sender_device,
+            sender_servername,
+            from_appservice,
+            json_body,
+        })
+    }
+}
+
+struct XMatrix {
+    origin: Box<ServerName>,
+    key: String, // KeyName?
+    sig: String,
+}
+
+impl Credentials for XMatrix {
+    const SCHEME: &'static str = "X-Matrix";
+
+    fn decode(value: &http::HeaderValue) -> Option<Self> {
+        debug_assert!(
+            value.as_bytes().starts_with(b"X-Matrix "),
+            "HeaderValue to decode should start with \"X-Matrix ..\", received = {:?}",
+            value,
+        );
+
+        let parameters = str::from_utf8(&value.as_bytes()["X-Matrix ".len()..])
+            .ok()?
+            .trim_start();
+
+        let mut origin = None;
+        let mut key = None;
+        let mut sig = None;
+
+        for entry in parameters.split_terminator(',') {
+            let (name, value) = entry.split_once('=')?;
+
+            // It's not at all clear why some fields are quoted and others not in the spec,
+            // let's simply accept either form for every field.
+            let value = value
+                .strip_prefix('"')
+                .and_then(|rest| rest.strip_suffix('"'))
+                .unwrap_or(value);
+
+            // FIXME: Catch multiple fields of the same name
+            match name {
+                "origin" => origin = Some(value.try_into().ok()?),
+                "key" => key = Some(value.to_owned()),
+                "sig" => sig = Some(value.to_owned()),
+                _ => debug!(
+                    "Unexpected field `{}` in X-Matrix Authorization header",
+                    name
+                ),
+            }
+        }
+
+        Some(Self {
+            origin: origin?,
+            key: key?,
+            sig: sig?,
+        })
+    }
+
+    fn encode(&self) -> http::HeaderValue {
+        todo!()
+    }
+}
+
+impl<T: OutgoingResponse> IntoResponse for RumaResponse<T> {
+    fn into_response(self) -> Response {
+        match self.0.try_into_http_response::<BytesMut>() {
+            Ok(res) => res.map(BytesMut::freeze).map(Full::new).into_response(),
+            Err(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
+        }
+    }
+}
diff --git a/src/server_server.rs b/src/server_server.rs
index 2c682f6f..6fa83e4c 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -2,15 +2,13 @@ use crate::{
     client_server::{self, claim_keys_helper, get_keys_helper},
     database::{rooms::CompressedStateEvent, DatabaseGuard},
     pdu::EventHash,
-    utils, ConduitResult, Database, Error, PduEvent, Result, Ruma,
+    utils, Database, Error, PduEvent, Result, Ruma,
 };
+use axum::{response::IntoResponse, Json};
+use futures_util::{stream::FuturesUnordered, StreamExt};
 use get_profile_information::v1::ProfileField;
 use http::header::{HeaderValue, AUTHORIZATION};
 use regex::Regex;
-use rocket::{
-    futures::{prelude::*, stream::FuturesUnordered},
-    response::content::Json,
-};
 use ruma::{
     api::{
         client::error::{Error as RumaError, ErrorKind},
@@ -28,29 +26,31 @@ use ruma::{
             membership::{
                 create_invite,
                 create_join_event::{self, RoomState},
-                create_join_event_template,
+                prepare_join_event,
             },
             query::{get_profile_information, get_room_information},
             transactions::{
-                edu::{DeviceListUpdateContent, DirectDeviceContent, Edu},
+                edu::{DeviceListUpdateContent, DirectDeviceContent, Edu, SigningKeyUpdateContent},
                 send_transaction_message,
             },
         },
-        EndpointError, IncomingResponse, OutgoingRequest, OutgoingResponse, SendAccessToken,
+        EndpointError, IncomingResponse, MatrixVersion, OutgoingRequest, OutgoingResponse,
+        SendAccessToken,
     },
     directory::{IncomingFilter, IncomingRoomNetwork},
     events::{
         receipt::{ReceiptEvent, ReceiptEventContent},
         room::{
             create::RoomCreateEventContent,
+            join_rules::{JoinRule, RoomJoinRulesEventContent},
             member::{MembershipState, RoomMemberEventContent},
             server_acl::RoomServerAclEventContent,
         },
-        AnyEphemeralRoomEvent, EventType,
+        RoomEventType, StateEventType,
     },
     int,
     receipt::ReceiptType,
-    serde::{Base64, JsonObject},
+    serde::{Base64, JsonObject, Raw},
     signatures::{CanonicalJsonObject, CanonicalJsonValue},
     state_res::{self, RoomVersion, StateMap},
     to_device::DeviceIdOrAllDevices,
@@ -72,9 +72,6 @@ use std::{
 use tokio::sync::{MutexGuard, Semaphore};
 use tracing::{debug, error, info, trace, warn};
 
-#[cfg(feature = "conduit_bin")]
-use rocket::{get, post, put};
-
 /// Wraps either an literal IP address plus port, or a hostname plus complement
 /// (colon-plus-port if it was specified).
 ///
@@ -82,12 +79,16 @@ use rocket::{get, post, put};
 /// was no port specified to construct a SocketAddr with.
 ///
 /// # Examples:
-/// ```rust,ignore
+/// ```rust
+/// # use conduit::server_server::FedDest;
+/// # fn main() -> Result<(), std::net::AddrParseError> {
 /// FedDest::Literal("198.51.100.3:8448".parse()?);
 /// FedDest::Literal("[2001:db8::4:5]:443".parse()?);
 /// FedDest::Named("matrix.example.org".to_owned(), "".to_owned());
 /// FedDest::Named("matrix.example.org".to_owned(), ":8448".to_owned());
 /// FedDest::Named("198.51.100.5".to_owned(), "".to_owned());
+/// # Ok(())
+/// # }
 /// ```
 #[derive(Clone, Debug, PartialEq)]
 pub enum FedDest {
@@ -160,7 +161,11 @@ where
     let actual_destination_str = actual_destination.clone().into_https_string();
 
     let mut http_request = request
-        .try_into_http_request::<Vec<u8>>(&actual_destination_str, SendAccessToken::IfRequired(""))
+        .try_into_http_request::<Vec<u8>>(
+            &actual_destination_str,
+            SendAccessToken::IfRequired(""),
+            &[MatrixVersion::V1_0],
+        )
         .map_err(|e| {
             warn!(
                 "Failed to find destination {}: {}",
@@ -306,7 +311,6 @@ where
     }
 }
 
-#[tracing::instrument]
 fn get_ip_with_port(destination_str: &str) -> Option<FedDest> {
     if let Ok(destination) = destination_str.parse::<SocketAddr>() {
         Some(FedDest::Literal(destination))
@@ -317,7 +321,6 @@ fn get_ip_with_port(destination_str: &str) -> Option<FedDest> {
     }
 }
 
-#[tracing::instrument]
 fn add_port_to_hostname(destination_str: &str) -> FedDest {
     let (host, port) = match destination_str.find(':') {
         None => (destination_str, ":8448"),
@@ -495,11 +498,10 @@ async fn request_well_known(
 /// # `GET /_matrix/federation/v1/version`
 ///
 /// Get version information on this server.
-#[cfg_attr(feature = "conduit_bin", get("/_matrix/federation/v1/version"))]
-#[tracing::instrument(skip(db))]
-pub fn get_server_version_route(
+pub async fn get_server_version_route(
     db: DatabaseGuard,
-) -> ConduitResult<get_server_version::v1::Response> {
+    _body: Ruma<get_server_version::v1::Request>,
+) -> Result<get_server_version::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -509,8 +511,7 @@ pub fn get_server_version_route(
             name: Some("Conduit".to_owned()),
             version: Some(env!("CARGO_PKG_VERSION").to_owned()),
         }),
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/key/v2/server`
@@ -520,12 +521,9 @@ pub fn get_server_version_route(
 /// - Matrix does not support invalidating public keys, so the key returned by this will be valid
 /// forever.
 // Response type for this endpoint is Json because we need to calculate a signature for the response
-#[cfg_attr(feature = "conduit_bin", get("/_matrix/key/v2/server"))]
-#[tracing::instrument(skip(db))]
-pub fn get_server_keys_route(db: DatabaseGuard) -> Json<String> {
+pub async fn get_server_keys_route(db: DatabaseGuard) -> Result<impl IntoResponse> {
     if !db.globals.allow_federation() {
-        // TODO: Use proper types
-        return Json("Federation is disabled.".to_owned());
+        return Err(Error::bad_config("Federation is disabled."));
     }
 
     let mut verify_keys: BTreeMap<Box<ServerSigningKeyId>, VerifyKey> = BTreeMap::new();
@@ -539,7 +537,7 @@ pub fn get_server_keys_route(db: DatabaseGuard) -> Json<String> {
     );
     let mut response = serde_json::from_slice(
         get_server_keys::v2::Response {
-            server_key: ServerSigningKeys {
+            server_key: Raw::new(&ServerSigningKeys {
                 server_name: db.globals.server_name().to_owned(),
                 verify_keys,
                 old_verify_keys: BTreeMap::new(),
@@ -548,7 +546,8 @@ pub fn get_server_keys_route(db: DatabaseGuard) -> Json<String> {
                     SystemTime::now() + Duration::from_secs(86400 * 7),
                 )
                 .expect("time is valid"),
-            },
+            })
+            .expect("static conversion, no errors"),
         }
         .try_into_http_response::<Vec<u8>>()
         .unwrap()
@@ -563,7 +562,7 @@ pub fn get_server_keys_route(db: DatabaseGuard) -> Json<String> {
     )
     .unwrap();
 
-    Json(serde_json::to_string(&response).expect("JSON is canonical"))
+    Ok(Json(response))
 }
 
 /// # `GET /_matrix/key/v2/server/{keyId}`
@@ -572,24 +571,17 @@ pub fn get_server_keys_route(db: DatabaseGuard) -> Json<String> {
 ///
 /// - Matrix does not support invalidating public keys, so the key returned by this will be valid
 /// forever.
-#[cfg_attr(feature = "conduit_bin", get("/_matrix/key/v2/server/<_>"))]
-#[tracing::instrument(skip(db))]
-pub fn get_server_keys_deprecated_route(db: DatabaseGuard) -> Json<String> {
-    get_server_keys_route(db)
+pub async fn get_server_keys_deprecated_route(db: DatabaseGuard) -> impl IntoResponse {
+    get_server_keys_route(db).await
 }
 
 /// # `POST /_matrix/federation/v1/publicRooms`
 ///
 /// Lists the public rooms on this server.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/federation/v1/publicRooms", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_public_rooms_filtered_route(
     db: DatabaseGuard,
-    body: Ruma<get_public_rooms_filtered::v1::Request<'_>>,
-) -> ConduitResult<get_public_rooms_filtered::v1::Response> {
+    body: Ruma<get_public_rooms_filtered::v1::IncomingRequest>,
+) -> Result<get_public_rooms_filtered::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -602,41 +594,23 @@ pub async fn get_public_rooms_filtered_route(
         &body.filter,
         &body.room_network,
     )
-    .await?
-    .0;
+    .await?;
 
     Ok(get_public_rooms_filtered::v1::Response {
-        chunk: response
-            .chunk
-            .into_iter()
-            .map(|c| {
-                // Convert ruma::api::federation::directory::get_public_rooms::v1::PublicRoomsChunk
-                // to ruma::api::client::r0::directory::PublicRoomsChunk
-                serde_json::from_str(
-                    &serde_json::to_string(&c).expect("PublicRoomsChunk::to_string always works"),
-                )
-                .expect("federation and client-server PublicRoomsChunk are the same type")
-            })
-            .collect(),
+        chunk: response.chunk,
         prev_batch: response.prev_batch,
         next_batch: response.next_batch,
         total_room_count_estimate: response.total_room_count_estimate,
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/federation/v1/publicRooms`
 ///
 /// Lists the public rooms on this server.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/publicRooms", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_public_rooms_route(
     db: DatabaseGuard,
-    body: Ruma<get_public_rooms::v1::Request<'_>>,
-) -> ConduitResult<get_public_rooms::v1::Response> {
+    body: Ruma<get_public_rooms::v1::IncomingRequest>,
+) -> Result<get_public_rooms::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -649,45 +623,32 @@ pub async fn get_public_rooms_route(
         &IncomingFilter::default(),
         &IncomingRoomNetwork::Matrix,
     )
-    .await?
-    .0;
+    .await?;
 
     Ok(get_public_rooms::v1::Response {
-        chunk: response
-            .chunk
-            .into_iter()
-            .map(|c| {
-                // Convert ruma::api::federation::directory::get_public_rooms::v1::PublicRoomsChunk
-                // to ruma::api::client::r0::directory::PublicRoomsChunk
-                serde_json::from_str(
-                    &serde_json::to_string(&c).expect("PublicRoomsChunk::to_string always works"),
-                )
-                .expect("federation and client-server PublicRoomsChunk are the same type")
-            })
-            .collect(),
+        chunk: response.chunk,
         prev_batch: response.prev_batch,
         next_batch: response.next_batch,
         total_room_count_estimate: response.total_room_count_estimate,
-    }
-    .into())
+    })
 }
 
 /// # `PUT /_matrix/federation/v1/send/{txnId}`
 ///
 /// Push EDUs and PDUs to this server.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/federation/v1/send/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn send_transaction_message_route(
     db: DatabaseGuard,
-    body: Ruma<send_transaction_message::v1::Request<'_>>,
-) -> ConduitResult<send_transaction_message::v1::Response> {
+    body: Ruma<send_transaction_message::v1::IncomingRequest>,
+) -> Result<send_transaction_message::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
 
+    let sender_servername = body
+        .sender_servername
+        .as_ref()
+        .expect("server is authenticated");
+
     let mut resolved_map = BTreeMap::new();
 
     let pub_key_map = RwLock::new(BTreeMap::new());
@@ -702,7 +663,7 @@ pub async fn send_transaction_message_route(
 
     for pdu in &body.pdus {
         // We do not add the event_id field to the pdu here because of signature and hashes checks
-        let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(pdu) {
+        let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(pdu, &db) {
             Ok(t) => t,
             Err(_) => {
                 // Event could not be converted to canonical json
@@ -723,14 +684,14 @@ pub async fn send_transaction_message_route(
             }
         };
 
-        acl_check(&body.origin, &room_id, &db)?;
+        acl_check(&sender_servername, &room_id, &db)?;
 
         let mutex = Arc::clone(
             db.globals
                 .roomid_mutex_federation
                 .write()
                 .unwrap()
-                .entry(room_id.clone())
+                .entry(room_id.to_owned())
                 .or_default(),
         );
         let mutex_lock = mutex.lock().await;
@@ -738,7 +699,7 @@ pub async fn send_transaction_message_route(
         resolved_map.insert(
             event_id.clone(),
             handle_incoming_pdu(
-                &body.origin,
+                &sender_servername,
                 &event_id,
                 &room_id,
                 value,
@@ -795,10 +756,10 @@ pub async fn send_transaction_message_route(
                             let mut receipt_content = BTreeMap::new();
                             receipt_content.insert(event_id.to_owned(), receipts);
 
-                            let event = AnyEphemeralRoomEvent::Receipt(ReceiptEvent {
+                            let event = ReceiptEvent {
                                 content: ReceiptEventContent(receipt_content),
                                 room_id: room_id.clone(),
-                            });
+                            };
                             db.rooms.edus.readreceipt_update(
                                 &user_id,
                                 &room_id,
@@ -807,23 +768,27 @@ pub async fn send_transaction_message_route(
                             )?;
                         } else {
                             // TODO fetch missing events
-                            debug!("No known event ids in read receipt: {:?}", user_updates);
+                            info!("No known event ids in read receipt: {:?}", user_updates);
                         }
                     }
                 }
             }
             Edu::Typing(typing) => {
-                if typing.typing {
-                    db.rooms.edus.typing_add(
-                        &typing.user_id,
-                        &typing.room_id,
-                        3000 + utils::millis_since_unix_epoch(),
-                        &db.globals,
-                    )?;
-                } else {
-                    db.rooms
-                        .edus
-                        .typing_remove(&typing.user_id, &typing.room_id, &db.globals)?;
+                if db.rooms.is_joined(&typing.user_id, &typing.room_id)? {
+                    if typing.typing {
+                        db.rooms.edus.typing_add(
+                            &typing.user_id,
+                            &typing.room_id,
+                            3000 + utils::millis_since_unix_epoch(),
+                            &db.globals,
+                        )?;
+                    } else {
+                        db.rooms.edus.typing_remove(
+                            &typing.user_id,
+                            &typing.room_id,
+                            &db.globals,
+                        )?;
+                    }
                 }
             }
             Edu::DeviceListUpdate(DeviceListUpdateContent { user_id, .. }) => {
@@ -839,7 +804,7 @@ pub async fn send_transaction_message_route(
                 // Check if this is a new transaction id
                 if db
                     .transaction_ids
-                    .existing_txnid(&sender, None, (&*message_id).into())?
+                    .existing_txnid(&sender, None, &message_id)?
                     .is_some()
                 {
                     continue;
@@ -887,7 +852,26 @@ pub async fn send_transaction_message_route(
 
                 // Save transaction id with empty data
                 db.transaction_ids
-                    .add_txnid(&sender, None, (&*message_id).into(), &[])?;
+                    .add_txnid(&sender, None, &message_id, &[])?;
+            }
+            Edu::SigningKeyUpdate(SigningKeyUpdateContent {
+                user_id,
+                master_key,
+                self_signing_key,
+            }) => {
+                if user_id.server_name() != sender_servername {
+                    continue;
+                }
+                if let Some(master_key) = master_key {
+                    db.users.add_cross_signing_keys(
+                        &user_id,
+                        &master_key,
+                        &self_signing_key,
+                        &None,
+                        &db.rooms,
+                        &db.globals,
+                    )?;
+                }
             }
             Edu::_Custom(_) => {}
         }
@@ -895,7 +879,7 @@ pub async fn send_transaction_message_route(
 
     db.flush()?;
 
-    Ok(send_transaction_message::v1::Response { pdus: resolved_map }.into())
+    Ok(send_transaction_message::v1::Response { pdus: resolved_map })
 }
 
 /// An async function that can recursively call itself.
@@ -942,6 +926,13 @@ pub(crate) async fn handle_incoming_pdu<'a>(
         }
     }
 
+    match db.rooms.is_disabled(room_id) {
+        Ok(false) => {}
+        _ => {
+            return Err("Federation of this room is currently disabled on this server.".to_owned());
+        }
+    }
+
     // 1. Skip the PDU if we already have it as a timeline event
     if let Ok(Some(pdu_id)) = db.rooms.get_pdu_id(event_id) {
         return Ok(Some(pdu_id.to_vec()));
@@ -949,7 +940,7 @@ pub(crate) async fn handle_incoming_pdu<'a>(
 
     let create_event = db
         .rooms
-        .room_state_get(room_id, &EventType::RoomCreate, "")
+        .room_state_get(room_id, &StateEventType::RoomCreate, "")
         .map_err(|_| "Failed to ask database for event.".to_owned())?
         .ok_or_else(|| "Failed to find create event in db.".to_owned())?;
 
@@ -1054,6 +1045,34 @@ pub(crate) async fn handle_incoming_pdu<'a>(
 
     let mut errors = 0;
     for prev_id in dbg!(sorted) {
+        match db.rooms.is_disabled(room_id) {
+            Ok(false) => {}
+            _ => {
+                return Err(
+                    "Federation of this room is currently disabled on this server.".to_owned(),
+                );
+            }
+        }
+
+        if let Some((time, tries)) = db
+            .globals
+            .bad_event_ratelimiter
+            .read()
+            .unwrap()
+            .get(&*prev_id)
+        {
+            // Exponential backoff
+            let mut min_elapsed_duration = Duration::from_secs(5 * 60) * (*tries) * (*tries);
+            if min_elapsed_duration > Duration::from_secs(60 * 60 * 24) {
+                min_elapsed_duration = Duration::from_secs(60 * 60 * 24);
+            }
+
+            if time.elapsed() < min_elapsed_duration {
+                info!("Backing off from {}", prev_id);
+                continue;
+            }
+        }
+
         if errors >= 5 {
             break;
         }
@@ -1063,7 +1082,11 @@ pub(crate) async fn handle_incoming_pdu<'a>(
             }
 
             let start_time = Instant::now();
-            let event_id = pdu.event_id.clone();
+            db.globals
+                .roomid_federationhandletime
+                .write()
+                .unwrap()
+                .insert(room_id.to_owned(), ((*prev_id).to_owned(), start_time));
             if let Err(e) = upgrade_outlier_to_timeline_pdu(
                 pdu,
                 json,
@@ -1076,19 +1099,44 @@ pub(crate) async fn handle_incoming_pdu<'a>(
             .await
             {
                 errors += 1;
-                warn!("Prev event {} failed: {}", event_id, e);
+                warn!("Prev event {} failed: {}", prev_id, e);
+                match db
+                    .globals
+                    .bad_event_ratelimiter
+                    .write()
+                    .unwrap()
+                    .entry((*prev_id).to_owned())
+                {
+                    hash_map::Entry::Vacant(e) => {
+                        e.insert((Instant::now(), 1));
+                    }
+                    hash_map::Entry::Occupied(mut e) => {
+                        *e.get_mut() = (Instant::now(), e.get().1 + 1)
+                    }
+                }
             }
             let elapsed = start_time.elapsed();
+            db.globals
+                .roomid_federationhandletime
+                .write()
+                .unwrap()
+                .remove(&room_id.to_owned());
             warn!(
                 "Handling prev event {} took {}m{}s",
-                event_id,
+                prev_id,
                 elapsed.as_secs() / 60,
                 elapsed.as_secs() % 60
             );
         }
     }
 
-    upgrade_outlier_to_timeline_pdu(
+    let start_time = Instant::now();
+    db.globals
+        .roomid_federationhandletime
+        .write()
+        .unwrap()
+        .insert(room_id.to_owned(), (event_id.to_owned(), start_time));
+    let r = upgrade_outlier_to_timeline_pdu(
         incoming_pdu,
         val,
         &create_event,
@@ -1097,10 +1145,17 @@ pub(crate) async fn handle_incoming_pdu<'a>(
         room_id,
         pub_key_map,
     )
-    .await
+    .await;
+    db.globals
+        .roomid_federationhandletime
+        .write()
+        .unwrap()
+        .remove(&room_id.to_owned());
+
+    r
 }
 
-#[tracing::instrument(skip(origin, create_event, event_id, room_id, value, db, pub_key_map))]
+#[tracing::instrument(skip(create_event, value, db, pub_key_map))]
 fn handle_outlier_pdu<'a>(
     origin: &'a ServerName,
     create_event: &'a PduEvent,
@@ -1182,7 +1237,7 @@ fn handle_outlier_pdu<'a>(
         .await;
 
         // 6. Reject "due to auth events" if the event doesn't pass auth based on the auth events
-        debug!(
+        info!(
             "Auth check for {} based on auth events",
             incoming_pdu.event_id
         );
@@ -1199,7 +1254,7 @@ fn handle_outlier_pdu<'a>(
             };
 
             match auth_events.entry((
-                auth_event.kind.clone(),
+                auth_event.kind.to_string().into(),
                 auth_event
                     .state_key
                     .clone()
@@ -1219,50 +1274,37 @@ fn handle_outlier_pdu<'a>(
 
         // The original create event must be in the auth events
         if auth_events
-            .get(&(EventType::RoomCreate, "".to_owned()))
+            .get(&(StateEventType::RoomCreate, "".to_owned()))
             .map(|a| a.as_ref())
             != Some(create_event)
         {
             return Err("Incoming event refers to wrong create event.".to_owned());
         }
 
-        // If the previous event was the create event special rules apply
-        let previous_create = if incoming_pdu.auth_events.len() == 1
-            && incoming_pdu.prev_events == incoming_pdu.auth_events
-        {
-            db.rooms
-                .get_pdu(&incoming_pdu.auth_events[0])
-                .map_err(|e| e.to_string())?
-                .filter(|maybe_create| **maybe_create == *create_event)
-        } else {
-            None
-        };
-
         if !state_res::event_auth::auth_check(
             &room_version,
             &incoming_pdu,
-            previous_create.as_ref(),
             None::<PduEvent>, // TODO: third party invite
-            |k, s| auth_events.get(&(k.clone(), s.to_owned())),
+            |k, s| auth_events.get(&(k.to_string().into(), s.to_owned())),
         )
         .map_err(|_e| "Auth check failed".to_owned())?
         {
             return Err("Event has failed auth check with auth events.".to_owned());
         }
 
-        debug!("Validation successful.");
+        info!("Validation successful.");
 
         // 7. Persist the event as an outlier.
         db.rooms
             .add_pdu_outlier(&incoming_pdu.event_id, &val)
             .map_err(|_| "Failed to add pdu as outlier.".to_owned())?;
-        debug!("Added pdu as outlier.");
+        info!("Added pdu as outlier.");
 
         Ok((Arc::new(incoming_pdu), val))
     })
 }
 
-#[tracing::instrument(skip(incoming_pdu, val, create_event, origin, db, room_id, pub_key_map))]
+#[tracing::instrument(skip(incoming_pdu, val, create_event, db, pub_key_map))]
 async fn upgrade_outlier_to_timeline_pdu(
     incoming_pdu: Arc<PduEvent>,
     val: BTreeMap<String, CanonicalJsonValue>,
@@ -1284,6 +1326,8 @@ async fn upgrade_outlier_to_timeline_pdu(
         return Err("Event has been soft failed".into());
     }
 
+    info!("Upgrading {} to timeline pdu", incoming_pdu.event_id);
+
     let create_event_content: RoomCreateEventContent =
         serde_json::from_str(create_event.content.get()).map_err(|e| {
             warn!("Invalid create event: {}", e);
@@ -1299,7 +1343,7 @@ async fn upgrade_outlier_to_timeline_pdu(
     // TODO: if we know the prev_events of the incoming event we can avoid the request and build
     // the state from a known point and resolve if > 1 prev_event
 
-    debug!("Requesting state at event.");
+    info!("Requesting state at event");
     let mut state_at_incoming_event = None;
 
     if incoming_pdu.prev_events.len() == 1 {
@@ -1309,11 +1353,14 @@ async fn upgrade_outlier_to_timeline_pdu(
             .pdu_shortstatehash(prev_event)
             .map_err(|_| "Failed talking to db".to_owned())?;
 
-        let state =
-            prev_event_sstatehash.map(|shortstatehash| db.rooms.state_full_ids(shortstatehash));
+        let state = if let Some(shortstatehash) = prev_event_sstatehash {
+            Some(db.rooms.state_full_ids(shortstatehash).await)
+        } else {
+            None
+        };
 
         if let Some(Ok(mut state)) = state {
-            warn!("Using cached state");
+            info!("Using cached state");
             let prev_pdu =
                 db.rooms.get_pdu(prev_event).ok().flatten().ok_or_else(|| {
                     "Could not find prev event, but we know the state.".to_owned()
@@ -1322,7 +1369,11 @@ async fn upgrade_outlier_to_timeline_pdu(
             if let Some(state_key) = &prev_pdu.state_key {
                 let shortstatekey = db
                     .rooms
-                    .get_or_create_shortstatekey(&prev_pdu.kind, state_key, &db.globals)
+                    .get_or_create_shortstatekey(
+                        &prev_pdu.kind.to_string().into(),
+                        state_key,
+                        &db.globals,
+                    )
                     .map_err(|_| "Failed to create shortstatekey.".to_owned())?;
 
                 state.insert(shortstatekey, Arc::from(prev_event));
@@ -1332,7 +1383,7 @@ async fn upgrade_outlier_to_timeline_pdu(
             state_at_incoming_event = Some(state);
         }
     } else {
-        warn!("Calculating state at event using state res");
+        info!("Calculating state at event using state res");
         let mut extremity_sstatehashes = HashMap::new();
 
         let mut okay = true;
@@ -1362,12 +1413,17 @@ async fn upgrade_outlier_to_timeline_pdu(
                 let mut leaf_state: BTreeMap<_, _> = db
                     .rooms
                     .state_full_ids(sstatehash)
+                    .await
                     .map_err(|_| "Failed to ask db for room state.".to_owned())?;
 
                 if let Some(state_key) = &prev_event.state_key {
                     let shortstatekey = db
                         .rooms
-                        .get_or_create_shortstatekey(&prev_event.kind, state_key, &db.globals)
+                        .get_or_create_shortstatekey(
+                            &prev_event.kind.to_string().into(),
+                            state_key,
+                            &db.globals,
+                        )
                         .map_err(|_| "Failed to create shortstatekey.".to_owned())?;
                     leaf_state.insert(shortstatekey, Arc::from(&*prev_event.event_id));
                     // Now it's the state after the pdu
@@ -1377,8 +1433,10 @@ async fn upgrade_outlier_to_timeline_pdu(
                 let mut starting_events = Vec::with_capacity(leaf_state.len());
 
                 for (k, id) in leaf_state {
-                    if let Ok(k) = db.rooms.get_statekey_from_short(k) {
-                        state.insert(k, id.clone());
+                    if let Ok((ty, st_key)) = db.rooms.get_statekey_from_short(k) {
+                        // FIXME: Undo .to_string().into() when StateMap
+                        //        is updated to use StateEventType
+                        state.insert((ty.to_string().into(), st_key), id.clone());
                     } else {
                         warn!("Failed to get_statekey_from_short.");
                     }
@@ -1387,6 +1445,7 @@ async fn upgrade_outlier_to_timeline_pdu(
 
                 auth_chain_sets.push(
                     get_auth_chain(room_id, starting_events, db)
+                        .await
                         .map_err(|_| "Failed to load auth chain.".to_owned())?
                         .collect(),
                 );
@@ -1394,25 +1453,29 @@ async fn upgrade_outlier_to_timeline_pdu(
                 fork_states.push(state);
             }
 
-            state_at_incoming_event = match state_res::resolve(
-                room_version_id,
-                &fork_states,
-                auth_chain_sets,
-                |id| {
-                    let res = db.rooms.get_pdu(id);
-                    if let Err(e) = &res {
-                        error!("LOOK AT ME Failed to fetch event: {}", e);
-                    }
-                    res.ok().flatten()
-                },
-            ) {
+            let lock = db.globals.stateres_mutex.lock();
+
+            let result = state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| {
+                let res = db.rooms.get_pdu(id);
+                if let Err(e) = &res {
+                    error!("LOOK AT ME Failed to fetch event: {}", e);
+                }
+                res.ok().flatten()
+            });
+            drop(lock);
+
+            state_at_incoming_event = match result {
                 Ok(new_state) => Some(
                     new_state
                         .into_iter()
                         .map(|((event_type, state_key), event_id)| {
                             let shortstatekey = db
                                 .rooms
-                                .get_or_create_shortstatekey(&event_type, &state_key, &db.globals)
+                                .get_or_create_shortstatekey(
+                                    &event_type.to_string().into(),
+                                    &state_key,
+                                    &db.globals,
+                                )
                                 .map_err(|_| "Failed to get_or_create_shortstatekey".to_owned())?;
                             Ok((shortstatekey, event_id))
                         })
@@ -1422,12 +1485,12 @@ async fn upgrade_outlier_to_timeline_pdu(
                     warn!("State resolution on prev events failed, either an event could not be found or deserialization: {}", e);
                     None
                 }
-            };
+            }
         }
     }
 
     if state_at_incoming_event.is_none() {
-        warn!("Calling /state_ids");
+        info!("Calling /state_ids");
         // Call /state_ids to find out what the state at this pdu is. We trust the server's
         // response to some extend, but we still do a lot of checks on the events
         match db
@@ -1443,7 +1506,7 @@ async fn upgrade_outlier_to_timeline_pdu(
             .await
         {
             Ok(res) => {
-                warn!("Fetching state events at event.");
+                info!("Fetching state events at event.");
                 let state_vec = fetch_and_handle_outliers(
                     db,
                     origin,
@@ -1466,7 +1529,11 @@ async fn upgrade_outlier_to_timeline_pdu(
 
                     let shortstatekey = db
                         .rooms
-                        .get_or_create_shortstatekey(&pdu.kind, &state_key, &db.globals)
+                        .get_or_create_shortstatekey(
+                            &pdu.kind.to_string().into(),
+                            &state_key,
+                            &db.globals,
+                        )
                         .map_err(|_| "Failed to create shortstatekey.".to_owned())?;
 
                     match state.entry(shortstatekey) {
@@ -1483,7 +1550,7 @@ async fn upgrade_outlier_to_timeline_pdu(
                 // The original create event must still be in the state
                 let create_shortstatekey = db
                     .rooms
-                    .get_shortstatekey(&EventType::RoomCreate, "")
+                    .get_shortstatekey(&StateEventType::RoomCreate, "")
                     .map_err(|_| "Failed to talk to db.")?
                     .expect("Room exists");
 
@@ -1505,27 +1572,15 @@ async fn upgrade_outlier_to_timeline_pdu(
     let state_at_incoming_event =
         state_at_incoming_event.expect("we always set this to some above");
 
+    info!("Starting auth check");
     // 11. Check the auth of the event passes based on the state of the event
-    // If the previous event was the create event special rules apply
-    let previous_create = if incoming_pdu.auth_events.len() == 1
-        && incoming_pdu.prev_events == incoming_pdu.auth_events
-    {
-        db.rooms
-            .get_pdu(&incoming_pdu.auth_events[0])
-            .map_err(|e| e.to_string())?
-            .filter(|maybe_create| **maybe_create == *create_event)
-    } else {
-        None
-    };
-
     let check_result = state_res::event_auth::auth_check(
         &room_version,
         &incoming_pdu,
-        previous_create.as_ref(),
         None::<PduEvent>, // TODO: third party invite
         |k, s| {
             db.rooms
-                .get_shortstatekey(k, s)
+                .get_shortstatekey(&k.to_string().into(), s)
                 .ok()
                 .flatten()
                 .and_then(|shortstatekey| state_at_incoming_event.get(&shortstatekey))
@@ -1537,7 +1592,7 @@ async fn upgrade_outlier_to_timeline_pdu(
     if !check_result {
         return Err("Event has failed auth check with state at the event.".into());
     }
-    debug!("Auth check succeeded.");
+    info!("Auth check succeeded");
 
     // We start looking at current room state now, so lets lock the room
 
@@ -1553,6 +1608,7 @@ async fn upgrade_outlier_to_timeline_pdu(
 
     // Now we calculate the set of extremities this room has after the incoming event has been
     // applied. We start with the previous extremities (aka leaves)
+    info!("Calculating extremities");
     let mut extremities = db
         .rooms
         .get_pdu_leaves(room_id)
@@ -1568,16 +1624,18 @@ async fn upgrade_outlier_to_timeline_pdu(
     // Only keep those extremities were not referenced yet
     extremities.retain(|id| !matches!(db.rooms.is_event_referenced(room_id, id), Ok(true)));
 
-    let current_sstatehash = db
-        .rooms
-        .current_shortstatehash(room_id)
-        .map_err(|_| "Failed to load current state hash.".to_owned())?
-        .expect("every room has state");
+    info!("Compressing state at event");
+    let state_ids_compressed = state_at_incoming_event
+        .iter()
+        .map(|(shortstatekey, id)| {
+            db.rooms
+                .compress_state_event(*shortstatekey, id, &db.globals)
+                .map_err(|_| "Failed to compress_state_event".to_owned())
+        })
+        .collect::<Result<_, _>>()?;
 
-    let current_state_ids = db
-        .rooms
-        .state_full_ids(current_sstatehash)
-        .map_err(|_| "Failed to load room state.")?;
+    // 13. Check if the event passes auth based on the "current state" of the room, if not "soft fail" it
+    info!("Starting soft fail auth check");
 
     let auth_events = db
         .rooms
@@ -1590,22 +1648,9 @@ async fn upgrade_outlier_to_timeline_pdu(
         )
         .map_err(|_| "Failed to get_auth_events.".to_owned())?;
 
-    let state_ids_compressed = state_at_incoming_event
-        .iter()
-        .map(|(shortstatekey, id)| {
-            db.rooms
-                .compress_state_event(*shortstatekey, id, &db.globals)
-                .map_err(|_| "Failed to compress_state_event".to_owned())
-        })
-        .collect::<Result<_, _>>()?;
-
-    // 13. Check if the event passes auth based on the "current state" of the room, if not "soft fail" it
-    debug!("starting soft fail auth check");
-
     let soft_fail = !state_res::event_auth::auth_check(
         &room_version,
         &incoming_pdu,
-        previous_create.as_ref(),
         None::<PduEvent>,
         |k, s| auth_events.get(&(k.clone(), s.to_owned())),
     )
@@ -1621,7 +1666,10 @@ async fn upgrade_outlier_to_timeline_pdu(
             soft_fail,
             &state_lock,
         )
-        .map_err(|_| "Failed to add pdu to db.".to_owned())?;
+        .map_err(|e| {
+            warn!("Failed to add pdu to db: {}", e);
+            "Failed to add pdu to db.".to_owned()
+        })?;
 
         // Soft fail, we keep the event as an outlier but don't add it to the timeline
         warn!("Event was soft failed: {:?}", incoming_pdu);
@@ -1632,8 +1680,23 @@ async fn upgrade_outlier_to_timeline_pdu(
     }
 
     if incoming_pdu.state_key.is_some() {
+        info!("Loading current room state ids");
+        let current_sstatehash = db
+            .rooms
+            .current_shortstatehash(room_id)
+            .map_err(|_| "Failed to load current state hash.".to_owned())?
+            .expect("every room has state");
+
+        let current_state_ids = db
+            .rooms
+            .state_full_ids(current_sstatehash)
+            .await
+            .map_err(|_| "Failed to load room state.")?;
+
+        info!("Preparing for stateres to derive new room state");
         let mut extremity_sstatehashes = HashMap::new();
 
+        info!("Loading extremities");
         for id in dbg!(&extremities) {
             match db
                 .rooms
@@ -1677,7 +1740,11 @@ async fn upgrade_outlier_to_timeline_pdu(
         if let Some(state_key) = &incoming_pdu.state_key {
             let shortstatekey = db
                 .rooms
-                .get_or_create_shortstatekey(&incoming_pdu.kind, state_key, &db.globals)
+                .get_or_create_shortstatekey(
+                    &incoming_pdu.kind.to_string().into(),
+                    state_key,
+                    &db.globals,
+                )
                 .map_err(|_| "Failed to create shortstatekey.".to_owned())?;
 
             state_after.insert(shortstatekey, Arc::from(&*incoming_pdu.event_id));
@@ -1689,6 +1756,7 @@ async fn upgrade_outlier_to_timeline_pdu(
         let new_room_state = if fork_states.is_empty() {
             return Err("State is empty.".to_owned());
         } else if fork_states.iter().skip(1).all(|f| &fork_states[0] == f) {
+            info!("State resolution trivial");
             // There was only one state, so it has to be the room's current state (because that is
             // always included)
             fork_states[0]
@@ -1700,6 +1768,7 @@ async fn upgrade_outlier_to_timeline_pdu(
                 })
                 .collect::<Result<_, _>>()?
         } else {
+            info!("Loading auth chains");
             // We do need to force an update to this room's state
             update_state = true;
 
@@ -1711,11 +1780,14 @@ async fn upgrade_outlier_to_timeline_pdu(
                         state.iter().map(|(_, id)| id.clone()).collect(),
                         db,
                     )
+                    .await
                     .map_err(|_| "Failed to load auth chain.".to_owned())?
                     .collect(),
                 );
             }
 
+            info!("Loading fork states");
+
             let fork_states: Vec<_> = fork_states
                 .into_iter()
                 .map(|map| {
@@ -1723,7 +1795,9 @@ async fn upgrade_outlier_to_timeline_pdu(
                         .filter_map(|(k, id)| {
                             db.rooms
                                 .get_statekey_from_short(k)
-                                .map(|k| (k, id))
+                                // FIXME: Undo .to_string().into() when StateMap
+                                //        is updated to use StateEventType
+                                .map(|(ty, st_key)| ((ty.to_string().into(), st_key), id))
                                 .map_err(|e| warn!("Failed to get_statekey_from_short: {}", e))
                                 .ok()
                         })
@@ -1731,6 +1805,9 @@ async fn upgrade_outlier_to_timeline_pdu(
                 })
                 .collect();
 
+            info!("Resolving state");
+
+            let lock = db.globals.stateres_mutex.lock();
             let state = match state_res::resolve(
                 room_version_id,
                 &fork_states,
@@ -1749,12 +1826,20 @@ async fn upgrade_outlier_to_timeline_pdu(
                 }
             };
 
+            drop(lock);
+
+            info!("State resolution done. Compressing state");
+
             state
                 .into_iter()
                 .map(|((event_type, state_key), event_id)| {
                     let shortstatekey = db
                         .rooms
-                        .get_or_create_shortstatekey(&event_type, &state_key, &db.globals)
+                        .get_or_create_shortstatekey(
+                            &event_type.to_string().into(),
+                            &state_key,
+                            &db.globals,
+                        )
                         .map_err(|_| "Failed to get_or_create_shortstatekey".to_owned())?;
                     db.rooms
                         .compress_state_event(shortstatekey, &event_id, &db.globals)
@@ -1765,13 +1850,14 @@ async fn upgrade_outlier_to_timeline_pdu(
 
         // Set the new room state to the resolved state
         if update_state {
+            info!("Forcing new room state");
             db.rooms
                 .force_state(room_id, new_room_state, db)
                 .map_err(|_| "Failed to set new room state.".to_owned())?;
         }
-        debug!("Updated resolved state");
     }
 
+    info!("Appending pdu to timeline");
     extremities.insert(incoming_pdu.event_id.clone());
 
     // Now that the event has passed all auth it is added into the timeline.
@@ -1787,9 +1873,12 @@ async fn upgrade_outlier_to_timeline_pdu(
         soft_fail,
         &state_lock,
     )
-    .map_err(|_| "Failed to add pdu to db.".to_owned())?;
+    .map_err(|e| {
+        warn!("Failed to add pdu to db: {}", e);
+        "Failed to add pdu to db.".to_owned()
+    })?;
 
-    debug!("Appended incoming pdu.");
+    info!("Appended incoming pdu");
 
     // Event has passed all auth/stateres checks
     drop(state_lock);
@@ -1805,7 +1894,7 @@ async fn upgrade_outlier_to_timeline_pdu(
 /// b. Look at outlier pdu tree
 /// c. Ask origin server over federation
 /// d. TODO: Ask other servers over federation?
-#[tracing::instrument(skip(db, origin, events, create_event, room_id, pub_key_map))]
+#[tracing::instrument(skip_all)]
 pub(crate) fn fetch_and_handle_outliers<'a>(
     db: &'a Database,
     origin: &'a ServerName,
@@ -1853,17 +1942,23 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
             let mut todo_auth_events = vec![Arc::clone(id)];
             let mut events_in_reverse_order = Vec::new();
             let mut events_all = HashSet::new();
+            let mut i = 0;
             while let Some(next_id) = todo_auth_events.pop() {
                 if events_all.contains(&next_id) {
                     continue;
                 }
 
+                i += 1;
+                if i % 100 == 0 {
+                    tokio::task::yield_now().await;
+                }
+
                 if let Ok(Some(_)) = db.rooms.get_pdu(&next_id) {
                     trace!("Found {} in db", id);
                     continue;
                 }
 
-                warn!("Fetching {} over federation.", next_id);
+                info!("Fetching {} over federation.", next_id);
                 match db
                     .sending
                     .send_federation_request(
@@ -1874,9 +1969,9 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
                     .await
                 {
                     Ok(res) => {
-                        warn!("Got {} over federation", next_id);
+                        info!("Got {} over federation", next_id);
                         let (calculated_event_id, value) =
-                            match crate::pdu::gen_event_id_canonical_json(&res.pdu) {
+                            match crate::pdu::gen_event_id_canonical_json(&res.pdu, &db) {
                                 Ok(t) => t,
                                 Err(_) => {
                                     back_off((*next_id).to_owned());
@@ -1946,7 +2041,7 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
 
 /// Search the DB for the signing keys of the given server, if we don't have them
 /// fetch them from the server and save to our DB.
-#[tracing::instrument(skip(db, origin, signature_ids))]
+#[tracing::instrument(skip_all)]
 pub(crate) async fn fetch_signing_keys(
     db: &Database,
     origin: &ServerName,
@@ -2025,24 +2120,23 @@ pub(crate) async fn fetch_signing_keys(
 
     debug!("Fetching signing keys for {} over federation", origin);
 
-    if let Ok(get_keys_response) = db
+    if let Some(server_key) = db
         .sending
         .send_federation_request(&db.globals, origin, get_server_keys::v2::Request::new())
         .await
+        .ok()
+        .and_then(|resp| resp.server_key.deserialize().ok())
     {
-        db.globals
-            .add_signing_key(origin, get_keys_response.server_key.clone())?;
+        db.globals.add_signing_key(origin, server_key.clone())?;
 
         result.extend(
-            get_keys_response
-                .server_key
+            server_key
                 .verify_keys
                 .into_iter()
                 .map(|(k, v)| (k.to_string(), v.key)),
         );
         result.extend(
-            get_keys_response
-                .server_key
+            server_key
                 .old_verify_keys
                 .into_iter()
                 .map(|(k, v)| (k.to_string(), v.key)),
@@ -2055,7 +2149,7 @@ pub(crate) async fn fetch_signing_keys(
 
     for server in db.globals.trusted_servers() {
         debug!("Asking {} for {}'s signing key", server, origin);
-        if let Ok(keys) = db
+        if let Some(server_keys) = db
             .sending
             .send_federation_request(
                 &db.globals,
@@ -2071,9 +2165,16 @@ pub(crate) async fn fetch_signing_keys(
                 ),
             )
             .await
+            .ok()
+            .map(|resp| {
+                resp.server_keys
+                    .into_iter()
+                    .filter_map(|e| e.deserialize().ok())
+                    .collect::<Vec<_>>()
+            })
         {
-            trace!("Got signing keys: {:?}", keys);
-            for k in keys.server_keys {
+            trace!("Got signing keys: {:?}", server_keys);
+            for k in server_keys {
                 db.globals.add_signing_key(origin, k.clone())?;
                 result.extend(
                     k.verify_keys
@@ -2105,7 +2206,7 @@ pub(crate) async fn fetch_signing_keys(
 
 /// Append the incoming event setting the state snapshot to the state from the
 /// server that sent the event.
-#[tracing::instrument(skip(db, pdu, pdu_json, new_room_leaves, state_ids_compressed, _mutex_lock))]
+#[tracing::instrument(skip_all)]
 fn append_incoming_pdu<'a>(
     db: &Database,
     pdu: &PduEvent,
@@ -2164,7 +2265,7 @@ fn append_incoming_pdu<'a>(
 
             let matching_users = |users: &Regex| {
                 users.is_match(pdu.sender.as_str())
-                    || pdu.kind == EventType::RoomMember
+                    || pdu.kind == RoomEventType::RoomMember
                         && pdu
                             .state_key
                             .as_ref()
@@ -2190,7 +2291,7 @@ fn append_incoming_pdu<'a>(
 }
 
 #[tracing::instrument(skip(starting_events, db))]
-pub(crate) fn get_auth_chain<'a>(
+pub(crate) async fn get_auth_chain<'a>(
     room_id: &RoomId,
     starting_events: Vec<Arc<EventId>>,
     db: &'a Database,
@@ -2199,10 +2300,15 @@ pub(crate) fn get_auth_chain<'a>(
 
     let mut buckets = vec![BTreeSet::new(); NUM_BUCKETS];
 
+    let mut i = 0;
     for id in starting_events {
         let short = db.rooms.get_or_create_shorteventid(&id, &db.globals)?;
         let bucket_id = (short % NUM_BUCKETS as u64) as usize;
         buckets[bucket_id].insert((short, id.clone()));
+        i += 1;
+        if i % 100 == 0 {
+            tokio::task::yield_now().await;
+        }
     }
 
     let mut full_auth_chain = HashSet::new();
@@ -2225,6 +2331,7 @@ pub(crate) fn get_auth_chain<'a>(
         let mut chunk_cache = HashSet::new();
         let mut hits2 = 0;
         let mut misses2 = 0;
+        let mut i = 0;
         for (sevent_id, event_id) in chunk {
             if let Some(cached) = db.rooms.get_auth_chain_from_cache(&[sevent_id])? {
                 hits2 += 1;
@@ -2240,6 +2347,11 @@ pub(crate) fn get_auth_chain<'a>(
                     auth_chain.len()
                 );
                 chunk_cache.extend(auth_chain.iter());
+
+                i += 1;
+                if i % 100 == 0 {
+                    tokio::task::yield_now().await;
+                }
             };
         }
         println!(
@@ -2309,15 +2421,10 @@ fn get_auth_chain_inner(
 /// Retrieves a single event from the server.
 ///
 /// - Only works if a user of this server is currently invited or joined the room
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/event/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn get_event_route(
+pub async fn get_event_route(
     db: DatabaseGuard,
-    body: Ruma<get_event::v1::Request<'_>>,
-) -> ConduitResult<get_event::v1::Response> {
+    body: Ruma<get_event::v1::IncomingRequest>,
+) -> Result<get_event::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -2351,22 +2458,16 @@ pub fn get_event_route(
         origin: db.globals.server_name().to_owned(),
         origin_server_ts: MilliSecondsSinceUnixEpoch::now(),
         pdu: PduEvent::convert_to_outgoing_federation_event(event),
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/federation/v1/get_missing_events/{roomId}`
 ///
 /// Retrieves events that the sender is missing.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/federation/v1/get_missing_events/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn get_missing_events_route(
+pub async fn get_missing_events_route(
     db: DatabaseGuard,
-    body: Ruma<get_missing_events::v1::Request<'_>>,
-) -> ConduitResult<get_missing_events::v1::Response> {
+    body: Ruma<get_missing_events::v1::IncomingRequest>,
+) -> Result<get_missing_events::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -2428,7 +2529,7 @@ pub fn get_missing_events_route(
         i += 1;
     }
 
-    Ok(get_missing_events::v1::Response { events }.into())
+    Ok(get_missing_events::v1::Response { events })
 }
 
 /// # `GET /_matrix/federation/v1/event_auth/{roomId}/{eventId}`
@@ -2436,15 +2537,10 @@ pub fn get_missing_events_route(
 /// Retrieves the auth chain for a given event.
 ///
 /// - This does not include the event itself
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/event_auth/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn get_event_authorization_route(
+pub async fn get_event_authorization_route(
     db: DatabaseGuard,
-    body: Ruma<get_event_authorization::v1::Request<'_>>,
-) -> ConduitResult<get_event_authorization::v1::Response> {
+    body: Ruma<get_event_authorization::v1::IncomingRequest>,
+) -> Result<get_event_authorization::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -2476,29 +2572,23 @@ pub fn get_event_authorization_route(
     let room_id = <&RoomId>::try_from(room_id_str)
         .map_err(|_| Error::bad_database("Invalid room id field in event in database"))?;
 
-    let auth_chain_ids = get_auth_chain(room_id, vec![Arc::from(&*body.event_id)], &db)?;
+    let auth_chain_ids = get_auth_chain(room_id, vec![Arc::from(&*body.event_id)], &db).await?;
 
     Ok(get_event_authorization::v1::Response {
         auth_chain: auth_chain_ids
             .filter_map(|id| db.rooms.get_pdu_json(&id).ok()?)
             .map(PduEvent::convert_to_outgoing_federation_event)
             .collect(),
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/federation/v1/state/{roomId}`
 ///
 /// Retrieves the current state of the room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/state/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn get_room_state_route(
+pub async fn get_room_state_route(
     db: DatabaseGuard,
-    body: Ruma<get_room_state::v1::Request<'_>>,
-) -> ConduitResult<get_room_state::v1::Response> {
+    body: Ruma<get_room_state::v1::IncomingRequest>,
+) -> Result<get_room_state::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -2527,7 +2617,8 @@ pub fn get_room_state_route(
 
     let pdus = db
         .rooms
-        .state_full_ids(shortstatehash)?
+        .state_full_ids(shortstatehash)
+        .await?
         .into_iter()
         .map(|(_, id)| {
             PduEvent::convert_to_outgoing_federation_event(
@@ -2536,7 +2627,8 @@ pub fn get_room_state_route(
         })
         .collect();
 
-    let auth_chain_ids = get_auth_chain(&body.room_id, vec![Arc::from(&*body.event_id)], &db)?;
+    let auth_chain_ids =
+        get_auth_chain(&body.room_id, vec![Arc::from(&*body.event_id)], &db).await?;
 
     Ok(get_room_state::v1::Response {
         auth_chain: auth_chain_ids
@@ -2548,22 +2640,16 @@ pub fn get_room_state_route(
             .filter_map(|r| r.ok())
             .collect(),
         pdus,
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/federation/v1/state_ids/{roomId}`
 ///
 /// Retrieves the current state of the room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/state_ids/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn get_room_state_ids_route(
+pub async fn get_room_state_ids_route(
     db: DatabaseGuard,
-    body: Ruma<get_room_state_ids::v1::Request<'_>>,
-) -> ConduitResult<get_room_state_ids::v1::Response> {
+    body: Ruma<get_room_state_ids::v1::IncomingRequest>,
+) -> Result<get_room_state_ids::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -2592,32 +2678,28 @@ pub fn get_room_state_ids_route(
 
     let pdu_ids = db
         .rooms
-        .state_full_ids(shortstatehash)?
+        .state_full_ids(shortstatehash)
+        .await?
         .into_iter()
         .map(|(_, id)| (*id).to_owned())
         .collect();
 
-    let auth_chain_ids = get_auth_chain(&body.room_id, vec![Arc::from(&*body.event_id)], &db)?;
+    let auth_chain_ids =
+        get_auth_chain(&body.room_id, vec![Arc::from(&*body.event_id)], &db).await?;
 
     Ok(get_room_state_ids::v1::Response {
         auth_chain_ids: auth_chain_ids.map(|id| (*id).to_owned()).collect(),
         pdu_ids,
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/federation/v1/make_join/{roomId}/{userId}`
 ///
 /// Creates a join template.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/make_join/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn create_join_event_template_route(
+pub async fn create_join_event_template_route(
     db: DatabaseGuard,
-    body: Ruma<create_join_event_template::v1::Request<'_>>,
-) -> ConduitResult<create_join_event_template::v1::Response> {
+    body: Ruma<prepare_join_event::v1::IncomingRequest>,
+) -> Result<prepare_join_event::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -2636,6 +2718,33 @@ pub fn create_join_event_template_route(
 
     acl_check(sender_servername, &body.room_id, &db)?;
 
+    // TODO: Conduit does not implement restricted join rules yet, we always reject
+    let join_rules_event =
+        db.rooms
+            .room_state_get(&body.room_id, &StateEventType::RoomJoinRules, "")?;
+
+    let join_rules_event_content: Option<RoomJoinRulesEventContent> = join_rules_event
+        .as_ref()
+        .map(|join_rules_event| {
+            serde_json::from_str(join_rules_event.content.get()).map_err(|e| {
+                warn!("Invalid join rules event: {}", e);
+                Error::bad_database("Invalid join rules event in db.")
+            })
+        })
+        .transpose()?;
+
+    if let Some(join_rules_event_content) = join_rules_event_content {
+        if matches!(
+            join_rules_event_content.join_rule,
+            JoinRule::Restricted { .. }
+        ) {
+            return Err(Error::BadRequest(
+                ErrorKind::Unknown,
+                "Conduit does not support restricted rooms yet.",
+            ));
+        }
+    }
+
     let prev_events: Vec<_> = db
         .rooms
         .get_pdu_leaves(&body.room_id)?
@@ -2645,7 +2754,7 @@ pub fn create_join_event_template_route(
 
     let create_event = db
         .rooms
-        .room_state_get(&body.room_id, &EventType::RoomCreate, "")?;
+        .room_state_get(&body.room_id, &StateEventType::RoomCreate, "")?;
 
     let create_event_content: Option<RoomCreateEventContent> = create_event
         .as_ref()
@@ -2657,17 +2766,12 @@ pub fn create_join_event_template_route(
         })
         .transpose()?;
 
-    let create_prev_event = if prev_events.len() == 1
-        && Some(&prev_events[0]) == create_event.as_ref().map(|c| &c.event_id)
-    {
-        create_event
-    } else {
-        None
-    };
-
-    // If there was no create event yet, assume we are creating a version 6 room right now
-    let room_version_id =
-        create_event_content.map_or(RoomVersionId::V6, |create_event| create_event.room_version);
+    // If there was no create event yet, assume we are creating a room with the default version
+    // right now
+    let room_version_id = create_event_content
+        .map_or(db.globals.default_room_version(), |create_event| {
+            create_event.room_version
+        });
     let room_version = RoomVersion::new(&room_version_id).expect("room version is supported");
 
     if !body.ver.contains(&room_version_id) {
@@ -2692,11 +2796,11 @@ pub fn create_join_event_template_route(
     .expect("member event is valid value");
 
     let state_key = body.user_id.to_string();
-    let kind = EventType::RoomMember;
+    let kind = StateEventType::RoomMember;
 
     let auth_events = db.rooms.get_auth_events(
         &body.room_id,
-        &kind,
+        &kind.to_string().into(),
         &body.user_id,
         Some(&state_key),
         &content,
@@ -2727,7 +2831,7 @@ pub fn create_join_event_template_route(
         origin_server_ts: utils::millis_since_unix_epoch()
             .try_into()
             .expect("time is valid"),
-        kind,
+        kind: kind.to_string().into(),
         content,
         state_key: Some(state_key),
         prev_events,
@@ -2751,7 +2855,6 @@ pub fn create_join_event_template_route(
     let auth_check = state_res::auth_check(
         &room_version,
         &pdu,
-        create_prev_event,
         None::<PduEvent>, // TODO: third_party_invite
         |k, s| auth_events.get(&(k.clone(), s.to_owned())),
     )
@@ -2779,11 +2882,10 @@ pub fn create_join_event_template_route(
         CanonicalJsonValue::String(db.globals.server_name().as_str().to_owned()),
     );
 
-    Ok(create_join_event_template::v1::Response {
+    Ok(prepare_join_event::v1::Response {
         room_version: Some(room_version_id),
         event: to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"),
-    }
-    .into())
+    })
 }
 
 async fn create_join_event(
@@ -2805,6 +2907,33 @@ async fn create_join_event(
 
     acl_check(sender_servername, room_id, db)?;
 
+    // TODO: Conduit does not implement restricted join rules yet, we always reject
+    let join_rules_event = db
+        .rooms
+        .room_state_get(room_id, &StateEventType::RoomJoinRules, "")?;
+
+    let join_rules_event_content: Option<RoomJoinRulesEventContent> = join_rules_event
+        .as_ref()
+        .map(|join_rules_event| {
+            serde_json::from_str(join_rules_event.content.get()).map_err(|e| {
+                warn!("Invalid join rules event: {}", e);
+                Error::bad_database("Invalid join rules event in db.")
+            })
+        })
+        .transpose()?;
+
+    if let Some(join_rules_event_content) = join_rules_event_content {
+        if matches!(
+            join_rules_event_content.join_rule,
+            JoinRule::Restricted { .. }
+        ) {
+            return Err(Error::BadRequest(
+                ErrorKind::Unknown,
+                "Conduit does not support restricted rooms yet.",
+            ));
+        }
+    }
+
     // We need to return the state prior to joining, let's keep a reference to that here
     let shortstatehash = db
         .rooms
@@ -2818,7 +2947,7 @@ async fn create_join_event(
     // let mut auth_cache = EventMap::new();
 
     // We do not add the event_id field to the pdu here because of signature and hashes checks
-    let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(pdu) {
+    let (event_id, value) = match crate::pdu::gen_event_id_canonical_json(pdu, &db) {
         Ok(t) => t,
         Err(_) => {
             // Event could not be converted to canonical json
@@ -2862,12 +2991,13 @@ async fn create_join_event(
         ))?;
     drop(mutex_lock);
 
-    let state_ids = db.rooms.state_full_ids(shortstatehash)?;
+    let state_ids = db.rooms.state_full_ids(shortstatehash).await?;
     let auth_chain_ids = get_auth_chain(
         room_id,
         state_ids.iter().map(|(_, id)| id.clone()).collect(),
         db,
-    )?;
+    )
+    .await?;
 
     let servers = db
         .rooms
@@ -2895,15 +3025,10 @@ async fn create_join_event(
 /// # `PUT /_matrix/federation/v1/send_join/{roomId}/{eventId}`
 ///
 /// Submits a signed join event.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/federation/v1/send_join/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn create_join_event_v1_route(
     db: DatabaseGuard,
-    body: Ruma<create_join_event::v1::Request<'_>>,
-) -> ConduitResult<create_join_event::v1::Response> {
+    body: Ruma<create_join_event::v1::IncomingRequest>,
+) -> Result<create_join_event::v1::Response> {
     let sender_servername = body
         .sender_servername
         .as_ref()
@@ -2911,21 +3036,16 @@ pub async fn create_join_event_v1_route(
 
     let room_state = create_join_event(&db, sender_servername, &body.room_id, &body.pdu).await?;
 
-    Ok(create_join_event::v1::Response { room_state }.into())
+    Ok(create_join_event::v1::Response { room_state })
 }
 
 /// # `PUT /_matrix/federation/v2/send_join/{roomId}/{eventId}`
 ///
 /// Submits a signed join event.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/federation/v2/send_join/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn create_join_event_v2_route(
     db: DatabaseGuard,
-    body: Ruma<create_join_event::v2::Request<'_>>,
-) -> ConduitResult<create_join_event::v2::Response> {
+    body: Ruma<create_join_event::v2::IncomingRequest>,
+) -> Result<create_join_event::v2::Response> {
     let sender_servername = body
         .sender_servername
         .as_ref()
@@ -2933,21 +3053,16 @@ pub async fn create_join_event_v2_route(
 
     let room_state = create_join_event(&db, sender_servername, &body.room_id, &body.pdu).await?;
 
-    Ok(create_join_event::v2::Response { room_state }.into())
+    Ok(create_join_event::v2::Response { room_state })
 }
 
 /// # `PUT /_matrix/federation/v2/invite/{roomId}/{eventId}`
 ///
 /// Invites a remote user to a room.
-#[cfg_attr(
-    feature = "conduit_bin",
-    put("/_matrix/federation/v2/invite/<_>/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn create_invite_route(
     db: DatabaseGuard,
-    body: Ruma<create_invite::v2::Request<'_>>,
-) -> ConduitResult<create_invite::v2::Response> {
+    body: Ruma<create_invite::v2::IncomingRequest>,
+) -> Result<create_invite::v2::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -2959,7 +3074,7 @@ pub async fn create_invite_route(
 
     acl_check(sender_servername, &body.room_id, &db)?;
 
-    if body.room_version != RoomVersionId::V5 && body.room_version != RoomVersionId::V6 {
+    if !db.rooms.is_supported_version(&db, &body.room_version) {
         return Err(Error::BadRequest(
             ErrorKind::IncompatibleRoomVersion {
                 room_version: body.room_version.clone(),
@@ -3048,26 +3163,25 @@ pub async fn create_invite_route(
 
     Ok(create_invite::v2::Response {
         event: PduEvent::convert_to_outgoing_federation_event(signed_event),
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/federation/v1/user/devices/{userId}`
 ///
 /// Gets information on all devices of the user.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/user/devices/<_>", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn get_devices_route(
+pub async fn get_devices_route(
     db: DatabaseGuard,
-    body: Ruma<get_devices::v1::Request<'_>>,
-) -> ConduitResult<get_devices::v1::Response> {
+    body: Ruma<get_devices::v1::IncomingRequest>,
+) -> Result<get_devices::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
 
+    let sender_servername = body
+        .sender_servername
+        .as_ref()
+        .expect("server is authenticated");
+
     Ok(get_devices::v1::Response {
         user_id: body.user_id.clone(),
         stream_id: db
@@ -3091,22 +3205,22 @@ pub fn get_devices_route(
                 })
             })
             .collect(),
-    }
-    .into())
+        master_key: db
+            .users
+            .get_master_key(&body.user_id, |u| u.server_name() == sender_servername)?,
+        self_signing_key: db
+            .users
+            .get_self_signing_key(&body.user_id, |u| u.server_name() == sender_servername)?,
+    })
 }
 
 /// # `GET /_matrix/federation/v1/query/directory`
 ///
 /// Resolve a room alias to a room id.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/query/directory", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn get_room_information_route(
+pub async fn get_room_information_route(
     db: DatabaseGuard,
-    body: Ruma<get_room_information::v1::Request<'_>>,
-) -> ConduitResult<get_room_information::v1::Response> {
+    body: Ruma<get_room_information::v1::IncomingRequest>,
+) -> Result<get_room_information::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -3122,22 +3236,16 @@ pub fn get_room_information_route(
     Ok(get_room_information::v1::Response {
         room_id,
         servers: vec![db.globals.server_name().to_owned()],
-    }
-    .into())
+    })
 }
 
 /// # `GET /_matrix/federation/v1/query/profile`
 ///
 /// Gets information on a profile.
-#[cfg_attr(
-    feature = "conduit_bin",
-    get("/_matrix/federation/v1/query/profile", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
-pub fn get_profile_information_route(
+pub async fn get_profile_information_route(
     db: DatabaseGuard,
-    body: Ruma<get_profile_information::v1::Request<'_>>,
-) -> ConduitResult<get_profile_information::v1::Response> {
+    body: Ruma<get_profile_information::v1::IncomingRequest>,
+) -> Result<get_profile_information::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -3165,22 +3273,16 @@ pub fn get_profile_information_route(
         blurhash,
         displayname,
         avatar_url,
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/federation/v1/user/keys/query`
 ///
 /// Gets devices and identity keys for the given users.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/federation/v1/user/keys/query", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn get_keys_route(
     db: DatabaseGuard,
     body: Ruma<get_keys::v1::Request>,
-) -> ConduitResult<get_keys::v1::Response> {
+) -> Result<get_keys::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -3199,22 +3301,16 @@ pub async fn get_keys_route(
         device_keys: result.device_keys,
         master_keys: result.master_keys,
         self_signing_keys: result.self_signing_keys,
-    }
-    .into())
+    })
 }
 
 /// # `POST /_matrix/federation/v1/user/keys/claim`
 ///
 /// Claims one-time keys.
-#[cfg_attr(
-    feature = "conduit_bin",
-    post("/_matrix/federation/v1/user/keys/claim", data = "<body>")
-)]
-#[tracing::instrument(skip(db, body))]
 pub async fn claim_keys_route(
     db: DatabaseGuard,
     body: Ruma<claim_keys::v1::Request>,
-) -> ConduitResult<claim_keys::v1::Response> {
+) -> Result<claim_keys::v1::Response> {
     if !db.globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));
     }
@@ -3225,11 +3321,10 @@ pub async fn claim_keys_route(
 
     Ok(claim_keys::v1::Response {
         one_time_keys: result.one_time_keys,
-    }
-    .into())
+    })
 }
 
-#[tracing::instrument(skip(event, pub_key_map, db))]
+#[tracing::instrument(skip_all)]
 pub(crate) async fn fetch_required_signing_keys(
     event: &BTreeMap<String, CanonicalJsonValue>,
     pub_key_map: &RwLock<BTreeMap<String, BTreeMap<String, Base64>>>,
@@ -3418,6 +3513,8 @@ pub(crate) async fn fetch_join_signing_keys(
                 .write()
                 .map_err(|_| Error::bad_database("RwLock is poisoned."))?;
             for k in keys.server_keys {
+                let k = k.deserialize().unwrap();
+
                 // TODO: Check signature from trusted server?
                 servers.remove(&k.server_name);
 
@@ -3457,7 +3554,7 @@ pub(crate) async fn fetch_join_signing_keys(
         if let (Ok(get_keys_response), origin) = result {
             let result: BTreeMap<_, _> = db
                 .globals
-                .add_signing_key(&origin, get_keys_response.server_key.clone())?
+                .add_signing_key(&origin, get_keys_response.server_key.deserialize().unwrap())?
                 .into_iter()
                 .map(|(k, v)| (k.to_string(), v.key))
                 .collect();
@@ -3476,7 +3573,7 @@ pub(crate) async fn fetch_join_signing_keys(
 fn acl_check(server_name: &ServerName, room_id: &RoomId, db: &Database) -> Result<()> {
     let acl_event = match db
         .rooms
-        .room_state_get(room_id, &EventType::RoomServerAcl, "")?
+        .room_state_get(room_id, &StateEventType::RoomServerAcl, "")?
     {
         Some(acl) => acl,
         None => return Ok(()),
diff --git a/src/utils.rs b/src/utils.rs
index e2d71f4c..1ad0aa3f 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -3,12 +3,11 @@ use cmp::Ordering;
 use rand::prelude::*;
 use ruma::serde::{try_from_json_map, CanonicalJsonError, CanonicalJsonObject};
 use std::{
-    cmp,
+    cmp, fmt,
     str::FromStr,
     time::{SystemTime, UNIX_EPOCH},
 };
 
-#[tracing::instrument]
 pub fn millis_since_unix_epoch() -> u64 {
     SystemTime::now()
         .duration_since(UNIX_EPOCH)
@@ -39,19 +38,16 @@ pub fn generate_keypair() -> Vec<u8> {
 }
 
 /// Parses the bytes into an u64.
-#[tracing::instrument(skip(bytes))]
 pub fn u64_from_bytes(bytes: &[u8]) -> Result<u64, std::array::TryFromSliceError> {
     let array: [u8; 8] = bytes.try_into()?;
     Ok(u64::from_be_bytes(array))
 }
 
 /// Parses the bytes into a string.
-#[tracing::instrument(skip(bytes))]
 pub fn string_from_bytes(bytes: &[u8]) -> Result<String, std::string::FromUtf8Error> {
     String::from_utf8(bytes.to_vec())
 }
 
-#[tracing::instrument(skip(length))]
 pub fn random_string(length: usize) -> String {
     thread_rng()
         .sample_iter(&rand::distributions::Alphanumeric)
@@ -61,7 +57,6 @@ pub fn random_string(length: usize) -> String {
 }
 
 /// Calculate a new hash for the given password
-#[tracing::instrument(skip(password))]
 pub fn calculate_hash(password: &str) -> Result<String, argon2::Error> {
     let hashing_config = Config {
         variant: Variant::Argon2id,
@@ -72,7 +67,6 @@ pub fn calculate_hash(password: &str) -> Result<String, argon2::Error> {
     argon2::hash_encoded(password.as_bytes(), salt.as_bytes(), &hashing_config)
 }
 
-#[tracing::instrument(skip(iterators, check_order))]
 pub fn common_elements(
     mut iterators: impl Iterator<Item = impl Iterator<Item = Vec<u8>>>,
     check_order: impl Fn(&[u8], &[u8]) -> Ordering,
@@ -100,7 +94,6 @@ pub fn common_elements(
 /// Fallible conversion from any value that implements `Serialize` to a `CanonicalJsonObject`.
 ///
 /// `value` must serialize to an `serde_json::Value::Object`.
-#[tracing::instrument(skip(value))]
 pub fn to_canonical_object<T: serde::Serialize>(
     value: T,
 ) -> Result<CanonicalJsonObject, CanonicalJsonError> {
@@ -114,7 +107,6 @@ pub fn to_canonical_object<T: serde::Serialize>(
     }
 }
 
-#[tracing::instrument(skip(deserializer))]
 pub fn deserialize_from_str<
     'de,
     D: serde::de::Deserializer<'de>,
@@ -140,3 +132,40 @@ pub fn deserialize_from_str<
     }
     deserializer.deserialize_str(Visitor(std::marker::PhantomData))
 }
+
+// Copied from librustdoc:
+// https://github.com/rust-lang/rust/blob/cbaeec14f90b59a91a6b0f17fc046c66fa811892/src/librustdoc/html/escape.rs
+
+/// Wrapper struct which will emit the HTML-escaped version of the contained
+/// string when passed to a format string.
+pub struct HtmlEscape<'a>(pub &'a str);
+
+impl<'a> fmt::Display for HtmlEscape<'a> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // Because the internet is always right, turns out there's not that many
+        // characters to escape: http://stackoverflow.com/questions/7381974
+        let HtmlEscape(s) = *self;
+        let pile_o_bits = s;
+        let mut last = 0;
+        for (i, ch) in s.char_indices() {
+            let s = match ch {
+                '>' => "&gt;",
+                '<' => "&lt;",
+                '&' => "&amp;",
+                '\'' => "&#39;",
+                '"' => "&quot;",
+                _ => continue,
+            };
+            fmt.write_str(&pile_o_bits[last..i])?;
+            fmt.write_str(s)?;
+            // NOTE: we only expect single byte characters here - which is fine as long as we
+            // only match single byte characters
+            last = i + 1;
+        }
+
+        if last < s.len() {
+            fmt.write_str(&pile_o_bits[last..])?;
+        }
+        Ok(())
+    }
+}
diff --git a/tests/Complement.Dockerfile b/tests/Complement.Dockerfile
index f6c62fe8..22016e91 100644
--- a/tests/Complement.Dockerfile
+++ b/tests/Complement.Dockerfile
@@ -27,19 +27,18 @@ RUN chmod +x /workdir/caddy
 COPY conduit-example.toml conduit.toml
 
 ENV SERVER_NAME=localhost
-ENV ROCKET_LOG=normal
 ENV CONDUIT_CONFIG=/workdir/conduit.toml
 
 RUN sed -i "s/port = 6167/port = 8008/g" conduit.toml
 RUN echo "allow_federation = true" >> conduit.toml
 RUN echo "allow_encryption = true" >> conduit.toml
 RUN echo "allow_registration = true" >> conduit.toml
-RUN echo "log = \"info,rocket=info,_=off,sled=off\"" >> conduit.toml
+RUN echo "log = \"info,_=off,sled=off\"" >> conduit.toml
 RUN sed -i "s/address = \"127.0.0.1\"/address = \"0.0.0.0\"/g" conduit.toml
 
 # Enabled Caddy auto cert generation for complement provided CA.
-RUN echo '{"logging":{"logs":{"default":{"level":"WARN"}}}, "apps":{"http":{"https_port":8448,"servers":{"srv0":{"listen":[":8448"],"routes":[{"match":[{"host":["your.server.name"]}],"handle":[{"handler":"subroute","routes":[{"handle":[{"handler":"reverse_proxy","upstreams":[{"dial":"127.0.0.1:8008"}]}]}]}],"terminal":true}],"tls_connection_policies": [{"match": {"sni": ["your.server.name"]}}]}}},"pki": {"certificate_authorities": {"local": {"name": "Complement CA","root": {"certificate": "/ca/ca.crt","private_key": "/ca/ca.key"},"intermediate": {"certificate": "/ca/ca.crt","private_key": "/ca/ca.key"}}}},"tls":{"automation":{"policies":[{"subjects":["your.server.name"],"issuer":{"module":"internal"},"on_demand":true},{"issuer":{"module":"internal", "ca": "local"}}]}}}}' > caddy.json 
- 
+RUN echo '{"logging":{"logs":{"default":{"level":"WARN"}}}, "apps":{"http":{"https_port":8448,"servers":{"srv0":{"listen":[":8448"],"routes":[{"match":[{"host":["your.server.name"]}],"handle":[{"handler":"subroute","routes":[{"handle":[{"handler":"reverse_proxy","upstreams":[{"dial":"127.0.0.1:8008"}]}]}]}],"terminal":true}],"tls_connection_policies": [{"match": {"sni": ["your.server.name"]}}]}}},"pki": {"certificate_authorities": {"local": {"name": "Complement CA","root": {"certificate": "/ca/ca.crt","private_key": "/ca/ca.key"},"intermediate": {"certificate": "/ca/ca.crt","private_key": "/ca/ca.key"}}}},"tls":{"automation":{"policies":[{"subjects":["your.server.name"],"issuer":{"module":"internal"},"on_demand":true},{"issuer":{"module":"internal", "ca": "local"}}]}}}}' > caddy.json
+
 EXPOSE 8008 8448
 
 CMD ([ -z "${COMPLEMENT_CA}" ] && echo "Error: Need Complement PKI support" && true) || \
diff --git a/tests/sytest/sytest-whitelist b/tests/sytest/sytest-whitelist
index 5afc3fd9..1c969dba 100644
--- a/tests/sytest/sytest-whitelist
+++ b/tests/sytest/sytest-whitelist
@@ -445,6 +445,9 @@ Typing notifications don't leak
 Uninvited users cannot join the room
 Unprivileged users can set m.room.topic if it only needs level 0
 User appears in user directory
+User in private room doesn't appear in user directory
+User joining then leaving public room appears and dissappears from directory 
+User in shared private room does appear in user directory until leave 
 User can create and send/receive messages in a room with version 1
 User can create and send/receive messages in a room with version 2
 User can create and send/receive messages in a room with version 3