diff --git a/.env b/.env
index aa09f237b..3275bd419 100644
--- a/.env
+++ b/.env
@@ -20,9 +20,9 @@ IOS_LIB_BASE="libxayn_discovery_engine_bindings"
 
 PRODUCTION_RUSTFLAGS="-Ccodegen-units=1 -Clto=on -Cembed-bitcode=yes"
 
-JUST_VERSION=1.2.0
+JUST_VERSION=1.3.0
 CARGO_SORT_VERSION=1.0.7
 # In the cases we want to use nightly we use the following version
-RUST_NIGHTLY=nightly-2022-05-19
+RUST_NIGHTLY=nightly-2022-07-16
 # cargo install will install CLI tools into this directory
 CARGO_INSTALL_ROOT=cargo-installs
diff --git a/.github/actions/setup-job-docker/action.yml b/.github/actions/setup-job-docker/action.yml
index 5181baf95..5a78e04d6 100644
--- a/.github/actions/setup-job-docker/action.yml
+++ b/.github/actions/setup-job-docker/action.yml
@@ -23,6 +23,9 @@ runs:
     - name: Load .env
       uses: xom9ikk/dotenv@d3ff95524814ceac377510f30f4af6296ea612c1 #v1.0.2
 
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@884cf5c591490f86b788d68b6f585f26235578d6 # v1.12
+
     - uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c # v1.4.0
       if: inputs.rust != 'false'
       with:
diff --git a/.github/actions/setup-job-macos/action.yml b/.github/actions/setup-job-macos/action.yml
index efb0189d0..b046711be 100644
--- a/.github/actions/setup-job-macos/action.yml
+++ b/.github/actions/setup-job-macos/action.yml
@@ -39,6 +39,9 @@ runs:
     - name: Load .env
       uses: xom9ikk/dotenv@d3ff95524814ceac377510f30f4af6296ea612c1 #v1.0.2
 
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@884cf5c591490f86b788d68b6f585f26235578d6 # v1.12
+
     - name: Install just
       uses: extractions/setup-just@aa5d15c144db4585980a44ebfdd2cf337c4f14cb #v1.4.0
       env:
diff --git a/.github/workflows/_reusable.build-android.yml b/.github/workflows/_reusable.build-android.yml
index c319c4b41..616e2d300 100644
--- a/.github/workflows/_reusable.build-android.yml
+++ b/.github/workflows/_reusable.build-android.yml
@@ -17,7 +17,7 @@ jobs:
   build-android-libs:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 45
     strategy:
       matrix:
diff --git a/.github/workflows/_reusable.build-flutter-example.yml b/.github/workflows/_reusable.build-flutter-example.yml
index 76f7ab461..857f5ff69 100644
--- a/.github/workflows/_reusable.build-flutter-example.yml
+++ b/.github/workflows/_reusable.build-flutter-example.yml
@@ -47,7 +47,7 @@ jobs:
     # that needs to exist during the linking process.
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
diff --git a/.github/workflows/_reusable.dart.yml b/.github/workflows/_reusable.dart.yml
index 56a020cbf..e33f6f0f3 100644
--- a/.github/workflows/_reusable.dart.yml
+++ b/.github/workflows/_reusable.dart.yml
@@ -7,7 +7,7 @@ jobs:
   dart-format:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 10
     steps:
       - name: Checkout repository
@@ -24,7 +24,7 @@ jobs:
   dart-analyze:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 15
     steps:
       - name: Checkout repository
@@ -42,7 +42,7 @@ jobs:
   dart-test:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 20
     steps:
       - name: Checkout repository
@@ -60,7 +60,7 @@ jobs:
   dart-doc:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 15
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/_reusable.flutter.yml b/.github/workflows/_reusable.flutter.yml
index 32aef59af..18d675d5e 100644
--- a/.github/workflows/_reusable.flutter.yml
+++ b/.github/workflows/_reusable.flutter.yml
@@ -7,7 +7,7 @@ jobs:
   flutter-analyze:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 15
     steps:
       - name: Checkout repository
@@ -24,7 +24,7 @@ jobs:
   flutter-test:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 15
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/_reusable.rust.yml b/.github/workflows/_reusable.rust.yml
index 2b8a956b3..65bf57595 100644
--- a/.github/workflows/_reusable.rust.yml
+++ b/.github/workflows/_reusable.rust.yml
@@ -7,7 +7,7 @@ jobs:
   cargo-format:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
@@ -23,7 +23,7 @@ jobs:
   cargo-clippy:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
@@ -40,7 +40,7 @@ jobs:
   cargo-test:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
@@ -59,7 +59,7 @@ jobs:
   cargo-doc:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
index a328bf7f7..3c0991484 100644
--- a/.github/workflows/bors.yml
+++ b/.github/workflows/bors.yml
@@ -45,7 +45,7 @@ jobs:
       - build-flutter-example
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 5
     if: ${{ always() }}
     steps:
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index bdabb1fe9..c954a8ee5 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -17,7 +17,7 @@ jobs:
   selection:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     outputs:
       dart: ${{ steps.filter.outputs.dart }}
       rust: ${{ steps.filter.outputs.rust }}
@@ -64,7 +64,7 @@ jobs:
     if: ${{ always() }}
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 93f9042eb..98a0ed1cc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
   release:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 10
     needs: [build-ios-libs, build-android-libs]
     steps:
diff --git a/.github/workflows/web-service.yml b/.github/workflows/web-service.yml
index 7041f418a..936b762f6 100644
--- a/.github/workflows/web-service.yml
+++ b/.github/workflows/web-service.yml
@@ -13,7 +13,7 @@ jobs:
   rust-build:
     runs-on: hetzner-pm
     container:
-      image: xaynetci/yellow:v3
+      image: xaynetci/yellow:v4
     timeout-minutes: 10
     steps:
       - name: Checkout repository
diff --git a/discovery_engine_core/Cargo.lock b/discovery_engine_core/Cargo.lock
index eff9254c9..db4ee7802 100644
--- a/discovery_engine_core/Cargo.lock
+++ b/discovery_engine_core/Cargo.lock
@@ -14,7 +14,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
  "once_cell",
  "version_check",
 ]
@@ -45,9 +45,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.57"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142"
 
 [[package]]
 name = "anymap2"
@@ -57,9 +57,9 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
 
 [[package]]
 name = "assert-json-diff"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f1c3703dd33532d7f0ca049168930e9099ecac238e23cf932f3a69c42f06da"
+checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
 dependencies = [
  "serde",
  "serde_json",
@@ -121,9 +121,9 @@ checksum = "f61305cacf1d0c5c9d3ee283d22f8f1f8c743a18ceb44a1b102bd53476c141de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.56"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
+checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -161,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "base64"
@@ -189,7 +189,7 @@ dependencies = [
  "bitflags",
  "cexpr",
  "clang-sys",
- "clap 3.2.4",
+ "clap 3.2.16",
  "env_logger",
  "lazy_static",
  "lazycell",
@@ -205,9 +205,9 @@ dependencies = [
 
 [[package]]
 name = "bit-set"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
  "bit-vec",
 ]
@@ -224,25 +224,13 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
 ]
 
 [[package]]
@@ -251,16 +239,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
 dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
+ "generic-array",
 ]
 
 [[package]]
@@ -287,15 +266,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
 
 [[package]]
 name = "byteorder"
@@ -305,9 +278,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
 
 [[package]]
 name = "bzip2"
@@ -338,12 +311,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 
 [[package]]
 name = "cast"
-version = "0.2.7"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
-dependencies = [
- "rustc_version",
-]
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cbindgen"
@@ -351,7 +321,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb"
 dependencies = [
- "clap 3.2.4",
+ "clap 3.2.16",
  "heck 0.4.0",
  "indexmap",
  "log",
@@ -404,20 +374,11 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
 
-[[package]]
-name = "claim"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81099d6bb72e1df6d50bb2347224b666a670912bb7f06dbe867a4a070ab3ce8"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "clang-sys"
-version = "1.3.1"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21"
+checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
 dependencies = [
  "glob",
  "libc",
@@ -441,9 +402,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.4"
+version = "3.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d20de3739b4fb45a17837824f40aa1769cc7655d7a83e68739a77fe7b30c87a"
+checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9"
 dependencies = [
  "atty",
  "bitflags",
@@ -456,27 +417,36 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
 dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "concurrent-queue"
-version = "1.2.2"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
 dependencies = [
  "cache-padded",
 ]
 
 [[package]]
 name = "console"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
+checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847"
 dependencies = [
  "encode_unicode",
  "libc",
@@ -520,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
+checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
 dependencies = [
  "atty",
  "cast",
@@ -546,9 +516,9 @@ dependencies = [
 
 [[package]]
 name = "criterion-plot"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
+checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
 dependencies = [
  "cast",
  "itertools",
@@ -556,9 +526,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -566,9 +536,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
 dependencies = [
  "cfg-if",
  "crossbeam-epoch",
@@ -577,23 +547,23 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.8"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
+checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "lazy_static",
  "memoffset",
+ "once_cell",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
+checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -601,21 +571,27 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
+checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
 dependencies = [
  "cfg-if",
- "lazy_static",
+ "once_cell",
 ]
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-common"
-version = "0.1.3"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
  "typenum",
 ]
 
@@ -643,9 +619,9 @@ dependencies = [
 
 [[package]]
 name = "deadpool"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90d58a15f5acfe41afcac9775d8e92f2338d14482220c778c6e42aa77778182"
+checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e"
 dependencies = [
  "async-trait",
  "deadpool-runtime",
@@ -699,22 +675,13 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "digest"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array",
 ]
 
 [[package]]
@@ -727,6 +694,26 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.3"
@@ -745,10 +732,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
-name = "dotenv"
-version = "0.15.0"
+name = "dotenvy"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+checksum = "7e851a83c30366fd01d75b913588e95e74a1705c1ecc5d58b1f8e1a6d556525f"
+dependencies = [
+ "dirs",
+]
 
 [[package]]
 name = "downcast"
@@ -764,9 +754,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28"
+checksum = "9d07a982d1fb29db01e5a59b1918e03da4df7297eaeee7686ac45542fd4e59c8"
 
 [[package]]
 name = "educe"
@@ -782,9 +772,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
 
 [[package]]
 name = "encode_unicode"
@@ -830,21 +820,15 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
 dependencies = [
  "instant",
 ]
@@ -864,31 +848,29 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c"
+checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
 name = "fixedbitset"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
 dependencies = [
- "cfg-if",
  "crc32fast",
- "libc",
  "miniz_oxide",
 ]
 
@@ -903,14 +885,14 @@ dependencies = [
 
 [[package]]
 name = "flume"
-version = "0.10.13"
+version = "0.10.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ceeb589a3157cac0ab8cc585feb749bd2cea5cb55a6ee802ad72d9fd38303da"
+checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
 dependencies = [
  "futures-core",
  "futures-sink",
  "pin-project",
- "spin 0.9.3",
+ "spin 0.9.4",
 ]
 
 [[package]]
@@ -931,9 +913,9 @@ dependencies = [
 
 [[package]]
 name = "fragile"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d758e60b45e8d749c89c1b389ad8aee550f86aa12e2b9298b546dda7a82ab1"
+checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab"
 
 [[package]]
 name = "futures"
@@ -1058,18 +1040,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
 dependencies = [
  "typenum",
  "version_check",
@@ -1088,13 +1061,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -1118,7 +1091,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util 0.7.1",
+ "tokio-util 0.7.3",
  "tracing",
 ]
 
@@ -1128,11 +1101,21 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
+[[package]]
+name = "half"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554"
+dependencies = [
+ "crunchy",
+ "num-traits",
+]
+
 [[package]]
 name = "handlebars"
-version = "4.3.1"
+version = "4.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66d0c1b6e3abfd1e72818798925e16e02ed77e1b47f6c25a95a23b377ee4299"
+checksum = "360d9740069b2f6cbb63ce2dbaa71a20d3185350cbb990d7bebeb9318415eb17"
 dependencies = [
  "log",
  "pest",
@@ -1144,15 +1127,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-
-[[package]]
-name = "hashbrown"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
  "ahash",
 ]
@@ -1163,7 +1140,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086"
 dependencies = [
- "hashbrown 0.12.1",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1226,20 +1203,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "http"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.1",
+ "itoa 1.0.2",
 ]
 
 [[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",
@@ -1287,9 +1264,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.18"
+version = "0.14.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
+checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1300,7 +1277,7 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 1.0.1",
+ "itoa 1.0.2",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -1335,12 +1312,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.8.1"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg",
- "hashbrown 0.11.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1393,15 +1370,15 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
 
 [[package]]
 name = "js-sys"
-version = "0.3.57"
+version = "0.3.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
+checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1417,11 +1394,12 @@ dependencies = [
 
 [[package]]
 name = "kstring"
-version = "1.0.6"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
+checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
 dependencies = [
  "serde",
+ "static_assertions",
 ]
 
 [[package]]
@@ -1438,9 +1416,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "libloading"
@@ -1454,9 +1432,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
+checksum = "da83a57f3f5ba3680950aa3cbc806fc297bc0b289d42e8942ed528ace71b8145"
 
 [[package]]
 name = "libsqlite3-sys"
@@ -1471,12 +1449,11 @@ dependencies = [
 
 [[package]]
 name = "liquid"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6e6551b4c8a2045351f0853b54807b21080176a055b754dc0ad29428edf293"
+checksum = "00f55b9db2305857de3b3ceaa0e75cb51a76aaec793875fe152e139cb8fed05c"
 dependencies = [
  "doc-comment",
- "kstring",
  "liquid-core",
  "liquid-derive",
  "liquid-lib",
@@ -1485,9 +1462,9 @@ dependencies = [
 
 [[package]]
 name = "liquid-core"
-version = "0.24.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea8f6c13e8ae36bce67fc1eaacf32c13b26d16576b7ee2ec9de33a3980cefd6"
+checksum = "a93764837aeac37f14b74708cd88a44d82edfa9ad2b1bcd9a3b4d8802fdd9f98"
 dependencies = [
  "anymap2",
  "itertools",
@@ -1496,15 +1473,16 @@ dependencies = [
  "num-traits",
  "pest",
  "pest_derive",
+ "regex",
  "serde",
- "time 0.3.9",
+ "time 0.3.12",
 ]
 
 [[package]]
 name = "liquid-derive"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82d81028aba7e869d0aa423ae926a7f15fd55ca576baac279ed38020b180a56"
+checksum = "926454345f103e8433833077acdbfaa7c3e4b90788d585a8358f02f0b8f5a469"
 dependencies = [
  "proc-macro2",
  "proc-quote",
@@ -1513,26 +1491,26 @@ dependencies = [
 
 [[package]]
 name = "liquid-lib"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8256326835eae262affdc6df8743d9e1b917354ba3c8c380e6238426a8097564"
+checksum = "fd06ca30ae026d26ee7fa8596f9590959e2d3726bc5a0f16a21ac4f050ec83c0"
 dependencies = [
  "itertools",
- "kstring",
  "liquid-core",
  "once_cell",
  "percent-encoding",
  "regex",
- "time 0.3.9",
+ "time 0.3.12",
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "lock_api"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
 dependencies = [
+ "autocfg",
  "scopeguard",
 ]
 
@@ -1615,18 +1593,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
 dependencies = [
  "libc",
  "log",
@@ -1636,9 +1614,9 @@ dependencies = [
 
 [[package]]
 name = "mockall"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5641e476bbaf592a3939a7485fa079f427b4db21407d5ebfd5bba4e07a1f6f4c"
+checksum = "e2be9a9090bc1cac2930688fa9478092a64c6a92ddc6ae0692d46b37d9cab709"
 dependencies = [
  "cfg-if",
  "downcast",
@@ -1651,9 +1629,9 @@ dependencies = [
 
 [[package]]
 name = "mockall_derive"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "262d56735932ee0240d515656e5a7667af3af2a5b0af4da558c4cff2b2aeb0c7"
+checksum = "86d702a0530a0141cf4ed147cf5ec7be6f2c187d4e37fcbefc39cf34116bfe8f"
 dependencies = [
  "cfg-if",
  "proc-macro2",
@@ -1687,9 +1665,9 @@ dependencies = [
 
 [[package]]
 name = "ndarray"
-version = "0.15.4"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec23e6762830658d2b3d385a75aa212af2f67a4586d4442907144f3bb6a1ca8"
+checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
 dependencies = [
  "matrixmultiply",
  "num-complex",
@@ -1728,9 +1706,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fbc387afefefd5e9e39493299f3069e14a140dd34dc19b4c1c1a8fddb6a790"
+checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
 dependencies = [
  "num-traits",
 ]
@@ -1828,12 +1806,6 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"
@@ -1842,9 +1814,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "os_str_bytes"
-version = "6.1.0"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
+checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
 
 [[package]]
 name = "parking"
@@ -1879,9 +1851,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22"
 
 [[package]]
 name = "peeking_take_while"
@@ -1897,18 +1869,19 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pest"
-version = "2.1.3"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8"
 dependencies = [
+ "thiserror",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.1.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+checksum = "b13570633aff33c6d22ce47dd566b10a3b9122c2fe9d8e7501895905be532b91"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1916,9 +1889,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.1.3"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+checksum = "b3c567e5702efdc79fb18859ea74c3eb36e14c43da7b8c1f098a4ed6514ec7a0"
 dependencies = [
  "pest",
  "pest_meta",
@@ -1929,20 +1902,20 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.1.3"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+checksum = "5eb32be5ee3bbdafa8c7a18b0a8a8d962b66cfa2ceee4037f49267a50ee821fe"
 dependencies = [
- "maplit",
+ "once_cell",
  "pest",
- "sha-1 0.8.2",
+ "sha-1 0.10.0",
 ]
 
 [[package]]
 name = "petgraph"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
+checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -1950,18 +1923,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
+checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
+checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1988,9 +1961,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "plotters"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
+checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -2001,15 +1974,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
+checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
+checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615"
 dependencies = [
  "plotters-backend",
 ]
@@ -2082,9 +2055,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.39"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
 dependencies = [
  "unicode-ident",
 ]
@@ -2115,9 +2088,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.9.0"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
+checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -2125,12 +2098,14 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.9.0"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
+checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
 dependencies = [
  "bytes",
- "heck 0.3.3",
+ "cfg-if",
+ "cmake",
+ "heck 0.4.0",
  "itertools",
  "lazy_static",
  "log",
@@ -2145,9 +2120,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
+checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2158,9 +2133,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
+checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
 dependencies = [
  "bytes",
  "prost",
@@ -2174,9 +2149,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
@@ -2240,7 +2215,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
 ]
 
 [[package]]
@@ -2282,9 +2257,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"
+checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -2294,18 +2269,29 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom 0.2.7",
+ "redox_syscall",
+ "thiserror",
+]
+
 [[package]]
 name = "regex"
-version = "1.5.6"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2320,9 +2306,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.26"
+version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
 [[package]]
 name = "remove_dir_all"
@@ -2374,9 +2360,9 @@ dependencies = [
 
 [[package]]
 name = "retain_mut"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086"
+checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
 
 [[package]]
 name = "ring"
@@ -2410,9 +2396,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.20.4"
+version = "0.20.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921"
+checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
 dependencies = [
  "log",
  "ring",
@@ -2422,18 +2408,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
+checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
 dependencies = [
  "base64",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
 
 [[package]]
 name = "safemem"
@@ -2483,15 +2469,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.10"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c"
+checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
 
 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "7af873f2c95b99fcb0bd0fe622a43e29514658873c8ceba88c4cb88833a22500"
 dependencies = [
  "serde_derive",
 ]
@@ -2502,15 +2488,15 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
- "half",
+ "half 1.8.2",
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "75743a150d003dd863b51dc809bcad0d73f2102c53632f1e954e738192a3413f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2519,20 +2505,20 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
+checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
 dependencies = [
- "itoa 1.0.1",
+ "itoa 1.0.2",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7868ad3b8196a8a0aea99a8220b124278ee5320a55e4fde97794b6f85b1a377"
+checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d"
 dependencies = [
  "serde",
 ]
@@ -2566,23 +2552,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.1",
+ "itoa 1.0.2",
  "ryu",
  "serde",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -2593,7 +2567,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -2635,9 +2609,12 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "smallstr"
@@ -2650,9 +2627,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
 
 [[package]]
 name = "socket2"
@@ -2672,9 +2649,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spin"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d"
+checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
 dependencies = [
  "lock_api",
 ]
@@ -2692,9 +2669,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f82cbe94f41641d6c410ded25bbf5097c240cefdf8e3b06d04198d0a96af6a4"
+checksum = "788841def501aabde58d3666fcea11351ec3962e6ea75dbcd05c84a71d68bcd1"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -2702,9 +2679,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093"
+checksum = "8c21d3b5e7cadfe9ba7cdc1295f72cc556c750b4419c27c219c0693198901f8e"
 dependencies = [
  "ahash",
  "atoi",
@@ -2714,6 +2691,7 @@ dependencies = [
  "chrono",
  "crc",
  "crossbeam-queue",
+ "dotenvy",
  "either",
  "event-listener",
  "flume",
@@ -2725,7 +2703,7 @@ dependencies = [
  "hashlink",
  "hex",
  "indexmap",
- "itoa 1.0.1",
+ "itoa 1.0.2",
  "libc",
  "libsqlite3-sys",
  "log",
@@ -2749,11 +2727,11 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40c63177cf23d356b159b60acd27c54af7423f1736988502e36bae9a712118f"
+checksum = "4adfd2df3557bddd3b91377fc7893e8fa899e9b4061737cbade4e1bb85f1b45c"
 dependencies = [
- "dotenv",
+ "dotenvy",
  "either",
  "heck 0.4.0",
  "once_cell",
@@ -2768,9 +2746,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-rt"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f"
+checksum = "7be52fc7c96c136cedea840ed54f7d446ff31ad670c9dea95ebcb998530971a3"
 dependencies = [
  "once_cell",
  "tokio",
@@ -2831,9 +2809,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.96"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2907,18 +2885,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2936,21 +2914,23 @@ 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.3.9"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
+checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f"
 dependencies = [
- "itoa 1.0.1",
+ "itoa 1.0.2",
+ "js-sys",
  "libc",
  "num_threads",
  "time-macros",
@@ -2989,10 +2969,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.19.2"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
+checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
 dependencies = [
+ "autocfg",
  "bytes",
  "libc",
  "memchr",
@@ -3007,9 +2988,9 @@ dependencies = [
 
 [[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",
@@ -3067,9 +3048,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3090,15 +3071,15 @@ dependencies = [
 
 [[package]]
 name = "tower-service"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
+checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
 dependencies = [
  "cfg-if",
  "log",
@@ -3120,9 +3101,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
+checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3131,9 +3112,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.27"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921"
+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
 dependencies = [
  "once_cell",
  "valuable",
@@ -3162,9 +3143,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.11"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
+checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
 dependencies = [
  "ansi_term",
  "serde",
@@ -3179,9 +3160,9 @@ dependencies = [
 
 [[package]]
 name = "tract-core"
-version = "0.17.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97e029047bf3a3679f28648fc90719574ea4b72267e15cc8ffa9ad6188d316"
+checksum = "a3a144e86dde49212227969d9c8e445f4e4397608ee68497e5a015a7c4e74553"
 dependencies = [
  "anyhow",
  "bit-set",
@@ -3202,13 +3183,13 @@ dependencies = [
 
 [[package]]
 name = "tract-data"
-version = "0.17.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd1e09b9ec99cfd446db49dbfde76411f3ad98c8d57b02604a1ccf3189d6957"
+checksum = "4f7233d5c8fd58903e4606614cadecdbb9d29ae960cca26772825cd89ea7db1e"
 dependencies = [
  "anyhow",
  "educe",
- "half",
+ "half 2.1.0",
  "itertools",
  "lazy_static",
  "maplit",
@@ -3216,14 +3197,15 @@ dependencies = [
  "num-complex",
  "num-integer",
  "num-traits",
+ "scan_fmt",
  "smallvec",
 ]
 
 [[package]]
 name = "tract-hir"
-version = "0.17.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6c2acc716340e2f55e3ebb641ccad71b25c7743064f8a405a165a9a6595954"
+checksum = "22490aebf54448688676cb5ca5809f096afd19fca779a446f99b96c2221114ff"
 dependencies = [
  "derive-new",
  "educe",
@@ -3233,18 +3215,20 @@ dependencies = [
 
 [[package]]
 name = "tract-linalg"
-version = "0.17.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaa4dad2ea99f5900bd71168c504ba4b2821f2497856ed3b5c23652ec6f8da71"
+checksum = "19f1c0f50ae7e30ee70bfe9d49e57821771762d9a6064f1695607d631c5d5ae7"
 dependencies = [
  "cc",
  "derive-new",
  "downcast-rs",
  "dyn-clone",
  "educe",
+ "half 2.1.0",
  "lazy_static",
  "libc",
  "liquid",
+ "liquid-core",
  "log",
  "num-traits",
  "paste",
@@ -3257,9 +3241,9 @@ dependencies = [
 
 [[package]]
 name = "tract-nnef"
-version = "0.17.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a480ea422995e30877afbd8fc434672937094df0999bdfc32ca59a555b22add7"
+checksum = "07958ce7d81f3b7adf594482515a992a2fc1898fbe513010b724973a2bb270ca"
 dependencies = [
  "byteorder",
  "flate2",
@@ -3272,9 +3256,9 @@ dependencies = [
 
 [[package]]
 name = "tract-onnx"
-version = "0.17.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff59cf937e7ec868bd86ec29248b2de4a7445e7656d7afcaf88743bffef34b45"
+checksum = "142c21a6f3fd8a88fa23edd4a559c7f2fa94d0b3086cc613f5ed61fb06bfa75e"
 dependencies = [
  "bytes",
  "derive-new",
@@ -3292,9 +3276,9 @@ dependencies = [
 
 [[package]]
 name = "tract-onnx-opl"
-version = "0.17.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1553cf0c89a1c196326e60e7ec15546769d50f1763aca747855cd761b41c5d2d"
+checksum = "49770cff107f7dd6e0a14dc6f04d0515b8ed3e1aa4e74b3dbb4a825f5df483de"
 dependencies = [
  "educe",
  "tract-nnef",
@@ -3342,15 +3326,15 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c"
 
 [[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 = [
  "version_check",
 ]
@@ -3372,15 +3356,15 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.19"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
 dependencies = [
  "tinyvec",
 ]
@@ -3420,9 +3404,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9399fa2f927a3d327187cbd201480cee55bee6ac5d3c77dd27f0c6814cff16d5"
+checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
 dependencies = [
  "base64",
  "chunked_transfer",
@@ -3460,7 +3444,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
  "serde",
 ]
 
@@ -3553,9 +3537,9 @@ 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"
@@ -3565,9 +3549,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.80"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
+checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3575,13 +3559,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.80"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
+checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -3590,9 +3574,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.30"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
+checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3602,9 +3586,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.80"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
+checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3612,9 +3596,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.80"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
+checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3625,9 +3609,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.80"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
+checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
 
 [[package]]
 name = "web-api"
@@ -3635,7 +3619,7 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "derive_more",
- "dotenv",
+ "dotenvy",
  "serde",
  "serde_json",
  "tokio",
@@ -3650,9 +3634,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.57"
+version = "0.3.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
+checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3670,9 +3654,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.3"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
+checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
 dependencies = [
  "webpki",
 ]
@@ -3895,7 +3879,6 @@ dependencies = [
  "async-trait",
  "bincode",
  "chrono",
- "claim",
  "derivative",
  "derive_more",
  "displaydoc",
@@ -3964,7 +3947,6 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "chrono",
- "claim",
  "derive_more",
  "displaydoc",
  "itertools",
@@ -4031,5 +4013,5 @@ dependencies = [
  "crc32fast",
  "flate2",
  "thiserror",
- "time 0.1.43",
+ "time 0.1.44",
 ]
diff --git a/discovery_engine_core/ai/ai/Cargo.toml b/discovery_engine_core/ai/ai/Cargo.toml
index 1f143560f..e1a737207 100644
--- a/discovery_engine_core/ai/ai/Cargo.toml
+++ b/discovery_engine_core/ai/ai/Cargo.toml
@@ -11,15 +11,15 @@ derivative = "2.2.0"
 derive_more = { version = "0.99.17", default-features = false, features = ["display", "from"] }
 displaydoc = "0.2.3"
 itertools = "0.10.3"
-ndarray = "0.15.4"
+ndarray = "0.15.6"
 rayon = "1.5.3"
-serde = { version = "1.0.137", features = ["derive", "rc"] }
-thiserror = "1.0.31"
-tracing = "0.1.35"
+serde = { version = "1.0.141", features = ["derive", "rc"] }
+thiserror = "1.0.32"
+tracing = "0.1.36"
 uuid = { version = "1.1.2", features = ["serde", "v4"] }
 xayn-discovery-engine-bert = { path = "../bert" }
 xayn-discovery-engine-providers = { path = "../../providers" }
 
 [dev-dependencies]
-serde_json = "1.0.81"
+serde_json = "1.0.82"
 xayn-discovery-engine-test-utils = { path = "../test-utils" }
diff --git a/discovery_engine_core/ai/bert/Cargo.toml b/discovery_engine_core/ai/bert/Cargo.toml
index cbe4528df..5bde6e867 100644
--- a/discovery_engine_core/ai/bert/Cargo.toml
+++ b/discovery_engine_core/ai/bert/Cargo.toml
@@ -8,17 +8,17 @@ edition = "2021"
 derive_more = { version = "0.99.17", default-features = false, features = ["deref", "from"] }
 displaydoc = "0.2.3"
 float-cmp = "0.9.0"
-ndarray = { version = "0.15.4", features = ["serde"] }
-serde = { version = "1.0.137", features = ["derive"] }
-thiserror = "1.0.31"
-tract-onnx = "0.17.0"
+ndarray = { version = "0.15.6", features = ["serde"] }
+serde = { version = "1.0.141", features = ["derive"] }
+thiserror = "1.0.32"
+tract-onnx = "0.17.3"
 xayn-discovery-engine-tokenizer = { path = "../tokenizer" }
 
 # dev-dependencies which don't work for aarch targets
 onnxruntime = { version = "0.0.13", optional = true }
 
 [dev-dependencies]
-criterion = { version = "0.3.5", features = ["html_reports"] }
+criterion = { version = "0.3.6", features = ["html_reports"] }
 csv = { version = "1.1.6" }
 indicatif = { version = "0.16.2" }
 xayn-discovery-engine-test-utils = { path = "../test-utils" }
diff --git a/discovery_engine_core/ai/kpe/Cargo.toml b/discovery_engine_core/ai/kpe/Cargo.toml
index 51ca0505b..e23d26132 100644
--- a/discovery_engine_core/ai/kpe/Cargo.toml
+++ b/discovery_engine_core/ai/kpe/Cargo.toml
@@ -7,14 +7,14 @@ edition = "2021"
 [dependencies]
 derive_more = { version = "0.99.17", default-features = false, features = ["deref", "from"] }
 displaydoc = "0.2.3"
-ndarray = "0.15.4"
-thiserror = "1.0.31"
-tract-onnx = "0.17.0"
+ndarray = "0.15.6"
+thiserror = "1.0.32"
+tract-onnx = "0.17.3"
 xayn-discovery-engine-layer = { path = "../layer" }
 xayn-discovery-engine-tokenizer = { path = "../tokenizer" }
 
 [dev-dependencies]
-criterion = { version = "0.3.5", features = ["html_reports"] }
+criterion = { version = "0.3.6", features = ["html_reports"] }
 xayn-discovery-engine-test-utils = { path = "../test-utils" }
 
 [[example]]
diff --git a/discovery_engine_core/ai/layer/Cargo.toml b/discovery_engine_core/ai/layer/Cargo.toml
index 47731d186..f309ba3f8 100644
--- a/discovery_engine_core/ai/layer/Cargo.toml
+++ b/discovery_engine_core/ai/layer/Cargo.toml
@@ -7,11 +7,11 @@ edition = "2021"
 [dependencies]
 bincode = "1.3.3"
 displaydoc = "0.2.3"
-ndarray = "0.15.4"
+ndarray = "0.15.6"
 rand = "0.8.5"
 rand_distr = "0.4.3"
-serde = { version = "1.0.137", features = ["derive"] }
-thiserror = "1.0.31"
+serde = { version = "1.0.141", features = ["derive"] }
+thiserror = "1.0.32"
 
 [dev-dependencies]
 xayn-discovery-engine-test-utils = { path = "../test-utils" }
diff --git a/discovery_engine_core/ai/layer/src/io.rs b/discovery_engine_core/ai/layer/src/io.rs
index 5dfa9394e..c25dde81e 100644
--- a/discovery_engine_core/ai/layer/src/io.rs
+++ b/discovery_engine_core/ai/layer/src/io.rs
@@ -33,7 +33,7 @@ use crate::utils::IncompatibleMatrices;
 ///
 /// The flattened array is in row-major order.
 #[derive(Debug, Serialize)]
-#[cfg_attr(test, derive(Default, PartialEq))]
+#[cfg_attr(test, derive(Default, Eq, PartialEq))]
 pub struct FlattenedArray<A> {
     shape: Vec<Ix>,
     /// There is a invariant that the length of data is
diff --git a/discovery_engine_core/ai/test-utils/Cargo.toml b/discovery_engine_core/ai/test-utils/Cargo.toml
index 334aa19c0..65bb3b4bb 100644
--- a/discovery_engine_core/ai/test-utils/Cargo.toml
+++ b/discovery_engine_core/ai/test-utils/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 float-cmp = "0.9.0"
-ndarray = "0.15.4"
-serde = { version = "1.0.137", features = ["derive"] }
-serde_json = "1.0.81"
+ndarray = "0.15.6"
+serde = { version = "1.0.141", features = ["derive"] }
+serde_json = "1.0.82"
 uuid = "1.1.2"
diff --git a/discovery_engine_core/ai/tokenizer/Cargo.toml b/discovery_engine_core/ai/tokenizer/Cargo.toml
index fe8ce303c..f4e465e87 100644
--- a/discovery_engine_core/ai/tokenizer/Cargo.toml
+++ b/discovery_engine_core/ai/tokenizer/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2021"
 [dependencies]
 displaydoc = "0.2.3"
 num-traits = "0.2.15"
-regex = "1.5.6"
-regex-syntax = "0.6.26"
+regex = "1.6.0"
+regex-syntax = "0.6.27"
 smallstr = "0.3.0"
-thiserror = "1.0.31"
+thiserror = "1.0.32"
 unicode-normalization-alignments = "0.1.12"
 unicode_categories = "0.1.1"
diff --git a/discovery_engine_core/ai/tokenizer/src/normalizer/string.rs b/discovery_engine_core/ai/tokenizer/src/normalizer/string.rs
index 015dd5f4c..c5761d7ed 100644
--- a/discovery_engine_core/ai/tokenizer/src/normalizer/string.rs
+++ b/discovery_engine_core/ai/tokenizer/src/normalizer/string.rs
@@ -138,7 +138,7 @@ pub enum SplitDelimiter {
 ///
 /// Keeps both the original and the normalized sequence, alignment information between both and
 /// provides an interface to retrieve ranges of each sequence, using offsets from any of them.
-#[cfg_attr(test, derive(Clone, Debug, PartialEq))]
+#[cfg_attr(test, derive(Clone, Debug, Eq, PartialEq))]
 pub struct NormalizedString {
     /// The original sequence.
     pub original: String,
diff --git a/discovery_engine_core/ai/tokenizer/src/post_tokenizer/mod.rs b/discovery_engine_core/ai/tokenizer/src/post_tokenizer/mod.rs
index 3f5993bb7..200681c39 100644
--- a/discovery_engine_core/ai/tokenizer/src/post_tokenizer/mod.rs
+++ b/discovery_engine_core/ai/tokenizer/src/post_tokenizer/mod.rs
@@ -25,7 +25,7 @@ pub(crate) struct PostTokenizer<N> {
 }
 
 /// The potential errors of the post-tokenizer.
-#[derive(Debug, Display, Error, PartialEq)]
+#[derive(Debug, Display, Eq, Error, PartialEq)]
 pub enum PostTokenizerError {
     /// Missing the class token in the vocabulary
     ClsToken,
diff --git a/discovery_engine_core/ai/tokenizer/src/post_tokenizer/padding.rs b/discovery_engine_core/ai/tokenizer/src/post_tokenizer/padding.rs
index d7ff6fb20..65d98f0e2 100644
--- a/discovery_engine_core/ai/tokenizer/src/post_tokenizer/padding.rs
+++ b/discovery_engine_core/ai/tokenizer/src/post_tokenizer/padding.rs
@@ -9,7 +9,7 @@ use crate::{model::Vocab, post_tokenizer::encoding::Encoding, SmallString};
 pub struct Padding<N>(Paddings<N>);
 
 /// The potential errors of the padding strategy.
-#[derive(Debug, Display, Error, PartialEq)]
+#[derive(Debug, Display, Eq, Error, PartialEq)]
 pub enum PaddingError {
     /// Missing the padding token in the vocabulary
     PadToken,
diff --git a/discovery_engine_core/ai/tokenizer/src/post_tokenizer/truncation.rs b/discovery_engine_core/ai/tokenizer/src/post_tokenizer/truncation.rs
index b76a6c0a7..801aca730 100644
--- a/discovery_engine_core/ai/tokenizer/src/post_tokenizer/truncation.rs
+++ b/discovery_engine_core/ai/tokenizer/src/post_tokenizer/truncation.rs
@@ -8,7 +8,7 @@ use crate::post_tokenizer::{encoding::Encoding, ADDED_TOKENS};
 pub struct Truncation(Truncations);
 
 /// The potential errors of the truncation strategy.
-#[derive(Debug, Display, Error, PartialEq)]
+#[derive(Debug, Display, Eq, Error, PartialEq)]
 pub enum TruncationError {
     /** Invalid truncation length, must be greater or equal to the number of special tokens added by
     the post-tokenizer */
diff --git a/discovery_engine_core/async-bindgen/async-bindgen-derive/Cargo.toml b/discovery_engine_core/async-bindgen/async-bindgen-derive/Cargo.toml
index f94ae97a9..9a355714e 100644
--- a/discovery_engine_core/async-bindgen/async-bindgen-derive/Cargo.toml
+++ b/discovery_engine_core/async-bindgen/async-bindgen-derive/Cargo.toml
@@ -10,6 +10,6 @@ proc-macro = true
 [dependencies]
 heck = "0.4.0"
 once_cell = "1.12.0"
-proc-macro2 = "1.0.39"
-quote = "1.0.18"
-syn = { version = "1.0.96", features = ["full", "extra-traits"] }
+proc-macro2 = "1.0.42"
+quote = "1.0.21"
+syn = { version = "1.0.99", features = ["full", "extra-traits"] }
diff --git a/discovery_engine_core/async-bindgen/async-bindgen-gen-dart/Cargo.toml b/discovery_engine_core/async-bindgen/async-bindgen-gen-dart/Cargo.toml
index 2b89420d6..9e5429502 100644
--- a/discovery_engine_core/async-bindgen/async-bindgen-gen-dart/Cargo.toml
+++ b/discovery_engine_core/async-bindgen/async-bindgen-gen-dart/Cargo.toml
@@ -5,12 +5,12 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-anyhow = "1.0.57"
-handlebars = "4.3.1"
+anyhow = "1.0.60"
+handlebars = "4.3.3"
 heck = "0.4.0"
 once_cell = "1.12.0"
-regex = "1.5.6"
-serde = { version = "1.0.137", features = ["derive"] }
+regex = "1.6.0"
+serde = { version = "1.0.141", features = ["derive"] }
 structopt = "0.3.26"
 
 [dev-dependencies]
diff --git a/discovery_engine_core/async-bindgen/async-bindgen/Cargo.toml b/discovery_engine_core/async-bindgen/async-bindgen/Cargo.toml
index 34301644b..34ec871d0 100644
--- a/discovery_engine_core/async-bindgen/async-bindgen/Cargo.toml
+++ b/discovery_engine_core/async-bindgen/async-bindgen/Cargo.toml
@@ -8,6 +8,6 @@ license = "Apache-2.0"
 async-bindgen-derive = { path = "../async-bindgen-derive" }
 once_cell = "1.12.0"
 static_assertions = "1.1.0"
-thiserror = "1.0.31"
-tokio = { version = "1.19.2", features = ["rt", "rt-multi-thread"], default-features = false }
+thiserror = "1.0.32"
+tokio = { version = "1.20.1", features = ["rt", "rt-multi-thread"], default-features = false }
 xayn-dart-api-dl = "0.3.0"
diff --git a/discovery_engine_core/bindings/Cargo.toml b/discovery_engine_core/bindings/Cargo.toml
index 75cf1e03e..e76480758 100644
--- a/discovery_engine_core/bindings/Cargo.toml
+++ b/discovery_engine_core/bindings/Cargo.toml
@@ -10,10 +10,10 @@ cfg-if = "1.0.0"
 chrono = { version = "0.4.19", default-features = false }
 derive_more = { version = "0.99.17", default-features = false, features = ["as_ref", "from"] }
 itertools = "0.10.3"
-ndarray = "0.15.4"
-tokio = { version = "1.19.2", features = ["sync"] }
-tracing = "0.1.35"
-tracing-subscriber = { version = "0.3.11", features = ["json"] }
+ndarray = "0.15.6"
+tokio = { version = "1.20.1", features = ["sync"] }
+tracing = "0.1.36"
+tracing-subscriber = { version = "0.3.15", features = ["json"] }
 url = "2.2.2"
 uuid = "1.1.2"
 xayn-discovery-engine-ai = { path = "../ai/ai" }
diff --git a/discovery_engine_core/core/Cargo.toml b/discovery_engine_core/core/Cargo.toml
index a5b864354..57a3629eb 100644
--- a/discovery_engine_core/core/Cargo.toml
+++ b/discovery_engine_core/core/Cargo.toml
@@ -5,7 +5,7 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.56"
+async-trait = "0.1.57"
 bincode = "1.3.3"
 chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
 derivative = "2.2.0"
@@ -15,15 +15,15 @@ figment = { version = "0.10.6", default-features = false, features = ["json"] }
 futures = { version = "0.3.21", default-features = false, features = ["alloc"] }
 itertools = "0.10.3"
 kodama = "0.2.3"
-ndarray = "0.15.4"
+ndarray = "0.15.6"
 rand = "0.8.5"
 rand_distr = "0.4.3"
 rayon = "1.5.3"
-serde = { version = "1.0.137", features = ["derive"] }
+serde = { version = "1.0.141", features = ["derive"] }
 serde_repr = "0.1.8"
-thiserror = "1.0.31"
-tokio = { version = "1.19.2", features = ["macros", "sync"] }
-tracing = "0.1.35"
+thiserror = "1.0.32"
+tokio = { version = "1.20.1", features = ["macros", "sync"] }
+tracing = "0.1.36"
 url = { version = "2.2.2", features = ["serde"] }
 uuid = { version = "1.1.2", features = ["serde", "v4"] }
 xayn-discovery-engine-ai = { path = "../ai/ai" }
@@ -35,15 +35,14 @@ xayn-discovery-engine-tokenizer = { path = "../ai/tokenizer" }
 # feature storage
 num-derive = { version = "0.3.3", optional = true }
 num-traits = { version = "0.2.15", optional = true }
-sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "sqlite", "uuid", "chrono"], optional = true }
+sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "sqlite", "uuid", "chrono"], optional = true }
 
 [dev-dependencies]
 async-once-cell = "0.4.2"
-claim = "0.5.0"
-mockall = "0.11.1"
+mockall = "0.11.2"
 rand_chacha = "0.3.1"
-serde_json = "1.0.81"
-tokio = { version = "1.19.2", features = ["macros", "rt", "sync"] }
+serde_json = "1.0.82"
+tokio = { version = "1.20.1", features = ["macros", "rt", "sync"] }
 wiremock = "0.5.13"
 xayn-discovery-engine-test-utils = { path = "../ai/test-utils" }
 
diff --git a/discovery_engine_core/core/src/document.rs b/discovery_engine_core/core/src/document.rs
index 1b35337af..377baf24e 100644
--- a/discovery_engine_core/core/src/document.rs
+++ b/discovery_engine_core/core/src/document.rs
@@ -194,7 +194,7 @@ impl From<GenericArticle> for NewsResource {
 
 /// Indicates user's "sentiment" towards the document,
 /// essentially if the user "liked" or "disliked" the document.
-#[derive(Clone, Copy, Debug, Derivative, PartialEq, Serialize_repr, Deserialize_repr)]
+#[derive(Clone, Copy, Debug, Derivative, Eq, PartialEq, Serialize_repr, Deserialize_repr)]
 #[derivative(Default)]
 #[cfg_attr(feature = "storage", derive(num_derive::FromPrimitive))]
 #[repr(u8)]
diff --git a/discovery_engine_core/core/src/engine.rs b/discovery_engine_core/core/src/engine.rs
index b2c64bc2c..dc0479e58 100644
--- a/discovery_engine_core/core/src/engine.rs
+++ b/discovery_engine_core/core/src/engine.rs
@@ -455,6 +455,7 @@ impl Engine {
 
     /// Gets the next batch of feed documents.
     #[instrument(skip(self))]
+    #[cfg_attr(not(feature = "storage"), allow(clippy::unused_async))]
     pub async fn feed_next_batch(
         &mut self,
         sources: &[WeightedSource],
@@ -464,7 +465,7 @@ impl Engine {
             let history = self.storage.fetch_history().await?;
 
             // TODO: merge `get_feed_documents()` into this method after DB migration
-            return self.get_feed_documents(&history, sources).await;
+            self.get_feed_documents(&history, sources).await
         }
 
         #[cfg(not(feature = "storage"))]
@@ -526,16 +527,16 @@ impl Engine {
 
     /// Restores the feed documents, ordered by their global rank (timestamp & local rank).
     // TODO: rename methods to `fed()` and adjust events & docs accordingly after DB migration
+    #[cfg_attr(not(feature = "storage"), allow(clippy::unused_async))]
     pub async fn restore_feed(&self) -> Result<Vec<Document>, Error> {
         #[cfg(feature = "storage")]
         {
-            return self
-                .storage
+            self.storage
                 .feed()
                 .fetch()
                 .await
                 .map(|documents| documents.into_iter().map_into().collect())
-                .map_err(Into::into);
+                .map_err(Into::into)
         }
 
         #[cfg(not(feature = "storage"))]
@@ -543,13 +544,16 @@ impl Engine {
     }
 
     /// Deletes the feed documents.
-    #[cfg_attr(not(feature = "storage"), allow(unused_variables))]
+    #[cfg_attr(
+        not(feature = "storage"),
+        allow(unused_variables, clippy::unused_async)
+    )]
     pub async fn delete_feed_documents(&self, ids: &[document::Id]) -> Result<(), Error> {
         #[cfg(feature = "storage")]
         {
             self.storage.feed().delete_documents(ids).await?;
 
-            return Ok(());
+            Ok(())
         }
 
         #[cfg(not(feature = "storage"))]
@@ -700,6 +704,7 @@ impl Engine {
 
         #[cfg(feature = "storage")]
         {
+            #[allow(clippy::cast_possible_truncation)] // originally u32 in InitConfig
             let search = storage::models::Search {
                 search_by: storage::models::SearchBy::Query,
                 search_term: query,
@@ -741,6 +746,7 @@ impl Engine {
 
         #[cfg(feature = "storage")]
         {
+            #[allow(clippy::cast_possible_truncation)] // originally u32 in InitConfig
             let search = storage::models::Search {
                 search_by: storage::models::SearchBy::Topic,
                 search_term: topic.into(),
@@ -763,20 +769,22 @@ impl Engine {
     ///
     /// The documents are sorted in descending order wrt their cosine similarity towards the
     /// original search term embedding.
-    #[cfg_attr(not(feature = "storage"), allow(unused_variables))]
+    #[cfg_attr(
+        not(feature = "storage"),
+        allow(unused_variables, clippy::unused_async)
+    )]
     pub async fn search_by_id(&self, id: document::Id) -> Result<Vec<Document>, Error> {
         #[cfg(feature = "storage")]
         {
             let document = self.storage.search().get_document(id).await?;
 
             // TODO: merge `deep_search()` into this method after DB migration
-            return self
-                .deep_search(
-                    document.snippet_or_title(),
-                    &document.news_resource.market,
-                    &document.embedding,
-                )
-                .await;
+            self.deep_search(
+                document.snippet_or_title(),
+                &document.news_resource.market,
+                &document.embedding,
+            )
+            .await
         }
 
         #[cfg(not(feature = "storage"))]
@@ -784,6 +792,7 @@ impl Engine {
     }
 
     /// Gets the next batch of the current active search.
+    #[cfg_attr(not(feature = "storage"), allow(clippy::unused_async))]
     pub async fn search_next_batch(&self) -> Result<Vec<Document>, Error> {
         #[cfg(feature = "storage")]
         {
@@ -812,7 +821,7 @@ impl Engine {
                 )
                 .await?;
 
-            return Ok(documents);
+            Ok(documents)
         }
 
         #[cfg(not(feature = "storage"))]
@@ -821,13 +830,14 @@ impl Engine {
 
     /// Restores the current active search, ordered by their global rank (timestamp & local rank).
     // TODO: rename methods to `searched()` and adjust events & docs accordingly after DB migration
+    #[cfg_attr(not(feature = "storage"), allow(clippy::unused_async))]
     pub async fn restore_search(&self) -> Result<Vec<Document>, Error> {
         #[cfg(feature = "storage")]
         {
             let (_, documents) = self.storage.search().fetch().await?;
             let documents = documents.into_iter().map_into().collect();
 
-            return Ok(documents);
+            Ok(documents)
         }
 
         #[cfg(not(feature = "storage"))]
@@ -835,6 +845,7 @@ impl Engine {
     }
 
     /// Gets the current active search mode and term.
+    #[cfg_attr(not(feature = "storage"), allow(clippy::unused_async))]
     pub async fn searched_by(&self) -> Result<SearchBy<'_>, Error> {
         #[cfg(feature = "storage")]
         {
@@ -846,7 +857,7 @@ impl Engine {
                 storage::models::SearchBy::Topic => SearchBy::Topic(search.search_term.into()),
             };
 
-            return Ok(search);
+            Ok(search)
         }
 
         #[cfg(not(feature = "storage"))]
@@ -854,14 +865,15 @@ impl Engine {
     }
 
     /// Closes the current active search.
+    #[cfg_attr(not(feature = "storage"), allow(clippy::unused_async))]
     pub async fn close_search(&self) -> Result<(), Error> {
         #[cfg(feature = "storage")]
         {
-            return if self.storage.search().clear().await? {
+            if self.storage.search().clear().await? {
                 Ok(())
             } else {
                 Err(Error::Storage(storage::Error::NoSearch))
-            };
+            }
         }
 
         #[cfg(not(feature = "storage"))]
diff --git a/discovery_engine_core/core/src/stack.rs b/discovery_engine_core/core/src/stack.rs
index 84b75c05c..dd7f9c4ad 100644
--- a/discovery_engine_core/core/src/stack.rs
+++ b/discovery_engine_core/core/src/stack.rs
@@ -268,7 +268,6 @@ impl Bucket<Document> for Stack {
 mod tests {
     use std::fmt::Debug;
 
-    use claim::{assert_matches, assert_none, assert_ok, assert_some};
     use uuid::Uuid;
     use xayn_discovery_engine_test_utils::assert_approx_eq;
 
@@ -293,9 +292,9 @@ mod tests {
             ..Document::default()
         };
 
-        assert_ok!(f(&[]));
-        assert_ok!(f(&[doc_1.clone()]));
-        assert_ok!(f(&[doc_1, doc_2]));
+        assert!(f(&[]).is_ok());
+        assert!(f(&[doc_1.clone()]).is_ok());
+        assert!(f(&[doc_1, doc_2]).is_ok());
     }
 
     // assert that `f` returns an error if the argument contains a Document with an invalid `stack_id`
@@ -319,10 +318,11 @@ mod tests {
         };
 
         let assert_invalid_document = |docs: &[Document]| {
-            assert_matches!(
+            assert!(matches!(
                 f(docs),
                 Err(Error::InvalidDocument { document_id, document_stack_id, stack_id})
-                    if document_id == doc_ko.id && document_stack_id == doc_ko.stack_id && stack_id == stack_id_ok);
+                    if document_id == doc_ko.id && document_stack_id == doc_ko.stack_id && stack_id == stack_id_ok,
+            ));
         };
 
         assert_invalid_document(&[doc_ko.clone()]);
@@ -356,7 +356,7 @@ mod tests {
     fn test_stack_new_from_default() {
         let mut ops = MockOps::new();
         ops.expect_id().returning(Id::default);
-        assert_ok!(Stack::new(Data::default(), Box::new(ops)));
+        assert!(Stack::new(Data::default(), Box::new(ops)).is_ok());
     }
 
     #[test]
@@ -414,7 +414,7 @@ mod tests {
 
         let mut stack = Stack::new(Data::default(), Box::new(ops)).unwrap();
 
-        assert_none!(stack.pop());
+        assert!(stack.pop().is_none());
     }
 
     #[test]
@@ -426,9 +426,9 @@ mod tests {
         ops.expect_id().returning(Id::default);
         let mut stack = Stack::new(data, Box::new(ops)).unwrap();
 
-        assert_some!(stack.pop());
-        assert_some!(stack.pop());
-        assert_none!(stack.pop());
+        assert!(stack.pop().is_some());
+        assert!(stack.pop().is_some());
+        assert!(stack.pop().is_none());
     }
 
     #[test]
diff --git a/discovery_engine_core/core/src/stack/data.rs b/discovery_engine_core/core/src/stack/data.rs
index 49fe02053..95918b2f0 100644
--- a/discovery_engine_core/core/src/stack/data.rs
+++ b/discovery_engine_core/core/src/stack/data.rs
@@ -78,8 +78,6 @@ impl Data {
 
 #[cfg(test)]
 mod tests {
-    use claim::{assert_err, assert_matches, assert_ok};
-
     use super::*;
 
     #[test]
@@ -95,31 +93,12 @@ mod tests {
     #[test]
     #[allow(clippy::float_cmp)]
     fn test_stack_from_parts() {
-        let stack = Data::new(0. + f32::EPSILON, 0. + f32::EPSILON, vec![]);
-        assert_ok!(stack);
-
-        let stack = Data::new(0.0, 0.5, vec![]);
-        assert_err!(&stack);
-        assert_matches!(stack.unwrap_err(), Error::InvalidAlpha(x) if x == 0.0);
-
-        let stack = Data::new(0.5, 0.0, vec![]);
-        assert_err!(&stack);
-        assert_matches!(stack.unwrap_err(), Error::InvalidBeta(x) if x == 0.0);
-
-        let stack = Data::new(-0.0, 1.0, vec![]);
-        assert_err!(&stack);
-        assert_matches!(stack.unwrap_err(), Error::InvalidAlpha(x) if x == 0.0);
-
-        let stack = Data::new(1.0, -0.0, vec![]);
-        assert_err!(&stack);
-        assert_matches!(stack.unwrap_err(), Error::InvalidBeta(x) if x == 0.0);
-
-        let stack = Data::new(-1.0, 1.0, vec![]);
-        assert_err!(&stack);
-        assert_matches!(stack.unwrap_err(), Error::InvalidAlpha(x) if x == -1.0);
-
-        let stack = Data::new(1.0, -1.0, vec![]);
-        assert_err!(&stack);
-        assert_matches!(stack.unwrap_err(), Error::InvalidBeta(x) if x == -1.0);
+        assert!(Data::new(0. + f32::EPSILON, 0. + f32::EPSILON, vec![]).is_ok());
+        assert!(matches!(Data::new(0.0, 0.5, vec![]), Err(Error::InvalidAlpha(x)) if x == 0.0));
+        assert!(matches!(Data::new(0.5, 0.0, vec![]), Err(Error::InvalidBeta(x)) if x == 0.0));
+        assert!(matches!(Data::new(-0.0, 1.0, vec![]), Err(Error::InvalidAlpha(x)) if x == 0.0));
+        assert!(matches!(Data::new(1.0, -0.0, vec![]), Err(Error::InvalidBeta(x)) if x == 0.0));
+        assert!(matches!(Data::new(-1.0, 1.0, vec![]), Err(Error::InvalidAlpha(x)) if x == -1.0));
+        assert!(matches!(Data::new(1.0, -1.0, vec![]), Err(Error::InvalidBeta(x)) if x == -1.0));
     }
 }
diff --git a/discovery_engine_core/core/src/storage/sqlite.rs b/discovery_engine_core/core/src/storage/sqlite.rs
index d8411b419..a9441f52b 100644
--- a/discovery_engine_core/core/src/storage/sqlite.rs
+++ b/discovery_engine_core/core/src/storage/sqlite.rs
@@ -575,9 +575,7 @@ impl StateScope for SqliteStorage {
 
         tx.commit().await?;
 
-        Ok(state
-            .map(|state| (!state.state.is_empty()).then(|| state.state))
-            .flatten())
+        Ok(state.and_then(|state| (!state.state.is_empty()).then(|| state.state)))
     }
 
     async fn clear(&self) -> Result<bool, Error> {
@@ -778,7 +776,10 @@ mod tests {
                         image: (i != 0)
                             .then(|| Url::parse(&format!("http://example-image-{i}.com")).unwrap()),
                         rank: i,
-                        score: (i != 0).then(|| i as f32),
+                        score: (i != 0).then(
+                            #[allow(clippy::cast_precision_loss)] // index small enough
+                            || i as f32,
+                        ),
                         topic: format!("topic-{i}"),
                         ..NewsResource::default()
                     },
@@ -795,15 +796,14 @@ mod tests {
 
     fn check_eq_of_documents(api_docs: &[ApiDocumentView], docs: &[NewDocument]) -> bool {
         api_docs.len() == docs.len()
-            && api_docs
-                .iter()
-                .enumerate()
-                .zip(docs.iter())
-                .all(|((idx, api_docs), doc)| {
+            && api_docs.iter().enumerate().zip(docs.iter()).all(
+                #[allow(clippy::cast_possible_truncation)] // index small enough
+                |((idx, api_docs), doc)| {
                     api_docs.document_id == doc.id
                         && api_docs.news_resource == doc.news_resource
                         && api_docs.in_batch_index == idx as u32
-                })
+                },
+            )
     }
 
     async fn create_memory_storage() -> impl Storage {
@@ -1036,6 +1036,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[allow(clippy::similar_names)]
     async fn test_storing_user_reaction() {
         let storage = create_memory_storage().await;
         let docs = create_documents(10);
diff --git a/discovery_engine_core/providers/Cargo.toml b/discovery_engine_core/providers/Cargo.toml
index c084d6b8f..c32f74a55 100644
--- a/discovery_engine_core/providers/Cargo.toml
+++ b/discovery_engine_core/providers/Cargo.toml
@@ -5,23 +5,22 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.56"
+async-trait = "0.1.57"
 chrono = { version = "0.4.19", default-features = false, features = ["clock", "serde"] }
 derive_more = { version = "0.99.17", default-features = false, features = ["display", "deref"] }
 displaydoc = "0.2.3"
 itertools = "0.10.3"
 maplit = "1.0.2"
 once_cell = "1.13.0"
-regex = { version = "1.5.6", features = ["unicode-gencat"] }
+regex = { version = "1.6.0", features = ["unicode-gencat"] }
 reqwest = { version = "0.11.11", default-features = false, features = ["json", "rustls-tls"] }
-serde = { version = "1.0.137", features = ["derive"] }
-serde_json = "1.0.81"
-serde_path_to_error = "0.1.7"
-thiserror = "1.0.31"
-tracing = "0.1.35"
+serde = { version = "1.0.141", features = ["derive"] }
+serde_json = "1.0.82"
+serde_path_to_error = "0.1.8"
+thiserror = "1.0.32"
+tracing = "0.1.36"
 url = "2.2.2"
 
 [dev-dependencies]
-claim = "0.5.0"
-tokio = { version = "1.19.2", features = ["macros", "rt"] }
+tokio = { version = "1.20.1", features = ["macros", "rt"] }
 wiremock = "0.5.13"
diff --git a/discovery_engine_core/providers/src/models/content.rs b/discovery_engine_core/providers/src/models/content.rs
index 27f9b4322..b9a015109 100644
--- a/discovery_engine_core/providers/src/models/content.rs
+++ b/discovery_engine_core/providers/src/models/content.rs
@@ -122,7 +122,6 @@ impl TryFrom<NewscatcherArticle> for GenericArticle {
 #[cfg(test)]
 mod tests {
     use chrono::NaiveDate;
-    use claim::{assert_matches, assert_none};
 
     use super::*;
 
@@ -188,7 +187,7 @@ mod tests {
         };
 
         let res: Result<GenericArticle, _> = invalid_url.try_into();
-        assert_matches!(res.unwrap_err(), InvalidUrl(_));
+        assert!(matches!(res, Err(InvalidUrl(_))));
     }
 
     #[test]
@@ -199,7 +198,7 @@ mod tests {
         };
 
         let res: GenericArticle = article.try_into().unwrap();
-        assert_none!(res.image);
+        assert!(res.image.is_none());
     }
 
     #[test]
@@ -210,6 +209,6 @@ mod tests {
         };
 
         let res: Result<GenericArticle, _> = invalid_url.try_into();
-        assert_matches!(res.unwrap_err(), InvalidUrl(_));
+        assert!(matches!(res, Err(InvalidUrl(_))));
     }
 }
diff --git a/discovery_engine_core/rust-toolchain.toml b/discovery_engine_core/rust-toolchain.toml
index a0baecc8f..a053e971b 100644
--- a/discovery_engine_core/rust-toolchain.toml
+++ b/discovery_engine_core/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.61.0"
+channel = "1.62.1"
 profile = "default"
diff --git a/discovery_engine_core/tooling/Cargo.toml b/discovery_engine_core/tooling/Cargo.toml
index 2424fc112..f5738d7bd 100644
--- a/discovery_engine_core/tooling/Cargo.toml
+++ b/discovery_engine_core/tooling/Cargo.toml
@@ -13,10 +13,10 @@ name = "clean_sources"
 path = "bin/clean_sources.rs"
 
 [dependencies]
-anyhow = "1.0.57"
+anyhow = "1.0.60"
 csv = "1.1.6"
-serde_json = "1.0.81"
-serde_path_to_error = "0.1.7"
-tokio = { version = "1.19.2", features = ["fs"] }
+serde_json = "1.0.82"
+serde_path_to_error = "0.1.8"
+tokio = { version = "1.20.1", features = ["fs"] }
 url = "2.2.2"
 xayn-discovery-engine-providers = { path = "../providers" }
diff --git a/discovery_engine_core/web-api/Cargo.toml b/discovery_engine_core/web-api/Cargo.toml
index 68da6598a..5710ad7a7 100644
--- a/discovery_engine_core/web-api/Cargo.toml
+++ b/discovery_engine_core/web-api/Cargo.toml
@@ -7,10 +7,10 @@ edition = "2021"
 [dependencies]
 chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
 derive_more = { version = "0.99.17", default-features = false, features = ["display", "from"] }
-dotenv = "0.15.0"
-serde = { version = "1.0.137", features = ["derive"] }
-serde_json = "1.0.81"
-tokio = { version = "1.19.2", features = ["macros", "rt-multi-thread"] }
+dotenvy = "0.15.1"
+serde = { version = "1.0.141", features = ["derive"] }
+serde_json = "1.0.82"
+tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] }
 uuid = { version = "1.1.2", features = ["serde", "v4"] }
 warp = "0.3.2"
 xayn-discovery-engine-ai = { path = "../ai/ai" }
diff --git a/discovery_engine_core/web-api/src/main.rs b/discovery_engine_core/web-api/src/main.rs
index c8a37969f..43252fc99 100644
--- a/discovery_engine_core/web-api/src/main.rs
+++ b/discovery_engine_core/web-api/src/main.rs
@@ -31,7 +31,7 @@
 )]
 
 use db::{init_db, InitConfig};
-use dotenv::dotenv;
+use dotenvy::dotenv;
 use routes::api_routes;
 use std::{env, net::IpAddr};
 
diff --git a/justfile b/justfile
index 9f9a72f05..c0fbf8fb1 100644
--- a/justfile
+++ b/justfile
@@ -106,6 +106,7 @@ _codegen-order-workaround:
 rust-check: _codegen-order-workaround
     cd "$RUST_WORKSPACE"; \
     cargo clippy --all-targets --locked; \
+    cargo clippy --all-targets --features storage --locked; \
     cargo check -p xayn-discovery-engine-bindings
 
 # Checks rust and dart code, fails if there are any issues on CI
@@ -178,7 +179,7 @@ rust-test: _codegen-order-workaround download-assets
     cd "$RUST_WORKSPACE";
     cargo test --lib --bins --tests --quiet --locked
     cargo test --doc --quiet --locked
-    cargo test --lib --features "storage" --quiet --locked
+    cargo test --lib --features storage --quiet --locked
 
 # Tests dart and rust
 test: rust-test dart-test flutter-test
@@ -199,8 +200,14 @@ rust-clean:
     cargo clean
 
 # Cleans up darts build cache
+_dart-clean $WORKSPACE:
+    cd "$WORKSPACE"; \
+    find . -type d -name .dart_tool -prune -exec rm -r '{}' \;
+
 dart-clean:
-    find -type d -name .dart_tool -prune -exec rm -r '{}' \;
+    @{{just_executable()}} _dart-clean "$DART_WORKSPACE"
+    @{{just_executable()}} _dart-clean "$BINDGEN_DART_WORKSPACE"
+    @{{just_executable()}} _dart-clean "$FLUTTER_WORKSPACE"
 
 # Removes all local cargo installs
 clean-tools: