diff --git a/Cargo.lock b/Cargo.lock
index 8b8e74495..850ff07b2 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",
 ]
 
@@ -149,7 +149,7 @@ dependencies = [
  "cw-multi-test",
  "cw-orch",
  "cw-orch-daemon",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "enum-repr",
 ]
 
@@ -165,7 +165,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",
@@ -182,7 +182,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",
 ]
@@ -199,7 +199,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",
 ]
 
@@ -214,7 +214,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",
 ]
@@ -229,7 +229,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",
@@ -249,7 +249,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",
  "cw20 1.1.2",
  "cw721 0.18.0",
@@ -267,7 +267,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",
 ]
@@ -285,7 +285,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",
  "cw20 1.1.2",
  "cw20-base",
@@ -303,7 +303,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",
 ]
@@ -321,7 +321,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",
@@ -339,7 +339,7 @@ dependencies = [
  "cw-multi-test",
  "cw-orch",
  "cw-orch-daemon",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
 ]
@@ -368,7 +368,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",
 ]
 
@@ -417,7 +417,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",
@@ -451,7 +451,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",
 ]
 
@@ -463,7 +463,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",
@@ -499,7 +499,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",
@@ -534,7 +534,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",
 ]
@@ -549,7 +549,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",
 ]
@@ -567,7 +567,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",
@@ -587,7 +587,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",
@@ -612,7 +612,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",
 ]
@@ -638,7 +638,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",
@@ -657,7 +657,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",
@@ -704,7 +704,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",
 ]
 
@@ -719,7 +719,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",
 ]
@@ -736,7 +736,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",
 ]
@@ -753,7 +753,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",
 ]
@@ -770,7 +770,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",
 ]
 
@@ -787,7 +787,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",
@@ -806,7 +806,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",
 ]
 
@@ -820,7 +820,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",
@@ -854,7 +854,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",
 ]
@@ -920,7 +920,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",
 ]
 
@@ -937,7 +937,7 @@ dependencies = [
  "cw-multi-test",
  "cw-orch",
  "cw-orch-daemon",
- "cw-storage-plus 1.2.0",
+ "cw-storage-plus 2.0.0",
  "cw2 1.1.2",
  "enum-repr",
  "serde",
@@ -952,7 +952,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",
 ]
 
@@ -969,7 +969,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",
 ]
 
@@ -982,7 +982,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",
 ]
 
@@ -997,7 +997,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 891054ba5..6069260f9 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"