diff --git a/Cargo.lock b/Cargo.lock
index d4f5a297..eedd9766 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,9 +40,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -216,7 +216,7 @@ name = "arbiter"
 version = "0.4.14"
 dependencies = [
  "Inflector",
- "arbiter-core 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arbiter-core",
  "assert_cmd",
  "clap",
  "config",
@@ -285,42 +285,13 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "arbiter-core"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68b209635bd1ae186cb8d88faebe6b60afe39d189f72279b113e7ecd0b168db"
-dependencies = [
- "arbiter-bindings 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "async-stream",
- "async-trait",
- "bytes",
- "crossbeam-channel",
- "ethers",
- "futures-locks",
- "futures-timer",
- "futures-util",
- "hashbrown 0.14.3",
- "hex",
- "polars",
- "rand",
- "revm",
- "revm-primitives 2.0.0",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tracing",
- "uint",
-]
-
 [[package]]
 name = "arbiter-engine"
 version = "0.1.0"
 dependencies = [
  "anyhow",
  "arbiter-bindings 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "arbiter-core 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arbiter-core",
  "arbiter-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "async-stream",
  "async-trait",
@@ -804,9 +775,9 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.2"
+version = "1.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b"
+checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -883,9 +854,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d"
+checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f"
 dependencies = [
  "serde",
 ]
@@ -949,9 +920,9 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d7b79e99bfaa0d47da0687c43aa3b7381938a62ad3a6498599039321f660b7"
+checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
 dependencies = [
  "chrono",
  "chrono-tz-build",
@@ -1196,9 +1167,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -1449,7 +1420,7 @@ name = "documentation"
 version = "0.0.0"
 dependencies = [
  "arbiter-bindings 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "arbiter-core 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arbiter-core",
  "skeptic",
  "tokio",
 ]
@@ -1482,9 +1453,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "elliptic-curve"
@@ -2532,9 +2503,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
 name = "indexmap"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
+checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -2572,12 +2543,12 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
  "hermit-abi",
- "rustix",
+ "libc",
  "windows-sys 0.52.0",
 ]
 
@@ -4262,9 +4233,9 @@ dependencies = [
 
 [[package]]
 name = "revm"
-version = "4.0.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e55c6c96e1fd215dc981978602e6b5943b48509267060fb8e73714b44a47a8"
+checksum = "266f86bdefa6dac07d92e2f5c37d7d183f2575b2f9e0ee9cba9402dfde912524"
 dependencies = [
  "auto_impl",
  "cfg-if",
@@ -4280,9 +4251,9 @@ dependencies = [
 
 [[package]]
 name = "revm-interpreter"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12d7aac43d36bcd69ba4ad53aeedc0deaf411e88fc81b54dbf546990d93c2bd7"
+checksum = "9a80b516cc706630e604e2fd47c281501d2fb222712be4328921361388b7d2df"
 dependencies = [
  "revm-primitives 2.0.0",
  "serde",
@@ -4290,9 +4261,9 @@ dependencies = [
 
 [[package]]
 name = "revm-precompile"
-version = "3.0.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdbf367d7a9515113bf9ab128b64ba80d6e0e238904fb66f8567765ae52b6699"
+checksum = "e6912fafe7f70a264ec5895875ce2f2d0621a39263844280c9ee7f85e35bbb9e"
 dependencies = [
  "aurora-engine-modexp",
  "blst",
@@ -6058,9 +6029,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "winnow"
-version = "0.5.39"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
  "memchr",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 17c63179..becba2a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,10 +32,10 @@ path = "bin/main.rs"
 [workspace.dependencies]
 # Local
 arbiter-bindings = "0.1.2"
-arbiter-core = "0.10.0"
-arbiter-macros = "0.1.0" 
+arbiter-core = { path = "arbiter-core" }
+arbiter-macros = "0.1.0"
 
-revm = { version = "=4.0.0", features = ["ethersdb", "std", "serde"] }
+revm = { version = "5.0.0", features = ["ethersdb", "std", "serde"] }
 revm-primitives = "=2.0.0"
 ethers = { version = "2.0.13" }
 
diff --git a/arbiter-core/tests/environment_integration.rs b/arbiter-core/tests/environment_integration.rs
index 1b6cfa06..d234cb25 100644
--- a/arbiter-core/tests/environment_integration.rs
+++ b/arbiter-core/tests/environment_integration.rs
@@ -4,7 +4,7 @@ use arbiter_bindings::bindings::{self, weth::weth};
 use arbiter_core::database::fork::Fork;
 use ethers::{
     prelude::Middleware,
-    types::{Address, H256, U256 as eU256, U64},
+    types::{Address, U256 as eU256, U64},
 };
 include!("common.rs");
 
diff --git a/bin/fork/mod.rs b/bin/fork/mod.rs
index 6282abf4..ce360393 100644
--- a/bin/fork/mod.rs
+++ b/bin/fork/mod.rs
@@ -9,7 +9,7 @@ use ethers::{
     utils::{hex, keccak256},
 };
 use revm::{
-    db::{ethersdb::EthersDB, CacheDB, EmptyDB},
+    db::{ethersdb::EthersDB, in_memory_db::CacheDB, EmptyDB, EmptyDBTyped},
     Database,
 };
 use serde::Serialize;
@@ -63,7 +63,7 @@ impl ForkConfig {
     pub(crate) fn digest_config(&self) -> Result<CacheDB<EmptyDB>, ArbiterError> {
         // Spawn the `EthersDB` and the `CacheDB` we will write to.
         let ethers_db = &mut self.spawn_ethers_db()?;
-        let mut db = CacheDB::new(EmptyDB::default());
+        let mut db = CacheDB::new(EmptyDBTyped::default());
         for contract_data in self.contracts_meta.values() {
             let address = contract_data.address;
             let info = ethers_db