diff --git a/operator/Cargo.lock b/operator/Cargo.lock
index a5cf1593..4a53ce17 100644
--- a/operator/Cargo.lock
+++ b/operator/Cargo.lock
@@ -8783,7 +8783,7 @@ dependencies = [
 [[package]]
 name = "pallet-bucket-nfts"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8859,7 +8859,7 @@ dependencies = [
 [[package]]
 name = "pallet-cr-randomness"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9075,7 +9075,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-file-system"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "fp-account",
  "fp-evm",
@@ -9239,7 +9239,7 @@ dependencies = [
 [[package]]
 name = "pallet-file-system"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9266,7 +9266,7 @@ dependencies = [
 [[package]]
 name = "pallet-file-system-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9462,7 +9462,7 @@ dependencies = [
 [[package]]
 name = "pallet-payment-streams"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9482,7 +9482,7 @@ dependencies = [
 [[package]]
 name = "pallet-payment-streams-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9510,7 +9510,7 @@ dependencies = [
 [[package]]
 name = "pallet-proofs-dealer"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9532,7 +9532,7 @@ dependencies = [
 [[package]]
 name = "pallet-proofs-dealer-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9554,7 +9554,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9660,7 +9660,7 @@ dependencies = [
 [[package]]
 name = "pallet-storage-providers"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9682,12 +9682,13 @@ dependencies = [
 [[package]]
 name = "pallet-storage-providers-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -14778,7 +14779,7 @@ dependencies = [
 [[package]]
 name = "shc-actors-derive"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -14791,7 +14792,7 @@ dependencies = [
 [[package]]
 name = "shc-actors-framework"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "anyhow",
  "bincode",
@@ -14809,7 +14810,7 @@ dependencies = [
 [[package]]
 name = "shc-blockchain-service"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "anyhow",
  "array-bytes",
@@ -14834,6 +14835,7 @@ dependencies = [
  "rocksdb",
  "sc-client-api",
  "sc-network",
+ "sc-network-types",
  "sc-service",
  "sc-tracing",
  "sc-utils",
@@ -14859,7 +14861,7 @@ dependencies = [
 [[package]]
 name = "shc-client"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "anyhow",
  "array-bytes",
@@ -14893,6 +14895,7 @@ dependencies = [
  "rocksdb",
  "sc-client-api",
  "sc-network",
+ "sc-network-types",
  "sc-service",
  "sc-tracing",
  "serde",
@@ -14924,7 +14927,7 @@ dependencies = [
 [[package]]
 name = "shc-common"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "anyhow",
  "bigdecimal",
@@ -14988,7 +14991,7 @@ dependencies = [
 [[package]]
 name = "shc-file-manager"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "bincode",
  "hash-db",
@@ -15012,7 +15015,7 @@ dependencies = [
 [[package]]
 name = "shc-file-transfer-service"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "anyhow",
  "array-bytes",
@@ -15041,7 +15044,7 @@ dependencies = [
 [[package]]
 name = "shc-fisherman-service"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "async-trait",
  "diesel",
@@ -15071,7 +15074,7 @@ dependencies = [
 [[package]]
 name = "shc-forest-manager"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "async-trait",
  "bincode",
@@ -15096,7 +15099,7 @@ dependencies = [
 [[package]]
 name = "shc-indexer-db"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "bigdecimal",
  "chrono",
@@ -15118,7 +15121,7 @@ dependencies = [
 [[package]]
 name = "shc-indexer-service"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "anyhow",
  "array-bytes",
@@ -15169,7 +15172,7 @@ dependencies = [
 [[package]]
 name = "shc-rpc"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -15182,11 +15185,16 @@ dependencies = [
  "mime_guess",
  "pallet-file-system-runtime-api",
  "pallet-proofs-dealer-runtime-api",
+ "pallet-storage-providers-runtime-api",
+ "parity-scale-codec",
  "reqwest",
+ "sc-network",
  "sc-rpc-api",
  "serde",
+ "shc-actors-framework",
  "shc-common",
  "shc-file-manager",
+ "shc-file-transfer-service",
  "shc-forest-manager",
  "shp-constants",
  "shp-traits",
@@ -15214,7 +15222,7 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 [[package]]
 name = "shp-constants"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "sp-core",
  "sp-runtime",
@@ -15223,7 +15231,7 @@ dependencies = [
 [[package]]
 name = "shp-data-price-updater"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -15238,7 +15246,7 @@ dependencies = [
 [[package]]
 name = "shp-file-key-verifier"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -15256,7 +15264,7 @@ dependencies = [
 [[package]]
 name = "shp-file-metadata"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "hex",
  "num-bigint",
@@ -15272,7 +15280,7 @@ dependencies = [
 [[package]]
 name = "shp-forest-verifier"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -15289,7 +15297,7 @@ dependencies = [
 [[package]]
 name = "shp-opaque"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "parachains-common",
  "sp-runtime",
@@ -15298,7 +15306,7 @@ dependencies = [
 [[package]]
 name = "shp-session-keys"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -15313,7 +15321,7 @@ dependencies = [
 [[package]]
 name = "shp-traits"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -15327,7 +15335,7 @@ dependencies = [
 [[package]]
 name = "shp-treasury-funding"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "log",
  "shp-traits",
@@ -15338,7 +15346,7 @@ dependencies = [
 [[package]]
 name = "shp-types"
 version = "0.1.0"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.2-alpha#d0851b8778e11b04ddcfbd7835bc3ddc9acf7268"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.0.4-alpha#929d2d500f20a57466439347c9de19edf3bea6d6"
 dependencies = [
  "sp-core",
  "sp-runtime",
diff --git a/operator/Cargo.toml b/operator/Cargo.toml
index 665d1c54..0472938a 100644
--- a/operator/Cargo.toml
+++ b/operator/Cargo.toml
@@ -250,43 +250,43 @@ fc-storage = { git = "https://github.com/polkadot-evm/frontier", branch = "stabl
 
 # StorageHub
 ## Runtime
-storage-hub-runtime = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-bucket-nfts = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-cr-randomness = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-file-system = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-file-system-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-payment-streams = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-payment-streams-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-proofs-dealer = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-proofs-dealer-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-randomness = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-storage-providers = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-pallet-storage-providers-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-constants = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-file-metadata = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-traits = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-treasury-funding = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-forest-verifier = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-file-key-verifier = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-data-price-updater = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
+storage-hub-runtime = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-bucket-nfts = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-cr-randomness = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-file-system = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-file-system-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-payment-streams = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-payment-streams-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-proofs-dealer = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-proofs-dealer-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-randomness = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-storage-providers = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+pallet-storage-providers-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-constants = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-file-metadata = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-traits = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-treasury-funding = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-forest-verifier = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-file-key-verifier = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-data-price-updater = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
 ## Client
-shc-actors-framework = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-actors-derive = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-blockchain-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-file-transfer-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-indexer-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-indexer-db = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-common = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-file-manager = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-fisherman-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-forest-manager = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-rpc = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shc-client = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-opaque = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
-shp-types = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
+shc-actors-framework = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-actors-derive = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-blockchain-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-file-transfer-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-indexer-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-indexer-db = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-common = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-file-manager = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-fisherman-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-forest-manager = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-rpc = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shc-client = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-opaque = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
+shp-types = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
 cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6", default-features = false }
 ## Precompiles
-pallet-evm-precompile-file-system = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.2-alpha", default-features = false }
+pallet-evm-precompile-file-system = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.0.4-alpha", default-features = false }
 
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
 # that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
diff --git a/operator/node/src/cli.rs b/operator/node/src/cli.rs
index c3a5ef0c..c39fa440 100644
--- a/operator/node/src/cli.rs
+++ b/operator/node/src/cli.rs
@@ -596,6 +596,7 @@ impl FishermanConfigurations {
                     .fisherman_database_url
                     .clone()
                     .expect("Fisherman database URL is required"),
+                maintenance_mode: false, // Skipping maintenance mode for now
             })
         } else {
             None
diff --git a/operator/runtime/mainnet/src/lib.rs b/operator/runtime/mainnet/src/lib.rs
index 3b6a742c..e42f6256 100644
--- a/operator/runtime/mainnet/src/lib.rs
+++ b/operator/runtime/mainnet/src/lib.rs
@@ -1224,7 +1224,7 @@ impl_runtime_apis! {
     //║                                        STORAGEHUB APIS                                                        ║
     //╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
 
-    impl pallet_file_system_runtime_api::FileSystemApi<Block, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>> for Runtime {
+    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256> for Runtime {
         fn is_storage_request_open_to_volunteers(file_key: H256) -> Result<bool, IsStorageRequestOpenToVolunteersError> {
             FileSystem::is_storage_request_open_to_volunteers(file_key)
         }
@@ -1241,13 +1241,24 @@ impl_runtime_apis! {
             FileSystem::query_msp_confirm_chunks_to_prove_for_file(msp_id, file_key)
         }
 
-       fn decode_generic_apply_delta_event_info(encoded_event_info: Vec<u8>) -> Result<BucketId<Runtime>, GenericApplyDeltaEventInfoError> {
+        fn query_bsps_volunteered_for_file(file_key: H256) -> Result<Vec<BackupStorageProviderId<Runtime>>, QueryBspsVolunteeredForFileError> {
+            FileSystem::query_bsps_volunteered_for_file(file_key)
+        }
+
+        fn decode_generic_apply_delta_event_info(encoded_event_info: Vec<u8>) -> Result<BucketId<Runtime>, GenericApplyDeltaEventInfoError> {
             FileSystem::decode_generic_apply_delta_event_info(encoded_event_info)
         }
 
+        fn storage_requests_by_msp(msp_id: MainStorageProviderId<Runtime>) -> BTreeMap<H256, StorageRequestMetadata<Runtime>> {
+            FileSystem::storage_requests_by_msp(msp_id)
+        }
+
         fn pending_storage_requests_by_msp(msp_id: MainStorageProviderId<Runtime>) -> BTreeMap<H256, StorageRequestMetadata<Runtime>> {
             FileSystem::pending_storage_requests_by_msp(msp_id)
         }
+        fn query_incomplete_storage_request_metadata(file_key: H256) -> Result<pallet_file_system_runtime_api::IncompleteStorageRequestMetadataResponse<AccountId, BucketId<Runtime>, StorageDataUnit<Runtime>, H256, BackupStorageProviderId<Runtime>>, QueryIncompleteStorageRequestMetadataError> {
+            FileSystem::query_incomplete_storage_request_metadata(file_key)
+        }
     }
 
     impl pallet_payment_streams_runtime_api::PaymentStreamsApi<Block, ProviderIdFor<Runtime>, Balance, AccountId> for Runtime {
diff --git a/operator/runtime/stagenet/src/lib.rs b/operator/runtime/stagenet/src/lib.rs
index d73beb4c..0a324ae0 100644
--- a/operator/runtime/stagenet/src/lib.rs
+++ b/operator/runtime/stagenet/src/lib.rs
@@ -1225,7 +1225,8 @@ impl_runtime_apis! {
     //║                                        STORAGEHUB APIS                                                        ║
     //╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
 
-    impl pallet_file_system_runtime_api::FileSystemApi<Block, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>> for Runtime {
+
+    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256> for Runtime {
         fn is_storage_request_open_to_volunteers(file_key: H256) -> Result<bool, IsStorageRequestOpenToVolunteersError> {
             FileSystem::is_storage_request_open_to_volunteers(file_key)
         }
@@ -1242,13 +1243,24 @@ impl_runtime_apis! {
             FileSystem::query_msp_confirm_chunks_to_prove_for_file(msp_id, file_key)
         }
 
-       fn decode_generic_apply_delta_event_info(encoded_event_info: Vec<u8>) -> Result<BucketId<Runtime>, GenericApplyDeltaEventInfoError> {
+        fn query_bsps_volunteered_for_file(file_key: H256) -> Result<Vec<BackupStorageProviderId<Runtime>>, QueryBspsVolunteeredForFileError> {
+            FileSystem::query_bsps_volunteered_for_file(file_key)
+        }
+
+        fn decode_generic_apply_delta_event_info(encoded_event_info: Vec<u8>) -> Result<BucketId<Runtime>, GenericApplyDeltaEventInfoError> {
             FileSystem::decode_generic_apply_delta_event_info(encoded_event_info)
         }
 
+        fn storage_requests_by_msp(msp_id: MainStorageProviderId<Runtime>) -> BTreeMap<H256, StorageRequestMetadata<Runtime>> {
+            FileSystem::storage_requests_by_msp(msp_id)
+        }
+
         fn pending_storage_requests_by_msp(msp_id: MainStorageProviderId<Runtime>) -> BTreeMap<H256, StorageRequestMetadata<Runtime>> {
             FileSystem::pending_storage_requests_by_msp(msp_id)
         }
+        fn query_incomplete_storage_request_metadata(file_key: H256) -> Result<pallet_file_system_runtime_api::IncompleteStorageRequestMetadataResponse<AccountId, BucketId<Runtime>, StorageDataUnit<Runtime>, H256, BackupStorageProviderId<Runtime>>, QueryIncompleteStorageRequestMetadataError> {
+            FileSystem::query_incomplete_storage_request_metadata(file_key)
+        }
     }
 
     impl pallet_payment_streams_runtime_api::PaymentStreamsApi<Block, ProviderIdFor<Runtime>, Balance, AccountId> for Runtime {
diff --git a/operator/runtime/testnet/src/lib.rs b/operator/runtime/testnet/src/lib.rs
index 12df0ffb..b1444c23 100644
--- a/operator/runtime/testnet/src/lib.rs
+++ b/operator/runtime/testnet/src/lib.rs
@@ -1223,7 +1223,7 @@ impl_runtime_apis! {
     //║                                        STORAGEHUB APIS                                                        ║
     //╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
 
-    impl pallet_file_system_runtime_api::FileSystemApi<Block, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>> for Runtime {
+    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256> for Runtime {
         fn is_storage_request_open_to_volunteers(file_key: H256) -> Result<bool, IsStorageRequestOpenToVolunteersError> {
             FileSystem::is_storage_request_open_to_volunteers(file_key)
         }
@@ -1240,13 +1240,24 @@ impl_runtime_apis! {
             FileSystem::query_msp_confirm_chunks_to_prove_for_file(msp_id, file_key)
         }
 
-       fn decode_generic_apply_delta_event_info(encoded_event_info: Vec<u8>) -> Result<BucketId<Runtime>, GenericApplyDeltaEventInfoError> {
+        fn query_bsps_volunteered_for_file(file_key: H256) -> Result<Vec<BackupStorageProviderId<Runtime>>, QueryBspsVolunteeredForFileError> {
+            FileSystem::query_bsps_volunteered_for_file(file_key)
+        }
+
+        fn decode_generic_apply_delta_event_info(encoded_event_info: Vec<u8>) -> Result<BucketId<Runtime>, GenericApplyDeltaEventInfoError> {
             FileSystem::decode_generic_apply_delta_event_info(encoded_event_info)
         }
 
+        fn storage_requests_by_msp(msp_id: MainStorageProviderId<Runtime>) -> BTreeMap<H256, StorageRequestMetadata<Runtime>> {
+            FileSystem::storage_requests_by_msp(msp_id)
+        }
+
         fn pending_storage_requests_by_msp(msp_id: MainStorageProviderId<Runtime>) -> BTreeMap<H256, StorageRequestMetadata<Runtime>> {
             FileSystem::pending_storage_requests_by_msp(msp_id)
         }
+        fn query_incomplete_storage_request_metadata(file_key: H256) -> Result<pallet_file_system_runtime_api::IncompleteStorageRequestMetadataResponse<AccountId, BucketId<Runtime>, StorageDataUnit<Runtime>, H256, BackupStorageProviderId<Runtime>>, QueryIncompleteStorageRequestMetadataError> {
+            FileSystem::query_incomplete_storage_request_metadata(file_key)
+        }
     }
 
     impl pallet_payment_streams_runtime_api::PaymentStreamsApi<Block, ProviderIdFor<Runtime>, Balance, AccountId> for Runtime {
diff --git a/test/.papi/descriptors/package.json b/test/.papi/descriptors/package.json
index db83d2e5..021754cd 100644
--- a/test/.papi/descriptors/package.json
+++ b/test/.papi/descriptors/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0-autogenerated.15163338853582430870",
+  "version": "0.1.0-autogenerated.10311212470204876148",
   "name": "@polkadot-api/descriptors",
   "files": [
     "dist"
diff --git a/test/.papi/metadata/datahaven.scale b/test/.papi/metadata/datahaven.scale
index 4461c0ce..98ee1e77 100644
Binary files a/test/.papi/metadata/datahaven.scale and b/test/.papi/metadata/datahaven.scale differ