diff --git a/Cargo.lock b/Cargo.lock
index ef7e82c..0a4a2fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -267,7 +267,7 @@ dependencies = [
  "bitcoin_hashes",
  "hex-conservative",
  "hex_lit",
- "secp256k1",
+ "secp256k1 0.28.0",
  "serde",
 ]
 
@@ -1859,7 +1859,6 @@ version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
 dependencies = [
- "bitcoin_hashes",
  "rand",
  "secp256k1-sys",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index ca23fc2..d316469 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,6 @@ members = [
 ]
 default-members = [
     "psbt",
-    "cli",
     "fs",
     "."
 ]
@@ -18,7 +17,7 @@ keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"]
 categories = ["cryptography::cryptocurrencies"]
 authors = ["Dr Maxim Orlovsky <orlovsky@lnp-bp.org>"]
 homepage = "https://lnp-bp.org"
-repository = "https://github.com/RGB-WG/rgb-wallet"
+repository = "https://github.com/RGB-WG/rgb"
 rust-version = "1.67" # Due to strict encoding library
 edition = "2021"
 license = "Apache-2.0"
@@ -64,6 +63,7 @@ license.workspace = true
 
 [lib]
 name = "rgb_rt"
+crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 amplify = { workspace = true }
@@ -103,3 +103,4 @@ bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "v0.11" }
 rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "master" }
 rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "v0.11" }
 rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "v0.11" }
+bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "v0.11" }
diff --git a/src/lib.rs b/src/lib.rs
index 046dc1f..5ff46a6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,5 +35,6 @@ mod resolvers;
 
 pub use descriptor::{DescriptorRgb, RgbDescr, RgbKeychain, TapTweakAlreadyAssigned, TapretKey};
 pub use pay::{CompletionError, CompositionError, PayError, TransferParams};
+#[cfg(any(feature = "electrum", feature = "esplora_blocking"))]
 pub use resolvers::*;
 pub use runtime::{ContractOutpointsFilter, Runtime, RuntimeError};
diff --git a/src/resolvers/mod.rs b/src/resolvers/mod.rs
index 8a497ed..8cdb5a3 100644
--- a/src/resolvers/mod.rs
+++ b/src/resolvers/mod.rs
@@ -19,10 +19,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(any(feature = "electrum", feature = "esplora_blocking"))]
 mod any;
 #[cfg(feature = "esplora_blocking")]
 pub mod esplora_blocking;
 #[cfg(feature = "electrum")]
 pub mod electrum;
 
+#[cfg(any(feature = "electrum", feature = "esplora_blocking"))]
 pub use any::AnyResolver;