diff --git a/README.md b/README.md
index 3faafaf..e15050f 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@ repositories {
 dependencies {
   
   // for jvm
-  implementation 'org.bitcoindevkit:bdk-jvm:0.3.2'
+  implementation 'org.bitcoindevkit:bdk-jvm:0.4.0'
   // OR for android
-  implementation 'org.bitcoindevkit:bdk-android:0.3.2'
+  implementation 'org.bitcoindevkit:bdk-android:0.4.0'
   
 }
 
@@ -31,14 +31,16 @@ import org.bitcoindevkit.*
 
 // ...
 
-val descriptor = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)"
-val db = DatabaseConfig.Memory("")
+val externalDescriptor = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)"
+val internalDescriptor = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)"
 
-val client =
+val databaseConfig = DatabaseConfig.Memory("")
+
+val blockchainConfig =
   BlockchainConfig.Electrum(
     ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5u, null, 10u)
   )
-val wallet = OnlineWallet(descriptor, null, Network.TESTNET, db, client)
+val wallet = Wallet(externalDescriptor, internalDescriptor, Network.TESTNET, databaseConfig, blockchainConfig)
 val newAddress = wallet.getNewAddress()
 ```
 
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 625be75..e28c05e 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -44,7 +44,7 @@ afterEvaluate {
             create<MavenPublication>("maven") {
                 groupId = "org.bitcoindevkit"
                 artifactId = "bdk-android"
-                version = "0.3.2"
+                version = "0.4.1-SNAPSHOT"
                 from(components["release"])
                 pom {
                     name.set("bdk-android")
diff --git a/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt b/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
index 530756f..d106707 100644
--- a/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
+++ b/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
@@ -96,16 +96,6 @@ class AndroidLibTest {
 
     @Test
     fun onlineWalletSyncGetBalance() {
-        val db = DatabaseConfig.Memory("")
-        val client = BlockchainConfig.Electrum(
-            ElectrumConfig(
-                "ssl://electrum.blockstream.info:60002",
-                null,
-                5u,
-                null,
-                100u
-            )
-        )
         val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig)
         wallet.sync(LogProgress(), null)
         val balance = wallet.getBalance()
diff --git a/jvm/build.gradle.kts b/jvm/build.gradle.kts
index f6b576e..6dd37bb 100644
--- a/jvm/build.gradle.kts
+++ b/jvm/build.gradle.kts
@@ -44,7 +44,7 @@ afterEvaluate {
 
                 groupId = "org.bitcoindevkit"
                 artifactId = "bdk-jvm"
-                version = "0.3.2"
+                version = "0.4.1-SNAPSHOT"
 
                 from(components["java"])
 
diff --git a/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt b/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
index 0cdf9ae..a1786ce 100644
--- a/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
+++ b/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
@@ -90,16 +90,6 @@ class JvmLibTest {
 
     @Test
     fun onlineWalletSyncGetBalance() {
-        val db = DatabaseConfig.Memory("")
-        val client = BlockchainConfig.Electrum(
-            ElectrumConfig(
-                "ssl://electrum.blockstream.info:60002",
-                null,
-                5u,
-                null,
-                100u
-            )
-        )
         val wallet = Wallet(descriptor, null, Network.REGTEST, databaseConfig, blockchainConfig)
         wallet.sync(LogProgress(), null)
         val balance = wallet.getBalance()