diff --git a/Cargo.lock b/Cargo.lock
index 62a26fa04..f98883a12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -107,7 +107,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -121,7 +121,7 @@ dependencies = [
  "cw-asset",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "semver",
 ]
 
@@ -147,7 +147,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "enum-repr",
 ]
 
@@ -163,7 +163,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "cw721 0.18.0",
@@ -180,7 +180,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -197,7 +197,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -212,7 +212,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -227,7 +227,7 @@ dependencies = [
  "cosmwasm-schema 1.5.8",
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "schemars",
  "semver",
@@ -246,7 +246,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "cw721 0.18.0",
@@ -264,7 +264,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "test-case",
 ]
@@ -281,7 +281,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "cw20-base",
@@ -299,7 +299,7 @@ dependencies = [
  "cw-asset",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -317,7 +317,7 @@ dependencies = [
  "cw-asset",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "cw20-base",
@@ -334,7 +334,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
 ]
@@ -363,7 +363,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -412,7 +412,7 @@ dependencies = [
  "cw-multi-test",
  "cw-orch",
  "cw-orch-daemon",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
@@ -446,7 +446,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw20 1.1.2",
 ]
 
@@ -458,7 +458,7 @@ dependencies = [
  "cosmwasm-schema 1.5.8",
  "cosmwasm-std 1.5.8",
  "cw-asset",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw20 1.1.2",
  "schemars",
  "serde",
@@ -492,7 +492,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw3 1.1.2",
@@ -525,7 +525,7 @@ dependencies = [
  "cosmwasm-schema 1.5.8",
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -540,7 +540,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -558,7 +558,7 @@ dependencies = [
  "cw-controllers",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
@@ -578,7 +578,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "hex",
  "itertools 0.13.0",
  "osmosis-std",
@@ -604,7 +604,7 @@ dependencies = [
  "cw-asset",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -630,7 +630,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "cw721 0.18.0",
@@ -649,7 +649,7 @@ dependencies = [
  "cw-asset",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "hex",
@@ -694,7 +694,7 @@ dependencies = [
  "cosmwasm-schema 1.5.8",
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -709,7 +709,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -726,7 +726,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -743,7 +743,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -760,7 +760,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -777,7 +777,7 @@ dependencies = [
  "cw-json",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "serde-cw-value",
@@ -796,7 +796,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -810,7 +810,7 @@ dependencies = [
  "cw-asset",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
@@ -844,7 +844,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
 ]
@@ -910,7 +910,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -926,7 +926,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw2 1.1.2",
  "enum-repr",
  "serde",
@@ -941,7 +941,7 @@ dependencies = [
  "cosmwasm-schema 1.5.8",
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -958,7 +958,7 @@ dependencies = [
  "cw-asset",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
@@ -971,7 +971,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "serde",
 ]
 
@@ -986,7 +986,7 @@ dependencies = [
  "cosmwasm-std 1.5.8",
  "cw-multi-test",
  "cw-orch",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw-utils 1.0.3",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 132aa9a3f..79f2292a4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ andromeda-testing-e2e = { path = "./packages/andromeda-testing-e2e", version = "
 strum_macros = "0.24.3"
 cosmwasm-std = "1.5.8"
 cw-utils = "1.0.3"
-cw-storage-plus = "1.2.0"
+cw-storage-plus = "2.0.0"
 cw2 = "1.1.2"
 cw20 = "1.1.2"
 cw20-base = "1.1.2"