diff --git a/features/account/api/build.gradle.kts b/features/account/api/build.gradle.kts
index 6e0c5aeb96..4b8d15e52c 100644
--- a/features/account/api/build.gradle.kts
+++ b/features/account/api/build.gradle.kts
@@ -10,16 +10,12 @@ android {
 
 dependencies {
 
-    /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-    implementation(projects.common.ui)
+    // region Project - Core
+    api(projects.core.decompose)
+    api(projects.core.ui)
+    // endregion
 
-    /* Project - Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.core)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.account)
+    // region Project - Domain
+    api(projects.domain.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/features/account/impl/build.gradle.kts b/features/account/impl/build.gradle.kts
index 1c4ab8d7a1..f3e66aeb7d 100644
--- a/features/account/impl/build.gradle.kts
+++ b/features/account/impl/build.gradle.kts
@@ -13,43 +13,35 @@ android {
 
 dependencies {
     /** Api */
-    implementation(projects.features.account.api)
-    implementation(projects.features.wallet.api)
+    api(projects.features.account.api)
 
     /** Core modules */
-    implementation(projects.core.analytics)
-    implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
+    api(projects.core.analytics)
+    api(projects.core.analytics.models)
+    api(projects.core.decompose)
+    api(projects.core.error)
+    api(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.error)
     implementation(projects.core.res)
-    implementation(projects.core.decompose)
-    implementation(projects.core.navigation)
-    implementation(projects.core.datasource)
 
     /** Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.account)
-    implementation(projects.domain.account.status)
+    api(projects.domain.account)
+    api(projects.domain.account.status)
+    api(projects.domain.models)
+    api(projects.domain.wallets)
     implementation(projects.domain.core)
-    implementation(projects.domain.appCurrency)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.balanceHiding)
-    implementation(projects.domain.balanceHiding.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
-
-    /** Tangem libraries */
-    implementation(tangemDeps.card.core)
+    runtimeOnly(projects.domain.appCurrency)
+    runtimeOnly(projects.domain.balanceHiding)
+    runtimeOnly(projects.domain.tokens)
 
     /** Common */
     implementation(projects.common.ui)
     implementation(projects.common.routing)
 
     /** AndroidX libraries */
-    implementation(deps.androidx.core.ktx)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
+    implementation(deps.lifecycle.compose)
     implementation(deps.lifecycle.runtime.ktx)
 
     /** Compose libraries */
@@ -58,14 +50,13 @@ dependencies {
     implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.coil)
     implementation(deps.decompose.ext.compose)
     implementation(deps.androidx.activity.compose)
 
     /** Other libraries */
     implementation(deps.arrow.core)
+    implementation(deps.kotlin.coroutines)
     implementation(deps.kotlin.immutable.collections)
-    implementation(deps.kotlin.serialization)
     implementation(deps.firebase.crashlytics)
 
     /** DI */
diff --git a/features/address-book/api/build.gradle.kts b/features/address-book/api/build.gradle.kts
index b70fe75e59..1f16e5ab3c 100644
--- a/features/address-book/api/build.gradle.kts
+++ b/features/address-book/api/build.gradle.kts
@@ -10,20 +10,22 @@ android {
 
 dependencies {
 
-    /* Project - Common */
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    api(deps.kotlin.immutable.collections)
+    // endregion
+
+    // region Project - Common
     api(projects.common.routing)
-    implementation(projects.common.ui)
+    api(projects.common.ui)
+    // endregion
 
-    /* Project - Domain */
-    implementation(projects.domain.models)
+    // region Project - Core
+    api(projects.core.decompose)
+    api(projects.core.ui)
+    // endregion
 
-    /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-
-    /* Compose */
-    implementation(deps.compose.runtime)
-
-    /** Other */
-    implementation(deps.kotlin.immutable.collections)
+    // region Project - Domain
+    api(projects.domain.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/features/address-book/impl/build.gradle.kts b/features/address-book/impl/build.gradle.kts
index 5337d75bef..1c9781a086 100644
--- a/features/address-book/impl/build.gradle.kts
+++ b/features/address-book/impl/build.gradle.kts
@@ -13,29 +13,31 @@ android {
 
 dependencies {
     /** Api */
-    implementation(projects.features.addressBook.api)
-    implementation(projects.features.commonFeatures.api)
+    api(projects.features.addressBook.api)
+    api(projects.features.commonFeatures.api)
 
     /** Domain */
-    implementation(projects.domain.account)
-    implementation(projects.domain.addressBook)
+    api(projects.domain.account)
+    api(projects.domain.addressBook)
+    api(projects.domain.wallets)
     implementation(projects.domain.models)
     implementation(projects.domain.qrScanning)
     implementation(projects.domain.qrScanning.models)
-    implementation(projects.domain.wallets)
 
     /** Common */
+    implementation(projects.common.routing)
     implementation(projects.common.ui)
 
     /** Core modules */
-    implementation(projects.core.configToggles)
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-    implementation(projects.core.utils)
+    api(projects.core.configToggles)
+    api(projects.core.decompose)
+    api(projects.core.ui)
+    api(projects.core.utils)
 
     /** Compose */
+    api(deps.compose.foundation)
+    implementation(deps.compose.animation)
     implementation(deps.compose.runtime)
-    implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
     implementation(deps.compose.material3)
@@ -48,7 +50,12 @@ dependencies {
     kapt(deps.hilt.kapt)
 
     /** Other */
-    implementation(deps.kotlin.immutable.collections)
+    api(deps.kotlin.immutable.collections)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
+    implementation(deps.arrow.core)
+    implementation(deps.kotlin.coroutines)
+    implementation(deps.kotlin.serialization.core)
 
     /** Utils */
     implementation(projects.libs.blockchainSdk)
diff --git a/features/approval/api/build.gradle.kts b/features/approval/api/build.gradle.kts
index 0401b93110..63cc1cf6ea 100644
--- a/features/approval/api/build.gradle.kts
+++ b/features/approval/api/build.gradle.kts
@@ -9,20 +9,17 @@ android {
 }
 
 dependencies {
-    /** Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
 
-    /** Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.wallets.models)
+    // region Core
+    api(projects.core.decompose)
+    api(projects.core.ui)
+    // endregion
 
-    /** Common */
-    implementation(projects.common.ui)
+    // region Common
+    api(projects.common.ui)
+    // endregion
 
-    /** Other */
-    implementation(deps.kotlin.immutable.collections)
-
-    /** Compose */
-    implementation(deps.compose.runtime)
+    // region Domain
+    api(projects.domain.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/features/approval/impl/build.gradle.kts b/features/approval/impl/build.gradle.kts
index a61451f217..284cde8491 100644
--- a/features/approval/impl/build.gradle.kts
+++ b/features/approval/impl/build.gradle.kts
@@ -12,19 +12,20 @@ android {
 dependencies {
 
     /** Feature */
-    implementation(projects.features.approval.api)
-    implementation(projects.features.send.api)
+    api(projects.features.approval.api)
+    api(projects.features.send.api)
 
     /** Core */
-    implementation(projects.core.configToggles)
-    implementation(projects.core.decompose)
-    implementation(projects.core.navigation)
-    implementation(projects.core.ui)
-    implementation(projects.core.utils)
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.configToggles)
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
+    implementation(projects.core.ui)
 
     /** Common */
+    implementation(projects.common)
     implementation(projects.common.ui)
 
     /** SDK */
@@ -33,11 +34,10 @@ dependencies {
     }
 
     /** Domain */
+    api(projects.domain.transaction)
+    api(projects.domain.wallets)
     implementation(projects.domain.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
     implementation(projects.domain.transaction.models)
-    implementation(projects.domain.transaction)
 
     /** Compose */
     implementation(deps.compose.foundation)
@@ -47,10 +47,15 @@ dependencies {
     implementation(deps.compose.ui.tooling)
 
     /** Other */
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
+    implementation(deps.arrow.core)
     implementation(deps.decompose)
     implementation(deps.decompose.ext.compose)
+    implementation(deps.kotlin.coroutines)
     implementation(deps.kotlin.immutable.collections)
-    implementation(deps.arrow.core)
+    implementation(deps.lifecycle.compose)
+    implementation(deps.lifecycle.runtime.ktx)
 
     /** DI */
     implementation(deps.hilt.android)
diff --git a/features/biometry/api/build.gradle.kts b/features/biometry/api/build.gradle.kts
index d61052da36..1f4a6ffbf1 100644
--- a/features/biometry/api/build.gradle.kts
+++ b/features/biometry/api/build.gradle.kts
@@ -10,6 +10,6 @@ android {
 
 dependencies {
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 }
\ No newline at end of file
diff --git a/features/biometry/impl/build.gradle.kts b/features/biometry/impl/build.gradle.kts
index 075c304c23..8962902a95 100644
--- a/features/biometry/impl/build.gradle.kts
+++ b/features/biometry/impl/build.gradle.kts
@@ -13,39 +13,37 @@ android {
 
 dependencies {
     api(projects.features.biometry.api)
-    implementation(projects.features.hotWallet.api)
 
     /** Core modules */
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.res)
-    implementation(projects.core.decompose)
-    implementation(projects.core.analytics)
-    implementation(projects.core.analytics.models)
-    implementation(projects.core.configToggles)
-    implementation(projects.core.navigation)
-    implementation(projects.core.utils)
 
     /** Domain */
-    implementation(projects.domain.wallets)
-    api(projects.domain.models)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.card)
+    api(projects.domain.card)
+    api(projects.domain.common)
+    api(projects.domain.settings)
+    api(projects.domain.wallets)
+    implementation(projects.domain.models)
 
     /** Compose libraries */
+    api(deps.compose.animation)
     implementation(deps.compose.material3)
-    implementation(deps.compose.animation)
     implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
 
     /** Tangem libraries */
-    implementation(projects.libs.tangemSdkApi)
-    implementation(tangemDeps.card.core)
-    implementation(tangemDeps.card.android) {
-        exclude(module = "joda-time")
-    }
+    api(projects.libs.tangemSdkApi)
 
     /** Other */
+    implementation(deps.androidx.appCompat)
+    implementation(deps.arrow.core)
+    implementation(deps.decompose)
+    implementation(deps.kotlin.coroutines)
+    implementation(deps.lifecycle.compose)
+    implementation(deps.lifecycle.runtime.ktx)
 
     /** DI */
     implementation(deps.hilt.android)
diff --git a/features/common-features/api/build.gradle.kts b/features/common-features/api/build.gradle.kts
index 2d20ac5683..c18451b801 100644
--- a/features/common-features/api/build.gradle.kts
+++ b/features/common-features/api/build.gradle.kts
@@ -11,16 +11,22 @@ android {
 
 dependencies {
 
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    api(deps.kotlin.immutable.collections)
+    api(deps.kotlin.serialization.core)
+    // endregion
+
     /* Project - Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.markets)
-    implementation(projects.domain.account)
+    api(projects.domain.account)
+    api(projects.domain.appCurrency.models)
+    api(projects.domain.markets.models)
+    api(projects.domain.models)
 
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
     /* Compose */
     implementation(deps.compose.runtime)
-    implementation(deps.kotlin.immutable.collections)
 }
\ No newline at end of file
diff --git a/features/common-features/impl/build.gradle.kts b/features/common-features/impl/build.gradle.kts
index a44ae83e47..40e3f36597 100644
--- a/features/common-features/impl/build.gradle.kts
+++ b/features/common-features/impl/build.gradle.kts
@@ -12,69 +12,69 @@ android {
 }
 dependencies {
     /** Api */
-    implementation(projects.features.commonFeatures.api)
-    implementation(projects.features.wallet.api)
-    implementation(projects.features.tokenRecieve.api)
+    api(projects.features.commonFeatures.api)
+    api(projects.features.tokenRecieve.api)
+    api(projects.features.wallet.api)
 
     /** Core modules */
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.decompose)
+    api(projects.core.ui)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
-    implementation(projects.core.ui)
-    implementation(projects.core.error)
-    implementation(projects.core.res)
-    implementation(projects.core.decompose)
-    implementation(projects.core.navigation)
-    implementation(projects.core.datasource)
+    implementation(projects.core.pagination)
 
     /** Domain */
-    implementation(projects.domain.models)
+    api(projects.domain.account.status)
+    api(projects.domain.appCurrency)
+    api(projects.domain.appCurrency.models)
+    api(projects.domain.balanceHiding)
+    api(projects.domain.manageTokens)
+    api(projects.domain.markets)
+    api(projects.domain.markets.models)
+    api(projects.domain.models)
+    api(projects.domain.transaction)
+    api(projects.domain.wallets)
     implementation(projects.domain.account)
-    implementation(projects.domain.account.status)
+    implementation(projects.domain.card)
     implementation(projects.domain.core)
-    implementation(projects.domain.appCurrency)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.markets)
-    implementation(projects.domain.transaction)
     implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
-    implementation(projects.domain.manageTokens)
-    implementation(projects.domain.manageTokens.models)
-    implementation(projects.domain.balanceHiding)
-    implementation(projects.domain.balanceHiding.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
+    implementation(projects.domain.yieldSupply.models)
 
     /** Tangem libraries */
     implementation(tangemDeps.card.core)
 
     /** Common */
-    implementation(projects.common.ui)
+    api(projects.common.routing)
+    api(projects.common.ui)
+    api(projects.common.uiMarkets)
+    implementation(projects.common)
     implementation(projects.common.uiCharts)
-    implementation(projects.common.uiMarkets)
-    implementation(projects.common.routing)
 
     /** Libs */
-    implementation(projects.libs.blockchainSdk)
+    api(projects.libs.blockchainSdk)
+    implementation(projects.libs.crypto)
 
     /** AndroidX libraries */
-    implementation(deps.androidx.core.ktx)
+    implementation(deps.androidx.appCompat)
     implementation(deps.lifecycle.runtime.ktx)
 
     /** Compose libraries */
+    api(deps.compose.animation)
+    api(deps.compose.foundation)
     implementation(deps.compose.material3)
-    implementation(deps.compose.animation)
-    implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.coil)
     implementation(deps.decompose.ext.compose)
-    implementation(deps.androidx.activity.compose)
 
     /** Other libraries */
+    api(deps.kotlin.coroutines)
+    api(deps.kotlin.immutable.collections)
     implementation(deps.arrow.core)
-    implementation(deps.kotlin.immutable.collections)
+    implementation(deps.haze)
     implementation(deps.kotlin.serialization)
+    implementation(deps.lifecycle.compose)
     implementation(deps.firebase.crashlytics)
 
     /** DI */
@@ -83,5 +83,4 @@ dependencies {
 
     testImplementation(projects.common.test)
     testImplementation(projects.test.core)
-    testImplementation(projects.test.mock)
 }
\ No newline at end of file
diff --git a/features/create-wallet-selection/api/build.gradle.kts b/features/create-wallet-selection/api/build.gradle.kts
index 2ffb19aeee..83d4aece6e 100644
--- a/features/create-wallet-selection/api/build.gradle.kts
+++ b/features/create-wallet-selection/api/build.gradle.kts
@@ -10,13 +10,7 @@ android {
 
 dependencies {
 
-    /* Project - Domain */
-    implementation(projects.domain.models)
-
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-
-    /* Compose */
-    implementation(deps.compose.runtime)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 } 
\ No newline at end of file
diff --git a/features/create-wallet-selection/impl/build.gradle.kts b/features/create-wallet-selection/impl/build.gradle.kts
index 8fd9175d79..298c18f41a 100644
--- a/features/create-wallet-selection/impl/build.gradle.kts
+++ b/features/create-wallet-selection/impl/build.gradle.kts
@@ -14,63 +14,40 @@ android {
 dependencies {
     /** Api */
     implementation(projects.features.createWalletSelection.api)
-    
-    /** Hot Wallet Feature */
-    implementation(projects.features.hotWallet.api)
-
-    /** Project - Domain */
-    implementation(projects.domain.card)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.models)
-    implementation(projects.domain.hotWallet)
 
     /** Core modules */
-    implementation(projects.core.configToggles)
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.res)
-    implementation(projects.core.decompose)
-    implementation(projects.core.navigation)
-    implementation(projects.core.datasource)
+
+    /** Project - Domain */
+    api(projects.domain.hotWallet)
+    api(projects.domain.wallets)
 
     /** Common */
-    implementation(projects.common.ui)
-    implementation(projects.common.routing)
     implementation(projects.common)
-
-    /** Tangem libraries */
-    implementation(projects.libs.tangemSdkApi)
-    implementation(tangemDeps.card.core)
-    implementation(tangemDeps.card.android) {
-        exclude(module = "joda-time")
-    }
-
-    /** AndroidX libraries */
-    implementation(deps.androidx.core.ktx)
-    implementation(deps.lifecycle.runtime.ktx)
+    implementation(projects.common.routing)
 
     /** Compose libraries */
+    api(deps.compose.animation)
     implementation(deps.compose.material3)
-    implementation(deps.compose.animation)
     implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.coil)
-    implementation(deps.lottie.compose)
     implementation(deps.decompose.ext.compose)
-    implementation(deps.androidx.activity.compose)
-    implementation(deps.androidx.datastore)
 
     /** Other libraries */
-    implementation(deps.arrow.core)
+    implementation(deps.androidx.appCompat)
+    implementation(deps.kotlin.coroutines)
     implementation(deps.kotlin.immutable.collections)
-    implementation(deps.kotlin.serialization)
+    implementation(deps.lifecycle.compose)
+    implementation(deps.lifecycle.runtime.ktx)
     implementation(deps.firebase.crashlytics)
 
     /** DI */
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/features/create-wallet-start/api/build.gradle.kts b/features/create-wallet-start/api/build.gradle.kts
index 8c60a57f79..8b619d977f 100644
--- a/features/create-wallet-start/api/build.gradle.kts
+++ b/features/create-wallet-start/api/build.gradle.kts
@@ -9,13 +9,7 @@ android {
 }
 
 dependencies {
-    /* Project - Domain */
-    implementation(projects.domain.models)
-
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-
-    /* Compose */
-    implementation(deps.compose.runtime)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 }
\ No newline at end of file
diff --git a/features/create-wallet-start/impl/build.gradle.kts b/features/create-wallet-start/impl/build.gradle.kts
index 60c312171e..f898e3f65b 100644
--- a/features/create-wallet-start/impl/build.gradle.kts
+++ b/features/create-wallet-start/impl/build.gradle.kts
@@ -12,60 +12,52 @@ android {
 }
 dependencies {
     /** Api */
-    implementation(projects.features.createWalletStart.api)
-    implementation(projects.features.hotWallet.api)
-    implementation(projects.features.onboardingV2.api)
+    api(projects.features.createWalletStart.api)
+    api(projects.features.onboardingV2.api)
 
     /** Project - Domain */
-    implementation(projects.domain.card)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.wallets)
+    api(projects.domain.card)
+    api(projects.domain.common)
+    api(projects.domain.hotWallet)
+    api(projects.domain.settings)
+    api(projects.domain.wallets)
     implementation(projects.domain.models)
-    implementation(projects.domain.hotWallet)
     implementation(projects.domain.wallets.models)
 
     /** Core modules */
-    implementation(projects.core.configToggles)
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.datasource)
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.res)
-    implementation(projects.core.decompose)
-    implementation(projects.core.navigation)
-    implementation(projects.core.datasource)
 
     /** Common */
-    implementation(projects.common.ui)
-    implementation(projects.common.routing)
+    api(projects.common.routing)
+    runtimeOnly(projects.common.ui)
 
     /** Tangem libraries */
-    implementation(projects.libs.tangemSdkApi)
     implementation(tangemDeps.card.core)
-    implementation(tangemDeps.card.android) {
-        exclude(module = "joda-time")
-    }
 
     /** AndroidX libraries */
-    implementation(deps.androidx.core.ktx)
     implementation(deps.lifecycle.runtime.ktx)
 
     /** Compose libraries */
+    api(deps.compose.animation)
     implementation(deps.compose.material3)
-    implementation(deps.compose.animation)
     implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.coil)
-    implementation(deps.lottie.compose)
     implementation(deps.decompose.ext.compose)
-    implementation(deps.androidx.activity.compose)
-    implementation(deps.androidx.datastore)
 
     /** Other libraries */
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
     implementation(deps.arrow.core)
+    implementation(deps.kotlin.coroutines)
     implementation(deps.kotlin.immutable.collections)
-    implementation(deps.kotlin.serialization)
+    implementation(deps.lifecycle.compose)
     implementation(deps.firebase.crashlytics)
 
     /** DI */
@@ -75,6 +67,5 @@ dependencies {
     /** Test */
     testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
-    testImplementation(deps.test.truth)
     testImplementation(deps.test.coroutine)
 }
\ No newline at end of file
diff --git a/features/details/api/build.gradle.kts b/features/details/api/build.gradle.kts
index 0db132f289..b1effa0aab 100644
--- a/features/details/api/build.gradle.kts
+++ b/features/details/api/build.gradle.kts
@@ -10,13 +10,10 @@ android {
 
 dependencies {
 
-    /* Project - Domain */
-    implementation(projects.domain.models)
-
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
-    /* Compose */
-    implementation(deps.compose.runtime)
+    /* Project - Domain */
+    api(projects.domain.models)
 }
\ No newline at end of file
diff --git a/features/details/impl/build.gradle.kts b/features/details/impl/build.gradle.kts
index 51324ed3de..63309faae3 100644
--- a/features/details/impl/build.gradle.kts
+++ b/features/details/impl/build.gradle.kts
@@ -13,63 +13,54 @@ android {
 dependencies {
 
     /* Project - API */
-    implementation(projects.features.details.api)
-    implementation(projects.features.wallet.api)
-    implementation(projects.features.disclaimer.api)
-    implementation(projects.features.tester.api)
-    implementation(projects.features.createWalletSelection.api)
-    implementation(projects.features.onboardingV2.api)
-    implementation(projects.features.addressBook.api)
+    api(projects.features.addressBook.api)
+    api(projects.features.details.api)
+    api(projects.features.onboardingV2.api)
+    api(projects.features.wallet.api)
 
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-    implementation(projects.core.configToggles)
-    implementation(projects.core.navigation)
-    implementation(projects.core.analytics)
-    implementation(projects.core.utils)
+    api(projects.core.analytics)
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
+    implementation(projects.core.ui)
+
+    /* Common */
     implementation(projects.common.routing)
     implementation(projects.common.ui)
-    implementation(projects.core.datasource)
 
     /* Project - Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.feedback)
+    api(projects.domain.card)
+    api(projects.domain.feedback)
+    api(projects.domain.settings)
+    api(projects.domain.virtualAccount)
+    api(projects.domain.visa)
+    api(projects.domain.walletConnect)
+    api(projects.domain.wallets)
+    implementation(projects.domain.common)
     implementation(projects.domain.feedback.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.card)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.appCurrency)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.walletConnect)
-    implementation(projects.domain.balanceHiding)
-    implementation(projects.domain.balanceHiding.models)
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.visa)
-    implementation(projects.domain.virtualAccount)
+    implementation(projects.domain.models)
+    implementation(projects.domain.virtualAccount.models)
+    runtimeOnly(projects.domain.appCurrency)
+    runtimeOnly(projects.domain.balanceHiding)
+    runtimeOnly(projects.domain.tokens)
 
     /* SDK */
     // TODO: For TangemError model, should be removed after card domain scanning refactoring
     implementation(tangemDeps.card.core)
-    // For image resolving
-    implementation(tangemDeps.blockchain)
 
     /* AndroidX */
-    implementation(deps.androidx.activity.compose)
+    implementation(deps.androidx.annotation)
     implementation(deps.androidx.appCompat)
     implementation(deps.lifecycle.compose)
 
     /* Compose */
+    api(deps.compose.foundation)
+    implementation(deps.compose.animation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.accompanist.systemUiController)
-    implementation(deps.compose.foundation)
     implementation(deps.compose.material3)
-    implementation(deps.compose.shimmer)
     implementation(deps.compose.coil)
     implementation(deps.compose.reorderableV2)
 
@@ -78,9 +69,11 @@ dependencies {
     kapt(deps.hilt.kapt)
 
     /* Other */
-    implementation(deps.kotlin.immutable.collections)
     implementation(deps.arrow.core)
     implementation(deps.arrow.fx)
+    implementation(deps.decompose)
+    implementation(deps.kotlin.coroutines)
+    implementation(deps.kotlin.immutable.collections)
 
     /* Test */
     testImplementation(deps.test.junit5)
diff --git a/features/disclaimer/api/build.gradle.kts b/features/disclaimer/api/build.gradle.kts
index f1afef8518..6fbdad9cce 100644
--- a/features/disclaimer/api/build.gradle.kts
+++ b/features/disclaimer/api/build.gradle.kts
@@ -11,12 +11,9 @@ android {
 dependencies {
 
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
     /* Common */
-    implementation(projects.common.routing)
-
-    /* Compose */
-    implementation(deps.compose.runtime)
+    api(projects.common.routing)
 }
\ No newline at end of file
diff --git a/features/disclaimer/impl/build.gradle.kts b/features/disclaimer/impl/build.gradle.kts
index 58d95cba7f..7ed8a159aa 100644
--- a/features/disclaimer/impl/build.gradle.kts
+++ b/features/disclaimer/impl/build.gradle.kts
@@ -12,39 +12,37 @@ android {
 
 dependencies {
     /* AndroidX */
+    implementation(deps.androidx.appCompat)
     implementation(deps.lifecycle.compose)
-    implementation(deps.androidx.activity.compose)
 
     /** Compose */
-    implementation(deps.compose.foundation)
+    api(deps.compose.foundation)
+    implementation(deps.compose.animation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.accompanist.systemUiController)
-    implementation(deps.compose.accompanist.permission)
     implementation(deps.compose.accompanist.webView)
     implementation(deps.compose.material3)
 
     /** Core modules */
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.utils)
-    implementation(projects.core.configToggles)
-    implementation(projects.core.navigation)
-    implementation(projects.core.decompose)
     implementation(projects.common.routing)
     implementation(projects.common.ui)
 
     /** Domain modules */
-    implementation(projects.domain.models)
-    implementation(projects.domain.card)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.notifications)
+    api(projects.domain.card)
+    api(projects.domain.notifications)
+    api(projects.domain.settings)
 
     /** Feature modules */
-    implementation(projects.features.disclaimer.api)
+    api(projects.features.disclaimer.api)
     implementation(projects.features.pushNotifications.api)
 
     /** Other dependencies */
-    implementation(deps.arrow.core)
+    implementation(deps.decompose)
+    implementation(deps.kotlin.coroutines)
 
     /** DI */
     implementation(deps.hilt.android)