diff --git a/.gitignore b/.gitignore
index 58fcf1bd62..c518bfc142 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ captures/
 .idea/dictionaries
 .idea/libraries
 .idea/jarRepositories.xml
+/.idea/codeStyles/Project.xml
 # Android Studio 3 in .gitignore file.
 .idea/caches
 .idea/modules.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 4ce85a1565..602469c89d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,41 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="RIGHT_MARGIN" value="150" />
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/core/android/build.gradle.kts b/core/android/build.gradle.kts
index a7bb75af1a..3aa1fe59d2 100644
--- a/core/android/build.gradle.kts
+++ b/core/android/build.gradle.kts
@@ -98,6 +98,7 @@ dependencies {
     debugApi(project(":foundation"))
     releaseApi("com.reown:foundation:$FOUNDATION_VERSION")
 
+    //todo: remove yttrium from android-core - move all needed parts to sign sdk
     // Use specific yttrium version for CI builds, default version for local builds
     // Release builds use stable version, regular CI builds use CI version for e2e tests
     val yttriumVersion = if (System.getenv("IS_RELEASE_BUILD") == "true") {
@@ -107,7 +108,7 @@ dependencies {
     } else {
         "0.9.55" // Use stable version for local builds
     }
-    api("com.github.reown-com:yttrium:$yttriumVersion") //unspecified
+    api("com.github.reown-com:yttrium:unspecified") //$yttriumVersion
     implementation("net.java.dev.jna:jna:5.17.0@aar")
 
     api(libs.coroutines)
diff --git a/core/android/src/main/kotlin/com/reown/android/CoreProtocol.kt b/core/android/src/main/kotlin/com/reown/android/CoreProtocol.kt
index d7be0882cd..465e9edbcd 100644
--- a/core/android/src/main/kotlin/com/reown/android/CoreProtocol.kt
+++ b/core/android/src/main/kotlin/com/reown/android/CoreProtocol.kt
@@ -5,6 +5,7 @@ import android.content.SharedPreferences
 import com.reown.android.di.coreStorageModule
 import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.android.internal.common.di.KEY_CLIENT_ID
+import com.reown.android.internal.common.di.coreAppKitModule
 import com.reown.android.internal.common.di.coreAndroidNetworkModule
 import com.reown.android.internal.common.di.coreCommonModule
 import com.reown.android.internal.common.di.coreCryptoModule
@@ -14,7 +15,6 @@ import com.reown.android.internal.common.di.explorerModule
 import com.reown.android.internal.common.di.keyServerModule
 import com.reown.android.internal.common.di.pulseModule
 import com.reown.android.internal.common.di.pushModule
-import com.reown.android.internal.common.di.appKitModule
 import com.reown.android.internal.common.explorer.ExplorerInterface
 import com.reown.android.internal.common.explorer.ExplorerProtocol
 import com.reown.android.internal.common.model.AppMetaData
@@ -78,6 +78,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
     ) {
         try {
             require(relayServerUrl.isValidRelayServerUrl()) { "Check the schema and projectId parameter of the Server Url" }
+            //TODO: Init Sign rust client
 
             setup(
                 application = application,
@@ -89,7 +90,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
                 relay = relay,
                 onError = onError,
                 metaData = metaData,
-                keyServerUrl = keyServerUrl
+                keyServerUrl = keyServerUrl,
             )
         } catch (e: Exception) {
             onError(Core.Model.Error(e))
@@ -119,7 +120,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
                 relay = relay,
                 onError = onError,
                 metaData = metaData,
-                keyServerUrl = keyServerUrl
+                keyServerUrl = keyServerUrl,
             )
         } catch (e: Exception) {
             onError(Core.Model.Error(e))
@@ -136,7 +137,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
         relay: RelayConnectionInterface?,
         onError: (Core.Model.Error) -> Unit,
         metaData: Core.Model.AppMetaData,
-        keyServerUrl: String?
+        keyServerUrl: String?,
     ) {
         val packageName: String = application.packageName
         val relayServerUrl = if (serverUrl.isNullOrEmpty()) "wss://relay.walletconnect.org?projectId=$projectId" else serverUrl
@@ -144,6 +145,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
         with(koinApp) {
             androidContext(application)
             modules(
+//                module { single(named(AndroidCommonDITags.SIGN_RUST_CLIENT)) { signClient } },
                 module { single(named(AndroidCommonDITags.PACKAGE_NAME)) { packageName } },
                 module { single { ProjectId(projectId) } },
                 module { single(named(AndroidCommonDITags.TELEMETRY_ENABLED)) { TelemetryEnabled(telemetryEnabled) } },
@@ -152,6 +154,9 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
                 coreCryptoModule(),
             )
 
+//            val (_, privateKey) = keyStore.getKeyPair()
+//            signClient = SignClient(projectId = projectId, key = privateKey.hexToBytes())
+
             if (relay == null) {
                 Relay.initialize(connectionType) { error -> onError(Core.Model.Error(error)) }
             }
@@ -180,9 +185,9 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
                 coreJsonRpcModule(),
                 corePairingModule(Pairing, PairingController),
                 keyServerModule(keyServerUrl),
-                explorerModule(),
-                appKitModule(),
-                pulseModule(packageName)
+//                explorerModule(),
+//                coreAppKitModule(),
+//                pulseModule(packageName)
             )
         }
 
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/Validator.kt b/core/android/src/main/kotlin/com/reown/android/internal/Validator.kt
index c2bc808df3..1228855b24 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/Validator.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/Validator.kt
@@ -12,11 +12,12 @@ import java.net.URISyntaxException
 import java.net.URLDecoder
 
 
-internal object Validator {
+object Validator {
 
     private const val WC_URI_QUERY_KEY = "wc?uri="
+
     @JvmSynthetic
-    internal fun validateWCUri(uri: String): WalletConnectUri? {
+    fun validateWCUri(uri: String): WalletConnectUri? {
         val wcUri = getWcUri(uri)
         if (!wcUri.startsWith("wc:")) return null
 
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/connection/DefaultConnectionLifecycle.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/DefaultConnectionLifecycle.kt
index 031ed4b72c..e84364b95e 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/connection/DefaultConnectionLifecycle.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/DefaultConnectionLifecycle.kt
@@ -13,16 +13,16 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.supervisorScope
+
 
 internal class DefaultConnectionLifecycle(
     application: Application,
-    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry()
+    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(),
 ) : Lifecycle by lifecycleRegistry, ConnectionLifecycle {
     private val job = SupervisorJob()
     private var scope = CoroutineScope(job + Dispatchers.Default)
@@ -35,39 +35,27 @@ internal class DefaultConnectionLifecycle(
     }
 
     override fun reconnect() {
-        lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason())
-        lifecycleRegistry.onNext(Lifecycle.State.Started)
+//        lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason())
+//        lifecycleRegistry.onNext(Lifecycle.State.Started)
     }
 
     private inner class ActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
         var isResumed: Boolean = false
         var job: Job? = null
 
+
         override fun onActivityPaused(activity: Activity) {
-            isResumed = false
-
-            job = scope.launch {
-                delay(TimeUnit.SECONDS.toMillis(30))
-                if (!isResumed) {
-                    lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason(ShutdownReason(1000, "App is paused")))
-                    job = null
-                    _onResume.value = false
-                }
-            }
+            //TODO: call method from Rust Client
         }
 
         override fun onActivityResumed(activity: Activity) {
-            isResumed = true
-
-            if (job?.isActive == true) {
-                job?.cancel()
-                job = null
-            }
-
+            println("kobe: onResume")
 
-            scope.launch {
-                _onResume.value = true
-            }
+//            scope.launch {
+//                supervisorScope {
+//                    signClient.online()
+//                }
+//            }
         }
 
         override fun onActivityStarted(activity: Activity) {}
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/connection/ManualConnectionLifecycle.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/ManualConnectionLifecycle.kt
index 8b40415cba..9f4ada824d 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/connection/ManualConnectionLifecycle.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/ManualConnectionLifecycle.kt
@@ -25,6 +25,7 @@ internal class ManualConnectionLifecycle(
     private val _onResume = MutableStateFlow<Boolean?>(null)
     override val onResume: StateFlow<Boolean?> = _onResume.asStateFlow()
 
+    //TODO: call method from Rust Client
     fun connect() {
         scope.launch {
             connectionMutex.withLock {
@@ -33,6 +34,7 @@ internal class ManualConnectionLifecycle(
         }
     }
 
+    //TODO: call method from Rust Client
     fun disconnect() {
         scope.launch {
             connectionMutex.withLock {
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/AndroidCommonDITags.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/AndroidCommonDITags.kt
index f72106b872..3925730020 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/AndroidCommonDITags.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/AndroidCommonDITags.kt
@@ -43,4 +43,5 @@ enum class AndroidCommonDITags {
     ENABLE_AUTHENTICATE,
     TELEMETRY_ENABLED,
     PACKAGE_NAME,
+    SIGN_RUST_CLIENT
 }
\ No newline at end of file
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/AppKitModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/AppKitModule.kt
index 6e444e15c3..941c647575 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/AppKitModule.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/AppKitModule.kt
@@ -1,5 +1,6 @@
 package com.reown.android.internal.common.di
 
+import android.os.Build
 import com.reown.android.BuildConfig
 import com.reown.android.internal.common.modal.AppKitApiRepository
 import com.reown.android.internal.common.modal.data.network.AppKitService
@@ -11,23 +12,63 @@ import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUs
 import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface
 import com.reown.android.internal.common.modal.domain.usecase.GetWalletsUseCase
 import com.reown.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface
-import com.reown.android.internal.common.model.ProjectId
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
+import java.util.concurrent.TimeUnit
 
 @JvmSynthetic
-internal fun appKitModule() = module {
+ fun coreAppKitModule(projectId: String) = module {
+
+    factory(named(AndroidCommonDITags.USER_AGENT)) {
+        """wc-2/reown-kotlin-${BuildConfig.SDK_VERSION}/android-${Build.VERSION.RELEASE}"""
+    }
+
+    single(named(AndroidCommonDITags.SHARED_INTERCEPTOR)) {
+        Interceptor { chain ->
+            val updatedRequest = chain.request().newBuilder()
+                .addHeader("User-Agent", get(named(AndroidCommonDITags.USER_AGENT)))
+                .build()
+
+            chain.proceed(updatedRequest)
+        }
+    }
+
+    single<Interceptor>(named(AndroidCommonDITags.LOGGING_INTERCEPTOR)) {
+        HttpLoggingInterceptor().apply { setLevel(HttpLoggingInterceptor.Level.BODY) }
+    }
+
+    single(named(AndroidCommonDITags.OK_HTTP)) {
+        OkHttpClient.Builder()
+            .addInterceptor(get<Interceptor>(named(AndroidCommonDITags.SHARED_INTERCEPTOR)))
+//            .authenticator((get(named(AndroidCommonDITags.AUTHENTICATOR))))
+            .writeTimeout(15_000L, TimeUnit.MILLISECONDS)
+            .readTimeout(15_000L, TimeUnit.MILLISECONDS)
+            .callTimeout(15_000L, TimeUnit.MILLISECONDS)
+            .connectTimeout(15_000L, TimeUnit.MILLISECONDS)
+            .apply {
+                if (BuildConfig.DEBUG) {
+                    val loggingInterceptor = get<Interceptor>(named(AndroidCommonDITags.LOGGING_INTERCEPTOR))
+                    addInterceptor(loggingInterceptor)
+                }
+            }
+            .retryOnConnectionFailure(true)
+            .build()
+    }
+
     single(named(AndroidCommonDITags.WEB3MODAL_URL)) { "https://api.web3modal.com/" }
 
     single(named(AndroidCommonDITags.APPKIT_INTERCEPTOR)) {
         Interceptor { chain ->
             val updatedRequest = chain.request().newBuilder()
-                .addHeader("x-project-id", get<ProjectId>().value)
+                .addHeader("x-project-id", projectId)
                 .addHeader("x-sdk-version", "kotlin-${BuildConfig.SDK_VERSION}")
                 .build()
             chain.proceed(updatedRequest)
@@ -61,6 +102,6 @@ internal fun appKitModule() = module {
 
     single<GetInstalledWalletsIdsUseCaseInterface> { GetInstalledWalletsIdsUseCase(appKitApiRepository = get()) }
     single<GetWalletsUseCaseInterface> { GetWalletsUseCase(appKitApiRepository = get()) }
-    single<GetSampleWalletsUseCaseInterface> { GetSampleWalletsUseCase(context = get()) }
+    single<GetSampleWalletsUseCaseInterface> { GetSampleWalletsUseCase(context = androidContext()) }
     single<EnableAnalyticsUseCaseInterface> { EnableAnalyticsUseCase(repository = get()) }
 }
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt
index 5876a67968..d940d9b3cc 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt
@@ -28,6 +28,7 @@ import org.koin.core.scope.Scope
 import org.koin.dsl.module
 import com.reown.android.internal.common.scope as wcScope
 
+//TODO: move to Sign module
 fun baseStorageModule(storagePrefix: String = String.Empty, packageName: String) = module {
     single<ColumnAdapter<List<String>, String>>(named(AndroidCommonDITags.COLUMN_ADAPTER_LIST)) {
         object : ColumnAdapter<List<String>, String> {
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCryptoModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCryptoModule.kt
index 0de91abc78..3d68172cdb 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCryptoModule.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCryptoModule.kt
@@ -27,13 +27,20 @@ private const val ANDROID_KEY_STORE = "AndroidKeyStore"
 private const val SHARED_PREFS_FILE = "wc_key_store"
 private const val KEY_STORE_ALIAS = "wc_keystore_key"
 private const val KEY_SIZE = 256
+
 @JvmSynthetic
-fun coreCryptoModule(sharedPrefsFile: String = SHARED_PREFS_FILE, keyStoreAlias: String = KEY_STORE_ALIAS) = module {
+fun coreCryptoModule(
+    sharedPrefsFile: String = SHARED_PREFS_FILE,
+    keyStoreAlias: String = KEY_STORE_ALIAS
+) = module {
 
     @Synchronized
     fun Scope.createSharedPreferences(): SharedPreferences {
         val keyGenParameterSpec: KeyGenParameterSpec =
-            KeyGenParameterSpec.Builder(keyStoreAlias, KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+            KeyGenParameterSpec.Builder(
+                keyStoreAlias,
+                KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+            )
                 .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
                 .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
                 .setKeySize(KEY_SIZE)
@@ -69,7 +76,8 @@ fun coreCryptoModule(sharedPrefsFile: String = SHARED_PREFS_FILE, keyStoreAlias:
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                         deleteSharedPreferences(sharedPrefsFile)
                     } else {
-                        getSharedPreferences(sharedPrefsFile, Context.MODE_PRIVATE).edit().clear().apply()
+                        getSharedPreferences(sharedPrefsFile, Context.MODE_PRIVATE).edit().clear()
+                            .apply()
                         val dir = File(applicationInfo.dataDir, "shared_prefs")
                         File(dir, "$sharedPrefsFile.xml").delete()
                     }
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt
index 27d7eaabf7..1da5d72f48 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt
@@ -19,22 +19,22 @@ import kotlin.reflect.KClass
 @JvmSynthetic
 fun coreJsonRpcModule() = module {
 
-    single<RelayJsonRpcInteractorInterface> {
-        RelayJsonRpcInteractor(
-            relay = get(),
-            chaChaPolyCodec = get(),
-            jsonRpcHistory = get(),
-            pushMessageStorage = get(),
-            logger = get(named(AndroidCommonDITags.LOGGER)),
-            backoffStrategy = get()
-        )
-    }
-
-    addSerializerEntry(PairingRpc.PairingPing::class)
-    addSerializerEntry(PairingRpc.PairingDelete::class)
-
-    addDeserializerEntry(PairingJsonRpcMethod.WC_PAIRING_PING, PairingRpc.PairingPing::class)
-    addDeserializerEntry(PairingJsonRpcMethod.WC_PAIRING_DELETE, PairingRpc.PairingDelete::class)
+//    single<RelayJsonRpcInteractorInterface> {
+//        RelayJsonRpcInteractor(
+//            relay = get(),
+//            chaChaPolyCodec = get(),
+//            jsonRpcHistory = get(),
+//            pushMessageStorage = get(),
+//            logger = get(named(AndroidCommonDITags.LOGGER)),
+//            backoffStrategy = get()
+//        )
+//    }
+
+//    addSerializerEntry(PairingRpc.PairingPing::class)
+//    addSerializerEntry(PairingRpc.PairingDelete::class)
+//
+//    addDeserializerEntry(PairingJsonRpcMethod.WC_PAIRING_PING, PairingRpc.PairingPing::class)
+//    addDeserializerEntry(PairingJsonRpcMethod.WC_PAIRING_DELETE, PairingRpc.PairingDelete::class)
 
     single {
         JsonRpcSerializer(
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/ExplorerModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/ExplorerModule.kt
index 07444932ed..7c0c946189 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/ExplorerModule.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/ExplorerModule.kt
@@ -6,13 +6,14 @@ import com.reown.android.internal.common.explorer.ExplorerRepository
 import com.reown.android.internal.common.explorer.data.network.ExplorerService
 import com.reown.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase
 import com.reown.android.internal.common.explorer.domain.usecase.GetProjectsWithPaginationUseCase
+import com.reown.android.internal.common.model.ProjectId
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 
 @JvmSynthetic
-internal fun explorerModule() = module {
+fun explorerModule(projectId: String) = module {
 
     single(named(AndroidCommonDITags.EXPLORER_URL)) { "https://registry.walletconnect.org/" }
 
@@ -29,7 +30,7 @@ internal fun explorerModule() = module {
     single {
         ExplorerRepository(
             explorerService = get(),
-            projectId = get(),
+            projectId = ProjectId(projectId),
         )
     }
 
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt
index cfdd31d10f..78eed2e878 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt
@@ -7,7 +7,16 @@ import com.reown.android.internal.common.storage.key_chain.KeyStore
 import com.reown.foundation.common.model.PrivateKey
 import com.reown.foundation.common.model.PublicKey
 import com.reown.foundation.crypto.data.repository.BaseClientIdJwtRepository
+import com.reown.foundation.crypto.data.repository.BaseClientIdJwtRepository.Companion.CLIENT_ID_KEYPAIR_TAG
+import com.reown.util.bytesToHex
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair
+import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator
+import org.bouncycastle.crypto.params.Ed25519KeyGenerationParameters
+import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters
+import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters
+import java.security.SecureRandom
 
+//TODO: Remove
 internal class ClientIdJwtRepositoryAndroid(private val keyChain: KeyStore) : BaseClientIdJwtRepository() {
 
     override fun setKeyPair(key: String, privateKey: PrivateKey, publicKey: PublicKey) {
@@ -18,6 +27,7 @@ internal class ClientIdJwtRepositoryAndroid(private val keyChain: KeyStore) : Ba
         return if (doesKeyPairExist()) {
             val (privateKey, publicKey) = keyChain.getKeys(CLIENT_ID_KEYPAIR_TAG)
                 ?: throw CannotFindKeyPairException("No key pair for given tag: $CLIENT_ID_KEYPAIR_TAG")
+
             publicKey to privateKey
         } else {
             generateAndStoreClientIdKeyPair()
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/Pairing.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Pairing.kt
index 3dae354c19..7552674388 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/model/Pairing.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Pairing.kt
@@ -13,6 +13,9 @@ data class Pairing(
     val uri: String,
     val isProposalReceived: Boolean = false,
     val methods: String? = null,
+    val selfPublicKey: String? = null,
+    val symKey: String? = null,
+    val rpcId: Long? = null
 ) : Sequence {
 
     constructor(topic: Topic, relay: RelayProtocolOptions, symmetricKey: SymmetricKey, expiry: Expiry, methods: String?) : this(
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip6492/EIP6492Verifier.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip6492/EIP6492Verifier.kt
index a4f3d89dc4..65f65a22e5 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip6492/EIP6492Verifier.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip6492/EIP6492Verifier.kt
@@ -5,6 +5,7 @@ import org.web3j.crypto.Sign
 import org.web3j.utils.Numeric
 import uniffi.yttrium.Erc6492Client
 
+//TODO: move to Sign SDK
 object EIP6492Verifier {
     private lateinit var erc6492Client: Erc6492Client
 
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt
index 55a62718fd..54be859269 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt
@@ -23,7 +23,10 @@ class PairingStorageRepository(private val pairingQueries: PairingQueries) : Pai
                 uri = uri,
                 methods = methods ?: String.Empty,
                 is_active = true,
-                is_proposal_received = isProposalReceived
+                is_proposal_received = isProposalReceived,
+                rpc_id = rpcId,
+                self_public_key = selfPublicKey,
+                sym_key = symKey
             )
         }
     }
@@ -39,7 +42,8 @@ class PairingStorageRepository(private val pairingQueries: PairingQueries) : Pai
     override suspend fun getListOfPairings(): List<Pairing> = pairingQueries.getListOfPairing(mapper = this::toPairing).awaitAsList()
 
     @Throws(SQLiteException::class)
-    override suspend fun getListOfPairingsWithoutRequestReceived(): List<Pairing> = pairingQueries.getListOfPairingsWithoutRequestReceived(mapper = this::toPairing).awaitAsList()
+    override suspend fun getListOfPairingsWithoutRequestReceived(): List<Pairing> =
+        pairingQueries.getListOfPairingsWithoutRequestReceived(mapper = this::toPairing).awaitAsList()
 
     @Throws(SQLiteException::class)
     override fun setRequestReceived(topic: Topic) {
@@ -47,10 +51,30 @@ class PairingStorageRepository(private val pairingQueries: PairingQueries) : Pai
     }
 
     @Throws(SQLiteException::class)
-    override fun updateExpiry(topic: Topic, expiry: Expiry): Unit = pairingQueries.updateOrAbortExpiry(expiry = expiry.seconds, topic = topic.value)
+    override fun getPairingOrNullByTopic(topic: Topic): Pairing? =
+        pairingQueries.getPairingByTopic(topic = topic.value, mapper = this::toPairing).executeAsOneOrNull()
 
     @Throws(SQLiteException::class)
-    override fun getPairingOrNullByTopic(topic: Topic): Pairing? = pairingQueries.getPairingByTopic(topic = topic.value, mapper = this::toPairing).executeAsOneOrNull()
+    override fun getPairingOrNullByTopicAndRpcId(topic: Topic, rpcId: Long): Pairing? =
+        pairingQueries.getPairingByTopicAndRpcId(topic = topic.value, rpc_id = rpcId, mapper = this::toPairingWithoutMetadata).executeAsOneOrNull()
+
+    private fun toPairingWithoutMetadata(
+        rpc_id: Long?,
+        self_public_key: String?,
+        sym_key: String?,
+    ): Pairing {
+        return Pairing(
+            topic = Topic(""),
+            expiry = Expiry(0),
+            peerAppMetaData = null,
+            relayProtocol = "irn",
+            relayData = null,
+            uri = "",
+            selfPublicKey = self_public_key,
+            rpcId = rpc_id,
+            symKey = sym_key
+        )
+    }
 
     private fun toPairing(
         topic: String,
@@ -60,6 +84,9 @@ class PairingStorageRepository(private val pairingQueries: PairingQueries) : Pai
         uri: String,
         methods: String,
         is_proposal_received: Boolean?,
+        rpc_id: Long?,
+        self_public_key: String?,
+        sym_key: String?,
         peerName: String?,
         peerDesc: String?,
         peerUrl: String?,
@@ -80,7 +107,10 @@ class PairingStorageRepository(private val pairingQueries: PairingQueries) : Pai
             relayData = relay_data,
             uri = uri,
             isProposalReceived = is_proposal_received ?: true,
-            methods = methods
+            methods = methods,
+            selfPublicKey = self_public_key,
+            rpcId = rpc_id,
+            symKey = sym_key
         )
     }
 }
\ No newline at end of file
diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt
index 2f2039b251..af861a2039 100644
--- a/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt
+++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt
@@ -18,7 +18,7 @@ interface PairingStorageRepositoryInterface {
 
     fun setRequestReceived(topic: Topic)
 
-    fun updateExpiry(topic: Topic, expiry: Expiry)
-
     fun getPairingOrNullByTopic(topic: Topic): Pairing?
+
+    fun getPairingOrNullByTopicAndRpcId(topic: Topic, rpcId: Long): Pairing?
 }
\ No newline at end of file
diff --git a/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingInterface.kt b/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingInterface.kt
index 65c89e80f5..c4f9cdb9aa 100644
--- a/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingInterface.kt
+++ b/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingInterface.kt
@@ -10,13 +10,13 @@ interface PairingInterface {
      * Caution: This function is blocking and runs on the current thread.
      * It is advised that this function be called from background operation
      */
-    fun create(onError: (Core.Model.Error) -> Unit = {}): Core.Model.Pairing?
+//    fun create(onError: (Core.Model.Error) -> Unit = {}): Core.Model.Pairing?
 
     /**
      * Caution: This function is blocking and runs on the current thread.
      * It is advised that this function be called from background operation
      */
-    fun create(onError: (Core.Model.Error) -> Unit = {}, methods: String): Core.Model.Pairing?
+//    fun create(onError: (Core.Model.Error) -> Unit = {}, methods: String): Core.Model.Pairing?
 
     fun pair(
         pair: Core.Params.Pair,
diff --git a/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingProtocol.kt b/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingProtocol.kt
index 1a9deebec2..4d635ff8ad 100644
--- a/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingProtocol.kt
+++ b/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingProtocol.kt
@@ -9,17 +9,12 @@ import com.reown.android.internal.common.wcKoinApp
 import com.reown.android.pairing.engine.domain.PairingEngine
 import com.reown.android.pairing.engine.model.EngineDO
 import com.reown.android.pairing.model.mapper.toCore
-import com.reown.android.pulse.domain.InsertTelemetryEventUseCase
-import com.reown.android.relay.RelayConnectionInterface
-import com.reown.foundation.util.Logger
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.koin.core.KoinApplication
 
 internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) : PairingInterface {
     private lateinit var pairingEngine: PairingEngine
-    private val logger: Logger by lazy { koinApp.koin.get() }
-    private val relayClient: RelayConnectionInterface by lazy { koinApp.koin.get() }
-    private val insertEventUseCase: InsertTelemetryEventUseCase by lazy { koinApp.koin.get() }
 
     override fun initialize() {
         pairingEngine = koinApp.koin.get()
@@ -37,29 +32,29 @@ internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp)
         }.launchIn(scope)
     }
 
-    @Throws(IllegalStateException::class)
-    override fun create(onError: (Core.Model.Error) -> Unit): Core.Model.Pairing? {
-        checkEngineInitialization()
-
-        return try {
-            pairingEngine.create({ error -> onError(Core.Model.Error(error)) })
-        } catch (e: Exception) {
-            onError(Core.Model.Error(e))
-            null
-        }
-    }
-
-    @Throws(IllegalStateException::class)
-    override fun create(onError: (Core.Model.Error) -> Unit, methods: String): Core.Model.Pairing? {
-        checkEngineInitialization()
-
-        return try {
-            pairingEngine.create({ error -> onError(Core.Model.Error(error)) }, methods)
-        } catch (e: Exception) {
-            onError(Core.Model.Error(e))
-            null
-        }
-    }
+//    @Throws(IllegalStateException::class)
+//    override fun create(onError: (Core.Model.Error) -> Unit): Core.Model.Pairing? {
+//        checkEngineInitialization()
+//
+//        return try {
+//            pairingEngine.create({ error -> onError(Core.Model.Error(error)) })
+//        } catch (e: Exception) {
+//            onError(Core.Model.Error(e))
+//            null
+//        }
+//    }
+//
+//    @Throws(IllegalStateException::class)
+//    override fun create(onError: (Core.Model.Error) -> Unit, methods: String): Core.Model.Pairing? {
+//        checkEngineInitialization()
+//
+//        return try {
+//            pairingEngine.create({ error -> onError(Core.Model.Error(error)) }, methods)
+//        } catch (e: Exception) {
+//            onError(Core.Model.Error(e))
+//            null
+//        }
+//    }
 
     @Throws(IllegalStateException::class)
     override fun pair(
@@ -68,6 +63,7 @@ internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp)
         onError: (Core.Model.Error) -> Unit,
     ) {
         checkEngineInitialization()
+
         try {
             pairingEngine.pair(
                 uri = pair.uri,
diff --git a/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt b/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt
index 3820b44081..0a31450964 100644
--- a/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt
+++ b/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt
@@ -6,6 +6,7 @@ import com.reown.android.internal.NO_SEQUENCE_FOR_TOPIC_MESSAGE
 import com.reown.android.internal.Validator
 import com.reown.android.internal.common.JsonRpcResponse
 import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository
+import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.android.internal.common.exception.CannotFindSequenceForTopic
 import com.reown.android.internal.common.exception.ExpiredPairingException
 import com.reown.android.internal.common.exception.ExpiredPairingURIException
@@ -29,6 +30,7 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf
 import com.reown.android.internal.common.scope
 import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface
 import com.reown.android.internal.common.storage.pairing.PairingStorageRepositoryInterface
+import com.reown.android.internal.common.wcKoinApp
 import com.reown.android.internal.utils.CoreValidator.isExpired
 import com.reown.android.internal.utils.currentTimeInSeconds
 import com.reown.android.internal.utils.dayInSeconds
@@ -54,6 +56,7 @@ import com.reown.util.randomBytes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
@@ -73,6 +76,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.withTimeout
+import org.koin.core.qualifier.named
 import java.util.concurrent.TimeUnit
 
 //Split into PairingProtocolEngine and PairingControllerEngine
@@ -152,77 +156,100 @@ internal class PairingEngine(
     }
 
     fun pair(uri: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) {
-        scope.launch { _checkVerifyKeyFlow.emit(Unit) }
-        val trace: MutableList<String> = mutableListOf()
-        trace.add(Trace.Pairing.PAIRING_STARTED).also { logger.log("Pairing started") }
-        val walletConnectUri: WalletConnectUri = Validator.validateWCUri(uri) ?: run {
-            scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.MALFORMED_PAIRING_URI, properties = Properties(trace = trace))) } }
-            return onFailure(MalformedWalletConnectUri(MALFORMED_PAIRING_URI_MESSAGE))
-        }
-        trace.add(Trace.Pairing.PAIRING_URI_VALIDATION_SUCCESS)
-        val pairing = Pairing(walletConnectUri)
-        val pairingTopic = pairing.topic
-        val symmetricKey = walletConnectUri.symKey
-        try {
-            if (walletConnectUri.expiry?.isExpired() == true) {
-                scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_URI_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic.value))) } }
-                    .also { logger.error("Pairing URI expired: $pairingTopic") }
-                return onFailure(ExpiredPairingURIException("Pairing URI expired: $pairingTopic"))
-            }
-            trace.add(Trace.Pairing.PAIRING_URI_NOT_EXPIRED)
-            if (pairingRepository.getPairingOrNullByTopic(pairingTopic) != null) {
-                val localPairing = pairingRepository.getPairingOrNullByTopic(pairingTopic)
-                trace.add(Trace.Pairing.EXISTING_PAIRING)
-                if (!localPairing!!.isNotExpired()) {
-                    scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic.value))) } }
-                        .also { logger.error("Pairing expired: $pairingTopic") }
-                    return onFailure(ExpiredPairingException("Pairing expired: ${pairingTopic.value}"))
-                }
-                trace.add(Trace.Pairing.PAIRING_NOT_EXPIRED)
-                scope.launch {
-                    supervisorScope {
-                        trace.add(Trace.Pairing.EMIT_STORED_PAIRING).also { logger.log("Emitting stored pairing: $pairingTopic") }
-                        _storedPairingTopicFlow.emit(Pair(pairingTopic, trace))
-                    }
-                }
-            } else {
-                crypto.setKey(symmetricKey, pairingTopic.value)
-                pairingRepository.insertPairing(pairing)
-                trace.add(Trace.Pairing.STORE_NEW_PAIRING).also { logger.log("Storing a new pairing: $pairingTopic") }
-            }
-            trace.add(Trace.Pairing.SUBSCRIBING_PAIRING_TOPIC).also { logger.log("Subscribing pairing topic: $pairingTopic") }
-            jsonRpcInteractor.subscribe(topic = pairingTopic,
-                onSuccess = {
-                    trace.add(Trace.Pairing.SUBSCRIBE_PAIRING_TOPIC_SUCCESS).also { logger.log("Subscribe pairing topic success: $pairingTopic") }
-                    onSuccess()
-                }, onFailure = { error ->
-                    scope.launch {
-                        supervisorScope {
-                            insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_SUBSCRIPTION_FAILURE, properties = Properties(trace = trace, topic = pairingTopic.value)))
-                        }
-                    }.also { logger.error("Subscribe pairing topic error: $pairingTopic, error: $error") }
-                    onFailure(error)
-                }
-            )
-        } catch (e: Exception) {
-            logger.error("Subscribe pairing topic error: $pairingTopic, error: $e")
-            if (e is NoRelayConnectionException)
-                scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic.value))) } }
-            if (e is NoInternetConnectionException)
-                scope.launch {
-                    supervisorScope {
-                        insertTelemetryEventUseCase(
-                            Props(
-                                type = EventType.Error.NO_INTERNET_CONNECTION,
-                                properties = Properties(trace = trace, topic = pairingTopic.value)
-                            )
-                        )
-                    }
-                }
-            runCatching { crypto.removeKeys(pairingTopic.value) }.onFailure { logger.error("Remove keys error: $pairingTopic, error: $it") }
-            jsonRpcInteractor.unsubscribe(pairingTopic)
-            onFailure(e)
-        }
+//        scope.launch {
+//            try {
+//                val walletConnectUri = Validator.validateWCUri(uri) ?: throw Exception()
+//                //TODO: check if proposal already stored to safe latency?
+//                val proposal: SessionProposalFfi? = async {
+//                    try {
+//                        signClient.pair(uri = walletConnectUri.toAbsoluteString())
+//                    } catch (e: Exception) {
+//                        println("kobe: Pair error 1: $e")
+//                        null
+//                    }
+//                }.await()
+//
+//                if (proposal != null) {
+//                    _sessionProposalFlow.emit(proposal)
+//                }
+//
+//            } catch (e: Exception) {
+//                println("kobe: Pair error 2: $e")
+//                onFailure(e)
+//            }
+//        }
+
+//        scope.launch { _checkVerifyKeyFlow.emit(Unit) }
+//        val trace: MutableList<String> = mutableListOf()
+//        trace.add(Trace.Pairing.PAIRING_STARTED).also { logger.log("Pairing started") }
+//        val walletConnectUri: WalletConnectUri = Validator.validateWCUri(uri) ?: run {
+//            scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.MALFORMED_PAIRING_URI, properties = Properties(trace = trace))) } }
+//            return onFailure(MalformedWalletConnectUri(MALFORMED_PAIRING_URI_MESSAGE))
+//        }
+//        trace.add(Trace.Pairing.PAIRING_URI_VALIDATION_SUCCESS)
+//        val pairing = Pairing(walletConnectUri)
+//        val pairingTopic = pairing.topic
+//        val symmetricKey = walletConnectUri.symKey
+//        try {
+//            if (walletConnectUri.expiry?.isExpired() == true) {
+//                scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_URI_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic.value))) } }
+//                    .also { logger.error("Pairing URI expired: $pairingTopic") }
+//                return onFailure(ExpiredPairingURIException("Pairing URI expired: $pairingTopic"))
+//            }
+//            trace.add(Trace.Pairing.PAIRING_URI_NOT_EXPIRED)
+//            if (pairingRepository.getPairingOrNullByTopic(pairingTopic) != null) {
+//                val localPairing = pairingRepository.getPairingOrNullByTopic(pairingTopic)
+//                trace.add(Trace.Pairing.EXISTING_PAIRING)
+//                if (!localPairing!!.isNotExpired()) {
+//                    scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic.value))) } }
+//                        .also { logger.error("Pairing expired: $pairingTopic") }
+//                    return onFailure(ExpiredPairingException("Pairing expired: ${pairingTopic.value}"))
+//                }
+//                trace.add(Trace.Pairing.PAIRING_NOT_EXPIRED)
+//                scope.launch {
+//                    supervisorScope {
+//                        trace.add(Trace.Pairing.EMIT_STORED_PAIRING).also { logger.log("Emitting stored pairing: $pairingTopic") }
+//                        _storedPairingTopicFlow.emit(Pair(pairingTopic, trace))
+//                    }
+//                }
+//            } else {
+//                crypto.setKey(symmetricKey, pairingTopic.value)
+//                pairingRepository.insertPairing(pairing)
+//                trace.add(Trace.Pairing.STORE_NEW_PAIRING).also { logger.log("Storing a new pairing: $pairingTopic") }
+//            }
+//            trace.add(Trace.Pairing.SUBSCRIBING_PAIRING_TOPIC).also { logger.log("Subscribing pairing topic: $pairingTopic") }
+//            jsonRpcInteractor.subscribe(topic = pairingTopic,
+//                onSuccess = {
+//                    trace.add(Trace.Pairing.SUBSCRIBE_PAIRING_TOPIC_SUCCESS).also { logger.log("Subscribe pairing topic success: $pairingTopic") }
+//                    onSuccess()
+//                }, onFailure = { error ->
+//                    scope.launch {
+//                        supervisorScope {
+//                            insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_SUBSCRIPTION_FAILURE, properties = Properties(trace = trace, topic = pairingTopic.value)))
+//                        }
+//                    }.also { logger.error("Subscribe pairing topic error: $pairingTopic, error: $error") }
+//                    onFailure(error)
+//                }
+//            )
+//        } catch (e: Exception) {
+//            logger.error("Subscribe pairing topic error: $pairingTopic, error: $e")
+//            if (e is NoRelayConnectionException)
+//                scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic.value))) } }
+//            if (e is NoInternetConnectionException)
+//                scope.launch {
+//                    supervisorScope {
+//                        insertTelemetryEventUseCase(
+//                            Props(
+//                                type = EventType.Error.NO_INTERNET_CONNECTION,
+//                                properties = Properties(trace = trace, topic = pairingTopic.value)
+//                            )
+//                        )
+//                    }
+//                }
+//            runCatching { crypto.removeKeys(pairingTopic.value) }.onFailure { logger.error("Remove keys error: $pairingTopic, error: $it") }
+//            jsonRpcInteractor.unsubscribe(pairingTopic)
+//            onFailure(e)
+//        }
     }
 
     @Deprecated(message = "Disconnect method has been deprecated. It will be removed soon. Pairing will disconnect automatically internally.")
@@ -235,7 +262,8 @@ internal class PairingEngine(
         val pairingDelete = PairingRpc.PairingDelete(params = deleteParams)
         val irnParams = IrnParams(Tags.PAIRING_DELETE, Ttl(dayInSeconds), correlationId = pairingDelete.id)
         logger.log("Sending Pairing disconnect")
-        jsonRpcInteractor.publishJsonRpcRequest(Topic(topic), irnParams, pairingDelete,
+        jsonRpcInteractor.publishJsonRpcRequest(
+            Topic(topic), irnParams, pairingDelete,
             onSuccess = {
                 scope.launch {
                     supervisorScope {
@@ -259,7 +287,8 @@ internal class PairingEngine(
             val pingPayload = PairingRpc.PairingPing(params = PairingParams.PingParams())
             val irnParams = IrnParams(Tags.PAIRING_PING, Ttl(thirtySeconds), correlationId = pingPayload.id)
 
-            jsonRpcInteractor.publishJsonRpcRequest(Topic(topic), irnParams, pingPayload,
+            jsonRpcInteractor.publishJsonRpcRequest(
+                Topic(topic), irnParams, pingPayload,
                 onSuccess = { onPingSuccess(pingPayload, onSuccess, topic, onFailure) },
                 onFailure = { error -> onFailure(error) })
         } else {
@@ -318,7 +347,8 @@ internal class PairingEngine(
 
     private suspend fun sendBatchSubscribeForPairings() {
         try {
-            val pairingTopics = pairingRepository.getListOfPairings().filter { pairing -> pairing.isNotExpired() }.map { pairing -> pairing.topic.value }
+            val pairingTopics =
+                pairingRepository.getListOfPairings().filter { pairing -> pairing.isNotExpired() }.map { pairing -> pairing.topic.value }
             jsonRpcInteractor.batchSubscribe(pairingTopics) { error -> scope.launch { internalErrorFlow.emit(SDKError(error)) } }
         } catch (e: Exception) {
             scope.launch { internalErrorFlow.emit(SDKError(e)) }
diff --git a/core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingController.kt b/core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingController.kt
index 09b34f22c8..714154d2bf 100644
--- a/core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingController.kt
+++ b/core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingController.kt
@@ -17,6 +17,7 @@ internal class PairingController(private val koinApp: KoinApplication = wcKoinAp
     override val findWrongMethodsFlow: Flow<SDKError> by lazy { merge(pairingEngine.internalErrorFlow, pairingEngine.jsonRpcErrorFlow) }
     override val storedPairingFlow: SharedFlow<Pair<Topic, MutableList<String>>> by lazy { pairingEngine.storedPairingTopicFlow }
     override val checkVerifyKeyFlow: SharedFlow<Unit> by lazy { pairingEngine.checkVerifyKeyFlow }
+//    override val sessionProposalFlow: SharedFlow<SessionProposalFfi> by lazy { pairingEngine.sessionProposalFlow }
 
     override fun initialize() {
         pairingEngine = koinApp.koin.get()
diff --git a/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/JsonRpcHistory.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/JsonRpcHistory.sq
index 0a68d42187..8a19dc4775 100644
--- a/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/JsonRpcHistory.sq
+++ b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/JsonRpcHistory.sq
@@ -20,6 +20,22 @@ UPDATE JsonRpcHistoryDao
 SET response = ?
 WHERE request_id = ?;
 
+deleteJsonRpcHistory:
+DELETE FROM JsonRpcHistoryDao
+WHERE topic = ?;
+
+deleteJsonRpcHistoryByRequestId:
+DELETE FROM JsonRpcHistoryDao
+WHERE request_id = ?;
+
+doesJsonRpcNotExist:
+SELECT NOT EXISTS (
+    SELECT 1
+    FROM JsonRpcHistoryDao
+    WHERE request_id = ?
+    LIMIT 1
+);
+
 getJsonRpcHistoryRecord:
 SELECT request_id, topic, method, body, response, transport_type
 FROM JsonRpcHistoryDao
@@ -39,21 +55,5 @@ SELECT request_id, topic, method, body, response, transport_type
 FROM JsonRpcHistoryDao
 WHERE method = "wc_sessionRequest" AND response IS NULL;
 
-doesJsonRpcNotExist:
-SELECT NOT EXISTS (
-    SELECT 1
-    FROM JsonRpcHistoryDao
-    WHERE request_id = ?
-    LIMIT 1
-);
-
 selectLastInsertedRowId:
-SELECT last_insert_rowid();
-
-deleteJsonRpcHistory:
-DELETE FROM JsonRpcHistoryDao
-WHERE topic = ?;
-
-deleteJsonRpcHistoryByRequestId:
-DELETE FROM JsonRpcHistoryDao
-WHERE request_id = ?;
\ No newline at end of file
+SELECT last_insert_rowid();
\ No newline at end of file
diff --git a/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/MetaData.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/MetaData.sq
index 347f868686..bae30b32bc 100644
--- a/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/MetaData.sq
+++ b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/MetaData.sq
@@ -18,7 +18,7 @@ CREATE TABLE MetaData(
 );
 
 insertOrAbortMetaData:
-INSERT OR ABORT INTO MetaData(sequence_topic, name, description, url, icons, native, type, app_link, link_mode)
+INSERT OR REPLACE INTO MetaData(sequence_topic, name, description, url, icons, native, type, app_link, link_mode)
 VALUES (?,?,?,?,?,?,?,?,?);
 
 updateMetaData:
diff --git a/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Pairing.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Pairing.sq
index 80fe0deab7..f703718891 100644
--- a/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Pairing.sq
+++ b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Pairing.sq
@@ -9,30 +9,38 @@ CREATE TABLE Pairing (
     uri TEXT NOT NULL,
     methods TEXT NOT NULL,
     is_active INTEGER AS Boolean NOT NULL,
-    is_proposal_received INTEGER AS Boolean DEFAULT 1
+    is_proposal_received INTEGER AS Boolean DEFAULT 1,
+    rpc_id INTEGER,
+    self_public_key TEXT,
+    sym_key TEXT
 );
 
 insertOrAbortPairing:
-INSERT OR ABORT INTO Pairing(topic, expiry, relay_protocol,  relay_data, uri, methods, is_active, is_proposal_received)
-VALUES (?,?,?,?,?,?, ?, ?);
+INSERT OR ABORT INTO Pairing(topic, expiry, relay_protocol,  relay_data, uri, methods, is_active, is_proposal_received, rpc_id, self_public_key, sym_key)
+VALUES (?,?,?,?,?,?, ?, ?, ?, ?, ?);
 
 getListOfPairing:
-SELECT pd.topic, pd.expiry, pd.relay_protocol, pd.relay_data, pd.uri, pd.methods, pd.is_proposal_received, mdd_peer.name, mdd_peer.description, mdd_peer.url, mdd_peer.icons, mdd_peer.native
+SELECT pd.topic, pd.expiry, pd.relay_protocol, pd.relay_data, pd.uri, pd.methods, pd.is_proposal_received, pd.rpc_id, pd.self_public_key, pd.sym_key, mdd_peer.name, mdd_peer.description, mdd_peer.url, mdd_peer.icons, mdd_peer.native
 FROM Pairing pd
     LEFT JOIN MetaData mdd_peer ON pd.topic = mdd_peer.sequence_topic AND mdd_peer.type = "PEER";
 
 getListOfPairingsWithoutRequestReceived:
-SELECT pd.topic, pd.expiry, pd.relay_protocol, pd.relay_data, pd.uri, pd.methods, pd.is_proposal_received, mdd_peer.name, mdd_peer.description, mdd_peer.url, mdd_peer.icons, mdd_peer.native
+SELECT pd.topic, pd.expiry, pd.relay_protocol, pd.relay_data, pd.uri, pd.methods, pd.is_proposal_received, pd.rpc_id, pd.self_public_key, pd.sym_key, mdd_peer.name, mdd_peer.description, mdd_peer.url, mdd_peer.icons, mdd_peer.native
 FROM Pairing pd
     LEFT JOIN MetaData mdd_peer ON pd.topic = mdd_peer.sequence_topic AND mdd_peer.type = "PEER"
 WHERE pd.is_proposal_received = 0;
 
 getPairingByTopic:
-SELECT pd.topic, pd.expiry, pd.relay_protocol, pd.relay_data, pd.uri, pd.methods, pd.is_proposal_received, mdd_peer.name, mdd_peer.description, mdd_peer.url, mdd_peer.icons, mdd_peer.native
+SELECT pd.topic, pd.expiry, pd.relay_protocol, pd.relay_data, pd.uri, pd.methods, pd.is_proposal_received, pd.rpc_id, pd.self_public_key, pd.sym_key, mdd_peer.name, mdd_peer.description, mdd_peer.url, mdd_peer.icons, mdd_peer.native
 FROM Pairing pd
     LEFT JOIN MetaData mdd_peer ON pd.topic = mdd_peer.sequence_topic AND mdd_peer.type = "PEER"
 WHERE ? = topic;
 
+getPairingByTopicAndRpcId:
+SELECT pd.rpc_id, pd.self_public_key, pd.sym_key
+FROM Pairing pd
+WHERE ? = topic AND ? = rpc_id;
+
 deletePairing:
 DELETE FROM Pairing
 WHERE ? = topic;
diff --git a/core/android/src/main/sqldelight/databases/13.db b/core/android/src/main/sqldelight/databases/13.db
new file mode 100644
index 0000000000..1ba3418fa7
Binary files /dev/null and b/core/android/src/main/sqldelight/databases/13.db differ
diff --git a/core/android/src/main/sqldelight/migration/12.sqm b/core/android/src/main/sqldelight/migration/12.sqm
new file mode 100644
index 0000000000..31f30a17b8
--- /dev/null
+++ b/core/android/src/main/sqldelight/migration/12.sqm
@@ -0,0 +1,5 @@
+-- migration from 12.db to 13.db
+
+ALTER TABLE Pairing ADD COLUMN rpc_id INTEGER;
+ALTER TABLE Pairing ADD COLUMN self_public_key TEXT;
+ALTER TABLE Pairing ADD COLUMN sym_key TEXT;
\ No newline at end of file
diff --git a/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt b/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt
index 8c897db61c..bbd1e41d19 100644
--- a/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt
+++ b/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt
@@ -132,6 +132,7 @@ abstract class BaseRelayClient : RelayInterface {
                     attestation = null,
                     correlationId = correlationId
                 )
+                println("kobe: Propose Session: $correlationId")
                 val proposeSessionRequest = RelayDTO.ProposeSession.Request(id = id ?: generateClientToServerId(), params = proposeSessionParams)
                 observeProposeSessionResult(proposeSessionRequest.id, onResult)
                 relayService.proposeSessionRequest(proposeSessionRequest)
@@ -184,6 +185,7 @@ abstract class BaseRelayClient : RelayInterface {
                     correlationId = correlationId
                 )
                 val approveSessionRequest = RelayDTO.ApproveSession.Request(id = id ?: generateClientToServerId(), params = approveSessionParams)
+                println("kobe: Approve Session: $correlationId")
                 observeApproveSessionResult(approveSessionRequest.id, onResult)
                 relayService.approveSessionRequest(approveSessionRequest)
             },
diff --git a/product/appkit/build.gradle.kts b/product/appkit/build.gradle.kts
index 14b4a57de6..56c0a9e8c8 100644
--- a/product/appkit/build.gradle.kts
+++ b/product/appkit/build.gradle.kts
@@ -93,11 +93,11 @@ dependencies {
     testImplementation(libs.coroutines.test)
     testImplementation(libs.turbine)
 
-    releaseImplementation("com.reown:android-core:$CORE_VERSION")
+    releaseImplementation("com.reown:android-core:$CORE_VERSION") //TODO: remove
     releaseImplementation("com.reown:sign:$SIGN_VERSION")
     releaseImplementation("com.reown:modal-core:$MODAL_CORE_VERSION")
 
-    debugImplementation(project(":core:android"))
+    debugImplementation(project(":core:android")) //TODO: remove
     debugImplementation(project(":protocol:sign"))
     debugImplementation(project(":core:modal"))
 
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt
index b14f68d3fe..6b7b575c98 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt
@@ -2,6 +2,11 @@ package com.reown.appkit.client
 
 import androidx.activity.ComponentActivity
 import com.reown.android.internal.common.di.AndroidCommonDITags
+import com.reown.android.internal.common.di.coreAppKitModule
+import com.reown.android.internal.common.di.explorerModule
+import com.reown.android.internal.common.di.pulseModule
+import com.reown.android.internal.common.model.ProjectId
+import com.reown.android.internal.common.model.TelemetryEnabled
 import com.reown.android.internal.common.scope
 import com.reown.android.internal.common.wcKoinApp
 import com.reown.android.pulse.model.EventType
@@ -76,7 +81,11 @@ object AppKit {
         onError: (Modal.Model.Error) -> Unit,
     ) {
         SignClient.initialize(
-            init = Sign.Params.Init(init.core),
+            init = Sign.Params.Init(
+                projectId = init.projectId,
+                metaData = init.metaData.toSign(),
+                application = init.application,
+            ),
             onSuccess = {
                 onInitializedClient(init, onSuccess, onError)
             },
@@ -116,17 +125,41 @@ object AppKit {
     ) {
         if (!::appKitEngine.isInitialized) {
             runCatching {
-                wcKoinApp.modules(appKitModule())
-                appKitEngine = wcKoinApp.koin.get()
-                appKitEngine.setup(init, onError)
-                appKitEngine.setInternalDelegate(AppKitDelegate)
                 wcKoinApp.modules(
+                    //todo: add telemetry flag to sign client
+                    module { single(named(AndroidCommonDITags.TELEMETRY_ENABLED)) { TelemetryEnabled(false) } },
                     module {
                         single(named(AndroidCommonDITags.ENABLE_WEB_3_MODAL_ANALYTICS)) {
-                            init.enableAnalytics ?: appKitEngine.fetchAnalyticsConfig()
+                            true
+                            //init.enableAnalytics ?: appKitEngine.fetchAnalyticsConfig()
+                        }
+                    },
+                    module {
+                        single { ProjectId(init.projectId) }
+                    },
+//                    coreCommonModule(),
+                    coreAppKitModule(init.projectId),
+                    explorerModule(init.projectId),
+                    appKitModule(init.projectId),
+                    pulseModule(init.application.packageName),
+                    module {
+                        single {
+                            AppKitEngine(
+                                getSessionUseCase = get(),
+                                getSelectedChainUseCase = get(),
+                                deleteSessionDataUseCase = get(),
+                                saveSessionUseCase = get(),
+                                connectionEventRepository = get(),
+                                enableAnalyticsUseCase = get(),
+                                sendEventUseCase = get(),
+                                logger = get(named(AndroidCommonDITags.LOGGER)),
+                            )
                         }
                     }
                 )
+                appKitEngine = wcKoinApp.koin.get()
+                appKitEngine.setup(init, onError)
+                appKitEngine.setInternalDelegate(AppKitDelegate)
             }
                 .onFailure { error -> return@onInitializedClient onError(Modal.Model.Error(error)) }
                 .onSuccess {
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt
index 8fca4859ca..c8b0776d4a 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt
@@ -165,4 +165,15 @@ internal fun Modal.Listeners.SessionPing.toSign() = object : Sign.Listeners.Sess
 
 internal fun Sign.Model.Session.toSession() = Session.WalletConnectSession(pairingTopic, topic, expiry, namespaces.toModal(), metaData)
 
-internal fun Account.toCoinbaseSession() = Session.CoinbaseSession(chain.id, address)
\ No newline at end of file
+internal fun Account.toCoinbaseSession() = Session.CoinbaseSession(chain.id, address)
+
+internal fun Modal.Model.MetaData.toSign() = Sign.Model.MetaData(
+    name = name,
+    description = description,
+    url = url,
+    icons = icons,
+    redirect = redirect,
+    appLink = appLink,
+    linkMode = linkMode,
+    verifyUrl = verifyUrl
+)
\ No newline at end of file
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt
index 97416b286e..1c060b30ba 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt
@@ -1,11 +1,14 @@
 package com.reown.appkit.client
 
+import android.app.Application
 import androidx.annotation.DrawableRes
 import androidx.annotation.Keep
 import com.reown.android.Core
 import com.reown.android.CoreInterface
 import com.reown.android.cacao.SignatureInterface
 import com.reown.android.internal.common.signing.cacao.Issuer
+import com.reown.sign.client.Sign
+import com.reown.sign.client.Sign.Model
 
 object Modal {
 
@@ -18,7 +21,10 @@ object Modal {
 
     sealed class Params {
         data class Init(
-            val core: CoreInterface,
+//            val core: CoreInterface,
+            val projectId: String,
+            val metaData: Modal.Model.MetaData,
+            val application: Application,
             val excludedWalletIds: List<String> = listOf(),
             val includeWalletIds: List<String> = listOf(),
             val recommendedWalletsIds: List<String> = listOf(),
@@ -38,7 +44,7 @@ object Modal {
             val sessionNamespaces: Map<String, Model.Namespace.Proposal>? = null,
             val properties: Map<String, String>? = null,
             val scopedProperties: Map<String, String>? = null,
-            val pairing: Core.Model.Pairing,
+            val pairing: Core.Model.Pairing? = null,
         ) : Params()
 
         data class Authenticate(
@@ -85,6 +91,17 @@ object Modal {
     sealed class Model {
         data class Error(val throwable: Throwable) : Model()
 
+        data class MetaData(
+            val name: String,
+            val description: String,
+            val url: String,
+            val icons: List<String>,
+            val redirect: String?,
+            val appLink: String? = null,
+            val linkMode: Boolean = false,
+            val verifyUrl: String? = null
+        ) : Model()
+
         sealed class Namespace : Model() {
             data class Proposal(
                 val chains: List<String>? = null,
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt
index 9a8035f181..49f58bd1c8 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt
@@ -1,6 +1,8 @@
 package com.reown.appkit.di
 
 import com.reown.android.internal.common.di.AndroidCommonDITags
+import com.reown.android.internal.common.explorer.data.model.Project
+import com.reown.android.internal.common.model.ProjectId
 import com.reown.appkit.data.BlockchainRepository
 import com.reown.appkit.data.network.BlockchainService
 import com.reown.appkit.domain.usecase.GetIdentityUseCase
@@ -9,7 +11,7 @@ import org.koin.dsl.module
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 
-internal fun blockchainApiModule() = module {
+internal fun blockchainApiModule(projectId: String) = module {
 
     single(named(AppKitDITags.BLOCKCHAIN_RETROFIT)) {
         Retrofit.Builder()
@@ -24,7 +26,7 @@ internal fun blockchainApiModule() = module {
     }
 
     single {
-        BlockchainRepository(blockchainService = get(), projectId = get())
+        BlockchainRepository(blockchainService = get(), projectId = ProjectId(projectId))
     }
 
     single { GetIdentityUseCase(blockchainRepository = get()) }
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt
index 216a5da301..bb7842c4d6 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt
@@ -15,18 +15,6 @@ internal fun engineModule() = module {
         ConnectionEventRepository(sharedPreferences = androidContext().getSharedPreferences("ConnectionEvents", Context.MODE_PRIVATE))
     }
 
-    single {
-        AppKitEngine(
-            getSessionUseCase = get(),
-            getSelectedChainUseCase = get(),
-            deleteSessionDataUseCase = get(),
-            saveSessionUseCase = get(),
-            connectionEventRepository = get(),
-            enableAnalyticsUseCase = get(),
-            sendEventUseCase = get(),
-            logger = get(named(AndroidCommonDITags.LOGGER)),
-        )
-    }
     single {
         CoinbaseClient(
             context = get(),
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt
index ed7f08f89b..b43b995fbf 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt
@@ -4,8 +4,6 @@ import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStore
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.appkit.domain.RecentWalletsRepository
 import com.reown.appkit.domain.SessionRepository
@@ -19,13 +17,15 @@ import com.reown.appkit.domain.usecase.ObserveSessionUseCase
 import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase
 import com.reown.appkit.domain.usecase.SaveRecentWalletUseCase
 import com.reown.appkit.domain.usecase.SaveSessionUseCase
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 private val Context.sessionDataStore: DataStore<Preferences> by preferencesDataStore(name = "session_store")
 
-internal fun appKitModule() = module {
+internal fun appKitModule(projectId: String) = module {
 
     single { RecentWalletsRepository(sharedPreferences = get()) }
 
@@ -45,7 +45,12 @@ internal fun appKitModule() = module {
     }
 
     single(named(AppKitDITags.SESSION_DATA_STORE)) { androidContext().sessionDataStore }
-    single { SessionRepository(sessionStore = get(named(AppKitDITags.SESSION_DATA_STORE)), moshi = get(named(AppKitDITags.MOSHI))) }
+    single {
+        SessionRepository(
+            sessionStore = get(named(AppKitDITags.SESSION_DATA_STORE)),
+            moshi = get<Moshi>(named(AppKitDITags.MOSHI))
+        )
+    }
 
     single { GetSessionUseCase(repository = get()) }
     single { SaveSessionUseCase(repository = get()) }
@@ -55,5 +60,5 @@ internal fun appKitModule() = module {
     single { ObserveSessionUseCase(repository = get()) }
     single { ObserveSelectedChainUseCase(repository = get()) }
 
-    includes(blockchainApiModule(), balanceRpcModule(), engineModule())
+    includes(blockchainApiModule(projectId), balanceRpcModule(), engineModule())
 }
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt
index 0ccd3813ad..570833a89a 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt
@@ -63,12 +63,13 @@ internal class AppKitEngine(
     internal var siweRequestIdWithMessage: Pair<Long, String>? = null
     private lateinit var coinbaseClient: CoinbaseClient
     internal var shouldDisconnect: Boolean = true
-    private val projectId by lazy { wcKoinApp.koin.get<ProjectId>() }
+    private lateinit var projectId: String
 
     fun setup(
         init: Modal.Params.Init,
         onError: (Modal.Model.Error) -> Unit
     ) {
+        this.projectId = init.projectId
         excludedWalletsIds.addAll(init.excludedWalletIds)
         includeWalletsIds.addAll(init.includeWalletIds)
         recommendedWalletsIds.addAll(init.recommendedWalletsIds)
@@ -327,7 +328,7 @@ internal class AppKitEngine(
                             )
                             siweRequestIdWithMessage = null
                             val account = getAccount() ?: throw IllegalStateException("Account is null")
-                            EIP6492Verifier.init(account.chain.id, projectId.value)
+                            EIP6492Verifier.init(account.chain.id, projectId)
                             val isValid = EIP6492Verifier.verify6492(
                                 originalMessage = siweResponse.message,
                                 signature = siweResponse.signature,
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt
index 5f63fd0316..6eb980fba4 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt
@@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlin.text.get
 
 @Composable
 fun rememberAppKitState(
@@ -45,13 +46,13 @@ class AppKitState(
     coroutineScope: CoroutineScope,
     private val navController: NavController
 ) {
-    private val logger: Logger = wcKoinApp.koin.get()
-    private val observeSelectedChainUseCase: ObserveSelectedChainUseCase = wcKoinApp.koin.get()
-    private val observeSessionTopicUseCase: ObserveSessionUseCase = wcKoinApp.koin.get()
-    private val getSessionUseCase: GetSessionUseCase = wcKoinApp.koin.get()
-    private val getEthBalanceUseCase: GetEthBalanceUseCase = wcKoinApp.koin.get()
-    private val appKitEngine: AppKitEngine = wcKoinApp.koin.get()
-    private val sendEventUseCase: SendEventInterface = wcKoinApp.koin.get()
+    private val logger: Logger by lazy { wcKoinApp.koin.get() }
+    private val observeSelectedChainUseCase: ObserveSelectedChainUseCase by lazy { wcKoinApp.koin.get() }
+    private val observeSessionTopicUseCase: ObserveSessionUseCase by lazy { wcKoinApp.koin.get() }
+    private val getSessionUseCase: GetSessionUseCase by lazy { wcKoinApp.koin.get() }
+    private val getEthBalanceUseCase: GetEthBalanceUseCase by lazy { wcKoinApp.koin.get() }
+    private val appKitEngine: AppKitEngine by lazy { wcKoinApp.koin.get() }
+    private val sendEventUseCase: SendEventInterface by lazy { wcKoinApp.koin.get() }
     private val sessionTopicFlow = observeSessionTopicUseCase()
 
     val isOpen = ComponentDelegate.modalComponentEvent
@@ -83,10 +84,37 @@ class AppKitState(
 
     private fun sendModalCloseOrOpenEvents(event: ComponentEvent) {
         when {
-            event.isOpen && isConnected.value -> sendEventUseCase.send(Props(EventType.TRACK, EventType.Track.MODAL_OPEN, Properties(connected = true)))
-            event.isOpen && !isConnected.value -> sendEventUseCase.send(Props(EventType.TRACK, EventType.Track.MODAL_OPEN, Properties(connected = false)))
-            !event.isOpen && isConnected.value -> sendEventUseCase.send(Props(EventType.TRACK, EventType.Track.MODAL_CLOSE, Properties(connected = true)))
-            !event.isOpen && !isConnected.value -> sendEventUseCase.send(Props(EventType.TRACK, EventType.Track.MODAL_CLOSE, Properties(connected = false)))
+            event.isOpen && isConnected.value -> sendEventUseCase.send(
+                Props(
+                    EventType.TRACK,
+                    EventType.Track.MODAL_OPEN,
+                    Properties(connected = true)
+                )
+            )
+
+            event.isOpen && !isConnected.value -> sendEventUseCase.send(
+                Props(
+                    EventType.TRACK,
+                    EventType.Track.MODAL_OPEN,
+                    Properties(connected = false)
+                )
+            )
+
+            !event.isOpen && isConnected.value -> sendEventUseCase.send(
+                Props(
+                    EventType.TRACK,
+                    EventType.Track.MODAL_CLOSE,
+                    Properties(connected = true)
+                )
+            )
+
+            !event.isOpen && !isConnected.value -> sendEventUseCase.send(
+                Props(
+                    EventType.TRACK,
+                    EventType.Track.MODAL_CLOSE,
+                    Properties(connected = false)
+                )
+            )
         }
     }
 
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt
index f6cde9fd30..3cb1cdf063 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt
@@ -2,6 +2,7 @@ package com.reown.appkit.ui.routes.account
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.android.internal.common.wcKoinApp
 import com.reown.android.pulse.domain.SendEventInterface
 import com.reown.android.pulse.model.EventType
@@ -38,18 +39,20 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import org.koin.core.qualifier.named
+import kotlin.text.get
 
 internal class AccountViewModel : ViewModel(), Navigator by NavigatorImpl() {
-    private val logger: Logger = wcKoinApp.koin.get()
-
-    private val saveChainSelectionUseCase: SaveChainSelectionUseCase = wcKoinApp.koin.get()
-    private val saveSessionUseCase: SaveSessionUseCase = wcKoinApp.koin.get()
-    private val observeSessionUseCase: ObserveSessionUseCase = wcKoinApp.koin.get()
-    private val observeSelectedChainUseCase: ObserveSelectedChainUseCase = wcKoinApp.koin.get()
-    private val getIdentityUseCase: GetIdentityUseCase = wcKoinApp.koin.get()
-    private val getEthBalanceUseCase: GetEthBalanceUseCase = wcKoinApp.koin.get()
-    private val appKitEngine: AppKitEngine = wcKoinApp.koin.get()
-    private val sendEventUseCase: SendEventInterface = wcKoinApp.koin.get()
+    private val logger: Logger by lazy { wcKoinApp.koin.get(named(AndroidCommonDITags.LOGGER)) }
+
+    private val saveChainSelectionUseCase: SaveChainSelectionUseCase by lazy { wcKoinApp.koin.get() }
+    private val saveSessionUseCase: SaveSessionUseCase by lazy { wcKoinApp.koin.get() }
+    private val observeSessionUseCase: ObserveSessionUseCase by lazy { wcKoinApp.koin.get() }
+    private val observeSelectedChainUseCase: ObserveSelectedChainUseCase by lazy { wcKoinApp.koin.get() }
+    private val getIdentityUseCase: GetIdentityUseCase by lazy { wcKoinApp.koin.get() }
+    private val getEthBalanceUseCase: GetEthBalanceUseCase by lazy { wcKoinApp.koin.get() }
+    private val appKitEngine: AppKitEngine by lazy { wcKoinApp.koin.get() }
+    private val sendEventUseCase: SendEventInterface by lazy { wcKoinApp.koin.get() }
     private val activeSessionFlow = observeSessionUseCase()
 
     private val accountDataFlow = activeSessionFlow
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt
index 26e8ea6787..d4447a515d 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt
@@ -2,6 +2,7 @@ package com.reown.appkit.ui.routes.connect
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.android.internal.common.modal.data.model.Wallet
 import com.reown.android.internal.common.wcKoinApp
 import com.reown.android.pulse.domain.SendEventInterface
@@ -36,9 +37,10 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import org.koin.core.qualifier.named
 
 internal class ConnectViewModel : ViewModel(), Navigator by NavigatorImpl(), ParingController by PairingControllerImpl() {
-    private val logger: Logger = wcKoinApp.koin.get()
+    private val logger: Logger = wcKoinApp.koin.get(named(AndroidCommonDITags.LOGGER))
     private val walletsDataStore = WalletDataSource { showError(it) }
     private val saveRecentWalletUseCase: SaveRecentWalletUseCase = wcKoinApp.koin.get()
     private val saveChainSelectionUseCase: SaveChainSelectionUseCase = wcKoinApp.koin.get()
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt
index 61f895f013..07cd07dc76 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt
@@ -1,7 +1,5 @@
 package com.reown.appkit.ui.routes.connect
 
-import com.reown.android.Core
-import com.reown.android.CoreClient
 import com.reown.android.internal.common.wcKoinApp
 import com.reown.appkit.client.Modal
 import com.reown.appkit.client.toModel
@@ -24,17 +22,17 @@ internal interface ParingController {
         onError: (Throwable) -> Unit
     )
 
-    val uri: String
+    val pairingUri: String
 }
 
 internal class PairingControllerImpl : ParingController {
 
     private val appKitEngine: AppKitEngine = wcKoinApp.koin.get()
 
-    private var _pairing: Core.Model.Pairing? = null
+    private var _uri: String? = null
 
-    private val pairing: Core.Model.Pairing
-        get() = _pairing ?: generatePairing()
+    private val uri: String
+        get() = _uri ?: ""
 
     override fun connect(
         name: String, method: String,
@@ -43,17 +41,20 @@ internal class PairingControllerImpl : ParingController {
         onError: (Throwable) -> Unit
     ) {
         try {
-            generatePairing()
+//            generatePairing()
             val connectParams = Modal.Params.ConnectParams(
                 sessionParams.optionalNamespaces,
                 sessionParams.properties,
                 sessionParams.scopedProperties,
-                pairing
             )
+
             appKitEngine.connectWC(
                 name = name, method = method,
                 connect = connectParams,
-                onSuccess = onSuccess,
+                onSuccess = { uri ->
+                    _uri = uri
+                    onSuccess(uri)
+                },
                 onError = onError
             )
         } catch (e: Exception) {
@@ -70,13 +71,16 @@ internal class PairingControllerImpl : ParingController {
         onError: (Throwable) -> Unit
     ) {
         try {
-            generateAuthenticatedPairing()
+//            generateAuthenticatedPairing()
             appKitEngine.authenticate(
                 name = name,
                 method = method,
-                authenticate = authParams.toModel(pairing.topic),
+                authenticate = authParams.toModel(""), //TODO: revisit 1CA
                 walletAppLink = walletAppLink,
-                onSuccess = onSuccess,
+                onSuccess = { uri ->
+                    _uri = uri
+                    onSuccess(uri)
+                },
                 onError = onError
             )
         } catch (e: Exception) {
@@ -84,16 +88,16 @@ internal class PairingControllerImpl : ParingController {
         }
     }
 
-    override val uri: String
-        get() = pairing.uri
-
-    private fun generatePairing(): Core.Model.Pairing =
-        CoreClient.Pairing.create { error -> throw IllegalStateException("Creating Pairing failed: ${error.throwable.stackTraceToString()}") }!!.also { _pairing = it }
-
-
-    private fun generateAuthenticatedPairing(): Core.Model.Pairing =
-        CoreClient.Pairing
-            .create(methods = "wc_sessionAuthenticate", onError = { error -> throw IllegalStateException("Creating Pairing failed: ${error.throwable.stackTraceToString()}") })!!
-            .also { _pairing = it }
+    override val pairingUri: String
+        get() = uri
+
+//    private fun generatePairing(): Core.Model.Pairing =
+//        CoreClient.Pairing.create { error -> throw IllegalStateException("Creating Pairing failed: ${error.throwable.stackTraceToString()}") }!!.also { _pairing = it }
+//
+//
+//    private fun generateAuthenticatedPairing(): Core.Model.Pairing =
+//        CoreClient.Pairing
+//            .create(methods = "wc_sessionAuthenticate", onError = { error -> throw IllegalStateException("Creating Pairing failed: ${error.throwable.stackTraceToString()}") })!!
+//            .also { _pairing = it }
 
 }
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt
index 4ed8fa2e6d..ea22880e87 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt
@@ -114,7 +114,7 @@ internal fun RedirectWalletRoute(
         wallet = wallet,
         onCopyLinkClick = {
             snackBar.showSuccessSnack("Link copied")
-            clipboardManager.setText(AnnotatedString(connectState.uri))
+            clipboardManager.setText(AnnotatedString(connectState.pairingUri))
         },
         onMobileRetry = {
             redirectState = RedirectState.Loading
diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt
index 52619680f8..edeb4333ac 100644
--- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt
+++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt
@@ -45,7 +45,7 @@ import kotlinx.coroutines.flow.filter
 internal fun ScanQRCodeRoute(connectViewModel: ConnectViewModel) {
     val snackBarHandler = LocalSnackBarHandler.current
     val clipboardManager: ClipboardManager = LocalClipboardManager.current
-    var uri by remember { mutableStateOf(connectViewModel.uri) }
+    var uri by remember { mutableStateOf(connectViewModel.pairingUri) }
 
     LaunchedEffect(Unit) {
         AppKitDelegate
@@ -61,7 +61,7 @@ internal fun ScanQRCodeRoute(connectViewModel: ConnectViewModel) {
         uri = uri,
         onCopyLinkClick = {
             snackBarHandler.showSuccessSnack("Link copied")
-            clipboardManager.setText(AnnotatedString(connectViewModel.uri))
+            clipboardManager.setText(AnnotatedString(connectViewModel.pairingUri))
         }
     )
 }
diff --git a/product/walletkit/build.gradle.kts b/product/walletkit/build.gradle.kts
index 011d22f170..5fd62d9777 100644
--- a/product/walletkit/build.gradle.kts
+++ b/product/walletkit/build.gradle.kts
@@ -59,10 +59,10 @@ dependencies {
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.messaging)
 
-    debugImplementation(project(":core:android"))
+    debugImplementation(project(":core:android")) //TODO: remove
     debugImplementation(project(":protocol:sign"))
 
-    releaseImplementation("com.reown:android-core:$CORE_VERSION")
+    releaseImplementation("com.reown:android-core:$CORE_VERSION") //TODO: remove
     releaseImplementation("com.reown:sign:$SIGN_VERSION")
 
     testImplementation(libs.bundles.androidxTest)
diff --git a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt
index 71a9fefd96..d76eabd819 100644
--- a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt
+++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt
@@ -1,8 +1,8 @@
 package com.reown.walletkit.client
 
+import android.app.Application
 import androidx.annotation.Keep
 import com.reown.android.Core
-import com.reown.android.CoreInterface
 import com.reown.android.cacao.SignatureInterface
 import java.net.URI
 import kotlin.time.Duration
@@ -18,7 +18,11 @@ object Wallet {
     }
 
     sealed class Params {
-        data class Init(val core: CoreInterface) : Params()
+        data class Init(
+            val projectId: String,
+            val metaData: Model.MetaData,
+            val application: Application,
+        ) : Params()
 
         data class Pair(val uri: String) : Params()
 
@@ -91,6 +95,17 @@ object Wallet {
             var chainId: String
         ) : Model()
 
+        data class MetaData(
+            val name: String,
+            val description: String,
+            val url: String,
+            val icons: List<String>,
+            val redirect: String?,
+            val appLink: String? = null,
+            val linkMode: Boolean = false,
+            val verifyUrl: String? = null
+        ) : Model()
+
         data class SolanaTransaction(
             val from: String,
             val chainId: String,
diff --git a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt
index 8c1f411a43..aa768c1f24 100644
--- a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt
+++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt
@@ -102,9 +102,15 @@ object WalletKit {
 
     @Throws(IllegalStateException::class)
     fun initialize(params: Wallet.Params.Init, onSuccess: () -> Unit = {}, onError: (Wallet.Model.Error) -> Unit) {
-        coreClient = params.core
-
-        SignClient.initialize(Sign.Params.Init(params.core), onSuccess = onSuccess) { error ->
+//        coreClient = params.core
+
+        SignClient.initialize(
+            Sign.Params.Init(
+                projectId = params.projectId,
+                metaData = params.metaData.toSignMetaData(),
+                application = params.application
+            ), onSuccess = onSuccess
+        ) { error ->
             if (error.throwable is SignClientAlreadyInitializedException) {
                 onSuccess()
             } else {
@@ -114,7 +120,12 @@ object WalletKit {
     }
 
     @Throws(IllegalStateException::class)
-    fun registerDeviceToken(firebaseAccessToken: String, enableEncrypted: Boolean = false, onSuccess: () -> Unit, onError: (Wallet.Model.Error) -> Unit) {
+    fun registerDeviceToken(
+        firebaseAccessToken: String,
+        enableEncrypted: Boolean = false,
+        onSuccess: () -> Unit,
+        onError: (Wallet.Model.Error) -> Unit
+    ) {
         coreClient.Echo.register(firebaseAccessToken, enableEncrypted, onSuccess) { error -> onError(Wallet.Model.Error(error)) }
     }
 
@@ -148,7 +159,10 @@ object WalletKit {
 
     @Throws(IllegalStateException::class)
     fun pair(params: Wallet.Params.Pair, onSuccess: (Wallet.Params.Pair) -> Unit = {}, onError: (Wallet.Model.Error) -> Unit = {}) {
-        coreClient.Pairing.pair(Core.Params.Pair(params.uri), { onSuccess(params) }, { error -> onError(Wallet.Model.Error(error.throwable)) })
+        SignClient.pair(
+            params.uri,
+            onSuccess = { onSuccess(Wallet.Params.Pair(params.uri)) },
+            onFailure = { error -> onError(Wallet.Model.Error(error)) })
     }
 
     @Throws(IllegalStateException::class)
@@ -157,12 +171,21 @@ object WalletKit {
         onSuccess: (Wallet.Params.SessionApprove) -> Unit = {},
         onError: (Wallet.Model.Error) -> Unit,
     ) {
-        val signParams = Sign.Params.Approve(params.proposerPublicKey, params.namespaces.toSign(), params.properties, params.scopedProperties, params.relayProtocol)
+        val signParams = Sign.Params.Approve(
+            params.proposerPublicKey,
+            params.namespaces.toSign(),
+            params.properties,
+            params.scopedProperties,
+            params.relayProtocol
+        )
         SignClient.approveSession(signParams, { onSuccess(params) }, { error -> onError(Wallet.Model.Error(error.throwable)) })
     }
 
     @Throws(Exception::class)
-    fun generateApprovedNamespaces(sessionProposal: Wallet.Model.SessionProposal, supportedNamespaces: Map<String, Wallet.Model.Namespace.Session>): Map<String, Wallet.Model.Namespace.Session> {
+    fun generateApprovedNamespaces(
+        sessionProposal: Wallet.Model.SessionProposal,
+        supportedNamespaces: Map<String, Wallet.Model.Namespace.Session>
+    ): Map<String, Wallet.Model.Namespace.Session> {
         return com.reown.sign.client.utils.generateApprovedNamespaces(sessionProposal.toSign(), supportedNamespaces.toSign()).toWallet()
     }
 
@@ -197,12 +220,20 @@ object WalletKit {
     }
 
     @Throws(Exception::class)
-    fun generateAuthObject(payloadParams: Wallet.Model.PayloadAuthRequestParams, issuer: String, signature: Wallet.Model.Cacao.Signature): Wallet.Model.Cacao {
+    fun generateAuthObject(
+        payloadParams: Wallet.Model.PayloadAuthRequestParams,
+        issuer: String,
+        signature: Wallet.Model.Cacao.Signature
+    ): Wallet.Model.Cacao {
         return com.reown.sign.client.utils.generateAuthObject(payloadParams.toSign(), issuer, signature.toSign()).toWallet()
     }
 
     @Throws(Exception::class)
-    fun generateAuthPayloadParams(payloadParams: Wallet.Model.PayloadAuthRequestParams, supportedChains: List<String>, supportedMethods: List<String>): Wallet.Model.PayloadAuthRequestParams {
+    fun generateAuthPayloadParams(
+        payloadParams: Wallet.Model.PayloadAuthRequestParams,
+        supportedChains: List<String>,
+        supportedMethods: List<String>
+    ): Wallet.Model.PayloadAuthRequestParams {
         return com.reown.sign.client.utils.generateAuthPayloadParams(payloadParams.toSign(), supportedChains, supportedMethods).toWallet()
     }
 
@@ -389,4 +420,20 @@ object WalletKit {
 //    fun prepareErc20TransferCall(contractAddress: String, to: String, amount: String): Wallet.Model.Call {
 //        return prepareCallERC20TransferCallUseCase(contractAddress, to, amount)
 //    }
+}
+
+/**
+ * Extension function to convert Wallet.Model.MetaData to Sign.Model.MetaData
+ */
+private fun Wallet.Model.MetaData.toSignMetaData(): Sign.Model.MetaData {
+    return Sign.Model.MetaData(
+        name = name,
+        description = description,
+        url = url,
+        icons = icons,
+        redirect = redirect,
+        appLink = appLink,
+        linkMode = linkMode,
+        verifyUrl = verifyUrl
+    )
 }
\ No newline at end of file
diff --git a/protocol/sign/build.gradle.kts b/protocol/sign/build.gradle.kts
index 03b894b550..163cc99d28 100644
--- a/protocol/sign/build.gradle.kts
+++ b/protocol/sign/build.gradle.kts
@@ -102,6 +102,17 @@ dependencies {
     debugImplementation(project(":core:android"))
     releaseImplementation("com.reown:android-core:$CORE_VERSION")
 
+    // Use specific yttrium version for CI builds, default version for local builds
+    // Release builds use stable version, regular CI builds use CI version for e2e tests
+    val yttriumVersion = if (System.getenv("IS_RELEASE_BUILD") == "true") {
+        "0.9.55" // Use stable version for release builds
+    } else if (System.getenv("CI") == "true") {
+        System.getenv("YTTRIUM_CI_VERSION") ?: "0.0.20-ci" // Use CI version for e2e tests
+    } else {
+        "0.9.55" // Use stable version for local builds
+    }
+    api("com.github.reown-com:yttrium:unspecified")//$yttriumVersion
+
     implementation("org.msgpack:msgpack-core:0.9.1")
 
     ksp(libs.moshi.ksp)
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/client/GetKeyPair.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/GetKeyPair.kt
new file mode 100644
index 0000000000..22ed367876
--- /dev/null
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/GetKeyPair.kt
@@ -0,0 +1,55 @@
+package com.reown.sign.client
+
+import com.reown.android.internal.common.exception.CannotFindKeyPairException
+import com.reown.android.internal.common.storage.key_chain.KeyStore
+import com.reown.foundation.common.model.PrivateKey
+import com.reown.foundation.common.model.PublicKey
+import com.reown.util.bytesToHex
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair
+import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator
+import org.bouncycastle.crypto.params.Ed25519KeyGenerationParameters
+import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters
+import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters
+import java.security.SecureRandom
+
+class GetKeyPair(private val keyChain: KeyStore) {
+
+    fun setKeyPair(privateKey: PrivateKey, publicKey: PublicKey) {
+        keyChain.setKeys(KEYPAIR_TAG, privateKey, publicKey)
+    }
+
+    fun getKeyPair(): Pair<String, String> {
+        return if (doesKeyPairExist()) {
+            val (privateKey, publicKey) = keyChain.getKeys(KEYPAIR_TAG)
+                ?: throw CannotFindKeyPairException("No key pair for given tag: $KEYPAIR_TAG")
+
+            publicKey to privateKey
+        } else {
+            generateAndStoreKeyPair()
+        }
+    }
+
+    private fun generateAndStoreKeyPair(): Pair<String, String> {
+        val secureRandom = SecureRandom()
+        val keyPair: AsymmetricCipherKeyPair = Ed25519KeyPairGenerator().run {
+            this.init(Ed25519KeyGenerationParameters(secureRandom))
+            this.generateKeyPair()
+        }
+        val publicKeyParameters = keyPair.public as Ed25519PublicKeyParameters
+        val privateKeyParameters = keyPair.private as Ed25519PrivateKeyParameters
+        val publicKey = PublicKey(publicKeyParameters.encoded.bytesToHex())
+        val privateKey = PrivateKey(privateKeyParameters.encoded.bytesToHex())
+
+        setKeyPair(privateKey, publicKey)
+
+        return publicKey.keyAsHex to privateKey.keyAsHex
+    }
+
+    private fun doesKeyPairExist(): Boolean {
+        return keyChain.checkKeys(KEYPAIR_TAG)
+    }
+
+    companion object {
+        const val KEYPAIR_TAG = "key_keypair_rust"
+    }
+}
\ No newline at end of file
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/client/Sign.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/Sign.kt
index 11d106dbfd..c3798d4d01 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/client/Sign.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/Sign.kt
@@ -1,7 +1,9 @@
 package com.reown.sign.client
 
+import android.app.Application
 import androidx.annotation.Keep
 import com.reown.android.Core
+import com.reown.android.Core.Model
 import com.reown.android.CoreInterface
 import com.reown.android.cacao.SignatureInterface
 import com.reown.android.internal.common.signing.cacao.Issuer
@@ -51,6 +53,17 @@ object Sign {
             val scopedProperties: Map<String, String>?,
         ) : Model()
 
+        data class MetaData(
+            val name: String,
+            val description: String,
+            val url: String,
+            val icons: List<String>,
+            val redirect: String?,
+            val appLink: String? = null,
+            val linkMode: Boolean = false,
+            val verifyUrl: String? = null
+        ) : Model()
+
         data class ExpiredProposal(val pairingTopic: String, val proposerPublicKey: String) : Model()
         data class ExpiredRequest(val topic: String, val id: Long) : Model()
 
@@ -312,7 +325,9 @@ object Sign {
     sealed class Params {
 
         data class Init constructor(
-            val core: CoreInterface,
+            val projectId: String,
+            val metaData: Sign.Model.MetaData,
+            val application: Application,
         ) : Params()
 
         data class Connect(
@@ -327,7 +342,7 @@ object Sign {
             val sessionNamespaces: Map<String, Model.Namespace.Proposal>? = null, //optionalNM
             val properties: Map<String, String>? = null,
             val scopedProperties: Map<String, String>? = null,
-            val pairing: Core.Model.Pairing,
+            val pairing: Core.Model.Pairing?, //TODO: revisit 1CA
         ) : Params()
 
         data class Authenticate(
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt
index ef169e853f..a5e83eceae 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt
@@ -71,6 +71,8 @@ interface SignInterface {
         onError: (Sign.Model.Error) -> Unit,
     )
 
+    fun pair(uri: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit)
+
     fun authenticate(
         authenticate: Sign.Params.Authenticate,
         walletAppLink: String? = null,
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignListener.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignListener.kt
new file mode 100644
index 0000000000..a4821db96e
--- /dev/null
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignListener.kt
@@ -0,0 +1,161 @@
+package com.reown.sign.client
+
+import com.reown.android.internal.common.model.AppMetaDataType
+import com.reown.android.internal.common.model.Expiry
+import com.reown.android.internal.common.model.Validation
+import com.reown.android.internal.common.model.type.EngineEvent
+import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface
+import com.reown.foundation.common.model.Topic
+import com.reown.sign.client.mapper.toMapOfEngineNamespacesSession
+import com.reown.sign.engine.model.EngineDO
+import com.reown.sign.engine.model.mapper.toEngineDOSessionExtend
+import com.reown.sign.engine.model.mapper.toMapOfEngineNamespacesSession
+import com.reown.sign.engine.model.mapper.toSessionApproved
+import com.reown.sign.engine.model.mapper.toSessionVO
+import com.reown.sign.json_rpc.domain.GetSessionRequestByIdUseCase
+import com.reown.sign.storage.sequence.SessionStorageRepository
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import uniffi.yttrium.SessionRequestJsonRpcFfi
+import uniffi.yttrium.SessionRequestJsonRpcResponseFfi
+import uniffi.yttrium.SettleNamespace
+import uniffi.yttrium.SignListener
+
+internal class SignListener(
+    private val sessionStorage: SessionStorageRepository,
+    private val metadataStorage: MetadataStorageRepositoryInterface,
+    private val getSessionRequestByIdUseCase: GetSessionRequestByIdUseCase,
+) : SignListener {
+    private val coroutineExceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        println("kobe: SignListener coroutine error: $throwable")
+    }
+
+    private val ioScope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO + coroutineExceptionHandler)
+    private val _events: MutableSharedFlow<EngineEvent> = MutableSharedFlow()
+    val events: SharedFlow<EngineEvent> = _events.asSharedFlow()
+
+    override fun onSessionConnect(id: ULong, topic: String) {
+        ioScope.launch {
+            println("kobe: onSessionConnect: $id; topic: $topic")
+
+            val session = sessionStorage.getSessionWithoutMetadataByTopic(Topic(topic))
+                .run {
+                    val peerAppMetaData = metadataStorage.getByTopicAndType(this.topic, AppMetaDataType.PEER)
+                    this.copy(peerAppMetaData = peerAppMetaData)
+                }
+
+            _events.emit(session.toSessionApproved())
+        }
+    }
+
+    override fun onSessionReject(id: ULong, topic: String) {
+        ioScope.launch {
+            println("kobe: onSessionReject: $id; topic: $topic")
+
+            _events.emit(EngineDO.SessionRejected(topic, "User rejected"))
+        }
+    }
+
+    override fun onSessionDisconnect(id: ULong, topic: String) {
+        ioScope.launch {
+            println("kobe: onSessionDisconnect: $id; $topic")
+
+
+            _events.emit(EngineDO.SessionDelete(topic, "User disconnected"))
+        }
+    }
+
+    override fun onSessionRequest(topic: String, sessionRequest: SessionRequestJsonRpcFfi) {
+        ioScope.launch {
+            println("kobe: onSessionRequest: $sessionRequest")
+
+            val sessionRequestEvent = EngineDO.SessionRequestEvent(
+                request = EngineDO.SessionRequest(
+                    topic = topic,
+                    chainId = sessionRequest.params.chainId,
+                    peerAppMetaData = null,
+                    expiry = if (sessionRequest.params.request.expiry != null) Expiry(sessionRequest.params.request.expiry!!.toLong()) else null,
+                    request = EngineDO.SessionRequest.JSONRPCRequest(
+                        id = sessionRequest.id.toLong(),
+                        method = sessionRequest.params.request.method,
+                        params = sessionRequest.params.request.params
+                    )
+                ),
+                context = EngineDO.VerifyContext(1, "", Validation.UNKNOWN, "", null)
+            )
+
+            _events.emit(sessionRequestEvent)
+            println("kobe: session request event emitted successfully")
+        }
+    }
+
+    override fun onSessionRequestResponse(id: ULong, topic: String, response: SessionRequestJsonRpcResponseFfi) {
+        ioScope.launch {
+            println("bary: onSessionRequestResponse: $id; $topic; $response")
+
+            val jsonRpcHistoryEntry = getSessionRequestByIdUseCase(id.toLong())
+
+            println("bary: onSessionRequestResponse: history entry: $jsonRpcHistoryEntry")
+
+            val result = when (val jsonRpcResponse = response) {
+                is SessionRequestJsonRpcResponseFfi.Result -> {
+                    EngineDO.JsonRpcResponse.JsonRpcResult(id = jsonRpcResponse.v1.id.toLong(), result = jsonRpcResponse.v1.result)
+                }
+
+                is SessionRequestJsonRpcResponseFfi.Error -> {
+                    EngineDO.JsonRpcResponse.JsonRpcError(
+                        id = jsonRpcResponse.v1.id.toLong(),
+                        error = EngineDO.JsonRpcResponse.Error(1000, jsonRpcResponse.v1.error)
+                    )
+                }
+
+            }
+
+            //todo: get chainId and method from json rpc history entry
+            _events.emit(
+                EngineDO.SessionPayloadResponse(
+                    topic,
+                    jsonRpcHistoryEntry?.params?.chainId,
+                    jsonRpcHistoryEntry?.params?.request?.method ?: "",
+                    result
+                )
+            )
+        }
+    }
+
+    override fun onSessionEvent(topic: String, name: String, data: String, chainId: String) {
+        ioScope.launch {
+            println("kobe: onSessionEvent: $name; $topic; $data; $chainId")
+
+            _events.emit(EngineDO.SessionEvent(topic, name, data, chainId))
+        }
+    }
+
+    override fun onSessionExtend(id: ULong, topic: String) {
+        ioScope.launch {
+            println("kobe: onSessionExtend: $id; $topic")
+
+            //Storage already update with new expiry, called from Rust
+            val session = sessionStorage.getSessionWithoutMetadataByTopic(Topic(topic))
+
+            _events.emit(session.toEngineDOSessionExtend())
+        }
+    }
+
+    override fun onSessionUpdate(
+        id: ULong,
+        topic: String,
+        namespaces: Map<String, SettleNamespace>
+    ) {
+        ioScope.launch {
+            println("kobe: onSessionUpdate: $id; $topic; $namespaces")
+            _events.emit(EngineDO.SessionUpdateNamespaces(Topic(topic), namespaces.toSessionVO().toMapOfEngineNamespacesSession()))
+        }
+    }
+}
\ No newline at end of file
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt
index 42dc4abe45..73a798d78f 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt
@@ -2,53 +2,227 @@
 
 package com.reown.sign.client
 
+import android.app.Activity
+import android.app.Application
+import android.os.Bundle
 import com.reown.android.Core
+import com.reown.android.di.coreStorageModule
 import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.android.internal.common.di.DatabaseConfig
+import com.reown.android.internal.common.di.coreCryptoModule
+import com.reown.android.internal.common.di.coreJsonRpcModule
+import com.reown.android.internal.common.model.AppMetaData
 import com.reown.android.internal.common.model.Expiry
+import com.reown.android.internal.common.model.Redirect
 import com.reown.android.internal.common.model.SDKError
 import com.reown.android.internal.common.scope
 import com.reown.android.internal.common.wcKoinApp
 import com.reown.android.pairing.model.mapper.toPairing
 import com.reown.android.relay.WSSConnectionState
 import com.reown.foundation.common.model.Topic
-import com.reown.sign.client.mapper.*
+import com.reown.sign.client.mapper.mapToPendingSessionRequests
+import com.reown.sign.client.mapper.toAuthenticate
+import com.reown.sign.client.mapper.toClient
+import com.reown.sign.client.mapper.toClientActiveSession
+import com.reown.sign.client.mapper.toClientDeletedSession
+import com.reown.sign.client.mapper.toClientError
+import com.reown.sign.client.mapper.toClientEvent
+import com.reown.sign.client.mapper.toClientSessionApproved
+import com.reown.sign.client.mapper.toClientSessionAuthenticate
+import com.reown.sign.client.mapper.toClientSessionAuthenticateResponse
+import com.reown.sign.client.mapper.toClientSessionEvent
+import com.reown.sign.client.mapper.toClientSessionPayloadResponse
+import com.reown.sign.client.mapper.toClientSessionProposal
+import com.reown.sign.client.mapper.toClientSessionRejected
+import com.reown.sign.client.mapper.toClientSessionRequest
+import com.reown.sign.client.mapper.toClientSessionsNamespaces
+import com.reown.sign.client.mapper.toClientSettledSessionResponse
+import com.reown.sign.client.mapper.toClientUpdateSessionNamespacesResponse
+import com.reown.sign.client.mapper.toCommon
+import com.reown.sign.client.mapper.toCore
+import com.reown.sign.client.mapper.toEngine
+import com.reown.sign.client.mapper.toEngineDORequest
+import com.reown.sign.client.mapper.toEngineEvent
+import com.reown.sign.client.mapper.toJsonRpcResponse
+import com.reown.sign.client.mapper.toMapOfEngineNamespacesOptional
+import com.reown.sign.client.mapper.toMapOfEngineNamespacesRequired
+import com.reown.sign.client.mapper.toMapOfEngineNamespacesSession
+import com.reown.sign.client.mapper.toSentRequest
+import com.reown.sign.client.mapper.toSign
 import com.reown.sign.common.exceptions.SignClientAlreadyInitializedException
 import com.reown.sign.di.engineModule
 import com.reown.sign.di.signJsonRpcModule
 import com.reown.sign.di.storageModule
 import com.reown.sign.engine.domain.SignEngine
 import com.reown.sign.engine.model.EngineDO
+import com.reown.sign.json_rpc.domain.GetSessionRequestByIdUseCase
+import com.reown.util.hexToBytes
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.withContext
+import org.koin.android.ext.koin.androidContext
 import org.koin.core.KoinApplication
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
+import timber.log.Timber
+import uniffi.yttrium.Logger
+import uniffi.yttrium.SignClient
+import uniffi.yttrium.StorageFfi
+import uniffi.yttrium.registerLogger
 import java.util.concurrent.atomic.AtomicBoolean
 
+class AndroidLogger : Logger {
+    override fun log(message: String) {
+        println("kobe: Message from Rust: $message")
+    }
+}
+
 class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInterface {
     private lateinit var signEngine: SignEngine
     private var atomicBoolean: AtomicBoolean? = null
+    private val signClient: SignClient by lazy { wcKoinApp.koin.get(named(AndroidCommonDITags.SIGN_RUST_CLIENT)) }
 
     companion object {
         val instance = SignProtocol()
     }
 
+    private inner class ActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
+        var isResumed: Boolean = false
+        var job: Job? = null
+
+
+        override fun onActivityPaused(activity: Activity) {
+            //TODO: call method from Rust Client - wait 30s or check if Rust already waits
+            println("kobe: onPause")
+        }
+
+        override fun onActivityResumed(activity: Activity) {
+
+
+            scope.launch {
+                supervisorScope {
+                    println("kobe: online")
+                    signClient.online() //TODO: this as first trigger or SignClient init
+                }
+            }
+        }
+
+        override fun onActivityStarted(activity: Activity) {}
+
+        override fun onActivityDestroyed(activity: Activity) {}
+
+        override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+
+        override fun onActivityStopped(activity: Activity) {}
+
+        override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+    }
+
     override fun initialize(init: Sign.Params.Init, onSuccess: () -> Unit, onError: (Sign.Model.Error) -> Unit) {
-        // TODO: re-init scope
         if (!::signEngine.isInitialized) {
             try {
+                println("kobe: init")
+                registerLogger(AndroidLogger())
+
+                wcKoinApp.androidContext(init.application)
+                koinApp.modules(
+                    coreCryptoModule(), //TODO: remove what's not needed
+                    module {
+                        single {
+                            KotlinJsonAdapterFactory()
+                        }
+
+                        single<Moshi.Builder>(named(AndroidCommonDITags.MOSHI)) {
+                            Moshi.Builder()
+                                .addLast(get<KotlinJsonAdapterFactory>())
+                        }
+                    },
+                    coreStorageModule(packageName = init.application.packageName), //TODO: remove what's not needed
+                    coreJsonRpcModule(), //TODO: remove what's not needed
+                    module {
+                        single<com.reown.foundation.util.Logger>(named(AndroidCommonDITags.LOGGER)) {
+                            object : com.reown.foundation.util.Logger {
+                                override fun log(logMsg: String?) {
+                                    println(logMsg)
+                                }
+
+                                override fun log(throwable: Throwable?) {
+                                    println(throwable)
+                                }
+
+                                override fun error(errorMsg: String?) {
+                                    println(errorMsg)
+                                }
+
+                                override fun error(throwable: Throwable?) {
+                                    println(throwable)
+                                }
+                            }
+                        }
+                    },
+                    module {
+                        single {
+                            with(init.metaData) {
+                                AppMetaData(
+                                    name = name,
+                                    description = description,
+                                    url = url,
+                                    icons = icons,
+                                    redirect = Redirect(native = redirect, universal = appLink, linkMode = linkMode)
+                                )
+                            }
+                        }
+                    },
+                    module { single { GetKeyPair(get()) } },
+                    module { single(named("rust_key")) { get<GetKeyPair>().getKeyPair().second.hexToBytes() } },
+                    module {
+                        single(named(AndroidCommonDITags.SIGN_RUST_CLIENT)) {
+                            SignClient(
+                                projectId = init.projectId,
+                                key = get(named("rust_key")),
+                                sessionStore = get<StorageFfi>()
+                            )
+                        }
+                    })
+
+                // Load storage module after other modules are loaded so DatabaseConfig is available
                 koinApp.modules(
                     signJsonRpcModule(),
+                    engineModule(),
                     storageModule(koinApp.koin.get<DatabaseConfig>().SIGN_SDK_DB_NAME),
-                    engineModule()
+                )
+
+                koinApp.modules(
+                    module {
+                        single {
+                            GetSessionRequestByIdUseCase(
+                                jsonRpcHistoryQueries = get(),
+                                serializer = get()
+                            )
+                        }
+                    }
                 )
 
                 signEngine = koinApp.koin.get()
                 signEngine.setup()
-                onSuccess()
+
+                scope.launch {
+                    println("kobe: start")
+                    signClient.start()
+                    println("kobe: register listener")
+                    signClient.registerSignListener(signEngine.signListener)
+                    println("kobe: register lifecycle")
+                    init.application.registerActivityLifecycleCallbacks(ActivityLifecycleCallbacks())
+                    onSuccess()
+                }
+
             } catch (e: Exception) {
                 onError(Sign.Model.Error(e))
             }
@@ -62,10 +236,16 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
         checkEngineInitialization()
 
         wcKoinApp.modules(module { single(named(AndroidCommonDITags.ENABLE_AUTHENTICATE)) { delegate.onSessionAuthenticate != null } })
-        handleConnectionState { connectionState -> delegate.onConnectionStateChange(connectionState) }
+//        handleConnectionState { connectionState -> delegate.onConnectionStateChange(connectionState) }
+
         signEngine.engineEvent.onEach { event ->
             when (event) {
-                is EngineDO.SessionProposalEvent -> delegate.onSessionProposal(event.proposal.toClientSessionProposal(), event.context.toCore())
+                is EngineDO.SessionProposalEvent -> {
+                    println("kobe: Session Proposal: ${event.proposal}")
+
+                    delegate.onSessionProposal(event.proposal.toClientSessionProposal(), event.context.toCore())
+                }
+
                 is EngineDO.SessionAuthenticateEvent -> delegate.onSessionAuthenticate?.invoke(
                     event.toClientSessionAuthenticate(),
                     event.verifyContext.toCore()
@@ -89,7 +269,7 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
     override fun setDappDelegate(delegate: SignInterface.DappDelegate) {
         checkEngineInitialization()
 
-        handleConnectionState { connectionState -> delegate.onConnectionStateChange(connectionState) }
+//        handleConnectionState { connectionState -> delegate.onConnectionStateChange(connectionState) }
         signEngine.engineEvent.onEach { event ->
             when (event) {
                 is EngineDO.SessionRejected -> delegate.onSessionRejected(event.toClientSessionRejected())
@@ -133,7 +313,7 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
                         properties,
                         scopedProperties,
                         pairing.toPairing(),
-                        onSuccess = { onSuccess(pairing.uri) },
+                        onSuccess = { uri -> onSuccess(uri) },
                         onFailure = { error -> onError(Sign.Model.Error(error)) }
                     )
                 }
@@ -158,8 +338,8 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
                         sessionNamespaces?.toMapOfEngineNamespacesOptional(),
                         properties,
                         scopedProperties,
-                        pairing.toPairing(),
-                        onSuccess = { onSuccess(pairing.uri) },
+                        pairing?.toPairing(),
+                        onSuccess = { uri -> onSuccess(uri) },
                         onFailure = { error -> onError(Sign.Model.Error(error)) }
                     )
                 }
@@ -169,6 +349,11 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
         }
     }
 
+    override fun pair(uri: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) {
+        checkEngineInitialization()
+        signEngine.pair(uri, onSuccess, onFailure)
+    }
+
     @Throws(IllegalStateException::class)
     override fun authenticate(
         authenticate: Sign.Params.Authenticate,
@@ -177,37 +362,38 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
         onError: (Sign.Model.Error) -> Unit,
     ) {
         checkEngineInitialization()
-        scope.launch {
-            try {
-                signEngine.authenticate(
-                    authenticate.toAuthenticate(),
-                    authenticate.methods, authenticate.pairingTopic,
-                    if (authenticate.expiry == null) null else Expiry(authenticate.expiry),
-                    walletAppLink,
-                    onSuccess = { url -> onSuccess(url) },
-                    onFailure = { throwable -> onError(Sign.Model.Error(throwable)) })
-            } catch (error: Exception) {
-                onError(Sign.Model.Error(error))
-            }
-        }
+//        scope.launch {
+//            try {
+//                signEngine.authenticate(
+//                    authenticate.toAuthenticate(),
+//                    authenticate.methods, authenticate.pairingTopic,
+//                    if (authenticate.expiry == null) null else Expiry(authenticate.expiry),
+//                    walletAppLink,
+//                    onSuccess = { url -> onSuccess(url) },
+//                    onFailure = { throwable -> onError(Sign.Model.Error(throwable)) })
+//            } catch (error: Exception) {
+//                onError(Sign.Model.Error(error))
+//            }
+//        }
     }
 
     @Throws(IllegalStateException::class)
     override fun dispatchEnvelope(urlWithEnvelope: String, onError: (Sign.Model.Error) -> Unit) {
         checkEngineInitialization()
-        scope.launch {
-            try {
-                signEngine.dispatchEnvelope(urlWithEnvelope)
-            } catch (error: Exception) {
-                onError(Sign.Model.Error(error))
-            }
-        }
+//        scope.launch {
+//            try {
+//                signEngine.dispatchEnvelope(urlWithEnvelope)
+//            } catch (error: Exception) {
+//                onError(Sign.Model.Error(error))
+//            }
+//        }
     }
 
     @Throws(IllegalStateException::class)
     override fun formatAuthMessage(formatMessage: Sign.Params.FormatMessage): String {
         checkEngineInitialization()
-        return runBlocking { signEngine.formatMessage(formatMessage.payloadParams.toEngine(), formatMessage.iss) }
+//        return runBlocking { signEngine.formatMessage(formatMessage.payloadParams.toEngine(), formatMessage.iss) }
+        return ""
     }
 
     @Throws(IllegalStateException::class)
@@ -254,18 +440,18 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
     ) {
         checkEngineInitialization()
 
-        scope.launch {
-            try {
-                signEngine.approveSessionAuthenticate(
-                    approve.id, approve.cacaos.toCommon(),
-                    onSuccess = { onSuccess(approve) },
-                    onFailure = { error -> onError(Sign.Model.Error(error)) }
-                )
-
-            } catch (error: Exception) {
-                onError(Sign.Model.Error(error))
-            }
-        }
+//        scope.launch {
+//            try {
+//                signEngine.approveSessionAuthenticate(
+//                    approve.id, approve.cacaos.toCommon(),
+//                    onSuccess = { onSuccess(approve) },
+//                    onFailure = { error -> onError(Sign.Model.Error(error)) }
+//                )
+//
+//            } catch (error: Exception) {
+//                onError(Sign.Model.Error(error))
+//            }
+//        }
     }
 
     @Throws(IllegalStateException::class)
@@ -276,19 +462,19 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
     ) {
         checkEngineInitialization()
 
-        scope.launch {
-            try {
-                signEngine.rejectSessionAuthenticate(reject.id, reject.reason, onSuccess = { onSuccess(reject) }) { error ->
-                    onError(
-                        Sign.Model.Error(
-                            error
-                        )
-                    )
-                }
-            } catch (error: Exception) {
-                onError(Sign.Model.Error(error))
-            }
-        }
+//        scope.launch {
+//            try {
+//                signEngine.rejectSessionAuthenticate(reject.id, reject.reason, onSuccess = { onSuccess(reject) }) { error ->
+//                    onError(
+//                        Sign.Model.Error(
+//                            error
+//                        )
+//                    )
+//                }
+//            } catch (error: Exception) {
+//                onError(Sign.Model.Error(error))
+//            }
+//        }
     }
 
     @Throws(IllegalStateException::class)
@@ -383,18 +569,18 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
     override fun ping(ping: Sign.Params.Ping, sessionPing: Sign.Listeners.SessionPing?) {
         checkEngineInitialization()
 
-        scope.launch {
-            try {
-                signEngine.ping(
-                    ping.topic,
-                    { topic -> sessionPing?.onSuccess(Sign.Model.Ping.Success(topic)) },
-                    { error -> sessionPing?.onError(Sign.Model.Ping.Error(error)) },
-                    ping.timeout
-                )
-            } catch (error: Exception) {
-                sessionPing?.onError(Sign.Model.Ping.Error(error))
-            }
-        }
+//        scope.launch {
+//            try {
+//                signEngine.ping(
+//                    ping.topic,
+//                    { topic -> sessionPing?.onSuccess(Sign.Model.Ping.Success(topic)) },
+//                    { error -> sessionPing?.onError(Sign.Model.Ping.Error(error)) },
+//                    ping.timeout
+//                )
+//            } catch (error: Exception) {
+//                sessionPing?.onError(Sign.Model.Ping.Error(error))
+//            }
+//        }
     }
 
     @Throws(IllegalStateException::class)
@@ -417,27 +603,27 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
     override fun decryptMessage(params: Sign.Params.DecryptMessage, onSuccess: (Sign.Model.Message) -> Unit, onError: (Sign.Model.Error) -> Unit) {
         checkEngineInitialization()
 
-        scope.launch {
-            try {
-                signEngine.decryptNotification(
-                    topic = params.topic,
-                    message = params.encryptedMessage,
-                    onSuccess = { message ->
-                        when (message) {
-                            is Core.Model.Message.SessionRequest -> onSuccess(message.toSign())
-                            is Core.Model.Message.SessionProposal -> onSuccess(message.toSign())
-                            is Core.Model.Message.SessionAuthenticate -> onSuccess(message.toSign())
-                            else -> {
-                                //Ignore
-                            }
-                        }
-                    },
-                    onFailure = { error -> onError(Sign.Model.Error(error)) }
-                )
-            } catch (error: Exception) {
-                onError(Sign.Model.Error(error))
-            }
-        }
+//        scope.launch {
+//            try {
+//                signEngine.decryptNotification(
+//                    topic = params.topic,
+//                    message = params.encryptedMessage,
+//                    onSuccess = { message ->
+//                        when (message) {
+//                            is Core.Model.Message.SessionRequest -> onSuccess(message.toSign())
+//                            is Core.Model.Message.SessionProposal -> onSuccess(message.toSign())
+//                            is Core.Model.Message.SessionAuthenticate -> onSuccess(message.toSign())
+//                            else -> {
+//                                //Ignore
+//                            }
+//                        }
+//                    },
+//                    onFailure = { error -> onError(Sign.Model.Error(error)) }
+//                )
+//            } catch (error: Exception) {
+//                onError(Sign.Model.Error(error))
+//            }
+//        }
     }
 
     @Throws(IllegalStateException::class)
@@ -460,7 +646,8 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
     @Throws(IllegalStateException::class)
     override fun getPendingSessionRequests(topic: String): List<Sign.Model.SessionRequest> {
         checkEngineInitialization()
-        return runBlocking { signEngine.getPendingSessionRequests(Topic(topic)).mapToPendingSessionRequests() }
+//        return runBlocking { signEngine.getPendingSessionRequests(Topic(topic)).mapToPendingSessionRequests() }
+        return emptyList()
     }
 
     @Throws(IllegalStateException::class)
@@ -472,19 +659,22 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
     @Throws(IllegalStateException::class)
     override fun getPendingAuthenticateRequests(): List<Sign.Model.SessionAuthenticate> {
         checkEngineInitialization()
-        return runBlocking { signEngine.getPendingAuthenticateRequests().map { request -> request.toClient() } }
+//        return runBlocking { signEngine.getPendingAuthenticateRequests().map { request -> request.toClient() } }
+        return emptyList()
     }
 
     @Throws(IllegalStateException::class)
     override fun getVerifyContext(id: Long): Sign.Model.VerifyContext? {
         checkEngineInitialization()
-        return runBlocking { signEngine.getVerifyContext(id)?.toCore() }
+//        return runBlocking { signEngine.getVerifyContext(id)?.toCore() }
+        return null
     }
 
     @Throws(IllegalStateException::class)
     override fun getListOfVerifyContexts(): List<Sign.Model.VerifyContext> {
         checkEngineInitialization()
-        return runBlocking { signEngine.getListOfVerifyContexts().map { verifyContext -> verifyContext.toCore() } }
+//        return runBlocking { signEngine.getListOfVerifyContexts().map { verifyContext -> verifyContext.toCore() } }
+        return emptyList()
     }
 
 // TODO: Uncomment once reinit scope logic is added
@@ -493,56 +683,56 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter
 //        wcKoinApp.close()
 //    }
 
-    private fun handleConnectionState(onDelegate: (state: Sign.Model.ConnectionState) -> Unit) {
-        signEngine.wssConnection.onEach { connectionState ->
-            when {
-                atomicBoolean == null -> {
-                    atomicBoolean = AtomicBoolean()
-                    when (connectionState) {
-                        is WSSConnectionState.Disconnected.ConnectionFailed ->
-                            onDelegate(
-                                Sign.Model.ConnectionState(
-                                    false,
-                                    Sign.Model.ConnectionState.Reason.ConnectionFailed(connectionState.throwable)
-                                )
-                            )
-
-                        is WSSConnectionState.Disconnected.ConnectionClosed ->
-                            onDelegate(
-                                Sign.Model.ConnectionState(
-                                    false,
-                                    Sign.Model.ConnectionState.Reason.ConnectionClosed(connectionState.message ?: "Connection closed")
-                                )
-                            )
-
-                        else -> onDelegate(Sign.Model.ConnectionState(true))
-                    }
-                }
-
-                atomicBoolean?.get() == true && connectionState is WSSConnectionState.Disconnected.ConnectionFailed -> {
-                    atomicBoolean?.set(false)
-                    onDelegate(Sign.Model.ConnectionState(false, Sign.Model.ConnectionState.Reason.ConnectionFailed(connectionState.throwable)))
-                }
-
-                atomicBoolean?.get() == true && connectionState is WSSConnectionState.Disconnected.ConnectionClosed -> {
-                    atomicBoolean?.set(false)
-                    onDelegate(
-                        Sign.Model.ConnectionState(
-                            false,
-                            Sign.Model.ConnectionState.Reason.ConnectionClosed(connectionState.message ?: "Connection closed")
-                        )
-                    )
-                }
-
-                atomicBoolean?.get() == false && connectionState is WSSConnectionState.Connected -> {
-                    atomicBoolean?.set(true)
-                    onDelegate(Sign.Model.ConnectionState(true))
-                }
-
-                else -> Unit
-            }
-        }.launchIn(scope)
-    }
+//    private fun handleConnectionState(onDelegate: (state: Sign.Model.ConnectionState) -> Unit) {
+//        signEngine.wssConnection.onEach { connectionState ->
+//            when {
+//                atomicBoolean == null -> {
+//                    atomicBoolean = AtomicBoolean()
+//                    when (connectionState) {
+//                        is WSSConnectionState.Disconnected.ConnectionFailed ->
+//                            onDelegate(
+//                                Sign.Model.ConnectionState(
+//                                    false,
+//                                    Sign.Model.ConnectionState.Reason.ConnectionFailed(connectionState.throwable)
+//                                )
+//                            )
+//
+//                        is WSSConnectionState.Disconnected.ConnectionClosed ->
+//                            onDelegate(
+//                                Sign.Model.ConnectionState(
+//                                    false,
+//                                    Sign.Model.ConnectionState.Reason.ConnectionClosed(connectionState.message ?: "Connection closed")
+//                                )
+//                            )
+//
+//                        else -> onDelegate(Sign.Model.ConnectionState(true))
+//                    }
+//                }
+//
+//                atomicBoolean?.get() == true && connectionState is WSSConnectionState.Disconnected.ConnectionFailed -> {
+//                    atomicBoolean?.set(false)
+//                    onDelegate(Sign.Model.ConnectionState(false, Sign.Model.ConnectionState.Reason.ConnectionFailed(connectionState.throwable)))
+//                }
+//
+//                atomicBoolean?.get() == true && connectionState is WSSConnectionState.Disconnected.ConnectionClosed -> {
+//                    atomicBoolean?.set(false)
+//                    onDelegate(
+//                        Sign.Model.ConnectionState(
+//                            false,
+//                            Sign.Model.ConnectionState.Reason.ConnectionClosed(connectionState.message ?: "Connection closed")
+//                        )
+//                    )
+//                }
+//
+//                atomicBoolean?.get() == false && connectionState is WSSConnectionState.Connected -> {
+//                    atomicBoolean?.set(true)
+//                    onDelegate(Sign.Model.ConnectionState(true))
+//                }
+//
+//                else -> Unit
+//            }
+//        }.launchIn(scope)
+//    }
 
     @Throws(IllegalStateException::class)
     private fun checkEngineInitialization() {
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignStorage.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignStorage.kt
new file mode 100644
index 0000000000..4b9daa5a98
--- /dev/null
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignStorage.kt
@@ -0,0 +1,266 @@
+package com.reown.sign.client
+
+import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord
+import com.reown.android.internal.common.model.AppMetaData
+import com.reown.android.internal.common.model.AppMetaDataType
+import com.reown.android.internal.common.model.Expiry
+import com.reown.android.internal.common.model.Pairing
+import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface
+import com.reown.android.internal.common.storage.pairing.PairingStorageRepository
+import com.reown.android.internal.common.storage.pairing.PairingStorageRepositoryInterface
+import com.reown.android.pairing.model.pairingExpiry
+import com.reown.android.sdk.storage.data.dao.JsonRpcHistoryQueries
+import com.reown.foundation.common.model.Topic
+import com.reown.foundation.util.Logger
+import com.reown.sign.engine.model.mapper.toSessionFfi
+import com.reown.sign.engine.model.mapper.toVO
+import com.reown.sign.storage.sequence.SessionStorageRepository
+import com.reown.util.bytesToHex
+import com.reown.util.hexToBytes
+import com.reown.utils.isSequenceValid
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import com.reown.android.internal.common.model.TransportType as InternalTransportType
+import uniffi.yttrium.PairingFfi
+import uniffi.yttrium.SessionFfi
+import uniffi.yttrium.StorageFfi
+import uniffi.yttrium.TransportType
+
+internal class SignStorage(
+    private val metadataStorage: MetadataStorageRepositoryInterface,
+    private val sessionStorage: SessionStorageRepository,
+    private val pairingStorage: PairingStorageRepositoryInterface,
+    private val selfAppMetaData: AppMetaData,
+    private val jsonRpcHistoryQueries: JsonRpcHistoryQueries,
+    private val logger: Logger,
+) : StorageFfi {
+    private val coroutineExceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        println("kobe: SignStorage coroutine error: $throwable")
+    }
+
+    private val ioScope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO + coroutineExceptionHandler)
+
+    override fun doesJsonRpcExist(requestId: ULong): Boolean {
+        return runBlocking {
+            println("bary: SessionStore: doesJsonRpcExist: $requestId")
+
+            !jsonRpcHistoryQueries.doesJsonRpcNotExist(requestId.toLong()).executeAsOne().also { println("bary: does exist: ${!it}") }
+        }
+    }
+
+    override fun insertJsonRpcHistory(
+        requestId: ULong,
+        topic: String,
+        method: String,
+        body: String,
+        transportType: TransportType?
+    ) {
+        ioScope.launch {
+            println("bary: SessionStore: insertJsonRpcHistory: $requestId, $topic, $method, $body, $transportType")
+
+            try {
+                jsonRpcHistoryQueries.insertOrAbortJsonRpcHistory(requestId.toLong(), topic, method, body, transportType.toInternal())
+                jsonRpcHistoryQueries.selectLastInsertedRowId().executeAsOne() > 0L
+            } catch (e: Exception) {
+                logger.error("kobe: insert history error: $e")
+            }
+        }
+    }
+
+    override fun updateJsonRpcHistoryResponse(requestId: ULong, response: String) {
+        ioScope.launch {
+            println("bary: SessionStore: updateJsonRpcHistoryResponse: $requestId, $response")
+
+            val record = jsonRpcHistoryQueries.getJsonRpcHistoryRecord(requestId.toLong(), mapper = ::toRecord).executeAsOneOrNull()
+            
+            when {
+                record == null -> {
+                    logger.log("bary: No JsonRpcRequest matching response")
+                }
+                record.response.isNullOrBlank() -> {
+                    logger.log("bary: INSERTING RESPONSE: ${requestId.toLong()}")
+                    jsonRpcHistoryQueries.updateJsonRpcHistory(response = response, request_id = requestId.toLong())
+                }
+                else -> {
+                    logger.log("bary: Duplicated JsonRpc RequestId: $requestId")
+                }
+            }
+        }
+    }
+
+    override fun deleteJsonRpcHistoryByTopic(topic: String) {
+        ioScope.launch {
+            println("bary: SessionStore: deleteJsonRpcHistoryByTopic: $topic")
+
+            jsonRpcHistoryQueries.deleteJsonRpcHistory(topic)
+        }
+    }
+
+    override fun addSession(session: SessionFfi) {
+        ioScope.launch {
+            println("kobe: SessionStore: addSession: $session")
+
+            val sessionVO = session.toVO()
+
+            println("kobe: insert: ${sessionVO.symKey}")
+
+            sessionStorage.insertSession(session = sessionVO, requestId = session.requestId.toLong())
+
+
+            println("kobe: insert self metadata: ${selfAppMetaData}")
+            metadataStorage.insertOrAbortMetadata(
+                topic = sessionVO.topic,
+                appMetaData = selfAppMetaData,
+                appMetaDataType = AppMetaDataType.SELF
+            )
+
+            println("kobe: insert peer metadata: ${sessionVO.peerAppMetaData!!}")
+            metadataStorage.insertOrAbortMetadata(
+                topic = sessionVO.topic,
+                appMetaData = sessionVO.peerAppMetaData,
+                appMetaDataType = AppMetaDataType.PEER
+            )
+        }
+    }
+
+    override fun getAllSessions(): List<SessionFfi> {
+        return runBlocking {
+            println("kobe: SessionStore: get all sessions")
+
+            sessionStorage.getListOfSessionVOsWithoutMetadata()
+                .filter { session -> session.isAcknowledged && session.expiry.isSequenceValid() }
+                .map { session ->
+                    session.copy(
+                        selfAppMetaData = selfAppMetaData,
+                        peerAppMetaData = metadataStorage.getByTopicAndType(session.topic, AppMetaDataType.PEER)
+                    )
+                }
+                .map { session -> session.toSessionFfi() }
+        }
+    }
+
+    override fun getSession(topic: String): SessionFfi? {
+        return runBlocking {
+            println("kobe: SessionStore: get session: $topic")
+
+            sessionStorage.getSessionWithoutMetadataByTopic(topic = Topic(topic))
+                .run {
+                    println("kobe: session: $this")
+                    val peerAppMetaData = metadataStorage.getByTopicAndType(this.topic, AppMetaDataType.PEER)
+                    println("kobe: metadata: $peerAppMetaData")
+                    this.copy(
+                        selfAppMetaData = selfAppMetaData,
+                        peerAppMetaData = peerAppMetaData
+                    )
+                }.toSessionFfi().also { println("kobe: sessionFfi: $it") }
+        }
+    }
+
+    override fun getAllTopics(): List<uniffi.yttrium.Topic> {
+        return runBlocking {
+            println("kobe: SessionStore: getAllTopics")
+
+            val sessionTopics =
+                sessionStorage.getListOfSessionVOsWithoutMetadata().map { it.topic.value }.also { println("kobe: session topics: $it") }
+            val pairingTopics = pairingStorage.getListOfPairings().map { it.topic.value }.also { println("kobe: pairing topics: $it") }
+
+            (sessionTopics + pairingTopics).also { println("kobe: all topics: $it") }
+        }
+    }
+
+
+    override fun getDecryptionKeyForTopic(topic: String): ByteArray? {
+        return runBlocking {
+            println("kobe: SessionStore: getDecryptionKeyForTopic: $topic")
+
+            try {
+                val symKeyHex = sessionStorage.getSymKeyByTopic(Topic(topic))
+
+                if (symKeyHex.isNullOrBlank()) {
+                    pairingStorage.getPairingOrNullByTopic(Topic(topic))?.symKey?.also { println("kobe: Pairing symKey: $it") }?.hexToBytes()
+                } else {
+                    println("kobe: SymKey: $symKeyHex")
+
+                    symKeyHex.hexToBytes()
+                }
+
+            } catch (e: Exception) {
+                println("kobe: error: $e")
+                ByteArray(0)
+            }
+        }
+    }
+
+    override fun savePartialSession(topic: String, symKey: ByteArray) {
+        ioScope.launch {
+            println("kobe: SessionStore: savePartialSession: topic=$topic")
+
+            sessionStorage.insertPartialSession(topic = topic, symKey = symKey.bytesToHex())
+        }
+    }
+
+    override fun deleteSession(topic: String) {
+        ioScope.launch {
+            println("kobe: SessionStore: deleteSession: $topic")
+
+            jsonRpcHistoryQueries.deleteJsonRpcHistory(topic)
+            metadataStorage.deleteMetaData(Topic(topic))
+            sessionStorage.deleteSession(topic = Topic(topic))
+        }
+    }
+
+    override fun getPairing(topic: String, rpcId: ULong): PairingFfi? {
+        return runBlocking {
+            println("kobe: SessionStore: getPairing: topic=$topic, rpcId=$rpcId")
+
+            val pairing = pairingStorage.getPairingOrNullByTopicAndRpcId(Topic(topic), rpcId.toLong())
+            pairing?.toPairingFfi()
+        }
+    }
+
+    override fun savePairing(topic: String, rpcId: ULong, symKey: ByteArray, selfKey: ByteArray) {
+        ioScope.launch {
+
+            println("kobe: SessionStore: savePairing: topic=$topic, rpcId=$rpcId")
+
+            val pairing = Pairing(
+                topic = Topic(topic),
+                expiry = Expiry(pairingExpiry),
+                relayProtocol = "irn", // Default relay protocol
+                relayData = null,
+                uri = "", // Will be set when needed
+                isProposalReceived = false,
+                methods = null,
+                selfPublicKey = selfKey.bytesToHex(),
+                symKey = symKey.bytesToHex(),
+                rpcId = rpcId.toLong()
+            )
+
+            pairingStorage.insertPairing(pairing)
+        }
+    }
+
+
+    // Extension function to convert Pairing to PairingFfi
+    private fun Pairing.toPairingFfi(): PairingFfi {
+        return PairingFfi(
+            rpcId = rpcId?.toULong() ?: (-1L).toULong(),
+            selfKey = selfPublicKey?.hexToBytes() ?: ByteArray(0),
+            symKey = symKey?.hexToBytes() ?: ByteArray(0)
+        )
+    }
+
+    // Map yttrium TransportType to internal TransportType
+    private fun TransportType?.toInternal(): InternalTransportType? = when (this) {
+        null -> null
+        TransportType.RELAY -> InternalTransportType.RELAY
+        TransportType.LINK_MODE -> InternalTransportType.LINK_MODE
+    }
+
+    private fun toRecord(requestId: Long, topic: String, method: String, body: String, response: String?, transportType: InternalTransportType?): JsonRpcHistoryRecord =
+        JsonRpcHistoryRecord(requestId, topic, method, body, response, transportType)
+}
\ No newline at end of file
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/proposal/ProposalVO.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/proposal/ProposalVO.kt
index e639767c9a..c0cfa77357 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/proposal/ProposalVO.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/proposal/ProposalVO.kt
@@ -21,7 +21,8 @@ internal data class ProposalVO(
     val proposerPublicKey: String,
     val relayProtocol: String,
     val relayData: String?,
-    val expiry: Expiry?
+    val expiry: Expiry?,
+    val pairingSymKey: String
 ) {
     val appMetaData: AppMetaData
         get() = AppMetaData(name = name, description = description, url = url, icons = icons, redirect = Redirect(native = redirect))
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/sequence/SessionVO.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/sequence/SessionVO.kt
index 3707a236cd..628db13eae 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/sequence/SessionVO.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/sequence/SessionVO.kt
@@ -33,7 +33,8 @@ internal data class SessionVO(
     val scopedProperties: Map<String, String>? = null,
     val isAcknowledged: Boolean,
     val pairingTopic: String,
-    val transportType: TransportType?
+    val transportType: TransportType?,
+    val symKey: String? = null
 ) : Sequence {
     val isPeerController: Boolean = peerPublicKey?.keyAsHex == controllerKey?.keyAsHex
     val isSelfController: Boolean = selfPublicKey.keyAsHex == controllerKey?.keyAsHex
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/di/CallsModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/CallsModule.kt
index d535077706..c0f6826b04 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/di/CallsModule.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/CallsModule.kt
@@ -20,7 +20,6 @@ import com.reown.sign.engine.use_case.calls.FormatAuthenticateMessageUseCaseInte
 import com.reown.sign.engine.use_case.calls.GetListOfVerifyContextsUseCase
 import com.reown.sign.engine.use_case.calls.GetListOfVerifyContextsUseCaseInterface
 import com.reown.sign.engine.use_case.calls.GetNamespacesFromReCaps
-import com.reown.sign.engine.use_case.calls.GetPairingForSessionAuthenticateUseCase
 import com.reown.sign.engine.use_case.calls.GetPairingsUseCase
 import com.reown.sign.engine.use_case.calls.GetPairingsUseCaseInterface
 import com.reown.sign.engine.use_case.calls.GetSessionProposalsUseCase
@@ -59,27 +58,28 @@ internal fun callsModule() = module {
 
     single<ProposeSessionUseCaseInterface> {
         ProposeSessionUseCase(
-            jsonRpcInteractor = get(),
+//            jsonRpcInteractor = get(),
             crypto = get(),
             selfAppMetaData = get(),
             proposalStorageRepository = get(),
-            logger = get(named(AndroidCommonDITags.LOGGER))
+            logger = get(named(AndroidCommonDITags.LOGGER)),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT)),
         )
     }
 
     single<SessionAuthenticateUseCaseInterface> {
         SessionAuthenticateUseCase(
-            jsonRpcInteractor = get(),
+//            jsonRpcInteractor = get(),
             crypto = get(),
             selfAppMetaData = get(),
             authenticateResponseTopicRepository = get(),
             proposeSessionUseCase = get(),
-            getPairingForSessionAuthenticate = get(),
+//            getPairingForSessionAuthenticate = get(),
             getNamespacesFromReCaps = get(),
-            linkModeJsonRpcInteractor = get<LinkModeJsonRpcInteractorInterface>(),
+//            linkModeJsonRpcInteractor = get<LinkModeJsonRpcInteractorInterface>(),
             linkModeStorageRepository = get(),
-            insertEventUseCase = get(),
-            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
+//            insertEventUseCase = get(),
+//            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
             logger = get(named(AndroidCommonDITags.LOGGER))
         )
     }
@@ -91,18 +91,20 @@ internal fun callsModule() = module {
             proposalStorageRepository = get(),
             selfAppMetaData = get(),
             crypto = get(),
-            jsonRpcInteractor = get(),
+//            jsonRpcInteractor = get(),
             metadataStorageRepository = get(),
             sessionStorageRepository = get(),
             verifyContextStorageRepository = get(),
-            insertEventUseCase = get(),
-            logger = get(named(AndroidCommonDITags.LOGGER))
+//            insertEventUseCase = get(),
+            logger = get(named(AndroidCommonDITags.LOGGER)),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT)),
+            pairingRepository = get()
         )
     }
 
     single<ApproveSessionAuthenticateUseCaseInterface> {
         ApproveSessionAuthenticateUseCase(
-            jsonRpcInteractor = get(),
+//            jsonRpcInteractor = get(),
             crypto = get(),
             cacaoVerifier = get(),
             logger = get(named(AndroidCommonDITags.LOGGER)),
@@ -112,22 +114,22 @@ internal fun callsModule() = module {
             sessionStorageRepository = get(),
             metadataStorageRepository = get(),
             insertTelemetryEventUseCase = get(),
-            insertEventUseCase = get(),
-            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
-            linkModeJsonRpcInteractor = get<LinkModeJsonRpcInteractorInterface>()
+//            insertEventUseCase = get(),
+//            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
+//            linkModeJsonRpcInteractor = get<LinkModeJsonRpcInteractorInterface>()
         )
     }
 
     single<RejectSessionAuthenticateUseCaseInterface> {
         RejectSessionAuthenticateUseCase(
-            jsonRpcInteractor = get(),
+//            jsonRpcInteractor = get(),
             crypto = get(),
             logger = get(named(AndroidCommonDITags.LOGGER)),
             verifyContextStorageRepository = get(),
             getPendingSessionAuthenticateRequest = get(),
-            linkModeJsonRpcInteractor = get<LinkModeJsonRpcInteractorInterface>(),
-            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
-            insertEventUseCase = get()
+//            linkModeJsonRpcInteractor = get<LinkModeJsonRpcInteractorInterface>(),
+//            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
+//            insertEventUseCase = get()
         )
     }
 
@@ -135,40 +137,50 @@ internal fun callsModule() = module {
         RejectSessionUseCase(
             verifyContextStorageRepository = get(),
             proposalStorageRepository = get(),
-            jsonRpcInteractor = get(),
-            logger = get(named(AndroidCommonDITags.LOGGER))
+//            jsonRpcInteractor = get(),
+            logger = get(named(AndroidCommonDITags.LOGGER)),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT)),
         )
     }
 
-    single<SessionUpdateUseCaseInterface> { SessionUpdateUseCase(jsonRpcInteractor = get(), sessionStorageRepository = get(), logger = get(named(AndroidCommonDITags.LOGGER))) }
+    single<SessionUpdateUseCaseInterface> {
+        SessionUpdateUseCase(
+//            jsonRpcInteractor = get(),
+            sessionStorageRepository = get(),
+            logger = get(named(AndroidCommonDITags.LOGGER)),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT))
+        )
+    }
 
     single<SessionRequestUseCaseInterface> {
         SessionRequestUseCase(
-            jsonRpcInteractor = get(),
+//            jsonRpcInteractor = get(),
             sessionStorageRepository = get(),
-            linkModeJsonRpcInteractor = get(),
+//            linkModeJsonRpcInteractor = get(),
             metadataStorageRepository = get(),
-            insertEventUseCase = get(),
-            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
+//            insertEventUseCase = get(),
+//            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
             logger = get(named(AndroidCommonDITags.LOGGER)),
-            tvf = get(),
+//            tvf = get(),
             walletServiceFinder = get(),
-            walletServiceRequester = get()
+            walletServiceRequester = get(),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT))
         )
     }
 
     single<RespondSessionRequestUseCaseInterface> {
         RespondSessionRequestUseCase(
-            jsonRpcInteractor = get(),
+//            jsonRpcInteractor = get(),
             verifyContextStorageRepository = get(),
             sessionStorageRepository = get(),
-            logger = get(named(AndroidCommonDITags.LOGGER)),
-            getPendingJsonRpcHistoryEntryByIdUseCase = get(),
-            linkModeJsonRpcInteractor = get(),
+//            logger = get(named(AndroidCommonDITags.LOGGER)),
+//            getPendingJsonRpcHistoryEntryByIdUseCase = get(),
+//            linkModeJsonRpcInteractor = get(),
             metadataStorageRepository = get(),
-            insertEventUseCase = get(),
-            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
-            tvf = get()
+//            insertEventUseCase = get(),
+//            clientId = get(named(AndroidCommonDITags.CLIENT_ID)),
+//            tvf = get(),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT))
         )
     }
 
@@ -180,29 +192,69 @@ internal fun callsModule() = module {
             pushMessageStorage = get(),
         )
 
-        get<MutableMap<String, DecryptMessageUseCaseInterface>>(named(AndroidCommonDITags.DECRYPT_USE_CASES))[Tags.SESSION_PROPOSE.id.toString()] = useCase
+        get<MutableMap<String, DecryptMessageUseCaseInterface>>(named(AndroidCommonDITags.DECRYPT_USE_CASES))[Tags.SESSION_PROPOSE.id.toString()] =
+            useCase
         useCase
     }
 
-    single<PingUseCaseInterface> { PingUseCase(sessionStorageRepository = get(), jsonRpcInteractor = get(), logger = get(named(AndroidCommonDITags.LOGGER))) }
+    single<PingUseCaseInterface> {
+        PingUseCase(
+            sessionStorageRepository = get(),
+//            jsonRpcInteractor = get(),
+            logger = get(named(AndroidCommonDITags.LOGGER))
+        )
+    }
 
-    single<EmitEventUseCaseInterface> { EmitEventUseCase(jsonRpcInteractor = get(), sessionStorageRepository = get(), logger = get(named(AndroidCommonDITags.LOGGER))) }
+    single<EmitEventUseCaseInterface> {
+        EmitEventUseCase(
+//            jsonRpcInteractor = get(),
+            sessionStorageRepository = get(),
+            logger = get(named(AndroidCommonDITags.LOGGER)),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT))
+        )
+    }
 
-    single<ExtendSessionUseCaseInterface> { ExtendSessionUseCase(jsonRpcInteractor = get(), sessionStorageRepository = get(), logger = get(named(AndroidCommonDITags.LOGGER))) }
+    single<ExtendSessionUseCaseInterface> {
+        ExtendSessionUseCase(
+//            jsonRpcInteractor = get(),
+            sessionStorageRepository = get(),
+            logger = get(named(AndroidCommonDITags.LOGGER)),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT))
+        )
+    }
 
-    single<DisconnectSessionUseCaseInterface> { DisconnectSessionUseCase(jsonRpcInteractor = get(), sessionStorageRepository = get(), logger = get(named(AndroidCommonDITags.LOGGER))) }
+    single<DisconnectSessionUseCaseInterface> {
+        DisconnectSessionUseCase(
+//            jsonRpcInteractor = get(),
+            sessionStorageRepository = get(),
+            logger = get(named(AndroidCommonDITags.LOGGER)),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT))
+        )
+    }
 
-    single<GetSessionsUseCaseInterface> { GetSessionsUseCase(sessionStorageRepository = get(), metadataStorageRepository = get(), selfAppMetaData = get()) }
+    single<GetSessionsUseCaseInterface> {
+        GetSessionsUseCase(
+            sessionStorageRepository = get(),
+            metadataStorageRepository = get(),
+            selfAppMetaData = get()
+        )
+    }
 
-    single<GetPairingsUseCaseInterface> { GetPairingsUseCase(pairingInterface = get()) }
+//    single<GetPairingsUseCaseInterface> { GetPairingsUseCase(pairingInterface = get()) }
 
-    single { GetPairingForSessionAuthenticateUseCase(pairingProtocol = get()) }
+//    single { GetPairingForSessionAuthenticateUseCase(pairingProtocol = get()) }
 
     single { GetNamespacesFromReCaps() }
 
-    single<GetPendingRequestsUseCaseByTopicInterface> { GetPendingRequestsUseCaseByTopic(serializer = get(), jsonRpcHistory = get()) }
-
-    single<GetPendingSessionRequestByTopicUseCaseInterface> { GetPendingSessionRequestByTopicUseCase(jsonRpcHistory = get(), serializer = get(), metadataStorageRepository = get()) }
+//    single<GetPendingRequestsUseCaseByTopicInterface> { GetPendingRequestsUseCaseByTopic(serializer = get(), jsonRpcHistory = get()) }
+//
+//    single<GetPendingSessionRequestByTopicUseCaseInterface> {
+//        GetPendingSessionRequestByTopicUseCase(
+//            jsonRpcHistory = get(),
+//            serializer = get(),
+//            metadataStorageRepository = get()
+//        )
+//    }
 
     single<GetSessionProposalsUseCaseInterface> { GetSessionProposalsUseCase(proposalStorageRepository = get()) }
 
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/di/EngineModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/EngineModule.kt
index 202d856e96..76f45444e6 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/di/EngineModule.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/EngineModule.kt
@@ -4,43 +4,42 @@ package com.reown.sign.di
 
 import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.android.internal.common.signing.cacao.CacaoVerifier
+import com.reown.sign.client.SignListener
+import com.reown.sign.client.SignStorage
 import com.reown.sign.engine.domain.SignEngine
 import com.reown.sign.engine.domain.wallet_service.WalletServiceFinder
 import com.reown.sign.engine.domain.wallet_service.WalletServiceRequester
 import com.reown.sign.engine.model.tvf.TVF
-import com.reown.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCase
-import com.reown.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCaseInterface
-import com.reown.sign.json_rpc.domain.DeleteRequestByIdUseCase
-import com.reown.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase
-import com.reown.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest
-import com.reown.sign.json_rpc.domain.GetPendingSessionRequests
-import com.reown.sign.json_rpc.domain.GetSessionAuthenticateRequest
-import com.reown.sign.json_rpc.domain.GetSessionRequestByIdUseCase
 import okhttp3.OkHttpClient
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
+import uniffi.yttrium.StorageFfi
 import java.util.concurrent.TimeUnit
 
 @JvmSynthetic
 internal fun engineModule() = module {
 
-    includes(callsModule(), requestsModule(), responsesModule())
+    includes(
+        callsModule(),
+        requestsModule(),
+        responsesModule()
+    )
 
     single { TVF(moshi = get(named(AndroidCommonDITags.MOSHI))) }
 
-    single { GetPendingSessionRequests(jsonRpcHistory = get(), serializer = get()) }
+//    single { GetPendingSessionRequests(jsonRpcHistory = get(), serializer = get()) }
 
-    single<GetPendingAuthenticateRequestUseCaseInterface> { GetPendingAuthenticateRequestUseCase(jsonRpcHistory = get(), serializer = get()) }
+//    single<GetPendingAuthenticateRequestUseCaseInterface> { GetPendingAuthenticateRequestUseCase(jsonRpcHistory = get(), serializer = get()) }
 
-    single { DeleteRequestByIdUseCase(jsonRpcHistory = get(), verifyContextStorageRepository = get()) }
+//    single { DeleteRequestByIdUseCase(jsonRpcHistory = get(), verifyContextStorageRepository = get()) }
 
-    single { GetPendingJsonRpcHistoryEntryByIdUseCase(jsonRpcHistory = get(), serializer = get()) }
+//    single { GetPendingJsonRpcHistoryEntryByIdUseCase(jsonRpcHistory = get(), serializer = get()) }
 
-    single { GetSessionRequestByIdUseCase(jsonRpcHistory = get(), serializer = get()) }
+//    single { GetSessionRequestByIdUseCase(jsonRpcHistory = get(), serializer = get()) }
 
-    single { GetPendingSessionAuthenticateRequest(jsonRpcHistory = get(), serializer = get()) }
+//    single { GetPendingSessionAuthenticateRequest(jsonRpcHistory = get(), serializer = get()) }
 
-    single { GetSessionAuthenticateRequest(jsonRpcHistory = get(), serializer = get()) }
+//    single { GetSessionAuthenticateRequest(jsonRpcHistory = get(), serializer = get()) }
 
     single { CacaoVerifier(projectId = get()) }
 
@@ -56,59 +55,82 @@ internal fun engineModule() = module {
         )
     }
 
+    single<StorageFfi> {
+        SignStorage(
+            sessionStorage = get(),
+            metadataStorage = get(),
+            selfAppMetaData = get(),
+            pairingStorage = get(),
+            jsonRpcHistoryQueries = get(),
+            logger = get(named(AndroidCommonDITags.LOGGER))
+        )
+    }
+
+    single {
+        SignListener(
+            sessionStorage = get(),
+            metadataStorage = get(),
+            getSessionRequestByIdUseCase = get()
+        )
+    }
+
     single {
         SignEngine(
-            verifyContextStorageRepository = get(),
-            jsonRpcInteractor = get(),
-            crypto = get(),
-            authenticateResponseTopicRepository = get(),
+            signListener = get(),
+//            verifyContextStorageRepository = get(),
+//            jsonRpcInteractor = get(),
+//            crypto = get(),
+//            authenticateResponseTopicRepository = get(),
             proposalStorageRepository = get(),
-            authenticateSessionUseCase = get(),
+//            authenticateSessionUseCase = get(),
             sessionStorageRepository = get(),
             metadataStorageRepository = get(),
             approveSessionUseCase = get(),
             disconnectSessionUseCase = get(),
             emitEventUseCase = get(),
             extendSessionUseCase = get(),
-            decryptMessageUseCase = get(named(AndroidCommonDITags.DECRYPT_SIGN_MESSAGE)),
-            getListOfVerifyContextsUseCase = get(),
-            getPairingsUseCase = get(),
-            getPendingRequestsByTopicUseCase = get(),
-            getPendingSessionRequests = get(),
+//            decryptMessageUseCase = get(named(AndroidCommonDITags.DECRYPT_SIGN_MESSAGE)),
+//            getListOfVerifyContextsUseCase = get(),
+//            getPairingsUseCase = get(),
+//            getPendingRequestsByTopicUseCase = get(),
+//            getPendingSessionRequests = get(),
             getSessionProposalsUseCase = get(),
             getSessionsUseCase = get(),
-            onPingUseCase = get(),
-            getVerifyContextByIdUseCase = get(),
-            onSessionDeleteUseCase = get(),
-            onSessionEventUseCase = get(),
-            onSessionExtendUseCase = get(),
-            getPendingSessionRequestByTopicUseCase = get(),
-            onSessionProposalResponseUseCase = get(),
-            onSessionProposeUse = get(),
-            onSessionRequestResponseUseCase = get(),
-            onSessionRequestUseCase = get(),
-            onSessionSettleResponseUseCase = get(),
-            onSessionSettleUseCase = get(),
-            onSessionUpdateResponseUseCase = get(),
-            onSessionUpdateUseCase = get(),
-            pairingController = get(),
-            pairUseCase = get(),
-            pingUseCase = get(),
+//            onPingUseCase = get(),
+//            getVerifyContextByIdUseCase = get(),
+//            onSessionDeleteUseCase = get(),
+//            onSessionEventUseCase = get(),
+//            onSessionExtendUseCase = get(),
+//            getPendingSessionRequestByTopicUseCase = get(),
+//            onSessionProposalResponseUseCase = get(),
+//            onSessionProposeUse = get(),
+            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT)),
+//            onSessionRequestResponseUseCase = get(),
+//            onSessionRequestUseCase = get(),
+//            onSessionSettleResponseUseCase = get(),
+//            onSessionSettleUseCase = get(),
+//            onSessionUpdateResponseUseCase = get(),
+//            onSessionUpdateUseCase = get(),
+//            pairingController = get(),
+//            pairUseCase = get(),
+//            pingUseCase = get(),
             proposeSessionUseCase = get(),
             rejectSessionUseCase = get(),
             respondSessionRequestUseCase = get(),
             sessionRequestUseCase = get(),
             sessionUpdateUseCase = get(),
-            onAuthenticateSessionUseCase = get(),
-            onSessionAuthenticateResponseUseCase = get(),
-            approveSessionAuthenticateUseCase = get(),
-            rejectSessionAuthenticateUseCase = get(),
-            formatAuthenticateMessageUseCase = get(),
-            deleteRequestByIdUseCase = get(),
-            getPendingAuthenticateRequestUseCase = get(),
-            insertEventUseCase = get(),
-            linkModeJsonRpcInteractor = get(),
-            logger = get(named(AndroidCommonDITags.LOGGER))
+//            onAuthenticateSessionUseCase = get(),
+//            onSessionAuthenticateResponseUseCase = get(),
+//            approveSessionAuthenticateUseCase = get(),
+//            rejectSessionAuthenticateUseCase = get(),
+//            formatAuthenticateMessageUseCase = get(),
+//            deleteRequestByIdUseCase = get(),
+//            getPendingAuthenticateRequestUseCase = get(),
+//            insertEventUseCase = get(),
+//            linkModeJsonRpcInteractor = get(),
+//            logger = get(named(AndroidCommonDITags.LOGGER)),
+//            signClient = get(named(AndroidCommonDITags.SIGN_RUST_CLIENT)),
+//            signStorage = get()
         )
     }
 }
\ No newline at end of file
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt
index 743ab81a1b..dd78404d97 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt
@@ -2,171 +2,120 @@
 
 package com.reown.sign.engine.domain
 
-import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository
-import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface
-import com.reown.android.internal.common.model.AppMetaDataType
-import com.reown.android.internal.common.model.SDKError
-import com.reown.android.internal.common.model.Validation
+import com.reown.android.internal.Validator
 import com.reown.android.internal.common.model.type.EngineEvent
-import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
+import com.reown.android.internal.common.model.Validation
 import com.reown.android.internal.common.scope
 import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface
-import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository
-import com.reown.android.internal.utils.CoreValidator.isExpired
-import com.reown.android.pairing.handler.PairingControllerInterface
-import com.reown.android.pulse.domain.InsertTelemetryEventUseCase
-import com.reown.android.pulse.model.EventType
-import com.reown.android.pulse.model.Trace
-import com.reown.android.pulse.model.properties.Properties
-import com.reown.android.pulse.model.properties.Props
-import com.reown.android.push.notifications.DecryptMessageUseCaseInterface
-import com.reown.android.relay.WSSConnectionState
-import com.reown.android.verify.model.VerifyContext
-import com.reown.foundation.util.Logger
-import com.reown.sign.common.model.vo.clientsync.session.params.SignParams
+import com.reown.sign.client.SignListener
 import com.reown.sign.engine.model.EngineDO
 import com.reown.sign.engine.model.mapper.toEngineDO
-import com.reown.sign.engine.model.mapper.toExpiredProposal
-import com.reown.sign.engine.model.mapper.toExpiredSessionRequest
-import com.reown.sign.engine.model.mapper.toSessionRequest
-import com.reown.sign.engine.sessionRequestEventsQueue
-import com.reown.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCaseInterface
+import com.reown.sign.engine.model.mapper.toVO
 import com.reown.sign.engine.use_case.calls.ApproveSessionUseCaseInterface
 import com.reown.sign.engine.use_case.calls.DisconnectSessionUseCaseInterface
 import com.reown.sign.engine.use_case.calls.EmitEventUseCaseInterface
 import com.reown.sign.engine.use_case.calls.ExtendSessionUseCaseInterface
-import com.reown.sign.engine.use_case.calls.FormatAuthenticateMessageUseCaseInterface
-import com.reown.sign.engine.use_case.calls.GetListOfVerifyContextsUseCaseInterface
-import com.reown.sign.engine.use_case.calls.GetPairingsUseCaseInterface
-import com.reown.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCaseInterface
 import com.reown.sign.engine.use_case.calls.GetSessionProposalsUseCaseInterface
 import com.reown.sign.engine.use_case.calls.GetSessionsUseCaseInterface
-import com.reown.sign.engine.use_case.calls.GetVerifyContextByIdUseCaseInterface
-import com.reown.sign.engine.use_case.calls.PairUseCaseInterface
-import com.reown.sign.engine.use_case.calls.PingUseCaseInterface
 import com.reown.sign.engine.use_case.calls.ProposeSessionUseCaseInterface
-import com.reown.sign.engine.use_case.calls.RejectSessionAuthenticateUseCaseInterface
 import com.reown.sign.engine.use_case.calls.RejectSessionUseCaseInterface
 import com.reown.sign.engine.use_case.calls.RespondSessionRequestUseCaseInterface
-import com.reown.sign.engine.use_case.calls.SessionAuthenticateUseCaseInterface
 import com.reown.sign.engine.use_case.calls.SessionRequestUseCaseInterface
 import com.reown.sign.engine.use_case.calls.SessionUpdateUseCaseInterface
-import com.reown.sign.engine.use_case.requests.OnPingUseCase
-import com.reown.sign.engine.use_case.requests.OnSessionAuthenticateUseCase
-import com.reown.sign.engine.use_case.requests.OnSessionDeleteUseCase
-import com.reown.sign.engine.use_case.requests.OnSessionEventUseCase
-import com.reown.sign.engine.use_case.requests.OnSessionExtendUseCase
-import com.reown.sign.engine.use_case.requests.OnSessionProposalUseCase
-import com.reown.sign.engine.use_case.requests.OnSessionRequestUseCase
-import com.reown.sign.engine.use_case.requests.OnSessionSettleUseCase
-import com.reown.sign.engine.use_case.requests.OnSessionUpdateUseCase
-import com.reown.sign.engine.use_case.responses.OnSessionAuthenticateResponseUseCase
-import com.reown.sign.engine.use_case.responses.OnSessionProposalResponseUseCase
-import com.reown.sign.engine.use_case.responses.OnSessionRequestResponseUseCase
-import com.reown.sign.engine.use_case.responses.OnSessionSettleResponseUseCase
-import com.reown.sign.engine.use_case.responses.OnSessionUpdateResponseUseCase
-import com.reown.sign.json_rpc.domain.DeleteRequestByIdUseCase
-import com.reown.sign.json_rpc.domain.GetPendingRequestsUseCaseByTopicInterface
-import com.reown.sign.json_rpc.domain.GetPendingSessionRequestByTopicUseCaseInterface
-import com.reown.sign.json_rpc.domain.GetPendingSessionRequests
-import com.reown.sign.json_rpc.model.JsonRpcMethod
-import com.reown.sign.storage.authenticate.AuthenticateResponseTopicRepository
 import com.reown.sign.storage.proposal.ProposalStorageRepository
 import com.reown.sign.storage.sequence.SessionStorageRepository
-import com.reown.utils.Empty
-import com.reown.utils.isSequenceValid
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.SignClient
 
 internal class SignEngine(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
-    private val getPendingRequestsByTopicUseCase: GetPendingRequestsUseCaseByTopicInterface,
-    private val getPendingSessionRequestByTopicUseCase: GetPendingSessionRequestByTopicUseCaseInterface,
-    private val getPendingSessionRequests: GetPendingSessionRequests,
-    private val getPendingAuthenticateRequestUseCase: GetPendingAuthenticateRequestUseCaseInterface,
-    private val deleteRequestByIdUseCase: DeleteRequestByIdUseCase,
-    private val crypto: KeyManagementRepository,
-    private val authenticateResponseTopicRepository: AuthenticateResponseTopicRepository,
+    internal val signListener: SignListener,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val getPendingRequestsByTopicUseCase: GetPendingRequestsUseCaseByTopicInterface,
+//    private val getPendingSessionRequestByTopicUseCase: GetPendingSessionRequestByTopicUseCaseInterface,
+//    private val getPendingSessionRequests: GetPendingSessionRequests,
+//    private val getPendingAuthenticateRequestUseCase: GetPendingAuthenticateRequestUseCaseInterface,
+//    private val deleteRequestByIdUseCase: DeleteRequestByIdUseCase,
+//    private val crypto: KeyManagementRepository,
+//    private val authenticateResponseTopicRepository: AuthenticateResponseTopicRepository,
     private val proposalStorageRepository: ProposalStorageRepository,
     private val sessionStorageRepository: SessionStorageRepository,
     private val metadataStorageRepository: MetadataStorageRepositoryInterface,
-    private val pairingController: PairingControllerInterface,
-    private val verifyContextStorageRepository: VerifyContextStorageRepository,
+//    private val pairingController: PairingControllerInterface,
+//    private val verifyContextStorageRepository: VerifyContextStorageRepository,
     private val proposeSessionUseCase: ProposeSessionUseCaseInterface,
-    private val authenticateSessionUseCase: SessionAuthenticateUseCaseInterface,
-    private val pairUseCase: PairUseCaseInterface,
+//    private val authenticateSessionUseCase: SessionAuthenticateUseCaseInterface,
+//    private val pairUseCase: PairUseCaseInterface,
     private val rejectSessionUseCase: RejectSessionUseCaseInterface,
     private val approveSessionUseCase: ApproveSessionUseCaseInterface,
-    private val approveSessionAuthenticateUseCase: ApproveSessionAuthenticateUseCaseInterface,
-    private val rejectSessionAuthenticateUseCase: RejectSessionAuthenticateUseCaseInterface,
+//    private val approveSessionAuthenticateUseCase: ApproveSessionAuthenticateUseCaseInterface,
+//    private val rejectSessionAuthenticateUseCase: RejectSessionAuthenticateUseCaseInterface,
     private val sessionUpdateUseCase: SessionUpdateUseCaseInterface,
     private val sessionRequestUseCase: SessionRequestUseCaseInterface,
     private val respondSessionRequestUseCase: RespondSessionRequestUseCaseInterface,
-    private val pingUseCase: PingUseCaseInterface,
-    private val formatAuthenticateMessageUseCase: FormatAuthenticateMessageUseCaseInterface,
+//    private val pingUseCase: PingUseCaseInterface,
+//    private val formatAuthenticateMessageUseCase: FormatAuthenticateMessageUseCaseInterface,
     private val emitEventUseCase: EmitEventUseCaseInterface,
     private val extendSessionUseCase: ExtendSessionUseCaseInterface,
     private val disconnectSessionUseCase: DisconnectSessionUseCaseInterface,
-    private val decryptMessageUseCase: DecryptMessageUseCaseInterface,
+//    private val decryptMessageUseCase: DecryptMessageUseCaseInterface,
     private val getSessionsUseCase: GetSessionsUseCaseInterface,
-    private val getPairingsUseCase: GetPairingsUseCaseInterface,
+//    private val getPairingsUseCase: GetPairingsUseCaseInterface,
     private val getSessionProposalsUseCase: GetSessionProposalsUseCaseInterface,
-    private val getVerifyContextByIdUseCase: GetVerifyContextByIdUseCaseInterface,
-    private val getListOfVerifyContextsUseCase: GetListOfVerifyContextsUseCaseInterface,
-    private val onSessionProposeUse: OnSessionProposalUseCase,
-    private val onAuthenticateSessionUseCase: OnSessionAuthenticateUseCase,
-    private val onSessionSettleUseCase: OnSessionSettleUseCase,
-    private val onSessionRequestUseCase: OnSessionRequestUseCase,
-    private val onSessionDeleteUseCase: OnSessionDeleteUseCase,
-    private val onSessionEventUseCase: OnSessionEventUseCase,
-    private val onSessionUpdateUseCase: OnSessionUpdateUseCase,
-    private val onSessionExtendUseCase: OnSessionExtendUseCase,
-    private val onPingUseCase: OnPingUseCase,
-    private val onSessionProposalResponseUseCase: OnSessionProposalResponseUseCase,
-    private val onSessionAuthenticateResponseUseCase: OnSessionAuthenticateResponseUseCase,
-    private val onSessionSettleResponseUseCase: OnSessionSettleResponseUseCase,
-    private val onSessionUpdateResponseUseCase: OnSessionUpdateResponseUseCase,
-    private val onSessionRequestResponseUseCase: OnSessionRequestResponseUseCase,
-    private val insertEventUseCase: InsertTelemetryEventUseCase,
-    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
-    private val logger: Logger
+//    private val getVerifyContextByIdUseCase: GetVerifyContextByIdUseCaseInterface,
+//    private val getListOfVerifyContextsUseCase: GetListOfVerifyContextsUseCaseInterface,
+//    private val onSessionProposeUse: OnSessionProposalUseCase,
+//    private val onAuthenticateSessionUseCase: OnSessionAuthenticateUseCase,
+//    private val onSessionSettleUseCase: OnSessionSettleUseCase,
+//    private val onSessionRequestUseCase: OnSessionRequestUseCase,
+//    private val onSessionDeleteUseCase: OnSessionDeleteUseCase,
+//    private val onSessionEventUseCase: OnSessionEventUseCase,
+//    private val onSessionUpdateUseCase: OnSessionUpdateUseCase,
+//    private val onSessionExtendUseCase: OnSessionExtendUseCase,
+//    private val onPingUseCase: OnPingUseCase,
+//    private val onSessionProposalResponseUseCase: OnSessionProposalResponseUseCase,
+//    private val onSessionAuthenticateResponseUseCase: OnSessionAuthenticateResponseUseCase,
+//    private val onSessionSettleResponseUseCase: OnSessionSettleResponseUseCase,
+//    private val onSessionUpdateResponseUseCase: OnSessionUpdateResponseUseCase,
+//    private val onSessionRequestResponseUseCase: OnSessionRequestResponseUseCase,
+//    private val insertEventUseCase: InsertTelemetryEventUseCase,
+//    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
+//    private val logger: Logger,
+    private val signClient: SignClient,
+//    private val signStorage: SignStorage
 ) : ProposeSessionUseCaseInterface by proposeSessionUseCase,
-    SessionAuthenticateUseCaseInterface by authenticateSessionUseCase,
-    PairUseCaseInterface by pairUseCase,
+//    SessionAuthenticateUseCaseInterface by authenticateSessionUseCase,
+//    PairUseCaseInterface by pairUseCase,
     RejectSessionUseCaseInterface by rejectSessionUseCase,
     ApproveSessionUseCaseInterface by approveSessionUseCase,
-    ApproveSessionAuthenticateUseCaseInterface by approveSessionAuthenticateUseCase,
-    RejectSessionAuthenticateUseCaseInterface by rejectSessionAuthenticateUseCase,
+//    ApproveSessionAuthenticateUseCaseInterface by approveSessionAuthenticateUseCase,
+//    RejectSessionAuthenticateUseCaseInterface by rejectSessionAuthenticateUseCase,
     SessionUpdateUseCaseInterface by sessionUpdateUseCase,
     SessionRequestUseCaseInterface by sessionRequestUseCase,
     RespondSessionRequestUseCaseInterface by respondSessionRequestUseCase,
-    PingUseCaseInterface by pingUseCase,
-    FormatAuthenticateMessageUseCaseInterface by formatAuthenticateMessageUseCase,
+//    PingUseCaseInterface by pingUseCase,
+//    FormatAuthenticateMessageUseCaseInterface by formatAuthenticateMessageUseCase,
     EmitEventUseCaseInterface by emitEventUseCase,
     ExtendSessionUseCaseInterface by extendSessionUseCase,
     DisconnectSessionUseCaseInterface by disconnectSessionUseCase,
-    DecryptMessageUseCaseInterface by decryptMessageUseCase,
+//    DecryptMessageUseCaseInterface by decryptMessageUseCase,
     GetSessionsUseCaseInterface by getSessionsUseCase,
-    GetPairingsUseCaseInterface by getPairingsUseCase,
-    GetPendingRequestsUseCaseByTopicInterface by getPendingRequestsByTopicUseCase,
-    GetPendingAuthenticateRequestUseCaseInterface by getPendingAuthenticateRequestUseCase,
-    GetPendingSessionRequestByTopicUseCaseInterface by getPendingSessionRequestByTopicUseCase,
-    GetSessionProposalsUseCaseInterface by getSessionProposalsUseCase,
-    GetVerifyContextByIdUseCaseInterface by getVerifyContextByIdUseCase,
-    GetListOfVerifyContextsUseCaseInterface by getListOfVerifyContextsUseCase,
-    LinkModeJsonRpcInteractorInterface by linkModeJsonRpcInteractor {
+//    GetPairingsUseCaseInterface by getPairingsUseCase,
+//    GetPendingRequestsUseCaseByTopicInterface by getPendingRequestsByTopicUseCase,
+//    GetPendingAuthenticateRequestUseCaseInterface by getPendingAuthenticateRequestUseCase,
+//    GetPendingSessionRequestByTopicUseCaseInterface by getPendingSessionRequestByTopicUseCase,
+    GetSessionProposalsUseCaseInterface by getSessionProposalsUseCase
+//    GetVerifyContextByIdUseCaseInterface by getVerifyContextByIdUseCase,
+//    GetListOfVerifyContextsUseCaseInterface by getListOfVerifyContextsUseCase
+{
     private var jsonRpcRequestsJob: Job? = null
     private var jsonRpcResponsesJob: Job? = null
 
@@ -178,335 +127,406 @@ internal class SignEngine(
 
     private val _engineEvent: MutableSharedFlow<EngineEvent> = MutableSharedFlow()
     val engineEvent: SharedFlow<EngineEvent> = _engineEvent.asSharedFlow()
-    val wssConnection: StateFlow<WSSConnectionState> = jsonRpcInteractor.wssConnectionState
+    
+    // Resolve diamond inheritance: both ApproveSessionUseCaseInterface and RespondSessionRequestUseCaseInterface have 'events'
+
+//    val wssConnection: StateFlow<WSSConnectionState> = jsonRpcInteractor.wssConnectionState
 
     init {
-        pairingController.register(
-            JsonRpcMethod.WC_SESSION_PROPOSE,
-            JsonRpcMethod.WC_SESSION_AUTHENTICATE,
-            JsonRpcMethod.WC_SESSION_SETTLE,
-            JsonRpcMethod.WC_SESSION_REQUEST,
-            JsonRpcMethod.WC_SESSION_EVENT,
-            JsonRpcMethod.WC_SESSION_DELETE,
-            JsonRpcMethod.WC_SESSION_EXTEND,
-            JsonRpcMethod.WC_SESSION_PING,
-            JsonRpcMethod.WC_SESSION_UPDATE
-        )
-        setupSequenceExpiration()
-        propagatePendingSessionRequestsQueue()
-        emitReceivedPendingRequestsWhilePairingOnTheSameURL()
-        sessionProposalExpiryWatcher()
-        sessionRequestsExpiryWatcher()
+//        pairingController.register(
+//            JsonRpcMethod.WC_SESSION_PROPOSE,
+//            JsonRpcMethod.WC_SESSION_AUTHENTICATE,
+//            JsonRpcMethod.WC_SESSION_SETTLE,
+//            JsonRpcMethod.WC_SESSION_REQUEST,
+//            JsonRpcMethod.WC_SESSION_EVENT,
+//            JsonRpcMethod.WC_SESSION_DELETE,
+//            JsonRpcMethod.WC_SESSION_EXTEND,
+//            JsonRpcMethod.WC_SESSION_PING,
+//            JsonRpcMethod.WC_SESSION_UPDATE
+//        )
+//        setupSequenceExpiration()
+//        propagatePendingSessionRequestsQueue()
+//        emitReceivedPendingRequestsWhilePairingOnTheSameURL()
+//        sessionProposalExpiryWatcher()
+//        sessionRequestsExpiryWatcher()
+
+//        emitSessionProposal()
     }
 
     fun setup() {
-        handleLinkModeRequests()
-        handleLinkModeResponses()
+//        scope.launch {
+////            signClient.registerSignListener(onSessionRequestUseCase)
+//            signClient.start()
+//        }
+
+//        handleLinkModeRequests()
+//        handleLinkModeResponses()
 
         if (signEventsJob == null) {
             signEventsJob = collectSignEvents()
         }
 
-        if (internalErrorsJob == null) {
-            internalErrorsJob = collectInternalErrors()
-        }
+//        if (internalErrorsJob == null) {
+//            internalErrorsJob = collectInternalErrors()
+//        }
 
-        handleRelayRequestsAndResponses()
+//        handleRelayRequestsAndResponses()
     }
 
-    private fun handleRelayRequestsAndResponses() {
-        jsonRpcInteractor.onResubscribe
-            .onEach {
-                scope.launch {
-                    supervisorScope {
-                        launch(Dispatchers.IO) {
-                            resubscribeToSession()
-                            resubscribeToPendingAuthenticateTopics()
-                        }
-                    }
-
-                    if (jsonRpcRequestsJob == null) {
-                        jsonRpcRequestsJob = collectJsonRpcRequests()
-                    }
-
-                    if (jsonRpcResponsesJob == null) {
-                        jsonRpcResponsesJob = collectJsonRpcResponses()
-                    }
-                }
+    private fun collectSignEvents(): Job =
+        merge(
+            signListener.events,
+            respondSessionRequestUseCase.events,
+//            onSessionRequestUseCase.events,
+//            onSessionDeleteUseCase.events,
+//            onSessionProposeUse.events,
+//            onAuthenticateSessionUseCase.events,
+//            onSessionEventUseCase.events,
+//            onSessionSettleUseCase.events,
+//            onSessionUpdateUseCase.events,
+//            onSessionExtendUseCase.events,
+//            onSessionProposalResponseUseCase.events,
+//            onSessionSettleResponseUseCase.events,
+//            onSessionUpdateResponseUseCase.events,
+//            onSessionRequestResponseUseCase.events,
+//            onSessionAuthenticateResponseUseCase.events,
+            sessionRequestUseCase.requestEvents,
+            approveSessionUseCase.approveEvents
+        )
+            .onEach { event ->
+                println("kobe: engine event received: $event")
+                _engineEvent.emit(event)
             }.launchIn(scope)
-    }
 
-    private fun handleLinkModeResponses() {
-        if (envelopeResponsesJob == null) {
-            envelopeResponsesJob = linkModeJsonRpcInteractor.peerResponse
-                .filter { request -> request.params is SignParams }
-                .onEach { response ->
-                    when (val params = response.params) {
-                        is SignParams.SessionAuthenticateParams -> onSessionAuthenticateResponseUseCase(response, params)
-                        is SignParams.SessionRequestParams -> onSessionRequestResponseUseCase(response, params)
-                    }
-                }.launchIn(scope)
-        }
+    private fun handleRelayRequestsAndResponses() {
+//        jsonRpcInteractor.onResubscribe
+//            .onEach {
+//                scope.launch {
+//                    supervisorScope {
+//                        launch(Dispatchers.IO) {
+//                            resubscribeToSession()
+//                            resubscribeToPendingAuthenticateTopics()
+//                        }
+//                    }
+//
+//                    if (jsonRpcRequestsJob == null) {
+//                        jsonRpcRequestsJob = collectJsonRpcRequests()
+//                    }
+//
+//                    if (jsonRpcResponsesJob == null) {
+//                        jsonRpcResponsesJob = collectJsonRpcResponses()
+//                    }
+//                }
+//            }.launchIn(scope)
     }
 
-    private fun handleLinkModeRequests() {
-        if (envelopeRequestsJob == null) {
-            envelopeRequestsJob = linkModeJsonRpcInteractor.clientSyncJsonRpc
-                .filter { request -> request.params is SignParams }
-                .onEach { request ->
-                    when (val requestParams = request.params) {
-                        is SignParams.SessionAuthenticateParams -> onAuthenticateSessionUseCase(request, requestParams)
-                        is SignParams.SessionRequestParams -> onSessionRequestUseCase(request, requestParams)
-                    }
-                }.launchIn(scope)
-        }
-    }
+//    private fun handleLinkModeResponses() {
+//        if (envelopeResponsesJob == null) {
+//            envelopeResponsesJob = linkModeJsonRpcInteractor.peerResponse
+//                .filter { request -> request.params is SignParams }
+//                .onEach { response ->
+//                    when (val params = response.params) {
+//                        is SignParams.SessionAuthenticateParams -> onSessionAuthenticateResponseUseCase(response, params)
+//                        is SignParams.SessionRequestParams -> onSessionRequestResponseUseCase(response, params)
+//                    }
+//                }.launchIn(scope)
+//        }
+//    }
 
-    private fun collectJsonRpcRequests(): Job =
-        jsonRpcInteractor.clientSyncJsonRpc
-            .filter { request -> request.params is SignParams }
-            .onEach { request ->
-                when (val requestParams = request.params) {
-                    is SignParams.SessionProposeParams -> onSessionProposeUse(request, requestParams)
-                    is SignParams.SessionAuthenticateParams -> onAuthenticateSessionUseCase(request, requestParams)
-                    is SignParams.SessionSettleParams -> onSessionSettleUseCase(request, requestParams)
-                    is SignParams.SessionRequestParams -> onSessionRequestUseCase(request, requestParams)
-                    is SignParams.DeleteParams -> onSessionDeleteUseCase(request, requestParams)
-                    is SignParams.EventParams -> onSessionEventUseCase(request, requestParams)
-                    is SignParams.UpdateNamespacesParams -> onSessionUpdateUseCase(request, requestParams)
-                    is SignParams.ExtendParams -> onSessionExtendUseCase(request, requestParams)
-                    is SignParams.PingParams -> onPingUseCase(request)
-                }
-            }.launchIn(scope)
+//    private fun handleLinkModeRequests() {
+//        if (envelopeRequestsJob == null) {
+//            envelopeRequestsJob = linkModeJsonRpcInteractor.clientSyncJsonRpc
+//                .filter { request -> request.params is SignParams }
+//                .onEach { request ->
+//                    when (val requestParams = request.params) {
+//                        is SignParams.SessionAuthenticateParams -> onAuthenticateSessionUseCase(request, requestParams)
+//                        is SignParams.SessionRequestParams -> onSessionRequestUseCase(request, requestParams)
+//                    }
+//                }.launchIn(scope)
+//        }
+//    }
 
-    private fun collectJsonRpcResponses(): Job =
-        jsonRpcInteractor.peerResponse
-            .filter { request -> request.params is SignParams }
-            .onEach { response ->
-                when (val params = response.params) {
-                    is SignParams.SessionProposeParams -> onSessionProposalResponseUseCase(response, params)
-                    is SignParams.SessionAuthenticateParams -> onSessionAuthenticateResponseUseCase(response, params)
-                    is SignParams.SessionSettleParams -> onSessionSettleResponseUseCase(response)
-                    is SignParams.UpdateNamespacesParams -> onSessionUpdateResponseUseCase(response)
-                    is SignParams.SessionRequestParams -> onSessionRequestResponseUseCase(response, params)
-                }
-            }.launchIn(scope)
+//    private fun collectJsonRpcRequests(): Job =
+//        jsonRpcInteractor.clientSyncJsonRpc
+//            .filter { request -> request.params is SignParams }
+//            .onEach { request ->
+//                when (val requestParams = request.params) {
+//                    is SignParams.SessionProposeParams -> onSessionProposeUse(request, requestParams)
+//                    is SignParams.SessionAuthenticateParams -> onAuthenticateSessionUseCase(request, requestParams)
+//                    is SignParams.SessionSettleParams -> onSessionSettleUseCase(request, requestParams)
+//                    is SignParams.SessionRequestParams -> onSessionRequestUseCase(request, requestParams)
+//                    is SignParams.DeleteParams -> onSessionDeleteUseCase(request, requestParams)
+//                    is SignParams.EventParams -> onSessionEventUseCase(request, requestParams)
+//                    is SignParams.UpdateNamespacesParams -> onSessionUpdateUseCase(request, requestParams)
+//                    is SignParams.ExtendParams -> onSessionExtendUseCase(request, requestParams)
+//                    is SignParams.PingParams -> onPingUseCase(request)
+//                }
+//            }.launchIn(scope)
+//
+//    private fun collectJsonRpcResponses(): Job =
+//        jsonRpcInteractor.peerResponse
+//            .filter { request -> request.params is SignParams }
+//            .onEach { response ->
+//                when (val params = response.params) {
+//                    is SignParams.SessionProposeParams -> onSessionProposalResponseUseCase(response, params)
+//                    is SignParams.SessionAuthenticateParams -> onSessionAuthenticateResponseUseCase(response, params)
+//                    is SignParams.SessionSettleParams -> onSessionSettleResponseUseCase(response)
+//                    is SignParams.UpdateNamespacesParams -> onSessionUpdateResponseUseCase(response)
+//                    is SignParams.SessionRequestParams -> onSessionRequestResponseUseCase(response, params)
+//                }
+//            }.launchIn(scope)
 
-    private fun collectInternalErrors(): Job =
-        merge(
-            jsonRpcInteractor.internalErrors,
-            linkModeJsonRpcInteractor.internalErrors,
-            pairingController.findWrongMethodsFlow,
-            sessionRequestUseCase.errors
-        )
-            .onEach { exception -> _engineEvent.emit(exception) }
-            .launchIn(scope)
+//    private fun collectInternalErrors(): Job =
+//        merge(
+//            jsonRpcInteractor.internalErrors,
+//            linkModeJsonRpcInteractor.internalErrors,
+//            pairingController.findWrongMethodsFlow,
+//            sessionRequestUseCase.errors
+//        )
+//            .onEach { exception -> _engineEvent.emit(exception) }
+//            .launchIn(scope)
 
-    private fun collectSignEvents(): Job =
-        merge(
-            respondSessionRequestUseCase.events,
-            onSessionRequestUseCase.events,
-            onSessionDeleteUseCase.events,
-            onSessionProposeUse.events,
-            onAuthenticateSessionUseCase.events,
-            onSessionEventUseCase.events,
-            onSessionSettleUseCase.events,
-            onSessionUpdateUseCase.events,
-            onSessionExtendUseCase.events,
-            onSessionProposalResponseUseCase.events,
-            onSessionSettleResponseUseCase.events,
-            onSessionUpdateResponseUseCase.events,
-            onSessionRequestResponseUseCase.events,
-            onSessionAuthenticateResponseUseCase.events,
-            sessionRequestUseCase.requestEvents
-        )
-            .onEach { event -> _engineEvent.emit(event) }
-            .launchIn(scope)
-
-    private fun resubscribeToSession() {
-        try {
-            val (listOfExpiredSession, listOfValidSessions) =
-                sessionStorageRepository.getListOfSessionVOsWithoutMetadata().partition { session -> !session.expiry.isSequenceValid() }
-
-            listOfExpiredSession
-                .map { session -> session.topic }
-                .onEach { sessionTopic ->
-                    runCatching { crypto.removeKeys(sessionTopic.value) }.onFailure { logger.error(it) }
-                    sessionStorageRepository.deleteSession(sessionTopic)
-                }
 
-            val validSessionTopics = listOfValidSessions.map { it.topic.value }
-            jsonRpcInteractor.batchSubscribe(
-                validSessionTopics,
-                onFailure = { error -> scope.launch { _engineEvent.emit(SDKError(error)) } })
-        } catch (e: Exception) {
-            scope.launch { _engineEvent.emit(SDKError(e)) }
-        }
-    }
+//    private fun resubscribeToSession() {
+//        try {
+//            val (listOfExpiredSession, listOfValidSessions) =
+//                sessionStorageRepository.getListOfSessionVOsWithoutMetadata().partition { session -> !session.expiry.isSequenceValid() }
+//
+//            listOfExpiredSession
+//                .map { session -> session.topic }
+//                .onEach { sessionTopic ->
+//                    runCatching { crypto.removeKeys(sessionTopic.value) }.onFailure { logger.error(it) }
+//                    sessionStorageRepository.deleteSession(sessionTopic)
+//                }
+//
+//            val validSessionTopics = listOfValidSessions.map { it.topic.value }
+//            jsonRpcInteractor.batchSubscribe(
+//                validSessionTopics,
+//                onFailure = { error -> scope.launch { _engineEvent.emit(SDKError(error)) } })
+//        } catch (e: Exception) {
+//            scope.launch { _engineEvent.emit(SDKError(e)) }
+//        }
+//    }
+//
+//    private fun resubscribeToPendingAuthenticateTopics() {
+//        scope.launch {
+//            try {
+//                val responseTopics = authenticateResponseTopicRepository.getResponseTopics().map { responseTopic -> responseTopic }
+//                jsonRpcInteractor.batchSubscribe(responseTopics) { error -> scope.launch { _engineEvent.emit(SDKError(error)) } }
+//            } catch (e: Exception) {
+//                scope.launch { _engineEvent.emit(SDKError(e)) }
+//            }
+//        }
+//    }
+//
+//    private fun setupSequenceExpiration() {
+//        try {
+//            sessionStorageRepository.onSessionExpired = { sessionTopic ->
+//                jsonRpcInteractor.unsubscribe(sessionTopic, onSuccess = {
+//                    runCatching {
+//                        sessionStorageRepository.deleteSession(sessionTopic)
+//                        crypto.removeKeys(sessionTopic.value)
+//                    }.onFailure { logger.error(it) }
+//                })
+//            }
+//        } catch (e: Exception) {
+//            scope.launch { _engineEvent.emit(SDKError(e)) }
+//        }
+//    }
 
-    private fun resubscribeToPendingAuthenticateTopics() {
-        scope.launch {
-            try {
-                val responseTopics = authenticateResponseTopicRepository.getResponseTopics().map { responseTopic -> responseTopic }
-                jsonRpcInteractor.batchSubscribe(responseTopics) { error -> scope.launch { _engineEvent.emit(SDKError(error)) } }
-            } catch (e: Exception) {
-                scope.launch { _engineEvent.emit(SDKError(e)) }
-            }
-        }
-    }
+//    private fun propagatePendingSessionRequestsQueue() = scope.launch {
+//        try {
+//            getPendingSessionRequests()
+//                .map { pendingRequest ->
+//                    pendingRequest.toSessionRequest(
+//                        metadataStorageRepository.getByTopicAndType(
+//                            pendingRequest.topic,
+//                            AppMetaDataType.PEER
+//                        )
+//                    )
+//                }
+//                .filter { sessionRequest -> sessionRequest.expiry?.isExpired() == false }
+//                .filter { sessionRequest ->
+//                    try {
+//                        getSessionsUseCase.getListOfSettledSessions().find { session -> session.topic.value == sessionRequest.topic } != null
+//                    } catch (e: Exception) {
+//                        logger.error(e)
+//                        false
+//                    }
+//                }
+//                .onEach { sessionRequest ->
+//                    scope.launch {
+//                        supervisorScope {
+//                            val verifyContext =
+//                                verifyContextStorageRepository.get(sessionRequest.request.id) ?: VerifyContext(
+//                                    sessionRequest.request.id,
+//                                    String.Empty,
+//                                    Validation.UNKNOWN,
+//                                    String.Empty,
+//                                    null
+//                                )
+//                            val sessionRequestEvent = EngineDO.SessionRequestEvent(sessionRequest, verifyContext.toEngineDO())
+//                            sessionRequestEventsQueue.add(sessionRequestEvent)
+//                        }
+//                    }
+//                }
+//        } catch (e: Exception) {
+//            logger.error(e)
+//        }
+//    }
 
-    private fun setupSequenceExpiration() {
-        try {
-            sessionStorageRepository.onSessionExpired = { sessionTopic ->
-                jsonRpcInteractor.unsubscribe(sessionTopic, onSuccess = {
-                    runCatching {
-                        sessionStorageRepository.deleteSession(sessionTopic)
-                        crypto.removeKeys(sessionTopic.value)
-                    }.onFailure { logger.error(it) }
-                })
-            }
-        } catch (e: Exception) {
-            scope.launch { _engineEvent.emit(SDKError(e)) }
-        }
-    }
+//    private fun sessionProposalExpiryWatcher() {
+//        repeatableFlow()
+//            .onEach {
+//                try {
+//                    proposalStorageRepository
+//                        .getProposals()
+//                        .onEach { proposal ->
+//                            proposal.expiry?.let {
+//                                if (it.isExpired()) {
+//                                    proposalStorageRepository.deleteProposal(proposal.proposerPublicKey)
+//                                    deleteRequestByIdUseCase(proposal.requestId)
+//                                    _engineEvent.emit(proposal.toExpiredProposal())
+//                                }
+//                            }
+//                        }
+//                } catch (e: Exception) {
+//                    logger.error(e)
+//                }
+//            }.launchIn(scope)
+//    }
 
-    private fun propagatePendingSessionRequestsQueue() = scope.launch {
-        try {
-            getPendingSessionRequests()
-                .map { pendingRequest ->
-                    pendingRequest.toSessionRequest(
-                        metadataStorageRepository.getByTopicAndType(
-                            pendingRequest.topic,
-                            AppMetaDataType.PEER
-                        )
-                    )
-                }
-                .filter { sessionRequest -> sessionRequest.expiry?.isExpired() == false }
-                .filter { sessionRequest ->
-                    try {
-                        getSessionsUseCase.getListOfSettledSessions().find { session -> session.topic.value == sessionRequest.topic } != null
-                    } catch (e: Exception) {
-                        logger.error(e)
-                        false
-                    }
-                }
-                .onEach { sessionRequest ->
-                    scope.launch {
-                        supervisorScope {
-                            val verifyContext =
-                                verifyContextStorageRepository.get(sessionRequest.request.id) ?: VerifyContext(
-                                    sessionRequest.request.id,
-                                    String.Empty,
-                                    Validation.UNKNOWN,
-                                    String.Empty,
-                                    null
-                                )
-                            val sessionRequestEvent = EngineDO.SessionRequestEvent(sessionRequest, verifyContext.toEngineDO())
-                            sessionRequestEventsQueue.add(sessionRequestEvent)
-                        }
-                    }
-                }
-        } catch (e: Exception) {
-            logger.error(e)
-        }
-    }
+//    private fun sessionRequestsExpiryWatcher() {
+//        repeatableFlow()
+//            .onEach {
+//                try {
+//                    getPendingSessionRequests()
+//                        .onEach { pendingRequest ->
+//                            pendingRequest.expiry?.let {
+//                                if (it.isExpired()) {
+//                                    deleteRequestByIdUseCase(pendingRequest.id)
+//                                    _engineEvent.emit(pendingRequest.toExpiredSessionRequest())
+//                                }
+//                            }
+//                        }
+//                } catch (e: Exception) {
+//                    logger.error(e)
+//                }
+//            }.launchIn(scope)
+//    }
 
-    private fun sessionProposalExpiryWatcher() {
-        repeatableFlow()
-            .onEach {
-                try {
-                    proposalStorageRepository
-                        .getProposals()
-                        .onEach { proposal ->
-                            proposal.expiry?.let {
-                                if (it.isExpired()) {
-                                    proposalStorageRepository.deleteProposal(proposal.proposerPublicKey)
-                                    deleteRequestByIdUseCase(proposal.requestId)
-                                    _engineEvent.emit(proposal.toExpiredProposal())
-                                }
-                            }
-                        }
-                } catch (e: Exception) {
-                    logger.error(e)
-                }
-            }.launchIn(scope)
-    }
+//    private fun emitSessionProposal() {
+//        pairingController.sessionProposalFlow
+//            .map { it.toVO() }
+//            .onEach { proposalStorageRepository.insertProposal(it) }
+//            .onEach { proposal ->
+//                scope.launch {
+//                    _engineEvent.emit(
+//                        EngineDO.SessionProposalEvent(
+//                            proposal = proposal.toEngineDO(),
+//                            context = EngineDO.VerifyContext(1, "", Validation.UNKNOWN, "", null)
+//                        )
+//                    )
+//                }
+//            }
+//            .launchIn(scope)
+//    }
+
+//    private fun emitReceivedPendingRequestsWhilePairingOnTheSameURL() {
+//        pairingController.storedPairingFlow
+//            .onEach { (pairingTopic, trace) ->
+//                try {
+//                    val pendingAuthenticateRequests =
+//                        getPendingAuthenticateRequestUseCase.getPendingAuthenticateRequests().filter { request -> request.topic == pairingTopic }
+//                    if (pendingAuthenticateRequests.isNotEmpty()) {
+//                        pendingAuthenticateRequests.forEach { request ->
+//                            val context = verifyContextStorageRepository.get(request.id) ?: VerifyContext(
+//                                request.id,
+//                                String.Empty,
+//                                Validation.UNKNOWN,
+//                                String.Empty,
+//                                null
+//                            )
+//                            val sessionAuthenticateEvent = EngineDO.SessionAuthenticateEvent(
+//                                request.id,
+//                                request.topic.value,
+//                                request.params.authPayload.toEngineDO(),
+//                                request.params.requester.toEngineDO(),
+//                                request.params.expiryTimestamp,
+//                                context.toEngineDO()
+//                            )
+//                            logger.log("Emitting pending authenticate request from active pairing: $sessionAuthenticateEvent")
+//                            scope.launch { _engineEvent.emit(sessionAuthenticateEvent) }
+//                        }
+//                    } else {
+//                        val proposal = proposalStorageRepository.getProposalByTopic(pairingTopic.value)
+//                        if (proposal.expiry?.isExpired() == true) {
+//                            insertEventUseCase(
+//                                Props(
+//                                    type = EventType.Error.PROPOSAL_EXPIRED,
+//                                    properties = Properties(trace = trace, topic = pairingTopic.value)
+//                                )
+//                            )
+//                            proposalStorageRepository.deleteProposal(proposal.proposerPublicKey)
+//                            scope.launch { _engineEvent.emit(proposal.toExpiredProposal()) }
+//                        } else {
+//                            val context = verifyContextStorageRepository.get(proposal.requestId) ?: VerifyContext(
+//                                proposal.requestId,
+//                                String.Empty,
+//                                Validation.UNKNOWN,
+//                                String.Empty,
+//                                null
+//                            )
+//                            val sessionProposalEvent = EngineDO.SessionProposalEvent(proposal = proposal.toEngineDO(), context = context.toEngineDO())
+//                            logger.log("Emitting session proposal from active pairing: $sessionProposalEvent")
+//                            trace.add(Trace.Pairing.EMIT_SESSION_PROPOSAL)
+//                            scope.launch { _engineEvent.emit(sessionProposalEvent) }
+//                        }
+//                    }
+//                } catch (e: Exception) {
+//                    logger.log("No proposal or pending session authenticate request for pairing topic: $e")
+//                    scope.launch { _engineEvent.emit(SDKError(Throwable("No proposal or pending session authenticate request for pairing topic: $e"))) }
+//                }
+//            }.launchIn(scope)
+//    }
+
+    fun pair(uri: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) {
+        scope.launch {
+            try {
+                val walletConnectUri = Validator.validateWCUri(uri) ?: throw Exception("Invalid WalletConnect URI")
 
-    private fun sessionRequestsExpiryWatcher() {
-        repeatableFlow()
-            .onEach {
-                try {
-                    getPendingSessionRequests()
-                        .onEach { pendingRequest ->
-                            pendingRequest.expiry?.let {
-                                if (it.isExpired()) {
-                                    deleteRequestByIdUseCase(pendingRequest.id)
-                                    _engineEvent.emit(pendingRequest.toExpiredSessionRequest())
-                                }
-                            }
-                        }
+                // Call the Rust client to pair and get the proposal
+                val proposal: uniffi.yttrium.SessionProposalFfi? = try {
+                    signClient.pair(uri = walletConnectUri.toAbsoluteString())
                 } catch (e: Exception) {
-                    logger.error(e)
+                    println("kobe: pairing exception yttrium: $e")
+                    onFailure(e)
+                    return@launch
                 }
-            }.launchIn(scope)
-    }
 
-    private fun emitReceivedPendingRequestsWhilePairingOnTheSameURL() {
-        pairingController.storedPairingFlow
-            .onEach { (pairingTopic, trace) ->
-                try {
-                    val pendingAuthenticateRequests =
-                        getPendingAuthenticateRequestUseCase.getPendingAuthenticateRequests().filter { request -> request.topic == pairingTopic }
-                    if (pendingAuthenticateRequests.isNotEmpty()) {
-                        pendingAuthenticateRequests.forEach { request ->
-                            val context = verifyContextStorageRepository.get(request.id) ?: VerifyContext(
-                                request.id,
-                                String.Empty,
-                                Validation.UNKNOWN,
-                                String.Empty,
-                                null
-                            )
-                            val sessionAuthenticateEvent = EngineDO.SessionAuthenticateEvent(
-                                request.id,
-                                request.topic.value,
-                                request.params.authPayload.toEngineDO(),
-                                request.params.requester.toEngineDO(),
-                                request.params.expiryTimestamp,
-                                context.toEngineDO()
-                            )
-                            logger.log("Emitting pending authenticate request from active pairing: $sessionAuthenticateEvent")
-                            scope.launch { _engineEvent.emit(sessionAuthenticateEvent) }
-                        }
-                    } else {
-                        val proposal = proposalStorageRepository.getProposalByTopic(pairingTopic.value)
-                        if (proposal.expiry?.isExpired() == true) {
-                            insertEventUseCase(
-                                Props(
-                                    type = EventType.Error.PROPOSAL_EXPIRED,
-                                    properties = Properties(trace = trace, topic = pairingTopic.value)
-                                )
-                            )
-                            proposalStorageRepository.deleteProposal(proposal.proposerPublicKey)
-                            scope.launch { _engineEvent.emit(proposal.toExpiredProposal()) }
-                        } else {
-                            val context = verifyContextStorageRepository.get(proposal.requestId) ?: VerifyContext(
-                                proposal.requestId,
-                                String.Empty,
-                                Validation.UNKNOWN,
-                                String.Empty,
-                                null
-                            )
-                            val sessionProposalEvent = EngineDO.SessionProposalEvent(proposal = proposal.toEngineDO(), context = context.toEngineDO())
-                            logger.log("Emitting session proposal from active pairing: $sessionProposalEvent")
-                            trace.add(Trace.Pairing.EMIT_SESSION_PROPOSAL)
-                            scope.launch { _engineEvent.emit(sessionProposalEvent) }
-                        }
-                    }
-                } catch (e: Exception) {
-                    logger.log("No proposal or pending session authenticate request for pairing topic: $e")
-                    scope.launch { _engineEvent.emit(SDKError(Throwable("No proposal or pending session authenticate request for pairing topic: $e"))) }
+                if (proposal != null) {
+                    // Convert SessionProposalFfi to ProposalVO
+                    val proposalVO = proposal.toVO()
+
+                    // Store the proposal
+                    proposalStorageRepository.insertProposal(proposalVO)
+
+                    // Emit the session proposal event using _engineEvent
+                    val sessionProposalEvent = EngineDO.SessionProposalEvent(
+                        proposal = proposalVO.toEngineDO(),
+                        context = EngineDO.VerifyContext(1, "", Validation.UNKNOWN, "", null)
+                    )
+
+                    _engineEvent.emit(sessionProposalEvent)
+                    onSuccess()
+                } else {
+                    onFailure(Exception("Failed to get session proposal from pairing"))
                 }
-            }.launchIn(scope)
+            } catch (e: Exception) {
+                println("kobe: pairing exception: $e")
+                onFailure(e)
+            }
+        }
     }
 
     private fun repeatableFlow() = flow {
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt
index e7ae829277..5552542d0f 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt
@@ -28,8 +28,18 @@ import com.reown.sign.common.model.vo.proposal.ProposalVO
 import com.reown.sign.common.model.vo.sequence.SessionVO
 import com.reown.sign.engine.model.EngineDO
 import com.reown.sign.engine.model.ValidationError
+import com.reown.sign.engine.model.mapper.toSettleYttrium
 import com.reown.sign.json_rpc.model.JsonRpcMethod
 import com.reown.util.Empty
+import com.reown.util.bytesToHex
+import com.reown.util.hexToBytes
+import uniffi.yttrium.Metadata
+import uniffi.yttrium.ProposalNamespace
+import uniffi.yttrium.Redirect
+import uniffi.yttrium.Relay
+import uniffi.yttrium.SessionFfi
+import uniffi.yttrium.SessionProposalFfi
+import uniffi.yttrium.SettleNamespace
 import java.net.URI
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -81,7 +91,8 @@ internal fun SignParams.SessionProposeParams.toVO(topic: Topic, requestId: Long)
         relayProtocol = relays.first().protocol,
         relayData = relays.first().data,
         expiry = if (expiryTimestamp != null) Expiry(expiryTimestamp) else null,
-        scopedProperties = scopedProperties
+        scopedProperties = scopedProperties,
+        pairingSymKey = ""
     )
 
 @JvmSynthetic
@@ -93,7 +104,11 @@ internal fun ProposalVO.toSessionProposeRequest(): WCRequest =
         params = SignParams.SessionProposeParams(
             relays = listOf(RelayProtocolOptions(protocol = relayProtocol, data = relayData)),
             proposer = SessionProposer(proposerPublicKey, AppMetaData(name = name, description = description, url = url, icons = icons)),
-            requiredNamespaces = requiredNamespaces, optionalNamespaces = optionalNamespaces, properties = properties, expiryTimestamp = expiry?.seconds, scopedProperties = scopedProperties
+            requiredNamespaces = requiredNamespaces,
+            optionalNamespaces = optionalNamespaces,
+            properties = properties,
+            expiryTimestamp = expiry?.seconds,
+            scopedProperties = scopedProperties
         ),
         transportType = TransportType.RELAY
     )
@@ -136,10 +151,14 @@ internal fun SessionVO.toEngineDO(): EngineDO.Session =
     )
 
 @JvmSynthetic
-internal fun SessionVO.toEngineDOSessionExtend(expiryVO: Expiry): EngineDO.SessionExtend =
+internal fun SessionFfi.toEngineDO(): EngineDO.Session =
+    this.toVO().toEngineDO()
+
+@JvmSynthetic
+internal fun SessionVO.toEngineDOSessionExtend(): EngineDO.SessionExtend =
     EngineDO.SessionExtend(
         topic,
-        expiryVO,
+        expiry,
         pairingTopic,
         requiredNamespaces.toMapOfEngineNamespacesRequired(),
         optionalNamespaces?.toMapOfEngineNamespacesOptional(),
@@ -364,4 +383,178 @@ internal fun EngineDO.PayloadParams.toCacaoPayload(iss: Issuer): Cacao.Payload =
 
 @JvmSynthetic
 internal fun EngineDO.PayloadParams.toCAIP222Message(iss: Issuer, chainName: String): String =
-    this.toCacaoPayload(iss).toCAIP222Message(chainName)
\ No newline at end of file
+    this.toCacaoPayload(iss).toCAIP222Message(chainName)
+
+
+internal fun Map<String, ProposalNamespace>.toEngine(): Map<String, EngineDO.Namespace.Proposal> =
+    this.mapValues { (_, namespace) ->
+        EngineDO.Namespace.Proposal(namespace.chains, namespace.methods, namespace.events)
+    }
+
+internal fun Map<String, Namespace.Proposal>.toProposalYttrium(): Map<String, ProposalNamespace> =
+    this.mapValues { (_, namespace) ->
+        ProposalNamespace(namespace.chains!!, namespace.methods, namespace.events)
+    }
+
+internal fun Map<String, EngineDO.Namespace.Session>.toSettleYttrium(): Map<String, SettleNamespace> =
+    this.mapValues { (_, namespace) ->
+        SettleNamespace(accounts = namespace.accounts, chains = namespace.chains!!, methods = namespace.methods, events = namespace.events)
+    }
+
+internal fun AppMetaData.toYttrium(): Metadata =
+    Metadata(
+        name = name,
+        verifyUrl = null,
+        description = description,
+        icons = icons,
+        url = url,
+        redirect = Redirect(
+            native = redirect?.native,
+            universal = redirect?.universal ?: "",
+            linkMode = redirect?.linkMode ?: false
+        )
+    )
+
+internal fun SessionProposalFfi.toVO(): ProposalVO =
+    ProposalVO(
+        pairingTopic = Topic(topic),
+        name = metadata.name,
+        description = metadata.description,
+        url = metadata.url,
+        icons = metadata.icons,
+        requiredNamespaces = requiredNamespaces.toEngine().toNamespacesVOOptional(),
+        optionalNamespaces = optionalNamespaces?.toEngine()?.toNamespacesVOOptional() ?: emptyMap(),
+        proposerPublicKey = proposerPublicKey.bytesToHex(),
+        relayData = "",
+        relayProtocol = relays[0].protocol,
+        redirect = metadata.redirect?.native ?: "",
+        properties = scopedProperties,
+        scopedProperties = scopedProperties,
+        expiry = if (expiryTimestamp != null) Expiry(expiryTimestamp!!.toLong()) else null,
+        requestId = id.toLong(),
+        pairingSymKey = pairingSymKey.bytesToHex()
+    )
+
+internal fun ProposalVO.toProposalFfi(): SessionProposalFfi =
+    SessionProposalFfi(
+        id = requestId.toString(),
+        topic = pairingTopic.value,
+        pairingSymKey = pairingSymKey.hexToBytes(),
+        proposerPublicKey = proposerPublicKey.hexToBytes(),
+        requiredNamespaces = requiredNamespaces.toProposalYttrium(),
+        optionalNamespaces = optionalNamespaces.toProposalYttrium(),
+        sessionProperties = properties,
+        scopedProperties = scopedProperties,
+        expiryTimestamp = expiry?.seconds?.toULong(),
+        relays = listOf(Relay(relayProtocol)),
+        metadata = Metadata(
+            name = name,
+            verifyUrl = null,
+            description = description,
+            icons = icons,
+            url = url,
+            redirect = Redirect(
+                native = appMetaData.redirect?.native,
+                universal = appMetaData.redirect?.universal ?: "",
+                linkMode = appMetaData.redirect?.linkMode ?: false
+            )
+        )
+    )
+
+internal fun Map<String, ProposalNamespace>.toProposalNamespaceVO(): Map<String, Namespace.Proposal> =
+    this.mapValues { (_, namespace) ->
+        Namespace.Proposal(namespace.chains, namespace.methods, namespace.events)
+    }
+
+internal fun Map<String, SettleNamespace>.toSessionVO(): Map<String, Namespace.Session> =
+    this.mapValues { (_, namespace) ->
+        Namespace.Session(chains = namespace.chains, methods = namespace.methods, events = namespace.events, accounts = namespace.accounts)
+    }
+
+internal fun Map<String, Namespace.Session>.toYttriumSettle(): Map<String, SettleNamespace> =
+    this.mapValues { (_, namespace) ->
+        SettleNamespace(
+            chains = namespace.chains ?: emptyList(),
+            methods = namespace.methods,
+            events = namespace.events,
+            accounts = namespace.accounts
+        )
+    }
+
+internal fun SessionFfi.toVO(): SessionVO {
+    return SessionVO(
+        topic = Topic(this.topic),
+        expiry = Expiry(this.expiry.toLong()),
+        relayProtocol = "irn",
+        relayData = null,
+        controllerKey = PublicKey(this.controllerKey?.bytesToHex() ?: ""),
+        selfPublicKey = PublicKey(this.selfPublicKey.bytesToHex()),
+        selfAppMetaData = AppMetaData(
+            name = this.selfMetaData.name,
+            description = this.selfMetaData.description,
+            url = this.selfMetaData.url,
+            icons = this.selfMetaData.icons,
+            redirect = com.reown.android.internal.common.model.Redirect(
+                native = this.selfMetaData.redirect?.native,
+                linkMode = this.selfMetaData.redirect?.linkMode ?: false,
+                universal = this.selfMetaData.redirect?.universal
+            )
+        ),
+        peerPublicKey = PublicKey(this.peerPublicKey?.bytesToHex() ?: ""),
+        peerAppMetaData = AppMetaData(
+            name = this.peerMetaData?.name ?: "",
+            description = this.peerMetaData?.description ?: "",
+            url = this.peerMetaData?.url ?: "",
+            icons = this.peerMetaData?.icons ?: emptyList(),
+            redirect = com.reown.android.internal.common.model.Redirect(
+                native = this.peerMetaData?.redirect?.native,
+                linkMode = this.peerMetaData?.redirect?.linkMode ?: false,
+                universal = this.peerMetaData?.redirect?.universal
+            )
+        ),
+        sessionNamespaces = this.sessionNamespaces.toSessionVO(),
+        requiredNamespaces = this.requiredNamespaces.toProposalNamespaceVO(),
+        optionalNamespaces = this.optionalNamespaces?.toProposalNamespaceVO(),
+        properties = this.properties,
+        scopedProperties = this.scopedProperties,
+        isAcknowledged = true,
+        pairingTopic = this.pairingTopic,
+        transportType = TransportType.RELAY, //TODO change for LinkMode
+        symKey = this.sessionSymKey.bytesToHex()
+    )
+}
+
+internal fun SessionVO.toSessionFfi(): SessionFfi {
+    return SessionFfi(
+        topic = this.topic.value,
+        expiry = this.expiry.seconds.toULong(),
+        controllerKey = this.controllerKey?.keyAsHex?.hexToBytes(),
+        selfPublicKey = this.selfPublicKey.keyAsHex.hexToBytes(),
+        selfMetaData = this.selfAppMetaData?.toYttrium() ?: Metadata(
+            name = this.selfAppMetaData?.name ?: "",
+            verifyUrl = null,
+            description = this.selfAppMetaData?.description ?: "",
+            icons = this.selfAppMetaData?.icons ?: emptyList(),
+            url = this.selfAppMetaData?.url ?: "",
+            redirect = Redirect(
+                native = this.selfAppMetaData?.redirect?.native ?: "",
+                universal = this.selfAppMetaData?.redirect?.universal ?: "",
+                linkMode = this.selfAppMetaData?.redirect?.linkMode ?: false,
+            )
+        ),
+        peerPublicKey = this.peerPublicKey?.keyAsHex?.hexToBytes(),
+        peerMetaData = this.peerAppMetaData?.toYttrium(),
+        sessionNamespaces = this.sessionNamespaces.toYttriumSettle(),
+        requiredNamespaces = this.requiredNamespaces.toProposalYttrium(),
+        optionalNamespaces = this.optionalNamespaces?.toProposalYttrium(),
+        properties = this.properties,
+        scopedProperties = this.scopedProperties,
+        pairingTopic = this.pairingTopic,
+        sessionSymKey = this.symKey?.hexToBytes() ?: ByteArray(0),
+        relayProtocol = this.relayProtocol,
+        relayData = this.relayData,
+        isAcknowledged = this.isAcknowledged,
+        transportType = uniffi.yttrium.TransportType.RELAY, //TODO: change for link mode
+        requestId = 0.toULong()
+    )
+}
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt
index ea9827ab26..2b1cec101e 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt
@@ -49,7 +49,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 
 internal class ApproveSessionAuthenticateUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val getPendingSessionAuthenticateRequest: GetPendingSessionAuthenticateRequest,
     private val crypto: KeyManagementRepository,
     private val cacaoVerifier: CacaoVerifier,
@@ -59,9 +59,9 @@ internal class ApproveSessionAuthenticateUseCase(
     private val selfAppMetaData: AppMetaData,
     private val sessionStorageRepository: SessionStorageRepository,
     private val insertTelemetryEventUseCase: InsertTelemetryEventUseCase,
-    private val insertEventUseCase: InsertEventUseCase,
-    private val clientId: String,
-    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface
+//    private val insertEventUseCase: InsertEventUseCase,
+//    private val clientId: String,
+//    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface
 ) : ApproveSessionAuthenticateUseCaseInterface {
     override suspend fun approveSessionAuthenticate(id: Long, cacaos: List<Cacao>, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = supervisorScope {
         val trace: MutableList<String> = mutableListOf()
@@ -148,73 +148,73 @@ internal class ApproveSessionAuthenticateUseCase(
             val response: JsonRpcResponse = JsonRpcResponse.JsonRpcResult(id, result = responseParams)
             crypto.setKey(symmetricKey, sessionTopic.value)
             trace.add(Trace.SessionAuthenticate.SUBSCRIBING_AUTHENTICATED_SESSION_TOPIC).also { logger.log("Subscribing Session Authenticate on topic: $responseTopic") }
-            jsonRpcInteractor.subscribe(sessionTopic,
-                onSuccess = {
-                    trace.add(Trace.SessionAuthenticate.SUBSCRIBE_AUTHENTICATED_SESSION_TOPIC_SUCCESS).also { logger.log("Subscribed Session Authenticate on topic: $responseTopic") }
-                },
-                onFailure = { error ->
-                    scope.launch {
-                        supervisorScope {
-                            insertTelemetryEventUseCase(
-                                Props(
-                                    type = EventType.Error.SUBSCRIBE_AUTH_SESSION_TOPIC_FAILURE,
-                                    properties = Properties(trace = trace, topic = sessionTopic.value)
-                                )
-                            )
-                        }
-                    }.also { logger.log("Subscribing Session Authenticate error on topic: $responseTopic, $error") }
-                    onFailure(error)
-                }
-            )
+//            jsonRpcInteractor.subscribe(sessionTopic,
+//                onSuccess = {
+//                    trace.add(Trace.SessionAuthenticate.SUBSCRIBE_AUTHENTICATED_SESSION_TOPIC_SUCCESS).also { logger.log("Subscribed Session Authenticate on topic: $responseTopic") }
+//                },
+//                onFailure = { error ->
+//                    scope.launch {
+//                        supervisorScope {
+//                            insertTelemetryEventUseCase(
+//                                Props(
+//                                    type = EventType.Error.SUBSCRIBE_AUTH_SESSION_TOPIC_FAILURE,
+//                                    properties = Properties(trace = trace, topic = sessionTopic.value)
+//                                )
+//                            )
+//                        }
+//                    }.also { logger.log("Subscribing Session Authenticate error on topic: $responseTopic, $error") }
+//                    onFailure(error)
+//                }
+//            )
 
             if (jsonRpcHistoryEntry.transportType == TransportType.LINK_MODE && receiverMetadata.redirect?.linkMode == true) {
                 if (receiverMetadata.redirect?.universal.isNullOrEmpty()) return@supervisorScope onFailure(IllegalStateException("App link is missing"))
-                try {
-                    linkModeJsonRpcInteractor.triggerResponse(
-                        responseTopic,
-                        response,
-                        receiverMetadata.redirect!!.universal!!,
-                        Participants(senderPublicKey, receiverPublicKey),
-                        EnvelopeType.ONE
-                    )
-                    insertEventUseCase(
-                        Props(
-                            EventType.SUCCESS,
-                            Tags.SESSION_AUTHENTICATE_LINK_MODE_RESPONSE_APPROVE.id.toString(),
-                            Properties(clientId = clientId, correlationId = id, direction = Direction.SENT.state)
-                        )
-                    )
-                } catch (e: Exception) {
-                    onFailure(e)
-                }
+//                try {
+//                    linkModeJsonRpcInteractor.triggerResponse(
+//                        responseTopic,
+//                        response,
+//                        receiverMetadata.redirect!!.universal!!,
+//                        Participants(senderPublicKey, receiverPublicKey),
+//                        EnvelopeType.ONE
+//                    )
+//                    insertEventUseCase(
+//                        Props(
+//                            EventType.SUCCESS,
+//                            Tags.SESSION_AUTHENTICATE_LINK_MODE_RESPONSE_APPROVE.id.toString(),
+//                            Properties(clientId = clientId, correlationId = id, direction = Direction.SENT.state)
+//                        )
+//                    )
+//                } catch (e: Exception) {
+//                    onFailure(e)
+//                }
             } else {
                 trace.add(Trace.SessionAuthenticate.PUBLISHING_AUTHENTICATED_SESSION_APPROVE).also { logger.log("Sending Session Authenticate Approve on topic: $responseTopic") }
-                jsonRpcInteractor.publishJsonRpcResponse(responseTopic, irnParams, response, envelopeType = EnvelopeType.ONE, participants = Participants(senderPublicKey, receiverPublicKey),
-                    onSuccess = {
-                        trace.add(Trace.SessionAuthenticate.AUTHENTICATED_SESSION_APPROVE_PUBLISH_SUCCESS).also { logger.log("Session Authenticate Approve Responded on topic: $responseTopic") }
-                        onSuccess()
-                        scope.launch {
-                            supervisorScope {
-                                verifyContextStorageRepository.delete(id)
-                            }
-                        }
-                    },
-                    onFailure = { error ->
-                        runCatching { crypto.removeKeys(sessionTopic.value) }.onFailure { logger.error(it) }
-                        sessionStorageRepository.deleteSession(sessionTopic)
-                        scope.launch {
-                            supervisorScope {
-                                insertTelemetryEventUseCase(
-                                    Props(
-                                        type = EventType.Error.AUTHENTICATED_SESSION_APPROVE_PUBLISH_FAILURE,
-                                        properties = Properties(trace = trace, topic = responseTopic.value)
-                                    )
-                                )
-                            }
-                        }.also { logger.error("Error Responding Session Authenticate on topic: $responseTopic, error: $error") }
-                        onFailure(error)
-                    }
-                )
+//                jsonRpcInteractor.publishJsonRpcResponse(responseTopic, irnParams, response, envelopeType = EnvelopeType.ONE, participants = Participants(senderPublicKey, receiverPublicKey),
+//                    onSuccess = {
+//                        trace.add(Trace.SessionAuthenticate.AUTHENTICATED_SESSION_APPROVE_PUBLISH_SUCCESS).also { logger.log("Session Authenticate Approve Responded on topic: $responseTopic") }
+//                        onSuccess()
+//                        scope.launch {
+//                            supervisorScope {
+//                                verifyContextStorageRepository.delete(id)
+//                            }
+//                        }
+//                    },
+//                    onFailure = { error ->
+//                        runCatching { crypto.removeKeys(sessionTopic.value) }.onFailure { logger.error(it) }
+//                        sessionStorageRepository.deleteSession(sessionTopic)
+//                        scope.launch {
+//                            supervisorScope {
+//                                insertTelemetryEventUseCase(
+//                                    Props(
+//                                        type = EventType.Error.AUTHENTICATED_SESSION_APPROVE_PUBLISH_FAILURE,
+//                                        properties = Properties(trace = trace, topic = responseTopic.value)
+//                                    )
+//                                )
+//                            }
+//                        }.also { logger.error("Error Responding Session Authenticate on topic: $responseTopic, error: $error") }
+//                        onFailure(error)
+//                    }
+//                )
             }
         } catch (e: Exception) {
             logger.error("Error Responding Session Authenticate, error: $e")
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCase.kt
index 98bd004cad..fd3b1b53f7 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCase.kt
@@ -1,50 +1,42 @@
 package com.reown.sign.engine.use_case.calls
 
 import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository
-import com.reown.android.internal.common.exception.NoInternetConnectionException
-import com.reown.android.internal.common.exception.NoRelayConnectionException
 import com.reown.android.internal.common.model.AppMetaData
-import com.reown.android.internal.common.model.AppMetaDataType
-import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
-import com.reown.android.internal.common.scope
+import com.reown.android.internal.common.model.type.EngineEvent
 import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface
+import com.reown.android.internal.common.storage.pairing.PairingStorageRepositoryInterface
 import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository
-import com.reown.android.internal.utils.ACTIVE_SESSION
-import com.reown.android.internal.utils.CoreValidator.isExpired
-import com.reown.android.pulse.domain.InsertTelemetryEventUseCase
-import com.reown.android.pulse.model.EventType
-import com.reown.android.pulse.model.Trace
-import com.reown.android.pulse.model.properties.Properties
-import com.reown.android.pulse.model.properties.Props
-import com.reown.foundation.common.model.PublicKey
 import com.reown.foundation.util.Logger
-import com.reown.sign.common.exceptions.InvalidNamespaceException
-import com.reown.sign.common.exceptions.SessionProposalExpiredException
-import com.reown.sign.common.model.vo.clientsync.common.SessionParticipant
-import com.reown.sign.common.model.vo.clientsync.session.SignRpc
-import com.reown.sign.common.model.vo.sequence.SessionVO
-import com.reown.sign.common.validator.SignValidator
 import com.reown.sign.engine.model.EngineDO
-import com.reown.sign.engine.model.mapper.toMapOfNamespacesVOSession
-import com.reown.sign.engine.model.mapper.toSessionApproveParams
-import com.reown.sign.engine.model.mapper.toSessionProposeRequest
-import com.reown.sign.engine.model.mapper.toSessionSettleParams
+import com.reown.sign.engine.model.mapper.toEngineDO
+import com.reown.sign.engine.model.mapper.toProposalFfi
+import com.reown.sign.engine.model.mapper.toSettleYttrium
+import com.reown.sign.engine.model.mapper.toYttrium
 import com.reown.sign.storage.proposal.ProposalStorageRepository
 import com.reown.sign.storage.sequence.SessionStorageRepository
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.SessionFfi
+import uniffi.yttrium.SignClient
 
 internal class ApproveSessionUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val crypto: KeyManagementRepository,
     private val sessionStorageRepository: SessionStorageRepository,
     private val proposalStorageRepository: ProposalStorageRepository,
     private val metadataStorageRepository: MetadataStorageRepositoryInterface,
     private val verifyContextStorageRepository: VerifyContextStorageRepository,
     private val selfAppMetaData: AppMetaData,
-    private val insertEventUseCase: InsertTelemetryEventUseCase,
-    private val logger: Logger
+//    private val insertEventUseCase: InsertTelemetryEventUseCase,
+    private val logger: Logger,
+    private val signClient: SignClient,
+    private val pairingRepository: PairingStorageRepositoryInterface
 ) : ApproveSessionUseCaseInterface {
+    private val _events: MutableSharedFlow<EngineEvent> = MutableSharedFlow()
+    override val approveEvents: SharedFlow<EngineEvent> = _events.asSharedFlow()
 
     override suspend fun approve(
         proposerPublicKey: String,
@@ -54,102 +46,126 @@ internal class ApproveSessionUseCase(
         onSuccess: () -> Unit,
         onFailure: (Throwable) -> Unit
     ) = supervisorScope {
-        val trace: MutableList<String> = mutableListOf()
-        trace.add(Trace.Session.SESSION_APPROVE_STARTED).also { logger.log(Trace.Session.SESSION_APPROVE_STARTED) }
+//        val trace: MutableList<String> = mutableListOf()
+//        trace.add(Trace.Session.SESSION_APPROVE_STARTED).also { logger.log(Trace.Session.SESSION_APPROVE_STARTED) }
 
         val proposal = proposalStorageRepository.getProposalByKey(proposerPublicKey)
-        val request = proposal.toSessionProposeRequest()
-        val pairingTopic = proposal.pairingTopic.value
-        try {
-            proposal.expiry?.let {
-                if (it.isExpired()) {
-                    insertEventUseCase(Props(type = EventType.Error.PROPOSAL_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic)))
-                        .also { logger.error("Proposal expired on approve, topic: $pairingTopic, id: ${proposal.requestId}") }
-                    throw SessionProposalExpiredException("Session proposal expired")
-                }
-            }
-            trace.add(Trace.Session.PROPOSAL_NOT_EXPIRED)
-            SignValidator.validateSessionNamespace(sessionNamespaces.toMapOfNamespacesVOSession(), proposal.requiredNamespaces) { error ->
-                insertEventUseCase(
-                    Props(
-                        type = EventType.Error.SESSION_APPROVE_NAMESPACE_VALIDATION_FAILURE,
-                        properties = Properties(trace = trace, topic = pairingTopic)
-                    )
-                )
-                    .also { logger.log("Session approve failure - invalid namespaces, error: ${error.message}") }
-                throw InvalidNamespaceException(error.message)
-            }
-            trace.add(Trace.Session.SESSION_NAMESPACE_VALIDATION_SUCCESS)
-            val selfPublicKey: PublicKey = crypto.generateAndStoreX25519KeyPair()
-            val sessionTopic = crypto.generateTopicFromKeyAgreement(selfPublicKey, PublicKey(proposerPublicKey))
-            trace.add(Trace.Session.CREATE_SESSION_TOPIC)
-            val approvalParams = proposal.toSessionApproveParams(selfPublicKey)
 
-            //settlement
-            val selfParticipant = SessionParticipant(selfPublicKey.keyAsHex, selfAppMetaData)
-            val sessionExpiry = ACTIVE_SESSION
-            val unacknowledgedSession =
-                SessionVO.createUnacknowledgedSession(
-                    sessionTopic,
-                    proposal,
-                    selfParticipant,
-                    sessionExpiry,
-                    sessionNamespaces,
-                    scopedProperties,
-                    sessionProperties,
-                    pairingTopic
+        try {
+            val sessionFfi: SessionFfi = async {
+                signClient.approve(
+                    proposal = proposal.toProposalFfi(),
+                    approvedNamespaces = sessionNamespaces.toSettleYttrium(),
+                    selfMetadata = selfAppMetaData.toYttrium()
                 )
+            }.await()
+            println("kobe: Session Approve Result: $sessionFfi")
 
-            sessionStorageRepository.insertSession(unacknowledgedSession, request.id)
-            metadataStorageRepository.insertOrAbortMetadata(sessionTopic, selfAppMetaData, AppMetaDataType.SELF)
-            metadataStorageRepository.insertOrAbortMetadata(sessionTopic, proposal.appMetaData, AppMetaDataType.PEER)
-            trace.add(Trace.Session.STORE_SESSION)
-            val params = proposal.toSessionSettleParams(selfParticipant, sessionExpiry, sessionNamespaces, sessionProperties, scopedProperties)
-            val sessionSettle = SignRpc.SessionSettle(params = params)
-            trace.add(Trace.Session.PUBLISHING_SESSION_APPROVE)
-            jsonRpcInteractor.approveSession(
-                pairingTopic = proposal.pairingTopic,
-                sessionTopic = sessionTopic,
-                sessionProposalResponse = approvalParams,
-                settleRequest = sessionSettle,
-                correlationId = proposal.requestId,
-                onSuccess = {
-                    onSuccess()
-                    scope.launch {
-                        supervisorScope {
-                            trace.add(Trace.Session.SESSION_APPROVE_SUCCESS)
-                            proposalStorageRepository.deleteProposal(proposerPublicKey)
-                            verifyContextStorageRepository.delete(proposal.requestId)
-                        }
-                    }
-                },
-                onFailure = { error ->
-                    onFailure(error)
-                    scope.launch {
-                        supervisorScope {
-                            insertEventUseCase(
-                                Props(
-                                    type = EventType.Error.SESSION_APPROVE_FAILURE,
-                                    properties = Properties(trace = trace, topic = sessionTopic.value)
-                                )
-                            ).also { logger.error("Session approve failure, topic: ${sessionTopic.value}") }
-                        }
-                    }
-                }
-            )
+            //TODO: emit onSessionSettleReponse
+            _events.emit(EngineDO.SettledSessionResponse.Result(sessionFfi.toEngineDO()))
+            onSuccess()
         } catch (e: Exception) {
-            if (e is NoRelayConnectionException) {
-                insertEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic)))
-            }
-            if (e is NoInternetConnectionException) {
-                insertEventUseCase(Props(type = EventType.Error.NO_INTERNET_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic)))
-            }
+            println("kobe: Approve Error: $e")
+
+            //TODO: keep it or remove it?
+//            _events.emit(EngineDO.SettledSessionResponse.Result(sessionFfi.toEngineDO()))
             onFailure(e)
         }
     }
 }
+//        val request = proposal.toSessionProposeRequest()
+//        val pairingTopic = proposal.pairingTopic.value
+//        try {
+//            proposal.expiry?.let {
+//                if (it.isExpired()) {
+//                    insertEventUseCase(Props(type = EventType.Error.PROPOSAL_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic)))
+//                        .also { logger.error("Proposal expired on approve, topic: $pairingTopic, id: ${proposal.requestId}") }
+//                    throw SessionProposalExpiredException("Session proposal expired")
+//                }
+//            }
+//            trace.add(Trace.Session.PROPOSAL_NOT_EXPIRED)
+//            SignValidator.validateSessionNamespace(sessionNamespaces.toMapOfNamespacesVOSession(), proposal.requiredNamespaces) { error ->
+//                insertEventUseCase(
+//                    Props(
+//                        type = EventType.Error.SESSION_APPROVE_NAMESPACE_VALIDATION_FAILURE,
+//                        properties = Properties(trace = trace, topic = pairingTopic)
+//                    )
+//                )
+//                    .also { logger.log("Session approve failure - invalid namespaces, error: ${error.message}") }
+//                throw InvalidNamespaceException(error.message)
+//            }
+//            trace.add(Trace.Session.SESSION_NAMESPACE_VALIDATION_SUCCESS)
+//            val selfPublicKey: PublicKey = crypto.generateAndStoreX25519KeyPair()
+//            val sessionTopic = crypto.generateTopicFromKeyAgreement(selfPublicKey, PublicKey(proposerPublicKey))
+//            trace.add(Trace.Session.CREATE_SESSION_TOPIC)
+//            val approvalParams = proposal.toSessionApproveParams(selfPublicKey)
+//
+//            //settlement
+//            val selfParticipant = SessionParticipant(selfPublicKey.keyAsHex, selfAppMetaData)
+//            val sessionExpiry = ACTIVE_SESSION
+//            val unacknowledgedSession =
+//                SessionVO.createUnacknowledgedSession(
+//                    sessionTopic,
+//                    proposal,
+//                    selfParticipant,
+//                    sessionExpiry,
+//                    sessionNamespaces,
+//                    scopedProperties,
+//                    sessionProperties,
+//                    pairingTopic
+//                )
+//
+//            sessionStorageRepository.insertSession(unacknowledgedSession, request.id)
+//            metadataStorageRepository.insertOrAbortMetadata(sessionTopic, selfAppMetaData, AppMetaDataType.SELF)
+//            metadataStorageRepository.insertOrAbortMetadata(sessionTopic, proposal.appMetaData, AppMetaDataType.PEER)
+//            trace.add(Trace.Session.STORE_SESSION)
+//            val params = proposal.toSessionSettleParams(selfParticipant, sessionExpiry, sessionNamespaces, sessionProperties, scopedProperties)
+//            val sessionSettle = SignRpc.SessionSettle(params = params)
+//            trace.add(Trace.Session.PUBLISHING_SESSION_APPROVE)
+//            jsonRpcInteractor.approveSession(
+//                pairingTopic = proposal.pairingTopic,
+//                sessionTopic = sessionTopic,
+//                sessionProposalResponse = approvalParams,
+//                settleRequest = sessionSettle,
+//                correlationId = proposal.requestId,
+//                onSuccess = {
+//                    onSuccess()
+//                    scope.launch {
+//                        supervisorScope {
+//                            trace.add(Trace.Session.SESSION_APPROVE_SUCCESS)
+//                            proposalStorageRepository.deleteProposal(proposerPublicKey)
+//                            verifyContextStorageRepository.delete(proposal.requestId)
+//                        }
+//                    }
+//                },
+//                onFailure = { error ->
+//                    onFailure(error)
+//                    scope.launch {
+//                        supervisorScope {
+//                            insertEventUseCase(
+//                                Props(
+//                                    type = EventType.Error.SESSION_APPROVE_FAILURE,
+//                                    properties = Properties(trace = trace, topic = sessionTopic.value)
+//                                )
+//                            ).also { logger.error("Session approve failure, topic: ${sessionTopic.value}") }
+//                        }
+//                    }
+//                }
+//            )
+//        } catch (e: Exception) {
+//            if (e is NoRelayConnectionException) {
+//                insertEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic)))
+//            }
+//            if (e is NoInternetConnectionException) {
+//                insertEventUseCase(Props(type = EventType.Error.NO_INTERNET_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic)))
+//            }
+//            onFailure(e)
+//        }
+//    }
+//}
 
 internal interface ApproveSessionUseCaseInterface {
+    val approveEvents: SharedFlow<EngineEvent>
     suspend fun approve(
         proposerPublicKey: String,
         sessionNamespaces: Map<String, EngineDO.Namespace.Session>,
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCase.kt
index 9cd834c667..58e306952a 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCase.kt
@@ -1,24 +1,18 @@
 package com.reown.sign.engine.use_case.calls
 
 import com.reown.android.internal.common.exception.CannotFindSequenceForTopic
-import com.reown.android.internal.common.exception.Reason
-import com.reown.android.internal.common.model.IrnParams
-import com.reown.android.internal.common.model.Tags
-import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
-import com.reown.android.internal.utils.dayInSeconds
 import com.reown.foundation.common.model.Topic
-import com.reown.foundation.common.model.Ttl
 import com.reown.foundation.util.Logger
 import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE
-import com.reown.sign.common.model.vo.clientsync.session.SignRpc
-import com.reown.sign.common.model.vo.clientsync.session.params.SignParams
 import com.reown.sign.storage.sequence.SessionStorageRepository
+import kotlinx.coroutines.async
 import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.SignClient
 
 internal class DisconnectSessionUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val sessionStorageRepository: SessionStorageRepository,
     private val logger: Logger,
+    private val signClient: SignClient,
 ) : DisconnectSessionUseCaseInterface {
     override suspend fun disconnect(topic: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = supervisorScope {
         if (!sessionStorageRepository.isSessionValid(Topic(topic))) {
@@ -26,23 +20,15 @@ internal class DisconnectSessionUseCase(
             return@supervisorScope onFailure(CannotFindSequenceForTopic("$NO_SEQUENCE_FOR_TOPIC_MESSAGE$topic"))
         }
 
-        val deleteParams = SignParams.DeleteParams(Reason.UserDisconnected.code, Reason.UserDisconnected.message)
-        val sessionDelete = SignRpc.SessionDelete(params = deleteParams)
-        val irnParams = IrnParams(Tags.SESSION_DELETE, Ttl(dayInSeconds), correlationId = sessionDelete.id)
-
         logger.log("Sending session disconnect on topic: $topic")
-        jsonRpcInteractor.publishJsonRpcRequest(Topic(topic), irnParams, sessionDelete,
-            onSuccess = {
-                logger.log("Disconnect sent successfully on topic: $topic")
-                sessionStorageRepository.deleteSession(Topic(topic))
-                jsonRpcInteractor.unsubscribe(Topic(topic))
-                onSuccess()
-            },
-            onFailure = { error ->
-                logger.error("Sending session disconnect error: $error on topic: $topic")
-                onFailure(error)
-            }
-        )
+        
+        try {
+            async { signClient.disconnect(topic) }.await()
+            onSuccess()
+        } catch (e: Exception) {
+            logger.error("Sending session disconnect error: $e on topic: $topic")
+            onFailure(e)
+        }
     }
 }
 
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt
index a83c00949a..60fab12edb 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt
@@ -1,51 +1,40 @@
 package com.reown.sign.engine.use_case.calls
 
 import com.reown.android.internal.common.exception.CannotFindSequenceForTopic
-import com.reown.android.internal.common.model.IrnParams
-import com.reown.android.internal.common.model.Tags
-import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
-import com.reown.android.internal.utils.fiveMinutesInSeconds
 import com.reown.foundation.common.model.Topic
-import com.reown.foundation.common.model.Ttl
 import com.reown.foundation.util.Logger
 import com.reown.sign.common.exceptions.InvalidEventException
 import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE
 import com.reown.sign.common.exceptions.UNAUTHORIZED_EMIT_MESSAGE
 import com.reown.sign.common.exceptions.UnauthorizedEventException
 import com.reown.sign.common.exceptions.UnauthorizedPeerException
-import com.reown.sign.common.model.vo.clientsync.session.SignRpc
-import com.reown.sign.common.model.vo.clientsync.session.params.SignParams
-import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO
 import com.reown.sign.common.validator.SignValidator
 import com.reown.sign.engine.model.EngineDO
 import com.reown.sign.storage.sequence.SessionStorageRepository
-import com.reown.util.generateId
 import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.SignClient
+import kotlinx.coroutines.async
 
 internal class EmitEventUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val sessionStorageRepository: SessionStorageRepository,
     private val logger: Logger,
+    private val signClient: SignClient
 ) : EmitEventUseCaseInterface {
 
     override suspend fun emit(topic: String, event: EngineDO.Event, id: Long?, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = supervisorScope {
         runCatching { validate(topic, event) }.fold(
             onSuccess = {
-                val eventParams = SignParams.EventParams(SessionEventVO(event.name, event.data), event.chainId)
-                val sessionEvent = SignRpc.SessionEvent(id = id ?: generateId(), params = eventParams)
-                val irnParams = IrnParams(Tags.SESSION_EVENT, Ttl(fiveMinutesInSeconds), correlationId = sessionEvent.id, prompt = true)
+                logger.log("Emitting event on topic: $topic; event: $event")
 
-                logger.log("Emitting event on topic: $topic")
-                jsonRpcInteractor.publishJsonRpcRequest(Topic(topic), irnParams, sessionEvent,
-                    onSuccess = {
-                        logger.log("Event sent successfully, on topic: $topic")
-                        onSuccess()
-                    },
-                    onFailure = { error ->
-                        logger.error("Sending event error: $error, on topic: $topic")
-                        onFailure(error)
-                    }
-                )
+                try {
+                    async { signClient.emit(topic = topic, name = event.name, data = event.data, chainId = event.chainId) }.await()
+
+                    logger.log("Event sent successfully, on topic: $topic")
+                    onSuccess()
+                } catch (e: Exception) {
+                    logger.error("Sending event error: $e, on topic: $topic")
+                    onFailure(e)
+                }
             },
             onFailure = { error ->
                 logger.error("Sending event error: $error, on topic: $topic")
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCase.kt
index 6da2d1c458..ccad90bcd5 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCase.kt
@@ -1,26 +1,21 @@
 package com.reown.sign.engine.use_case.calls
 
 import com.reown.android.internal.common.exception.CannotFindSequenceForTopic
-import com.reown.android.internal.common.model.IrnParams
-import com.reown.android.internal.common.model.Tags
-import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
-import com.reown.android.internal.utils.dayInSeconds
-import com.reown.android.internal.utils.weekInSeconds
 import com.reown.foundation.common.model.Topic
-import com.reown.foundation.common.model.Ttl
 import com.reown.foundation.util.Logger
 import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE
 import com.reown.sign.common.exceptions.NotSettledSessionException
 import com.reown.sign.common.exceptions.SESSION_IS_NOT_ACKNOWLEDGED_MESSAGE
-import com.reown.sign.common.model.vo.clientsync.session.SignRpc
-import com.reown.sign.common.model.vo.clientsync.session.params.SignParams
 import com.reown.sign.storage.sequence.SessionStorageRepository
+import kotlinx.coroutines.async
 import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.SignClient
 
 internal class ExtendSessionUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val sessionStorageRepository: SessionStorageRepository,
     private val logger: Logger,
+    private val signClient: SignClient,
 ) : ExtendSessionUseCaseInterface {
 
     override suspend fun extend(topic: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = supervisorScope {
@@ -30,26 +25,21 @@ internal class ExtendSessionUseCase(
 
         val session = sessionStorageRepository.getSessionWithoutMetadataByTopic(Topic(topic))
         if (!session.isAcknowledged) {
-            logger.error("Sending session extend error: not acknowledged session on topic: $topic")
+            logger.error("kobe: Sending session extend error: not acknowledged session on topic: $topic")
             return@supervisorScope onFailure(NotSettledSessionException("$SESSION_IS_NOT_ACKNOWLEDGED_MESSAGE$topic"))
         }
 
-        val newExpiration = session.expiry.seconds + weekInSeconds
-        sessionStorageRepository.extendSession(Topic(topic), newExpiration)
-        val sessionExtend = SignRpc.SessionExtend(params = SignParams.ExtendParams(newExpiration))
-        val irnParams = IrnParams(Tags.SESSION_EXTEND, Ttl(dayInSeconds), correlationId = sessionExtend.id)
-
-        logger.log("Sending session extend on topic: $topic")
-        jsonRpcInteractor.publishJsonRpcRequest(
-            Topic(topic), irnParams, sessionExtend,
-            onSuccess = {
-                logger.log("Session extend sent successfully on topic: $topic")
-                onSuccess()
-            },
-            onFailure = { error ->
-                logger.error("Sending session extend error: $error on topic: $topic")
-                onFailure(error)
-            })
+        logger.log("kobe: Sending session extend on topic: $topic")
+
+        try {
+            async { signClient.extend(topic) }.await()
+
+            logger.log("kobe: Session extend sent successfully on topic: $topic")
+            onSuccess()
+        } catch (e: Exception) {
+            logger.error("Sending session extend error: $e on topic: $topic")
+            onFailure(e)
+        }
     }
 }
 
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt
index 845051fc54..c83040f448 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt
@@ -4,16 +4,16 @@ import com.reown.android.Core
 import com.reown.android.pairing.client.PairingInterface
 import com.reown.sign.json_rpc.model.JsonRpcMethod
 
-internal class GetPairingForSessionAuthenticateUseCase(private var pairingProtocol: PairingInterface) {
-    operator fun invoke(pairingTopic: String?): Core.Model.Pairing {
-        val pairing: Core.Model.Pairing = if (pairingTopic != null) {
-            pairingProtocol.getPairings().find { pairing -> pairing.topic == pairingTopic } ?: throw Exception("Pairing does not exist")
-        } else {
-            pairingProtocol.create(methods = JsonRpcMethod.WC_SESSION_AUTHENTICATE, onError = { error -> throw error.throwable }) ?: throw Exception("Cannot create a pairing")
-        }
-        if (!pairing.registeredMethods.contains(JsonRpcMethod.WC_SESSION_AUTHENTICATE)) {
-            throw Exception("Pairing does not support wc_sessionAuthenticate")
-        }
-        return pairing
-    }
-}
\ No newline at end of file
+//internal class GetPairingForSessionAuthenticateUseCase(private var pairingProtocol: PairingInterface) {
+//    operator fun invoke(pairingTopic: String?): Core.Model.Pairing {
+////        val pairing: Core.Model.Pairing = if (pairingTopic != null) {
+//            pairingProtocol.getPairings().find { pairing -> pairing.topic == pairingTopic } ?: throw Exception("Pairing does not exist")
+////        } else {
+////            pairingProtocol.create(methods = JsonRpcMethod.WC_SESSION_AUTHENTICATE, onError = { error -> throw error.throwable }) ?: throw Exception("Cannot create a pairing")
+////        }
+//        if (!pairing.registeredMethods.contains(JsonRpcMethod.WC_SESSION_AUTHENTICATE)) {
+//            throw Exception("Pairing does not support wc_sessionAuthenticate")
+//        }
+//        return pairing
+//    }
+//}
\ No newline at end of file
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PingUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PingUseCase.kt
index d9edcbf1e2..10766343dc 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PingUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PingUseCase.kt
@@ -24,7 +24,7 @@ import kotlin.time.Duration.Companion.seconds
 private val THIRTY_SECONDS_TIMEOUT: Duration = 30.seconds
 
 internal class PingUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val sessionStorageRepository: SessionStorageRepository,
     private val logger: Logger
 ) : PingUseCaseInterface {
@@ -35,15 +35,15 @@ internal class PingUseCase(
             val irnParams = IrnParams(Tags.SESSION_PING, Ttl(thirtySeconds), correlationId = pingPayload.id)
 
             logger.log("Sending ping... topic: $topic")
-            jsonRpcInteractor.publishJsonRpcRequest(Topic(topic), irnParams, pingPayload,
-                onSuccess = {
-                    logger.log("Ping sent successfully, topic: $topic")
-                    onPingSuccess(timeout, pingPayload, onSuccess, topic, onFailure)
-                },
-                onFailure = { error ->
-                    logger.error("Ping sent error: $error, topic: $topic")
-                    onFailure(error)
-                })
+//            jsonRpcInteractor.publishJsonRpcRequest(Topic(topic), irnParams, pingPayload,
+//                onSuccess = {
+//                    logger.log("Ping sent successfully, topic: $topic")
+//                    onPingSuccess(timeout, pingPayload, onSuccess, topic, onFailure)
+//                },
+//                onFailure = { error ->
+//                    logger.error("Ping sent error: $error, topic: $topic")
+//                    onFailure(error)
+//                })
         } else {
             onFailure(Throwable("Session topic is not valid"))
         }
@@ -79,14 +79,14 @@ internal class PingUseCase(
     }
 
     private suspend fun collectResponse(id: Long, onResponse: (Result<JsonRpcResponse.JsonRpcResult>) -> Unit = {}) {
-        jsonRpcInteractor.peerResponse
-            .filter { response -> response.response.id == id }
-            .collect { response ->
-                when (val result = response.response) {
-                    is JsonRpcResponse.JsonRpcResult -> onResponse(Result.success(result))
-                    is JsonRpcResponse.JsonRpcError -> onResponse(Result.failure(Throwable(result.errorMessage)))
-                }
-            }
+//        jsonRpcInteractor.peerResponse
+//            .filter { response -> response.response.id == id }
+//            .collect { response ->
+//                when (val result = response.response) {
+//                    is JsonRpcResponse.JsonRpcResult -> onResponse(Result.success(result))
+//                    is JsonRpcResponse.JsonRpcError -> onResponse(Result.failure(Throwable(result.errorMessage)))
+//                }
+//            }
     }
 }
 
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCase.kt
index d944540767..2246bbbb5c 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCase.kt
@@ -17,18 +17,23 @@ import com.reown.sign.common.validator.SignValidator
 import com.reown.sign.engine.model.EngineDO
 import com.reown.sign.engine.model.mapper.toNamespacesVOOptional
 import com.reown.sign.engine.model.mapper.toNamespacesVORequired
+import com.reown.sign.engine.model.mapper.toProposalYttrium
 import com.reown.sign.engine.model.mapper.toSessionProposeParams
 import com.reown.sign.engine.model.mapper.toVO
+import com.reown.sign.engine.model.mapper.toYttrium
 import com.reown.sign.engine.use_case.utils.NamespaceMerger
 import com.reown.sign.storage.proposal.ProposalStorageRepository
 import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.ConnectParamsFfi
+import uniffi.yttrium.SignClient
 
 internal class ProposeSessionUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val crypto: KeyManagementRepository,
     private val proposalStorageRepository: ProposalStorageRepository,
     private val selfAppMetaData: AppMetaData,
-    private val logger: Logger
+    private val logger: Logger,
+    private val signClient: SignClient
 ) : ProposeSessionUseCaseInterface {
 
     override suspend fun proposeSession(
@@ -36,37 +41,54 @@ internal class ProposeSessionUseCase(
         optionalNamespaces: Map<String, EngineDO.Namespace.Proposal>?,
         properties: Map<String, String>?,
         scopedProperties: Map<String, String>?,
-        pairing: Pairing,
-        onSuccess: () -> Unit,
+        pairing: Pairing?,
+        onSuccess: (String) -> Unit,
         onFailure: (Throwable) -> Unit,
     ) = supervisorScope {
-        val relay = RelayProtocolOptions(pairing.relayProtocol, pairing.relayData)
+//        val relay = RelayProtocolOptions(pairing.relayProtocol, pairing.relayData)
         // Map requiredNamespaces to optionalNamespaces if not null, ensuring no duplications
         val mergedOptionalNamespaces = NamespaceMerger.merge(requiredNamespaces, optionalNamespaces)
         runCatching { validate(null, mergedOptionalNamespaces, properties) }.fold(
             onSuccess = {
-                val expiry = Expiry(PROPOSAL_EXPIRY)
-                val selfPublicKey: PublicKey = crypto.generateAndStoreX25519KeyPair()
-                val sessionProposal: SignParams.SessionProposeParams =
-                    toSessionProposeParams(
-                        listOf(relay), emptyMap(), mergedOptionalNamespaces ?: emptyMap(),
-                        properties, scopedProperties, selfPublicKey, selfAppMetaData, expiry
+//                val expiry = Expiry(PROPOSAL_EXPIRY)
+//                val selfPublicKey: PublicKey = crypto.generateAndStoreX25519KeyPair()
+//                val sessionProposal: SignParams.SessionProposeParams =
+//                    toSessionProposeParams(
+//                        listOf(RelayProtocolOptions(pairing.relayProtocol, pairing.relayData)), emptyMap(), mergedOptionalNamespaces ?: emptyMap(),
+//                        properties, scopedProperties, selfPublicKey, selfAppMetaData, expiry
+//                    )
+//                val request = SignRpc.SessionPropose(params = sessionProposal)
+//                proposalStorageRepository.insertProposal(sessionProposal.toVO(pairing.topic, request.id))
+//                logger.log("Sending proposal on topic: ${pairing?.topic?.value}")
+
+                try {
+                    val connectResult = signClient.connect(
+                        params = ConnectParamsFfi(
+                            optionalNamespaces = mergedOptionalNamespaces?.toNamespacesVOOptional()?.toProposalYttrium() ?: emptyMap(),
+                            sessionProperties = properties,
+                            scopedProperties = scopedProperties,
+                            metadata = selfAppMetaData.toYttrium()
+                        ),
+                        selfMetadata = selfAppMetaData.toYttrium()
                     )
-                val request = SignRpc.SessionPropose(params = sessionProposal)
-                proposalStorageRepository.insertProposal(sessionProposal.toVO(pairing.topic, request.id))
-                logger.log("Sending proposal on topic: ${pairing.topic.value}")
+                    logger.log("Session proposal sent successfully, topic: ${connectResult.topic}, connectResult: $connectResult")
+                    onSuccess(connectResult.uri)
+                } catch (e: Exception) {
+                    logger.error("Failed to send a session proposal: $e")
+                    onFailure(e)
+                }
 
-                jsonRpcInteractor.proposeSession(
-                    topic = pairing.topic, payload = request,
-                    onSuccess = {
-                        logger.log("Session proposal sent successfully, topic: ${pairing.topic}")
-                        onSuccess()
-                    },
-                    onFailure = { error ->
-                        logger.error("Failed to send a session proposal: $error")
-                        onFailure(error)
-                    }
-                )
+//                jsonRpcInteractor.proposeSession(
+//                    topic = pairing.topic, payload = request,
+//                    onSuccess = {
+//                        logger.log("Session proposal sent successfully, topic: ${pairing.topic}")
+//                        onSuccess()
+//                    },
+//                    onFailure = { error ->
+//                        logger.error("Failed to send a session proposal: $error")
+//                        onFailure(error)
+//                    }
+//                )
             },
             onFailure = { error ->
                 logger.error("Failed to validate session proposal: $error")
@@ -109,8 +131,8 @@ internal interface ProposeSessionUseCaseInterface {
         optionalNamespaces: Map<String, EngineDO.Namespace.Proposal>?,
         properties: Map<String, String>?,
         scopedProperties: Map<String, String>?,
-        pairing: Pairing,
-        onSuccess: () -> Unit,
+        pairing: Pairing?,
+        onSuccess: (String) -> Unit,
         onFailure: (Throwable) -> Unit,
     )
 }
\ No newline at end of file
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt
index 76724a63ea..bc0181c739 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt
@@ -32,13 +32,13 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 
 internal class RejectSessionAuthenticateUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val getPendingSessionAuthenticateRequest: GetPendingSessionAuthenticateRequest,
     private val crypto: KeyManagementRepository,
     private val verifyContextStorageRepository: VerifyContextStorageRepository,
-    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
-    private val insertEventUseCase: InsertEventUseCase,
-    private val clientId: String,
+//    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
+//    private val insertEventUseCase: InsertEventUseCase,
+//    private val clientId: String,
     private val logger: Logger
 ) : RejectSessionAuthenticateUseCaseInterface {
     override suspend fun rejectSessionAuthenticate(id: Long, reason: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = supervisorScope {
@@ -68,40 +68,40 @@ internal class RejectSessionAuthenticateUseCase(
 
         if (jsonRpcHistoryEntry.transportType == TransportType.LINK_MODE && receiverMetadata.redirect?.linkMode == true) {
             if (receiverMetadata.redirect?.universal.isNullOrEmpty()) return@supervisorScope onFailure(IllegalStateException("App link is missing"))
-            try {
-                linkModeJsonRpcInteractor.triggerResponse(
-                    responseTopic,
-                    response,
-                    receiverMetadata.redirect?.universal!!,
-                    Participants(senderPublicKey, receiverPublicKey),
-                    EnvelopeType.ONE
-                )
-                insertEventUseCase(
-                    Props(
-                        EventType.SUCCESS,
-                        Tags.SESSION_AUTHENTICATE_LINK_MODE_RESPONSE_REJECT.id.toString(),
-                        Properties(clientId = clientId, correlationId = id, direction = Direction.SENT.state)
-                    )
-                )
-            } catch (e: Exception) {
-                onFailure(e)
-            }
+//            try {
+//                linkModeJsonRpcInteractor.triggerResponse(
+//                    responseTopic,
+//                    response,
+//                    receiverMetadata.redirect?.universal!!,
+//                    Participants(senderPublicKey, receiverPublicKey),
+//                    EnvelopeType.ONE
+//                )
+//                insertEventUseCase(
+//                    Props(
+//                        EventType.SUCCESS,
+//                        Tags.SESSION_AUTHENTICATE_LINK_MODE_RESPONSE_REJECT.id.toString(),
+//                        Properties(clientId = clientId, correlationId = id, direction = Direction.SENT.state)
+//                    )
+//                )
+//            } catch (e: Exception) {
+//                onFailure(e)
+//            }
         } else {
             val irnParams = IrnParams(Tags.SESSION_AUTHENTICATE_RESPONSE_REJECT, Ttl(dayInSeconds), correlationId = response.id, prompt = false)
             logger.log("Sending Session Authenticate Reject on topic: $responseTopic")
-            jsonRpcInteractor.publishJsonRpcResponse(
-                responseTopic, irnParams, response, envelopeType = EnvelopeType.ONE, participants = Participants(senderPublicKey, receiverPublicKey),
-                onSuccess = {
-                    logger.log("Session Authenticate Reject Responded on topic: $responseTopic")
-                    scope.launch { supervisorScope { verifyContextStorageRepository.delete(id) } }
-                    onSuccess()
-                },
-                onFailure = { error ->
-                    logger.error("Session Authenticate Error Responded on topic: $responseTopic")
-                    scope.launch { supervisorScope { verifyContextStorageRepository.delete(id) } }
-                    onFailure(error)
-                }
-            )
+//            jsonRpcInteractor.publishJsonRpcResponse(
+//                responseTopic, irnParams, response, envelopeType = EnvelopeType.ONE, participants = Participants(senderPublicKey, receiverPublicKey),
+//                onSuccess = {
+//                    logger.log("Session Authenticate Reject Responded on topic: $responseTopic")
+//                    scope.launch { supervisorScope { verifyContextStorageRepository.delete(id) } }
+//                    onSuccess()
+//                },
+//                onFailure = { error ->
+//                    logger.error("Session Authenticate Error Responded on topic: $responseTopic")
+//                    scope.launch { supervisorScope { verifyContextStorageRepository.delete(id) } }
+//                    onFailure(error)
+//                }
+//            )
         }
     }
 }
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt
index 76f47e89ef..6b86fdd178 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt
@@ -1,28 +1,22 @@
 package com.reown.sign.engine.use_case.calls
 
-import com.reown.android.Core
-import com.reown.android.internal.common.model.IrnParams
-import com.reown.android.internal.common.model.Tags
-import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
-import com.reown.android.internal.common.scope
 import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository
 import com.reown.android.internal.utils.CoreValidator.isExpired
-import com.reown.android.internal.utils.fiveMinutesInSeconds
-import com.reown.android.pairing.handler.PairingControllerInterface
-import com.reown.foundation.common.model.Ttl
 import com.reown.foundation.util.Logger
-import com.reown.sign.common.exceptions.PeerError
 import com.reown.sign.common.exceptions.SessionProposalExpiredException
-import com.reown.sign.engine.model.mapper.toSessionProposeRequest
+import com.reown.sign.engine.model.mapper.toProposalFfi
 import com.reown.sign.storage.proposal.ProposalStorageRepository
+import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.RejectionReason
+import uniffi.yttrium.SignClient
 
 internal class RejectSessionUseCase(
     private val verifyContextStorageRepository: VerifyContextStorageRepository,
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val proposalStorageRepository: ProposalStorageRepository,
-    private val logger: Logger
+    private val logger: Logger,
+    private val signClient: SignClient,
 ) : RejectSessionUseCaseInterface {
 
     override suspend fun reject(proposerPublicKey: String, reason: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = supervisorScope {
@@ -35,23 +29,27 @@ internal class RejectSessionUseCase(
         }
 
         logger.log("Sending session rejection, topic: ${proposal.pairingTopic.value}")
-        jsonRpcInteractor.respondWithError(
-            proposal.toSessionProposeRequest(),
-            PeerError.EIP1193.UserRejectedRequest(reason),
-            IrnParams(Tags.SESSION_PROPOSE_RESPONSE_REJECT, Ttl(fiveMinutesInSeconds), correlationId = proposal.requestId),
-            onSuccess = {
-                logger.log("Session rejection sent successfully, topic: ${proposal.pairingTopic.value}")
-                scope.launch {
-                    proposalStorageRepository.deleteProposal(proposerPublicKey)
-                    verifyContextStorageRepository.delete(proposal.requestId)
-                    jsonRpcInteractor.unsubscribe(proposal.pairingTopic)
-                }
-                onSuccess()
-            },
-            onFailure = { error ->
-                logger.error("Session rejection sent failure, topic: ${proposal.pairingTopic.value}. Error: $error")
-                onFailure(error)
-            })
+        try {
+            async {
+                signClient.reject(
+                    proposal = proposal.toProposalFfi(),
+                    reason = RejectionReason.USER_REJECTED
+                )
+            }.await()
+            
+            logger.log("Session rejection sent successfully, topic: ${proposal.pairingTopic.value}")
+            
+            // Cleanup storage
+            launch {
+                proposalStorageRepository.deleteProposal(proposerPublicKey)
+                verifyContextStorageRepository.delete(proposal.requestId)
+            }
+            
+            onSuccess()
+        } catch (e: Exception) {
+            logger.error("Session rejection sent failure, topic: ${proposal.pairingTopic.value}. Error: $e")
+            onFailure(e)
+        }
     }
 }
 
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt
index 7b0742a55e..6c87673d72 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt
@@ -29,24 +29,43 @@ import com.reown.sign.engine.model.tvf.TVF
 import com.reown.sign.engine.sessionRequestEventsQueue
 import com.reown.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase
 import com.reown.sign.storage.sequence.SessionStorageRepository
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import com.squareup.moshi.JsonClass
+import uniffi.yttrium.SessionRequestJsonRpcErrorResponseFfi
+import uniffi.yttrium.SessionRequestJsonRpcResponseFfi
+import uniffi.yttrium.SessionRequestJsonRpcResultResponseFfi
+import uniffi.yttrium.SignClient
+
+@JsonClass(generateAdapter = true)
+data class JsonRpcErrorData(
+    val code: Int,
+    val message: String,
+    val data: String? = null
+)
 
 internal class RespondSessionRequestUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val sessionStorageRepository: SessionStorageRepository,
-    private val getPendingJsonRpcHistoryEntryByIdUseCase: GetPendingJsonRpcHistoryEntryByIdUseCase,
-    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
-    private val logger: Logger,
+//    private val getPendingJsonRpcHistoryEntryByIdUseCase: GetPendingJsonRpcHistoryEntryByIdUseCase,
+//    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
+//    private val logger: Logger,
     private val verifyContextStorageRepository: VerifyContextStorageRepository,
     private val metadataStorageRepository: MetadataStorageRepositoryInterface,
-    private val insertEventUseCase: InsertEventUseCase,
-    private val clientId: String,
-    private val tvf: TVF
+//    private val insertEventUseCase: InsertEventUseCase,
+//    private val clientId: String,
+//    private val tvf: TVF,
+    private val signClient: SignClient
 ) : RespondSessionRequestUseCaseInterface {
+    private val moshi = Moshi.Builder()
+        .add(KotlinJsonAdapterFactory())
+        .build()
     private val _events: MutableSharedFlow<EngineEvent> = MutableSharedFlow()
     override val events: SharedFlow<EngineEvent> = _events.asSharedFlow()
     override suspend fun respondSessionRequest(
@@ -55,80 +74,121 @@ internal class RespondSessionRequestUseCase(
         onSuccess: () -> Unit,
         onFailure: (Throwable) -> Unit,
     ) = supervisorScope {
-        val topicWrapper = Topic(topic)
-        if (!sessionStorageRepository.isSessionValid(topicWrapper)) {
-            logger.error("Request response -  invalid session: $topic, id: ${jsonRpcResponse.id}")
-            return@supervisorScope onFailure(CannotFindSequenceForTopic("$NO_SEQUENCE_FOR_TOPIC_MESSAGE$topic"))
-        }
-        val session = sessionStorageRepository.getSessionWithoutMetadataByTopic(topicWrapper)
-            .run {
-                val peerAppMetaData = metadataStorageRepository.getByTopicAndType(this.topic, AppMetaDataType.PEER)
-                this.copy(peerAppMetaData = peerAppMetaData)
-            }
-
-        val pendingRequest = getPendingJsonRpcHistoryEntryByIdUseCase(jsonRpcResponse.id)
-        if (pendingRequest == null) {
-            logger.error("Request doesn't exist: $topic, id: ${jsonRpcResponse.id}")
-            return@supervisorScope onFailure(RequestExpiredException("This request has expired, id: ${jsonRpcResponse.id}"))
-        }
-        pendingRequest.params.expiry?.let {
-            if (Expiry(it).isExpired()) {
-                logger.error("Request Expired: $topic, id: ${jsonRpcResponse.id}")
-                return@supervisorScope onFailure(RequestExpiredException("This request has expired, id: ${jsonRpcResponse.id}"))
-            }
-        }
+        try {
+            val responseFfi = when (jsonRpcResponse) {
+                is JsonRpcResponse.JsonRpcResult -> {
+                    val responseResultFfi = SessionRequestJsonRpcResultResponseFfi(
+                        id = jsonRpcResponse.id.toULong(),
+                        jsonrpc = "2.0",
+                        result = jsonRpcResponse.result.toString()
+                    )
+                    SessionRequestJsonRpcResponseFfi.Result(responseResultFfi)
+                }
 
-        if (session.transportType == TransportType.LINK_MODE && session.peerLinkMode == true) {
-            if (session.peerAppLink.isNullOrEmpty()) return@supervisorScope onFailure(IllegalStateException("App link is missing"))
-            try {
-                removePendingSessionRequestAndEmit(jsonRpcResponse.id)
-                linkModeJsonRpcInteractor.triggerResponse(Topic(topic), jsonRpcResponse, session.peerAppLink)
-                insertEventUseCase(
-                    Props(
-                        EventType.SUCCESS,
-                        Tags.SESSION_REQUEST_LINK_MODE_RESPONSE.id.toString(),
-                        Properties(correlationId = jsonRpcResponse.id, clientId = clientId, direction = Direction.SENT.state)
+                is JsonRpcResponse.JsonRpcError -> {
+                    val errorJson = moshi.adapter(JsonRpcResponse.Error::class.java).toJson(jsonRpcResponse.error)
+                    println("kobe: parsed error JSON: $errorJson")
+                    
+                    val responseErrorFfi = SessionRequestJsonRpcErrorResponseFfi(
+                        id = jsonRpcResponse.id.toULong(),
+                        jsonrpc = "2.0",
+                        error = errorJson
                     )
-                )
-            } catch (e: Exception) {
-                onFailure(e)
-            }
-        } else {
-            val tvfData = tvf.collect(pendingRequest.params.rpcMethod, pendingRequest.params.rpcParams, pendingRequest.params.chainId)
-            val txHashes = (jsonRpcResponse as? JsonRpcResponse.JsonRpcResult)?.let {
-                tvf.collectTxHashes(
-                    pendingRequest.params.rpcMethod,
-                    it.result.toString(),
-                    pendingRequest.params.rpcParams
-                )
+                    SessionRequestJsonRpcResponseFfi.Error(responseErrorFfi)
+                }
             }
-            val irnParams = IrnParams(
-                Tags.SESSION_REQUEST_RESPONSE,
-                Ttl(fiveMinutesInSeconds),
-                correlationId = jsonRpcResponse.id,
-                rpcMethods = tvfData.first,
-                contractAddresses = tvfData.second,
-                txHashes = txHashes,
-                chainId = tvfData.third
-            )
-            logger.log("Sending session request response on topic: $topic, id: ${jsonRpcResponse.id}")
-            jsonRpcInteractor.publishJsonRpcResponse(
-                topic = Topic(topic), params = irnParams, response = jsonRpcResponse,
-                onSuccess = {
-                    onSuccess()
-                    logger.log("Session request response sent successfully on topic: $topic, id: ${jsonRpcResponse.id}")
-                    scope.launch {
-                        supervisorScope {
-                            removePendingSessionRequestAndEmit(jsonRpcResponse.id)
-                        }
-                    }
-                },
-                onFailure = { error ->
-                    logger.error("Sending session response error: $error, id: ${jsonRpcResponse.id}")
-                    onFailure(error)
+
+            val result = async {
+                try {
+                    println("kobe: sending response: $responseFfi")
+                    signClient.respond(topic, responseFfi)
+                } catch (e: Exception) {
+                    println("kobe: session request error: $e")
+                    onFailure(e)
                 }
-            )
+            }.await()
+
+            println("kobe: session request responded: $result")
+            onSuccess()
+
+        } catch (e: Exception) {
+            println("kobe: session request error: $e")
+            onFailure(e)
         }
+//        val topicWrapper = Topic(topic)
+//        if (!sessionStorageRepository.isSessionValid(topicWrapper)) {
+//            logger.error("Request response -  invalid session: $topic, id: ${jsonRpcResponse.id}")
+//            return@supervisorScope onFailure(CannotFindSequenceForTopic("$NO_SEQUENCE_FOR_TOPIC_MESSAGE$topic"))
+//        }
+//        val session = sessionStorageRepository.getSessionWithoutMetadataByTopic(topicWrapper)
+//            .run {
+//                val peerAppMetaData = metadataStorageRepository.getByTopicAndType(this.topic, AppMetaDataType.PEER)
+//                this.copy(peerAppMetaData = peerAppMetaData)
+//            }
+//
+//        val pendingRequest = getPendingJsonRpcHistoryEntryByIdUseCase(jsonRpcResponse.id)
+//        if (pendingRequest == null) {
+//            logger.error("Request doesn't exist: $topic, id: ${jsonRpcResponse.id}")
+//            return@supervisorScope onFailure(RequestExpiredException("This request has expired, id: ${jsonRpcResponse.id}"))
+//        }
+//        pendingRequest.params.expiry?.let {
+//            if (Expiry(it).isExpired()) {
+//                logger.error("Request Expired: $topic, id: ${jsonRpcResponse.id}")
+//                return@supervisorScope onFailure(RequestExpiredException("This request has expired, id: ${jsonRpcResponse.id}"))
+//            }
+//        }
+//
+//        if (session.transportType == TransportType.LINK_MODE && session.peerLinkMode == true) {
+//            if (session.peerAppLink.isNullOrEmpty()) return@supervisorScope onFailure(IllegalStateException("App link is missing"))
+//            try {
+//                removePendingSessionRequestAndEmit(jsonRpcResponse.id)
+//                linkModeJsonRpcInteractor.triggerResponse(Topic(topic), jsonRpcResponse, session.peerAppLink)
+//                insertEventUseCase(
+//                    Props(
+//                        EventType.SUCCESS,
+//                        Tags.SESSION_REQUEST_LINK_MODE_RESPONSE.id.toString(),
+//                        Properties(correlationId = jsonRpcResponse.id, clientId = clientId, direction = Direction.SENT.state)
+//                    )
+//                )
+//            } catch (e: Exception) {
+//                onFailure(e)
+//            }
+//        } else {
+//            val tvfData = tvf.collect(pendingRequest.params.rpcMethod, pendingRequest.params.rpcParams, pendingRequest.params.chainId)
+//            val txHashes = (jsonRpcResponse as? JsonRpcResponse.JsonRpcResult)?.let {
+//                tvf.collectTxHashes(
+//                    pendingRequest.params.rpcMethod,
+//                    it.result.toString(),
+//                    pendingRequest.params.rpcParams
+//                )
+//            }
+//            val irnParams = IrnParams(
+//                Tags.SESSION_REQUEST_RESPONSE,
+//                Ttl(fiveMinutesInSeconds),
+//                correlationId = jsonRpcResponse.id,
+//                rpcMethods = tvfData.first,
+//                contractAddresses = tvfData.second,
+//                txHashes = txHashes,
+//                chainId = tvfData.third
+//            )
+//            logger.log("Sending session request response on topic: $topic, id: ${jsonRpcResponse.id}")
+//            jsonRpcInteractor.publishJsonRpcResponse(
+//                topic = Topic(topic), params = irnParams, response = jsonRpcResponse,
+//                onSuccess = {
+//                    onSuccess()
+//                    logger.log("Session request response sent successfully on topic: $topic, id: ${jsonRpcResponse.id}")
+//                    scope.launch {
+//                        supervisorScope {
+//                            removePendingSessionRequestAndEmit(jsonRpcResponse.id)
+//                        }
+//                    }
+//                },
+//                onFailure = { error ->
+//                    logger.error("Sending session response error: $error, id: ${jsonRpcResponse.id}")
+//                    onFailure(error)
+//                }
+//            )
+//        }
     }
 
     private suspend fun removePendingSessionRequestAndEmit(id: Long) {
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt
index e1313b6591..53f465f7a3 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt
@@ -49,17 +49,17 @@ import org.json.JSONObject
 import java.util.UUID
 
 internal class SessionAuthenticateUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val crypto: KeyManagementRepository,
     private val selfAppMetaData: AppMetaData,
     private val authenticateResponseTopicRepository: AuthenticateResponseTopicRepository,
     private val proposeSessionUseCase: ProposeSessionUseCaseInterface,
-    private val getPairingForSessionAuthenticate: GetPairingForSessionAuthenticateUseCase,
+//    private val getPairingForSessionAuthenticate: GetPairingForSessionAuthenticateUseCase,
     private val getNamespacesFromReCaps: GetNamespacesFromReCaps,
-    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
+//    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
     private val linkModeStorageRepository: LinkModeStorageRepository,
-    private val insertEventUseCase: InsertEventUseCase,
-    private val clientId: String,
+//    private val insertEventUseCase: InsertEventUseCase,
+//    private val clientId: String,
     private val logger: Logger
 ) : SessionAuthenticateUseCaseInterface {
     override suspend fun authenticate(
@@ -106,51 +106,51 @@ internal class SessionAuthenticateUseCase(
         crypto.setKey(requesterPublicKey, responseTopic.getParticipantTag())
 
         if (isLinkModeEnabled(walletAppLink)) {
-            try {
-                linkModeJsonRpcInteractor.triggerRequest(authRequest, appLink = walletAppLink!!, topic = Topic(generateUUID()), envelopeType = EnvelopeType.TWO)
-                insertEventUseCase(
-                    Props(
-                        EventType.SUCCESS,
-                        Tags.SESSION_AUTHENTICATE_LINK_MODE.id.toString(),
-                        Properties(correlationId = authRequest.id, clientId = clientId, direction = Direction.SENT.state)
-                    )
-                )
-                logger.log("Link Mode - Request triggered successfully")
-            } catch (e: Error) {
-                onFailure(e)
-            }
+//            try {
+//                linkModeJsonRpcInteractor.triggerRequest(authRequest, appLink = walletAppLink!!, topic = Topic(generateUUID()), envelopeType = EnvelopeType.TWO)
+//                insertEventUseCase(
+//                    Props(
+//                        EventType.SUCCESS,
+//                        Tags.SESSION_AUTHENTICATE_LINK_MODE.id.toString(),
+//                        Properties(correlationId = authRequest.id, clientId = clientId, direction = Direction.SENT.state)
+//                    )
+//                )
+//                logger.log("Link Mode - Request triggered successfully")
+//            } catch (e: Error) {
+//                onFailure(e)
+//            }
         } else {
-            val pairing = getPairingForSessionAuthenticate(pairingTopic)
+//            val pairing = getPairingForSessionAuthenticate(pairingTopic)
             logger.log("Session authenticate subscribing on topic: $responseTopic")
-            jsonRpcInteractor.subscribe(
-                responseTopic,
-                onSuccess = {
-                    logger.log("Session authenticate subscribed on topic: $responseTopic")
-                    scope.launch {
-                        authenticateResponseTopicRepository.insertOrAbort(pairing.topic, responseTopic.value)
-                    }
-                },
-                onFailure = { error ->
-                    logger.error("Session authenticate subscribing on topic error: $responseTopic, $error")
-                    onFailure(error)
-                })
-
-            scope.launch {
-                supervisorScope {
-                    val sessionAuthenticateDeferred = publishSessionAuthenticateDeferred(pairing, authRequest, responseTopic, requestExpiry)
-                    val sessionProposeDeferred = publishSessionProposeDeferred(pairing, optionalNamespaces, responseTopic)
-
-                    val sessionAuthenticateResult = async { sessionAuthenticateDeferred }.await()
-                    val sessionProposeResult = async { sessionProposeDeferred }.await()
-
-                    when {
-                        sessionAuthenticateResult.isSuccess && sessionProposeResult.isSuccess -> onSuccess(pairing.uri)
-                        sessionAuthenticateResult.isFailure -> onFailure(sessionAuthenticateResult.exceptionOrNull() ?: Throwable("Session authenticate failed"))
-                        sessionProposeResult.isFailure -> onFailure(sessionProposeResult.exceptionOrNull() ?: Throwable("Session proposal as a fallback failed"))
-                        else -> onFailure(Throwable("Session authenticate failed, please try again"))
-                    }
-                }
-            }
+//            jsonRpcInteractor.subscribe(
+//                responseTopic,
+//                onSuccess = {
+//                    logger.log("Session authenticate subscribed on topic: $responseTopic")
+//                    scope.launch {
+//                        authenticateResponseTopicRepository.insertOrAbort(pairing.topic, responseTopic.value)
+//                    }
+//                },
+//                onFailure = { error ->
+//                    logger.error("Session authenticate subscribing on topic error: $responseTopic, $error")
+//                    onFailure(error)
+//                })
+
+//            scope.launch {
+//                supervisorScope {
+//                    val sessionAuthenticateDeferred = publishSessionAuthenticateDeferred(pairing, authRequest, responseTopic, requestExpiry)
+//                    val sessionProposeDeferred = publishSessionProposeDeferred(pairing, optionalNamespaces, responseTopic)
+//
+//                    val sessionAuthenticateResult = async { sessionAuthenticateDeferred }.await()
+//                    val sessionProposeResult = async { sessionProposeDeferred }.await()
+//
+//                    when {
+//                        sessionAuthenticateResult.isSuccess && sessionProposeResult.isSuccess -> onSuccess(pairing.uri)
+//                        sessionAuthenticateResult.isFailure -> onFailure(sessionAuthenticateResult.exceptionOrNull() ?: Throwable("Session authenticate failed"))
+//                        sessionProposeResult.isFailure -> onFailure(sessionProposeResult.exceptionOrNull() ?: Throwable("Session proposal as a fallback failed"))
+//                        else -> onFailure(Throwable("Session authenticate failed, please try again"))
+//                    }
+//                }
+//            }
         }
     }
 
@@ -188,17 +188,17 @@ internal class SessionAuthenticateUseCase(
         val irnParamsTtl = getIrnParamsTtl(requestExpiry, currentTimeInSeconds)
         val irnParams = IrnParams(Tags.SESSION_AUTHENTICATE, irnParamsTtl, correlationId = authRequest.id, prompt = true)
         val sessionAuthenticateDeferred = CompletableDeferred<Result<Unit>>()
-        jsonRpcInteractor.publishJsonRpcRequest(Topic(pairing.topic), irnParams, authRequest,
-            onSuccess = {
-                logger.log("Session authenticate sent successfully on topic: ${pairing.topic}")
-                sessionAuthenticateDeferred.complete(Result.success(Unit))
-            },
-            onFailure = { error ->
-                jsonRpcInteractor.unsubscribe(responseTopic)
-                logger.error("Failed to send a auth request: $error")
-                sessionAuthenticateDeferred.complete(Result.failure(error))
-            }
-        )
+//        jsonRpcInteractor.publishJsonRpcRequest(Topic(pairing.topic), irnParams, authRequest,
+//            onSuccess = {
+//                logger.log("Session authenticate sent successfully on topic: ${pairing.topic}")
+//                sessionAuthenticateDeferred.complete(Result.success(Unit))
+//            },
+//            onFailure = { error ->
+//                jsonRpcInteractor.unsubscribe(responseTopic)
+//                logger.error("Failed to send a auth request: $error")
+//                sessionAuthenticateDeferred.complete(Result.failure(error))
+//            }
+//        )
         return sessionAuthenticateDeferred.await()
     }
 
@@ -220,7 +220,7 @@ internal class SessionAuthenticateUseCase(
                 sessionProposeDeferred.complete(Result.success(Unit))
             },
             onFailure = { error ->
-                jsonRpcInteractor.unsubscribe(responseTopic)
+//                jsonRpcInteractor.unsubscribe(responseTopic)
                 logger.error("Failed to send a session proposal as a fallback: $error")
                 sessionProposeDeferred.complete(Result.failure(error))
             }
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCase.kt
index 199b88baae..b6ae8b9285 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCase.kt
@@ -1,66 +1,48 @@
 package com.reown.sign.engine.use_case.calls
 
-import com.reown.android.internal.common.JsonRpcResponse
 import com.reown.android.internal.common.exception.CannotFindSequenceForTopic
-import com.reown.android.internal.common.exception.InvalidExpiryException
-import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface
 import com.reown.android.internal.common.model.AppMetaDataType
 import com.reown.android.internal.common.model.Expiry
-import com.reown.android.internal.common.model.IrnParams
 import com.reown.android.internal.common.model.Namespace
 import com.reown.android.internal.common.model.SDKError
-import com.reown.android.internal.common.model.Tags
-import com.reown.android.internal.common.model.TransportType
 import com.reown.android.internal.common.model.type.EngineEvent
-import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
-import com.reown.android.internal.common.scope
 import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface
-import com.reown.android.internal.utils.CoreValidator
 import com.reown.android.internal.utils.currentTimeInSeconds
 import com.reown.android.internal.utils.fiveMinutesInSeconds
-import com.reown.android.pulse.domain.InsertEventUseCase
-import com.reown.android.pulse.model.Direction
-import com.reown.android.pulse.model.EventType
-import com.reown.android.pulse.model.properties.Properties
-import com.reown.android.pulse.model.properties.Props
 import com.reown.foundation.common.model.Topic
 import com.reown.foundation.common.model.Ttl
 import com.reown.foundation.util.Logger
-import com.reown.sign.common.exceptions.InvalidRequestException
+import com.reown.sign.client.Sign
 import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE
 import com.reown.sign.common.exceptions.UnauthorizedMethodException
 import com.reown.sign.common.model.vo.clientsync.session.SignRpc
-import com.reown.sign.common.model.vo.clientsync.session.params.SignParams
-import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO
 import com.reown.sign.common.validator.SignValidator
 import com.reown.sign.engine.domain.wallet_service.WalletServiceFinder
 import com.reown.sign.engine.domain.wallet_service.WalletServiceRequester
 import com.reown.sign.engine.model.EngineDO
-import com.reown.sign.engine.model.tvf.TVF
 import com.reown.sign.storage.sequence.SessionStorageRepository
-import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.async
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
-import kotlinx.coroutines.withTimeout
-import java.util.concurrent.TimeUnit
+import uniffi.yttrium.SessionRequestFfi
+import uniffi.yttrium.SessionRequestJsonRpcFfi
+import uniffi.yttrium.SessionRequestRequestFfi
+import uniffi.yttrium.SignClient
 
 internal class SessionRequestUseCase(
     private val sessionStorageRepository: SessionStorageRepository,
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
-    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val linkModeJsonRpcInteractor: LinkModeJsonRpcInteractorInterface,
     private val metadataStorageRepository: MetadataStorageRepositoryInterface,
-    private val insertEventUseCase: InsertEventUseCase,
-    private val clientId: String,
+//    private val insertEventUseCase: InsertEventUseCase,
+//    private val clientId: String,
     private val logger: Logger,
-    private val tvf: TVF,
+//    private val tvf: TVF,
     private val walletServiceFinder: WalletServiceFinder,
-    private val walletServiceRequester: WalletServiceRequester
+    private val walletServiceRequester: WalletServiceRequester,
+    private val signClient: SignClient
 ) : SessionRequestUseCaseInterface {
     private val _events: MutableSharedFlow<EngineEvent> = MutableSharedFlow()
     override val requestEvents: SharedFlow<EngineEvent> = _events.asSharedFlow()
@@ -79,16 +61,16 @@ internal class SessionRequestUseCase(
                 this.copy(peerAppMetaData = peerAppMetaData)
             }
 
-        val nowInSeconds = currentTimeInSeconds
-        if (!CoreValidator.isExpiryWithinBounds(request.expiry)) {
-            logger.error("Sending session request error: expiry not within bounds")
-            return@supervisorScope onFailure(InvalidExpiryException())
-        }
-        val expiry = request.expiry ?: Expiry(currentTimeInSeconds + fiveMinutesInSeconds)
-        SignValidator.validateSessionRequest(request) { error ->
-            logger.error("Sending session request error: invalid session request, ${error.message}")
-            return@supervisorScope onFailure(InvalidRequestException(error.message))
-        }
+//        val nowInSeconds = currentTimeInSeconds
+//        if (!CoreValidator.isExpiryWithinBounds(request.expiry)) {
+//            logger.error("Sending session request error: expiry not within bounds")
+//            return@supervisorScope onFailure(InvalidExpiryException())
+//        }
+//        val expiry = request.expiry ?: Expiry(currentTimeInSeconds + fiveMinutesInSeconds)
+//        SignValidator.validateSessionRequest(request) { error ->
+//            logger.error("Sending session request error: invalid session request, ${error.message}")
+//            return@supervisorScope onFailure(InvalidRequestException(error.message))
+//        }
 
         val namespaces: Map<String, Namespace.Session> =
             sessionStorageRepository.getSessionWithoutMetadataByTopic(Topic(request.topic)).sessionNamespaces
@@ -97,34 +79,52 @@ internal class SessionRequestUseCase(
             return@supervisorScope onFailure(UnauthorizedMethodException(error.message))
         }
 
-        val params = SignParams.SessionRequestParams(SessionRequestVO(request.method, request.params, expiry.seconds), request.chainId)
-        val sessionPayload = SignRpc.SessionRequest(params = params)
-        val walletServiceUrl = try {
-            walletServiceFinder.findMatchingWalletService(request, session)
+        val sessionRequestFfi = SessionRequestFfi(
+            chainId = request.chainId,
+            request = SessionRequestRequestFfi(
+                method = request.method,
+                params = request.params,
+                expiry = request.expiry?.seconds?.toULong()
+            )
+        )
+
+        try {
+            val id = async { signClient.request(topic = request.topic, sessionRequest = sessionRequestFfi) }.await()
+            onSuccess(id.toLong())
         } catch (e: Exception) {
-            null
+            logger.error("Sending session request error: $e")
+            onFailure(e)
         }
 
 
-        if (walletServiceUrl != null) {
-            try {
-                val response = async { walletServiceRequester.request(sessionPayload, walletServiceUrl.toString()) }.await()
-                val jsonRpcResult = EngineDO.JsonRpcResponse.JsonRpcResult(id = sessionPayload.id, result = response)
-                _events.emit(EngineDO.SessionPayloadResponse(request.topic, params.chainId, request.method, jsonRpcResult))
-            } catch (e: Exception) {
-                logger.error("Sending session request error: $e")
-                val jsonRpcResult =
-                    EngineDO.JsonRpcResponse.JsonRpcError(id = sessionPayload.id, error = EngineDO.JsonRpcResponse.Error(0, e.message ?: ""))
-                _events.emit(EngineDO.SessionPayloadResponse(request.topic, params.chainId, request.method, jsonRpcResult))
-            }
-        } else {
-            if (session.transportType == TransportType.LINK_MODE && session.peerLinkMode == true) {
-                if (session.peerAppLink.isNullOrEmpty()) return@supervisorScope onFailure(IllegalStateException("App link is missing"))
-                triggerLinkModeRequest(sessionPayload, request, session.peerAppLink, onFailure)
-            } else {
-                triggerRelayRequest(expiry, nowInSeconds, sessionPayload, request, onSuccess, onFailure)
-            }
-        }
+//        val params = SignParams.SessionRequestParams(SessionRequestVO(request.method, request.params, expiry.seconds), request.chainId)
+//        val sessionPayload = SignRpc.SessionRequest(params = params)
+//        val walletServiceUrl = try {
+//            walletServiceFinder.findMatchingWalletService(request, session)
+//        } catch (e: Exception) {
+//            null
+//        }
+
+
+//        if (walletServiceUrl != null) {
+//            try {
+//                val response = async { walletServiceRequester.request(sessionPayload, walletServiceUrl.toString()) }.await()
+//                val jsonRpcResult = EngineDO.JsonRpcResponse.JsonRpcResult(id = sessionPayload.id, result = response)
+//                _events.emit(EngineDO.SessionPayloadResponse(request.topic, params.chainId, request.method, jsonRpcResult))
+//            } catch (e: Exception) {
+//                logger.error("Sending session request error: $e")
+//                val jsonRpcResult =
+//                    EngineDO.JsonRpcResponse.JsonRpcError(id = sessionPayload.id, error = EngineDO.JsonRpcResponse.Error(0, e.message ?: ""))
+//                _events.emit(EngineDO.SessionPayloadResponse(request.topic, params.chainId, request.method, jsonRpcResult))
+//            }
+//        } else {
+//            if (session.transportType == TransportType.LINK_MODE && session.peerLinkMode == true) {
+//                if (session.peerAppLink.isNullOrEmpty()) return@supervisorScope onFailure(IllegalStateException("App link is missing"))
+//                triggerLinkModeRequest(sessionPayload, request, session.peerAppLink, onFailure)
+//            } else {
+//                triggerRelayRequest(expiry, nowInSeconds, sessionPayload, request, onSuccess, onFailure)
+//            }
+//        }
     }
 
     private fun triggerRelayRequest(
@@ -143,39 +143,39 @@ internal class SessionRequestUseCase(
             Ttl(newTtl)
         }
 
-        val tvfData = tvf.collect(sessionPayload.rpcMethod, sessionPayload.rpcParams, sessionPayload.params.chainId)
-        val irnParams = IrnParams(
-            Tags.SESSION_REQUEST,
-            irnParamsTtl,
-            correlationId = sessionPayload.id,
-            rpcMethods = tvfData.first,
-            contractAddresses = tvfData.second,
-            chainId = tvfData.third,
-            prompt = true
-        )
-        val requestTtlInSeconds = expiry.run { seconds - nowInSeconds }
+//        val tvfData = tvf.collect(sessionPayload.rpcMethod, sessionPayload.rpcParams, sessionPayload.params.chainId)
+//        val irnParams = IrnParams(
+//            Tags.SESSION_REQUEST,
+//            irnParamsTtl,
+//            correlationId = sessionPayload.id,
+//            rpcMethods = tvfData.first,
+//            contractAddresses = tvfData.second,
+//            chainId = tvfData.third,
+//            prompt = true
+//        )
+//        val requestTtlInSeconds = expiry.run { seconds - nowInSeconds }
 
         logger.log("Sending session request on topic: ${request.topic}}")
-        jsonRpcInteractor.publishJsonRpcRequest(
-            Topic(request.topic), irnParams, sessionPayload,
-            onSuccess = {
-                logger.log("Session request sent successfully on topic: ${request.topic}")
-                onSuccess(sessionPayload.id)
-                scope.launch {
-                    try {
-                        withTimeout(TimeUnit.SECONDS.toMillis(requestTtlInSeconds)) {
-                            collectResponse(sessionPayload.id) { cancel() }
-                        }
-                    } catch (e: TimeoutCancellationException) {
-                        _errors.emit(SDKError(e))
-                    }
-                }
-            },
-            onFailure = { error ->
-                logger.error("Sending session request error: $error")
-                onFailure(error)
-            }
-        )
+//        jsonRpcInteractor.publishJsonRpcRequest(
+//            Topic(request.topic), irnParams, sessionPayload,
+//            onSuccess = {
+//                logger.log("Session request sent successfully on topic: ${request.topic}")
+//                onSuccess(sessionPayload.id)
+//                scope.launch {
+//                    try {
+//                        withTimeout(TimeUnit.SECONDS.toMillis(requestTtlInSeconds)) {
+//                            collectResponse(sessionPayload.id) { cancel() }
+//                        }
+//                    } catch (e: TimeoutCancellationException) {
+//                        _errors.emit(SDKError(e))
+//                    }
+//                }
+//            },
+//            onFailure = { error ->
+//                logger.error("Sending session request error: $error")
+//                onFailure(error)
+//            }
+//        )
     }
 
     private suspend fun SessionRequestUseCase.triggerLinkModeRequest(
@@ -185,29 +185,29 @@ internal class SessionRequestUseCase(
         onFailure: (Throwable) -> Unit
     ) {
         try {
-            linkModeJsonRpcInteractor.triggerRequest(sessionPayload, Topic(request.topic), peerAppLink)
-            insertEventUseCase(
-                Props(
-                    EventType.SUCCESS,
-                    Tags.SESSION_REQUEST_LINK_MODE.id.toString(),
-                    Properties(correlationId = sessionPayload.id, clientId = clientId, direction = Direction.SENT.state)
-                )
-            )
+//            linkModeJsonRpcInteractor.triggerRequest(sessionPayload, Topic(request.topic), peerAppLink)
+//            insertEventUseCase(
+//                Props(
+//                    EventType.SUCCESS,
+//                    Tags.SESSION_REQUEST_LINK_MODE.id.toString(),
+//                    Properties(correlationId = sessionPayload.id, clientId = clientId, direction = Direction.SENT.state)
+//                )
+//            )
         } catch (e: Exception) {
             onFailure(e)
         }
     }
 
-    private suspend fun collectResponse(id: Long, onResponse: (Result<JsonRpcResponse.JsonRpcResult>) -> Unit = {}) {
-        jsonRpcInteractor.peerResponse
-            .filter { response -> response.response.id == id }
-            .collect { response ->
-                when (val result = response.response) {
-                    is JsonRpcResponse.JsonRpcResult -> onResponse(Result.success(result))
-                    is JsonRpcResponse.JsonRpcError -> onResponse(Result.failure(Throwable(result.errorMessage)))
-                }
-            }
-    }
+//    private suspend fun collectResponse(id: Long, onResponse: (Result<JsonRpcResponse.JsonRpcResult>) -> Unit = {}) {
+//        jsonRpcInteractor.peerResponse
+//            .filter { response -> response.response.id == id }
+//            .collect { response ->
+//                when (val result = response.response) {
+//                    is JsonRpcResponse.JsonRpcResult -> onResponse(Result.success(result))
+//                    is JsonRpcResponse.JsonRpcError -> onResponse(Result.failure(Throwable(result.errorMessage)))
+//                }
+//            }
+//    }
 }
 
 internal interface SessionRequestUseCaseInterface {
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCase.kt
index b14483be32..ef8e91e84b 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCase.kt
@@ -1,13 +1,7 @@
 package com.reown.sign.engine.use_case.calls
 
 import com.reown.android.internal.common.exception.CannotFindSequenceForTopic
-import com.reown.android.internal.common.exception.GenericException
-import com.reown.android.internal.common.model.IrnParams
-import com.reown.android.internal.common.model.Tags
-import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
-import com.reown.android.internal.utils.dayInSeconds
 import com.reown.foundation.common.model.Topic
-import com.reown.foundation.common.model.Ttl
 import com.reown.foundation.util.Logger
 import com.reown.sign.common.exceptions.InvalidNamespaceException
 import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE
@@ -15,18 +9,20 @@ import com.reown.sign.common.exceptions.NotSettledSessionException
 import com.reown.sign.common.exceptions.SESSION_IS_NOT_ACKNOWLEDGED_MESSAGE
 import com.reown.sign.common.exceptions.UNAUTHORIZED_UPDATE_MESSAGE
 import com.reown.sign.common.exceptions.UnauthorizedPeerException
-import com.reown.sign.common.model.vo.clientsync.session.SignRpc
-import com.reown.sign.common.model.vo.clientsync.session.params.SignParams
 import com.reown.sign.common.validator.SignValidator
 import com.reown.sign.engine.model.EngineDO
 import com.reown.sign.engine.model.mapper.toMapOfNamespacesVOSession
+import com.reown.sign.engine.model.mapper.toSettleYttrium
 import com.reown.sign.storage.sequence.SessionStorageRepository
+import kotlinx.coroutines.async
 import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.SignClient
 
 internal class SessionUpdateUseCase(
-    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
+//    private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
     private val sessionStorageRepository: SessionStorageRepository,
     private val logger: Logger,
+    private val signClient: SignClient,
 ) : SessionUpdateUseCaseInterface {
 
     override suspend fun sessionUpdate(
@@ -37,31 +33,20 @@ internal class SessionUpdateUseCase(
     ) = supervisorScope {
         runCatching { validate(topic, namespaces) }.fold(
             onSuccess = {
-                val params = SignParams.UpdateNamespacesParams(namespaces.toMapOfNamespacesVOSession())
-                val sessionUpdate = SignRpc.SessionUpdate(params = params)
-                val irnParams = IrnParams(Tags.SESSION_UPDATE, Ttl(dayInSeconds), correlationId = sessionUpdate.id)
+                logger.log("kobe: Sending session update on topic: $topic; $namespaces")
 
                 try {
-                    logger.log("Sending session update on topic: $topic")
-                    sessionStorageRepository.insertTempNamespaces(topic, namespaces.toMapOfNamespacesVOSession(), sessionUpdate.id)
-                    jsonRpcInteractor.publishJsonRpcRequest(
-                        Topic(topic), irnParams, sessionUpdate,
-                        onSuccess = {
-                            logger.log("Update sent successfully, topic: $topic")
-                            onSuccess()
-                        },
-                        onFailure = { error ->
-                            logger.error("Sending session update error: $error, topic: $topic")
-                            sessionStorageRepository.deleteTempNamespacesByTopic(topic)
-                            onFailure(error)
-                        })
+                    async { signClient.update(topic = topic, namespaces = namespaces.toSettleYttrium()) }.await()
+
+                    logger.log("kobe: Update sent successfully, topic: $topic")
+                    onSuccess()
                 } catch (e: Exception) {
-                    logger.error("Error updating namespaces: $e")
-                    onFailure(GenericException("Error updating namespaces: $e"))
+                    logger.error("kobe: Sending session update error: $e, topic: $topic")
+                    onFailure(e)
                 }
             },
             onFailure = {
-                logger.error("Error updating namespaces: $it")
+                logger.error("kobe: Error updating namespaces: $it")
                 onFailure(it)
             }
         )
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionExtendUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionExtendUseCase.kt
index e6896efe21..76aa8b9ff1 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionExtendUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionExtendUseCase.kt
@@ -51,7 +51,7 @@ internal class OnSessionExtendUseCase(
             sessionStorageRepository.extendSession(request.topic, newExpiry)
             jsonRpcInteractor.respondWithSuccess(request, irnParams)
             logger.log("Session extend received on topic: ${request.topic} - emitting")
-            _events.emit(session.toEngineDOSessionExtend(Expiry(newExpiry)))
+//            _events.emit(session.toEngineDOSessionExtend(Expiry(newExpiry)))
         } catch (e: Exception) {
             logger.error("Session extend received failure on topic: ${request.topic}: $e")
             jsonRpcInteractor.respondWithError(request, Uncategorized.GenericError("Cannot update a session: ${e.message}, topic: ${request.topic}"), irnParams)
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt
index c876eb4b9e..dda3030ddc 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt
@@ -10,6 +10,7 @@ import com.reown.android.internal.common.model.Namespace
 import com.reown.android.internal.common.model.SDKError
 import com.reown.android.internal.common.model.Tags
 import com.reown.android.internal.common.model.TransportType
+import com.reown.android.internal.common.model.Validation
 import com.reown.android.internal.common.model.WCRequest
 import com.reown.android.internal.common.model.type.EngineEvent
 import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface
@@ -40,6 +41,10 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
+import uniffi.yttrium.SessionRequestJsonRpcFfi
+import uniffi.yttrium.SessionRequestJsonRpcResponseFfi
+import uniffi.yttrium.SettleNamespace
+import uniffi.yttrium.SignListener
 
 internal class OnSessionRequestUseCase(
     private val jsonRpcInteractor: RelayJsonRpcInteractorInterface,
@@ -106,7 +111,12 @@ internal class OnSessionRequestUseCase(
 
             val url = sessionPeerAppMetaData?.url ?: String.Empty
             logger.log("Resolving session request attestation: ${System.currentTimeMillis()}")
-            resolveAttestationIdUseCase(request, url, linkMode = request.transportType == TransportType.LINK_MODE, appLink = sessionPeerAppMetaData?.redirect?.universal) { verifyContext ->
+            resolveAttestationIdUseCase(
+                request,
+                url,
+                linkMode = request.transportType == TransportType.LINK_MODE,
+                appLink = sessionPeerAppMetaData?.redirect?.universal
+            ) { verifyContext ->
                 logger.log("Session request attestation resolved: ${System.currentTimeMillis()}")
                 emitSessionRequest(params, request, sessionPeerAppMetaData, verifyContext)
             }
@@ -122,6 +132,54 @@ internal class OnSessionRequestUseCase(
         }
     }
 
+//    override fun onSessionConnect(id: ULong) {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override fun onSessionDisconnect(id: ULong, topic: String) {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override fun onSessionEvent(id: ULong, topic: String, params: Boolean) {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override fun onSessionExtend(id: ULong, topic: String) {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override fun onSessionRequest(topic: String, sessionRequest: SessionRequestJsonRpcFfi) {
+//        println("kobe: Session Request: $topic ; $sessionRequest")
+//
+//        val sessionRequestEvent = EngineDO.SessionRequestEvent(
+//            request = EngineDO.SessionRequest(
+//                topic = topic,
+//                chainId = sessionRequest.params.chainId,
+//                peerAppMetaData = null,
+//                expiry = if (sessionRequest.params.request.expiry != null) Expiry(sessionRequest.params.request.expiry!!.toLong()) else null,
+//                request = EngineDO.SessionRequest.JSONRPCRequest(
+//                    id = sessionRequest.id.toLong(),
+//                    method = sessionRequest.params.request.method,
+//                    params = sessionRequest.params.request.params
+//                )
+//            ),
+//            context = EngineDO.VerifyContext(1, "", Validation.UNKNOWN, "", null)
+//        )
+//        scope.launch { _events.emit(sessionRequestEvent) }
+//    }
+//
+//    override fun onSessionRequestResponse(id: ULong, topic: String, response: SessionRequestJsonRpcResponseFfi) {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override fun onSessionUpdate(
+//        id: ULong,
+//        topic: String,
+//        namespaces: Map<String, SettleNamespace>
+//    ) {
+//        TODO("Not yet implemented")
+//    }
+
     private fun emitSessionRequest(
         params: SignParams.SessionRequestParams,
         request: WCRequest,
@@ -132,7 +190,8 @@ internal class OnSessionRequestUseCase(
         val event = if (sessionRequestEventsQueue.isEmpty()) {
             sessionRequestEvent
         } else {
-            sessionRequestEventsQueue.find { event -> if (event.request.expiry != null) !event.request.expiry.isExpired() else true } ?: sessionRequestEvent
+            sessionRequestEventsQueue.find { event -> if (event.request.expiry != null) !event.request.expiry.isExpired() else true }
+                ?: sessionRequestEvent
         }
 
         sessionRequestEventsQueue.add(sessionRequestEvent)
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt
index 6091d0a3a5..de9d1c8555 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt
@@ -2,20 +2,23 @@ package com.reown.sign.json_rpc.domain
 
 import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer
 import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord
-import com.reown.android.internal.common.storage.rpc.JsonRpcHistory
+import com.reown.android.internal.common.model.TransportType
+import com.reown.android.sdk.storage.data.dao.JsonRpcHistoryQueries
 import com.reown.sign.common.model.Request
 import com.reown.sign.common.model.vo.clientsync.session.SignRpc
 import com.reown.sign.common.model.vo.clientsync.session.params.SignParams
 import com.reown.sign.json_rpc.model.toRequest
 
 internal class GetSessionRequestByIdUseCase(
-    private val jsonRpcHistory: JsonRpcHistory,
+    private val jsonRpcHistoryQueries: JsonRpcHistoryQueries,
     private val serializer: JsonRpcSerializer
 ) {
     operator fun invoke(id: Long): Request<SignParams.SessionRequestParams>? {
-        val record: JsonRpcHistoryRecord? = jsonRpcHistory.getRecordById(id)
+        val record: JsonRpcHistoryRecord? = jsonRpcHistoryQueries.getJsonRpcHistoryRecord(id, mapper = ::toRecord).executeAsOneOrNull()
         var entry: Request<SignParams.SessionRequestParams>? = null
 
+        println("kobe: RECORD: $record")
+
         if (record != null) {
             val sessionRequest: SignRpc.SessionRequest? = serializer.tryDeserialize<SignRpc.SessionRequest>(record.body)
             if (sessionRequest != null) {
@@ -25,4 +28,14 @@ internal class GetSessionRequestByIdUseCase(
 
         return entry
     }
+
+    private fun toRecord(
+        requestId: Long,
+        topic: String,
+        method: String,
+        body: String,
+        response: String?,
+        transportType: TransportType?
+    ): JsonRpcHistoryRecord =
+        JsonRpcHistoryRecord(requestId, topic, method, body, response, transportType)
 }
\ No newline at end of file
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/storage/proposal/ProposalStorageRepository.kt b/protocol/sign/src/main/kotlin/com/reown/sign/storage/proposal/ProposalStorageRepository.kt
index b4e21fbca0..20f818b1e4 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/storage/proposal/ProposalStorageRepository.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/storage/proposal/ProposalStorageRepository.kt
@@ -39,6 +39,7 @@ class ProposalStorageRepository(
             redirect,
             expiry?.seconds,
             scopedProperties,
+            pairingSymKey
         )
 
         insertRequiredNamespace(requiredNamespaces, requestId)
@@ -87,7 +88,8 @@ class ProposalStorageRepository(
         properties: Map<String, String>?,
         redirect: String,
         expiry: Long?,
-        scoped_properties: Map<String, String>?
+        scoped_properties: Map<String, String>?,
+        pairing_sym_key: String
     ): ProposalVO {
         val requiredNamespaces: Map<String, Namespace.Proposal> = getRequiredNamespaces(request_id)
         val optionalNamespaces: Map<String, Namespace.Proposal> = getOptionalNamespaces(request_id)
@@ -107,7 +109,8 @@ class ProposalStorageRepository(
             scopedProperties = scoped_properties,
             requiredNamespaces = requiredNamespaces,
             optionalNamespaces = optionalNamespaces,
-            expiry = if (expiry != null) Expiry(expiry) else null
+            expiry = if (expiry != null) Expiry(expiry) else null,
+            pairingSymKey = pairing_sym_key
         )
     }
 
diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt b/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt
index e8ed1b2dc7..12d632d099 100644
--- a/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt
+++ b/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt
@@ -55,6 +55,38 @@ internal class SessionStorageRepository(
         }
     }
 
+    @JvmSynthetic
+    fun getSymKeyByTopic(topic: Topic): String? {
+        return sessionDaoQueries.getSymKey(topic.value).executeAsOneOrNull()?.sym_key
+    }
+
+    @Synchronized
+    @JvmSynthetic
+    @Throws(SQLiteException::class)
+    fun insertPartialSession(topic: String, symKey: String) {
+        val hasTopic = sessionDaoQueries.hasTopic(topic).executeAsOneOrNull() != null
+        if (!hasTopic) {
+            println("kobe: inserting partial")
+            sessionDaoQueries.insertOrAbortSession(
+                topic = topic,
+                pairingTopic = "", // Default empty pairing topic
+                expiry = 0L, // Default expiry - will be updated later
+                self_participant = "", // Default empty - will be updated later
+                relay_protocol = "irn", // Default relay protocol
+                controller_key = null,
+                peer_participant = null,
+                relay_data = null,
+                is_acknowledged = false, // Default not acknowledged
+                properties = null,
+                scoped_properties = null,
+                transport_type = TransportType.RELAY, // Default transport type
+                sym_key = symKey
+            )
+        } else {
+            println("kobe: NOT inserting partial")
+        }
+    }
+
     @JvmSynthetic
     fun getSessionWithoutMetadataByTopic(topic: Topic): SessionVO =
         sessionDaoQueries.getSessionByTopic(topic.value, mapper = this@SessionStorageRepository::mapSessionDaoToSessionVO).executeAsOne()
@@ -68,6 +100,7 @@ internal class SessionStorageRepository(
     @Throws(SQLiteException::class)
     fun insertSession(session: SessionVO, requestId: Long) {
         with(session) {
+            println("kobe: inserting session: $session")
             sessionDaoQueries.insertOrAbortSession(
                 topic = topic.value,
                 pairingTopic = pairingTopic,
@@ -80,7 +113,8 @@ internal class SessionStorageRepository(
                 is_acknowledged = isAcknowledged,
                 properties = properties,
                 scoped_properties = scopedProperties,
-                transport_type = transportType
+                transport_type = transportType,
+                sym_key = symKey
             )
         }
 
@@ -225,6 +259,7 @@ internal class SessionStorageRepository(
         properties: Map<String, String>?,
         transportType: TransportType?,
         scoped_properties: Map<String, String>?,
+        sym_key: String?
     ): SessionVO {
         val sessionNamespaces: Map<String, Namespace.Session> = getSessionNamespaces(id)
         val requiredNamespaces: Map<String, Namespace.Proposal> = getRequiredNamespaces(id)
@@ -247,7 +282,8 @@ internal class SessionStorageRepository(
             properties = properties,
             scopedProperties = scoped_properties,
             pairingTopic = pairingTopic,
-            transportType = transportType
+            transportType = transportType,
+            symKey = sym_key
         )
     }
 
diff --git a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/namespace/NamespaceDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/namespace/NamespaceDao.sq
index dd9dbb8396..ba90571607 100644
--- a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/namespace/NamespaceDao.sq
+++ b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/namespace/NamespaceDao.sq
@@ -14,7 +14,7 @@ CREATE TABLE NamespaceDao(
 );
 
 insertOrAbortNamespace:
-INSERT OR ABORT INTO NamespaceDao(session_id, key, chains, accounts, methods, events, request_id)
+INSERT OR REPLACE INTO NamespaceDao(session_id, key, chains, accounts, methods, events, request_id)
 VALUES (?, ?, ?,?,?, ?, ?);
 
 deleteNamespacesByTopic:
diff --git a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq
index 629a5c7ab3..0e31628808 100644
--- a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq
+++ b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq
@@ -12,7 +12,7 @@ CREATE TABLE OptionalNamespaceDao (
 );
 
 insertOrAbortOptionalNamespace:
-INSERT OR ABORT INTO OptionalNamespaceDao(session_id, key, chains, methods, events)
+INSERT OR REPLACE INTO OptionalNamespaceDao(session_id, key, chains, methods, events)
 VALUES (?, ?, ?, ?, ?);
 
 deleteOptionalNamespacesByTopic:
diff --git a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal/ProposalDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal/ProposalDao.sq
index e6e875dca5..6db40a88d7 100644
--- a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal/ProposalDao.sq
+++ b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal/ProposalDao.sq
@@ -15,20 +15,21 @@ CREATE TABLE ProposalDao (
    properties TEXT AS Map<String, String>,
    redirect TEXT NOT NULL DEFAULT "",
    expiry INTEGER,
-   scoped_properties TEXT AS Map<String, String>
+   scoped_properties TEXT AS Map<String, String>,
+   pairing_sym_key TEXT NOT NULL
 );
 
 insertOrAbortSession:
-INSERT OR ABORT INTO ProposalDao(request_id, pairingTopic, name, description, url, icons, relay_protocol, relay_data, proposer_key, properties, redirect, expiry, scoped_properties)
-VALUES (?,?,?,?,?,?,?,?,?,?,?, ?, ?);
+INSERT OR ABORT INTO ProposalDao(request_id, pairingTopic, name, description, url, icons, relay_protocol, relay_data, proposer_key, properties, redirect, expiry, scoped_properties, pairing_sym_key)
+VALUES (?,?,?,?,?,?,?,?,?,?,?, ?, ?, ?);
 
 getProposalByKey:
-SELECT pd.request_id, pd.pairingTopic, pd.name, pd.description, pd.url, pd.icons, pd.relay_protocol, pd.relay_data, pd.proposer_key, pd.properties, pd.redirect, pd.expiry, pd.scoped_properties
+SELECT pd.request_id, pd.pairingTopic, pd.name, pd.description, pd.url, pd.icons, pd.relay_protocol, pd.relay_data, pd.proposer_key, pd.properties, pd.redirect, pd.expiry, pd.scoped_properties, pd.pairing_sym_key
 FROM ProposalDao pd
 WHERE proposer_key = ?;
 
 getListOfProposalDaos:
-SELECT pd.request_id, pd.pairingTopic, pd.name, pd.description, pd.url, pd.icons, pd.relay_protocol, pd.relay_data, pd.proposer_key, pd.properties, pd.redirect, pd.expiry, pd.scoped_properties
+SELECT pd.request_id, pd.pairingTopic, pd.name, pd.description, pd.url, pd.icons, pd.relay_protocol, pd.relay_data, pd.proposer_key, pd.properties, pd.redirect, pd.expiry, pd.scoped_properties, pd.pairing_sym_key
 FROM ProposalDao pd;
 
 deleteProposal:
@@ -36,6 +37,6 @@ DELETE FROM ProposalDao
 WHERE proposer_key = ?;
 
 getProposalByPairingTopic:
-SELECT pd.request_id, pd.pairingTopic, pd.name, pd.description, pd.url, pd.icons, pd.relay_protocol, pd.relay_data, pd.proposer_key, pd.properties, pd.redirect, pd.expiry, pd.scoped_properties
+SELECT pd.request_id, pd.pairingTopic, pd.name, pd.description, pd.url, pd.icons, pd.relay_protocol, pd.relay_data, pd.proposer_key, pd.properties, pd.redirect, pd.expiry, pd.scoped_properties, pd.pairing_sym_key
 FROM ProposalDao pd
 WHERE pairingTopic = ?;
\ No newline at end of file
diff --git a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq
index 18ed5e6dee..a59b550ddc 100644
--- a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq
+++ b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq
@@ -12,7 +12,7 @@ CREATE TABLE ProposalNamespaceDao (
 );
 
 insertOrAbortProposalNamespace:
-INSERT OR ABORT INTO ProposalNamespaceDao(session_id, key, chains, methods, events)
+INSERT OR REPLACE INTO ProposalNamespaceDao(session_id, key, chains, methods, events)
 VALUES (?, ?, ?, ?, ?);
 
 deleteProposalNamespacesByTopic:
diff --git a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/session/SessionDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/session/SessionDao.sq
index 3c31e7429a..7767caef0b 100644
--- a/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/session/SessionDao.sq
+++ b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/session/SessionDao.sq
@@ -16,12 +16,13 @@ CREATE TABLE SessionDao(
    is_acknowledged INTEGER AS Boolean NOT NULL,
    properties TEXT AS Map<String, String>,
    transport_type TEXT AS TransportType,
-   scoped_properties TEXT AS Map<String, String>
+   scoped_properties TEXT AS Map<String, String>,
+   sym_key TEXT
 );
 
 insertOrAbortSession:
-INSERT OR ABORT INTO SessionDao(topic, pairingTopic, expiry, relay_protocol, relay_data, controller_key, self_participant, peer_participant, is_acknowledged, properties, transport_type, scoped_properties)
-VALUES (?,  ?, ?,?, ?, ?, ?, ?, ?, ?, ?, ?);
+INSERT OR REPLACE INTO SessionDao(topic, pairingTopic, expiry, relay_protocol, relay_data, controller_key, self_participant, peer_participant, is_acknowledged, properties, transport_type, scoped_properties, sym_key)
+VALUES (?,  ?, ?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
 
 lastInsertedRow:
 SELECT id
@@ -29,11 +30,11 @@ FROM SessionDao
 WHERE id = (SELECT MAX(id) FROM SessionDao);
 
 getListOfSessionDaos:
-SELECT sd.id, sd.topic, sd.expiry, sd.relay_protocol, sd.relay_data, sd.controller_key, sd.self_participant, sd.peer_participant, sd.is_acknowledged, sd.pairingTopic, sd.properties, sd.transport_type, sd.scoped_properties
+SELECT sd.id, sd.topic, sd.expiry, sd.relay_protocol, sd.relay_data, sd.controller_key, sd.self_participant, sd.peer_participant, sd.is_acknowledged, sd.pairingTopic, sd.properties, sd.transport_type, sd.scoped_properties, sd.sym_key
 FROM SessionDao sd;
 
 getSessionByTopic:
-SELECT sd.id, sd.topic, sd.expiry, sd.relay_protocol, sd.relay_data, sd.controller_key, sd.self_participant, sd.peer_participant, sd.is_acknowledged, sd.pairingTopic, sd.properties, sd.transport_type, sd.scoped_properties
+SELECT sd.id, sd.topic, sd.expiry, sd.relay_protocol, sd.relay_data, sd.controller_key, sd.self_participant, sd.peer_participant, sd.is_acknowledged, sd.pairingTopic, sd.properties, sd.transport_type, sd.scoped_properties, sd.sym_key
 FROM SessionDao sd
 WHERE topic = ?;
 
@@ -69,4 +70,9 @@ WHERE ? = topic;
 getExpiry:
 SELECT expiry
 FROM SessionDao
+WHERE ? = topic;
+
+getSymKey:
+SELECT sym_key
+FROM SessionDao
 WHERE ? = topic;
\ No newline at end of file
diff --git a/protocol/sign/src/main/sqldelight/databases/14.db b/protocol/sign/src/main/sqldelight/databases/14.db
new file mode 100644
index 0000000000..1dcf3ef074
Binary files /dev/null and b/protocol/sign/src/main/sqldelight/databases/14.db differ
diff --git a/protocol/sign/src/main/sqldelight/databases/15.db b/protocol/sign/src/main/sqldelight/databases/15.db
new file mode 100644
index 0000000000..eb0b6ff496
Binary files /dev/null and b/protocol/sign/src/main/sqldelight/databases/15.db differ
diff --git a/protocol/sign/src/main/sqldelight/migrations/13.sqm b/protocol/sign/src/main/sqldelight/migrations/13.sqm
new file mode 100644
index 0000000000..bc942e25ef
--- /dev/null
+++ b/protocol/sign/src/main/sqldelight/migrations/13.sqm
@@ -0,0 +1,5 @@
+-- migrates 13db to 14db
+
+-- CREATE V14 SCHEMA
+
+ALTER TABLE ProposalDao ADD COLUMN pairing_sym_key TEXT NOT NULL;
\ No newline at end of file
diff --git a/protocol/sign/src/main/sqldelight/migrations/14.sqm b/protocol/sign/src/main/sqldelight/migrations/14.sqm
new file mode 100644
index 0000000000..20bda25bbd
--- /dev/null
+++ b/protocol/sign/src/main/sqldelight/migrations/14.sqm
@@ -0,0 +1,5 @@
+-- migrates 14db to 15db
+
+-- CREATE V15 SCHEMA
+
+ALTER TABLE SessionDao ADD COLUMN sym_key TEXT;
\ No newline at end of file
diff --git a/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt
index 570c1de1f0..d9f84f7c6a 100644
--- a/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt
+++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt
@@ -35,7 +35,7 @@ fun WCTopAppBar(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(start = 20.dp, top = 45.dp, end = 20.dp, bottom = 6.dp),
+            .padding(start = 20.dp, top = 60.dp, end = 20.dp, bottom = 6.dp),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically,
     ) {
diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt
index c1b8fc2a81..19397746fa 100644
--- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt
+++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt
@@ -2,17 +2,10 @@ package com.reown.sample.dapp
 
 import android.app.Application
 import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import com.reown.android.Core
-import com.reown.android.CoreClient
 import com.reown.sample.common.tag
-import com.reown.util.bytesToHex
-import com.reown.util.randomBytes
 import com.reown.appkit.client.AppKit
 import com.reown.appkit.client.Modal
 import com.reown.appkit.presets.AppKitChainsPresets
-import com.reown.appkit.utils.EthUtils
 import timber.log.Timber
 import com.reown.sample.common.BuildConfig as CommonBuildConfig
 
@@ -21,7 +14,7 @@ class DappSampleApp : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        val appMetaData = Core.Model.AppMetaData(
+        val metaData = Modal.Model.MetaData(
             name = "Kotlin Dapp",
             description = "Kotlin Dapp Implementation",
             url = "https://appkit-lab.reown.com",
@@ -31,17 +24,28 @@ class DappSampleApp : Application() {
             linkMode = true
         )
 
-        CoreClient.initialize(
-            application = this,
-            projectId = CommonBuildConfig.PROJECT_ID,
-            metaData = appMetaData,
-        ) {
-            Firebase.crashlytics.recordException(it.throwable)
-        }
-
-        AppKit.initialize(Modal.Params.Init(core = CoreClient)) { error ->
-            Timber.e(tag(this), error.throwable.stackTraceToString())
-        }
+//        CoreClient.initialize(
+//            application = this,
+//            projectId = CommonBuildConfig.PROJECT_ID,
+//            metaData = appMetaData,
+//        ) {
+//            Firebase.crashlytics.recordException(it.throwable)
+//        }
+
+        AppKit.initialize(
+            Modal.Params.Init(
+                application = this,
+                projectId = CommonBuildConfig.PROJECT_ID,
+                metaData = metaData,
+            ),
+            onError = { error ->
+                println("kobe: Error: $error")
+                Timber.e(tag(this), error.throwable.stackTraceToString())
+            },
+            onSuccess = {
+                println("kobe: AppKit init success")
+            }
+        )
 
         AppKit.setChains(AppKitChainsPresets.ethChains.values.toList())
 
diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/domain/DappDelegate.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/domain/DappDelegate.kt
index adf8920a90..b15d6c723c 100644
--- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/domain/DappDelegate.kt
+++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/domain/DappDelegate.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
-object DappDelegate : AppKit.ModalDelegate, CoreClient.CoreDelegate {
+object DappDelegate : AppKit.ModalDelegate { //}, CoreClient.CoreDelegate {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
     private val _wcEventModels: MutableSharedFlow<Modal.Model?> = MutableSharedFlow()
     val wcEventModels: SharedFlow<Modal.Model?> = _wcEventModels.asSharedFlow()
@@ -28,7 +28,7 @@ object DappDelegate : AppKit.ModalDelegate, CoreClient.CoreDelegate {
 
     init {
         AppKit.setDelegate(this)
-        CoreClient.setDelegate(this)
+//        CoreClient.setDelegate(this)
     }
 
     override fun onConnectionStateChange(state: Modal.Model.ConnectionState) {
@@ -122,15 +122,15 @@ object DappDelegate : AppKit.ModalDelegate, CoreClient.CoreDelegate {
         }
     }
 
-    override fun onPairingDelete(deletedPairing: Core.Model.DeletedPairing) {
-        //Deprecated - pairings are automatically deleted
-    }
-
-    override fun onPairingExpired(expiredPairing: Core.Model.ExpiredPairing) {
-        //Deprecated - pairings are automatically expired
-    }
-
-    override fun onPairingState(pairingState: Core.Model.PairingState) {
-        Timber.d(tag(this), "Dapp pairing state: ${pairingState.isPairingState}")
-    }
+//    override fun onPairingDelete(deletedPairing: Core.Model.DeletedPairing) {
+//        //Deprecated - pairings are automatically deleted
+//    }
+//
+//    override fun onPairingExpired(expiredPairing: Core.Model.ExpiredPairing) {
+//        //Deprecated - pairings are automatically expired
+//    }
+//
+//    override fun onPairingState(pairingState: Core.Model.PairingState) {
+//        Timber.d(tag(this), "Dapp pairing state: ${pairingState.isPairingState}")
+//    }
 }
diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt
index f4ae628894..2f99f28b36 100644
--- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt
+++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt
@@ -11,18 +11,30 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.lifecycle.lifecycleScope
 import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.reown.appkit.client.AppKit
+import com.reown.appkit.client.models.Account
 import com.reown.sample.common.ui.theme.WCSampleAppTheme
 import com.reown.sample.dapp.ui.routes.host.DappSampleHost
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class DappSampleActivity : ComponentActivity() {
+    private var account: Account? = null
+
     @ExperimentalMaterialNavigationApi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        // Wait for AppKit initialization to complete before accessing it
+        try {
+            account = AppKit.getAccount()
+        } catch (e: IllegalStateException) {
+            // AppKit not initialized yet, account will be null
+            account = null
+        }
+
         setContent {
             WCSampleAppTheme {
-                DappSampleHost()
+                DappSampleHost(account)
             }
         }
 
diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt
index b6e3fb0007..66e3a98091 100644
--- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt
+++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt
@@ -92,56 +92,56 @@ class ChainSelectionViewModel : ViewModel() {
             })
     }
 
-    fun connectToWallet(pairingTopicPosition: Int = -1, onSuccess: (String) -> Unit = {}, onError: (String) -> Unit = {}) {
-        viewModelScope.launch {
-            _awaitingProposalSharedFlow.emit(true)
-        }
-        try {
-            val pairing: Core.Model.Pairing? = if (pairingTopicPosition > -1) {
-                CoreClient.Pairing.getPairings()[pairingTopicPosition]
-            } else {
-                CoreClient.Pairing.create { error ->
-                    viewModelScope.launch {
-                        _awaitingProposalSharedFlow.emit(false)
-                    }
-                    onError("Creating Pairing failed: ${error.throwable.stackTraceToString()}")
-                }
-            }
-
-            if (pairing != null) {
-                val connectParams =
-                    Modal.Params.ConnectParams(
-                        sessionNamespaces = getOptionalNamespaces(),
-                        properties = getProperties(),
-                        pairing = pairing
-                    )
-
-                AppKit.connect(connectParams,
-                    onSuccess = { url ->
-                        if (pairingTopicPosition == -1) {
-                            viewModelScope.launch {
-                                _awaitingProposalSharedFlow.emit(false)
-                            }
-                        }
-                        onSuccess(url)
-                    },
-                    onError = { error ->
-                        viewModelScope.launch {
-                            _awaitingProposalSharedFlow.emit(false)
-                        }
-                        Timber.tag(tag(this)).e(error.throwable.stackTraceToString())
-                        Firebase.crashlytics.recordException(error.throwable)
-                        onError(error.throwable.message ?: "Unknown error, please contact support")
-                    }
-                )
-            }
-
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Timber.tag(tag(this)).e(e)
-            onError(e.message ?: "Unknown error, please contact support")
-        }
-    }
+//    fun connectToWallet(pairingTopicPosition: Int = -1, onSuccess: (String) -> Unit = {}, onError: (String) -> Unit = {}) {
+//        viewModelScope.launch {
+//            _awaitingProposalSharedFlow.emit(true)
+//        }
+//        try {
+//            val pairing: Core.Model.Pairing? = if (pairingTopicPosition > -1) {
+//                CoreClient.Pairing.getPairings()[pairingTopicPosition]
+//            } else {
+//                CoreClient.Pairing.create { error ->
+//                    viewModelScope.launch {
+//                        _awaitingProposalSharedFlow.emit(false)
+//                    }
+//                    onError("Creating Pairing failed: ${error.throwable.stackTraceToString()}")
+//                }
+//            }
+//
+//            if (pairing != null) {
+//                val connectParams =
+//                    Modal.Params.ConnectParams(
+//                        sessionNamespaces = getOptionalNamespaces(),
+//                        properties = getProperties(),
+//                        pairing = pairing
+//                    )
+//
+//                AppKit.connect(connectParams,
+//                    onSuccess = { url ->
+//                        if (pairingTopicPosition == -1) {
+//                            viewModelScope.launch {
+//                                _awaitingProposalSharedFlow.emit(false)
+//                            }
+//                        }
+//                        onSuccess(url)
+//                    },
+//                    onError = { error ->
+//                        viewModelScope.launch {
+//                            _awaitingProposalSharedFlow.emit(false)
+//                        }
+//                        Timber.tag(tag(this)).e(error.throwable.stackTraceToString())
+//                        Firebase.crashlytics.recordException(error.throwable)
+//                        onError(error.throwable.message ?: "Unknown error, please contact support")
+//                    }
+//                )
+//            }
+//
+//        } catch (e: Exception) {
+//            Firebase.crashlytics.recordException(e)
+//            Timber.tag(tag(this)).e(e)
+//            onError(e.message ?: "Unknown error, please contact support")
+//        }
+//    }
 
     private fun getNamespaces(): Map<String, Modal.Model.Namespace.Proposal> {
         val namespaces: Map<String, Modal.Model.Namespace.Proposal> =
diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/host/DappSampleHost.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/host/DappSampleHost.kt
index eefa9c3ea7..4c13c10c71 100644
--- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/host/DappSampleHost.kt
+++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/host/DappSampleHost.kt
@@ -35,6 +35,7 @@ import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.navigation.material.BottomSheetNavigator
 import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.reown.appkit.client.AppKit
+import com.reown.appkit.client.models.Account
 import com.reown.sample.dapp.R
 import com.reown.sample.dapp.ui.DappSampleEvents
 import com.reown.sample.dapp.ui.DappSampleNavGraph
@@ -42,7 +43,7 @@ import com.reown.sample.dapp.ui.routes.Route
 import kotlinx.coroutines.delay
 
 @Composable
-fun DappSampleHost() {
+fun DappSampleHost(account: Account?) {
     val scaffoldState: ScaffoldState = rememberScaffoldState()
     var isOfflineState: Boolean? by remember { mutableStateOf(null) }
     val sheetState = rememberModalBottomSheetState(
@@ -53,7 +54,7 @@ fun DappSampleHost() {
     val bottomSheetNavigator = BottomSheetNavigator(sheetState)
     val navController = rememberNavController(bottomSheetNavigator)
     val viewModel: DappSampleViewModel = viewModel()
-    val isConnected = AppKit.getAccount() != null
+    val isConnected = account != null
     val startDestination = if (isConnected) Route.Session.path else Route.ChainSelection.path
 
     LaunchedEffect(Unit) {
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt
index 694a8126e7..f5941effce 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt
@@ -10,12 +10,9 @@ import com.pandulapeter.beagle.Beagle
 import com.pandulapeter.beagle.common.configuration.Behavior
 import com.pandulapeter.beagle.log.BeagleLogger
 import com.pandulapeter.beagle.logOkHttp.BeagleOkHttpLogger
-import com.reown.android.Core
 import com.reown.android.CoreClient
 import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.android.internal.common.wcKoinApp
-import com.reown.android.relay.ConnectionType
-import com.reown.foundation.network.model.Relay
 import com.reown.foundation.util.Logger
 import com.reown.notify.client.Notify
 import com.reown.notify.client.NotifyClient
@@ -23,10 +20,9 @@ import com.reown.sample.wallet.domain.EthAccountDelegate
 import com.reown.sample.wallet.domain.NotificationHandler
 import com.reown.sample.wallet.domain.NotifyDelegate
 import com.reown.sample.wallet.domain.SmartAccountEnabler
+import com.reown.sample.wallet.domain.WCDelegate
 //import com.reown.sample.wallet.domain.SolanaAccountDelegate
 import com.reown.sample.wallet.domain.mixPanel
-import com.reown.sample.wallet.ui.state.ConnectionState
-import com.reown.sample.wallet.ui.state.connectionStateFlow
 import com.reown.walletkit.client.Wallet
 import com.reown.walletkit.client.WalletKit
 import kotlinx.coroutines.CoroutineScope
@@ -60,7 +56,7 @@ class WalletKitApplication : Application() {
         SmartAccountEnabler.init(this)
 
         val projectId = BuildConfig.PROJECT_ID
-        val appMetaData = Core.Model.AppMetaData(
+        val walletMetaData = Wallet.Model.MetaData(
             name = "Kotlin Wallet",
             description = "Kotlin Wallet Implementation",
             url = "https://appkit-lab.reown.com",
@@ -70,72 +66,79 @@ class WalletKitApplication : Application() {
             linkMode = true
         )
 
-        CoreClient.initialize(
-            application = this,
-            projectId = projectId,
-            metaData = appMetaData,
-            connectionType = ConnectionType.AUTOMATIC,
-            onError = { error ->
-                Firebase.crashlytics.recordException(error.throwable)
-                println("Init error: ${error.throwable.stackTraceToString()}")
-                scope.launch {
-                    connectionStateFlow.emit(ConnectionState.Error(error.throwable.message ?: ""))
-                }
-            }
-        )
+//        CoreClient.initialize(
+//            application = this,
+//            projectId = projectId,
+//            metaData = appMetaData,
+//            connectionType = ConnectionType.AUTOMATIC,
+//            onError = { error ->
+//                Firebase.crashlytics.recordException(error.throwable)
+//                println("Init error: ${error.throwable.stackTraceToString()}")
+//                scope.launch {
+//                    connectionStateFlow.emit(ConnectionState.Error(error.throwable.message ?: ""))
+//                }
+//            }
+//        )
 
         println("Account: ${EthAccountDelegate.address}")
 
         WalletKit.initialize(
-            Wallet.Params.Init(core = CoreClient),
-            onSuccess = { println("Web3Wallet initialized") },
+            Wallet.Params.Init(projectId = projectId, metaData = walletMetaData, application = this),
+            onSuccess = {
+                println("kobe: WalletKit initialized")
+
+                WalletKit.setWalletDelegate(WCDelegate)
+            },
             onError = { error ->
+                println("kobe: init error: $error")
                 Firebase.crashlytics.recordException(error.throwable)
                 println(error.throwable.stackTraceToString())
             })
 
-        FirebaseAppDistribution.getInstance().updateIfNewReleaseAvailable()
-        NotifyClient.initialize(
-            init = Notify.Params.Init(CoreClient)
-        ) { error ->
-            Firebase.crashlytics.recordException(error.throwable)
-            println(error.throwable.stackTraceToString())
-        }
 
-        mixPanel = MixpanelAPI.getInstance(this, CommonBuildConfig.MIX_PANEL, true).apply {
-            identify(CoreClient.Push.clientId)
-            people.set("\$name", EthAccountDelegate.ethAccount)
-        }
+//        FirebaseAppDistribution.getInstance().updateIfNewReleaseAvailable()
+//        NotifyClient.initialize(
+//            init = Notify.Params.Init(CoreClient)
+//        ) { error ->
+//            Firebase.crashlytics.recordException(error.throwable)
+//            println(error.throwable.stackTraceToString())
+//        }
+//
+//        mixPanel = MixpanelAPI.getInstance(this, CommonBuildConfig.MIX_PANEL, true).apply {
+//            println("kobe: UID: ${this@WalletKitApplication.applicationInfo.uid}")
+//            identify(this@WalletKitApplication.applicationInfo.uid.toString())
+//            people.set("\$name", EthAccountDelegate.ethAccount)
+//        }
 
         initializeBeagle()
 
-        FirebaseMessaging.getInstance().token.addOnSuccessListener { token ->
-            WalletKit.registerDeviceToken(
-                firebaseAccessToken = token, enableEncrypted = true,
-                onSuccess = {
-                    println("Successfully registered firebase token for Web3Wallet: $token")
-                },
-                onError = {
-                    println("Error while registering firebase token for Web3Wallet: ${it.throwable}")
-                }
-            )
-        }
+//        FirebaseMessaging.getInstance().token.addOnSuccessListener { token ->
+//            WalletKit.registerDeviceToken(
+//                firebaseAccessToken = token, enableEncrypted = true,
+//                onSuccess = {
+//                    println("Successfully registered firebase token for Web3Wallet: $token")
+//                },
+//                onError = {
+//                    println("Error while registering firebase token for Web3Wallet: ${it.throwable}")
+//                }
+//            )
+//        }
 
-        scope.launch {
-            supervisorScope {
-                wcKoinApp.koin.get<Timber.Forest>().plant(object : Timber.Tree() {
-                    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-                        if (t != null) {
-                            mixPanel.track("error: $t, message: $message")
-                        } else {
-                            mixPanel.track(message)
-                        }
-                    }
-                })
-
-                handleNotifyMessages()
-            }
-        }
+//        scope.launch {
+//            supervisorScope {
+//                wcKoinApp.koin.get<Timber.Forest>().plant(object : Timber.Tree() {
+//                    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+//                        if (t != null) {
+//                            mixPanel.track("error: $t, message: $message")
+//                        } else {
+//                            mixPanel.track(message)
+//                        }
+//                    }
+//                })
+//
+////                handleNotifyMessages()
+//            }
+//        }
     }
 
     private fun initializeBeagle() {
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotifyDelegate.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotifyDelegate.kt
index ae565d0e6f..6507cebf80 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotifyDelegate.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotifyDelegate.kt
@@ -21,7 +21,7 @@ object NotifyDelegate : NotifyClient.Delegate {
     val notifyErrors = _notifyErrors.asSharedFlow()
 
     init {
-        NotifyClient.setDelegate(this)
+//        NotifyClient.setDelegate(this)
     }
 
     override fun onNotifyNotification(notifyNotification: Notify.Event.Notification) {
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/WCDelegate.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/WCDelegate.kt
index 77fd371a6c..6746de8025 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/WCDelegate.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/WCDelegate.kt
@@ -18,8 +18,8 @@ import org.json.JSONObject
 
 object WCDelegate : WalletKit.WalletDelegate, CoreClient.CoreDelegate {
     internal val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    private val _coreEvents: MutableSharedFlow<Core.Model> = MutableSharedFlow()
-    val coreEvents: SharedFlow<Core.Model> = _coreEvents.asSharedFlow()
+//    private val _coreEvents: MutableSharedFlow<Core.Model> = MutableSharedFlow()
+//    val coreEvents: SharedFlow<Core.Model> = _coreEvents.asSharedFlow()
 
     internal val _walletEvents: MutableSharedFlow<Wallet.Model> = MutableSharedFlow()
     val walletEvents: SharedFlow<Wallet.Model> = _walletEvents.asSharedFlow()
@@ -36,8 +36,8 @@ object WCDelegate : WalletKit.WalletDelegate, CoreClient.CoreDelegate {
 
 
     init {
-        CoreClient.setDelegate(this)
-        WalletKit.setWalletDelegate(this)
+//        CoreClient.setDelegate(this)
+//        WalletKit.setWalletDelegate(this)
     }
 
     override fun onConnectionStateChange(state: Wallet.Model.ConnectionState) {
@@ -158,8 +158,8 @@ object WCDelegate : WalletKit.WalletDelegate, CoreClient.CoreDelegate {
     }
 
     override fun onPairingState(pairingState: Core.Model.PairingState) {
-        scope.launch {
-            _coreEvents.emit(pairingState)
-        }
+//        scope.launch {
+//            _coreEvents.emit(pairingState)
+//        }
     }
 }
\ No newline at end of file
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt
index 987575d707..82cca932c0 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt
@@ -83,9 +83,9 @@ class WalletKitActivity : AppCompatActivity() {
         setContent(web3walletViewModel, connectionsViewModel)
         handleWeb3WalletEvents(web3walletViewModel, connectionsViewModel)
         askNotificationPermission()
-        handleErrors()
+//        handleErrors()
         handleAppLink(intent)
-        registerAccount()
+//        registerAccount()
         setBeagle()
     }
 
@@ -128,12 +128,12 @@ class WalletKitActivity : AppCompatActivity() {
         }
     }
 
-    private fun handleErrors() {
-        NotifyDelegate.notifyErrors
-            .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
-            .onEach { error -> Timber.e(error.throwable) }
-            .launchIn(lifecycleScope)
-    }
+//    private fun handleErrors() {
+//        NotifyDelegate.notifyErrors
+//            .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
+//            .onEach { error -> Timber.e(error.throwable) }
+//            .launchIn(lifecycleScope)
+//    }
 
     private fun handleWeb3WalletEvents(
         web3walletViewModel: Web3WalletViewModel,
@@ -297,10 +297,10 @@ class WalletKitActivity : AppCompatActivity() {
 //                )
 //            },
             PaddingModule(size = PaddingModule.Size.LARGE),
-            TextModule(text = "Client ID"),
-            TextModule(text = CoreClient.Push.clientId, id = CoreClient.Push.clientId) {
-                (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("ClientId", CoreClient.Push.clientId))
-            },
+//            TextModule(text = "Client ID"),
+//            TextModule(text = CoreClient.Push.clientId, id = CoreClient.Push.clientId) {
+//                (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("ClientId", CoreClient.Push.clientId))
+//            },
             DividerModule(),
             TextInputModule(
                 text = "Import EVM Private Key",
@@ -316,7 +316,7 @@ class WalletKitActivity : AppCompatActivity() {
                         onSuccess = {
                             println("Unregister Success")
                             EthAccountDelegate.privateKey = text
-                            registerAccount()
+//                            registerAccount()
                         },
                         onError = { println(it.throwable.stackTraceToString()) }
                     )
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt
index 31f1da6229..677aae92d3 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt
@@ -49,9 +49,9 @@ class Web3WalletViewModel : ViewModel() {
     val sessionRequestStateFlow = _sessionRequestStateFlow.asSharedFlow()
 
     init {
-        WCDelegate.coreEvents.onEach { coreEvent ->
-            _isLoadingFlow.value = (coreEvent as? Core.Model.PairingState)?.isPairingState ?: false
-        }.launchIn(viewModelScope)
+//        WCDelegate.coreEvents.onEach { coreEvent ->
+//            _isLoadingFlow.value = (coreEvent as? Core.Model.PairingState)?.isPairingState ?: false
+//        }.launchIn(viewModelScope)
 
         flow {
             while (true) {
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt
index 84c1e6a733..e6442ca787 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt
@@ -76,6 +76,7 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con
     var isEmitLoading by remember { mutableStateOf(false) }
     var isDeleteLoading by remember { mutableStateOf(false) }
     var isUpdateLoading by remember { mutableStateOf(false) }
+    var isExtendLoading by remember { mutableStateOf(false) }
     val composableScope = rememberCoroutineScope()
     val context = LocalContext.current
 
@@ -86,6 +87,7 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con
                 isEmitAndUpdateVisible = uiConnection.type is ConnectionType.Sign,
                 isEmitLoading = isEmitLoading,
                 isUpdateLoading = isUpdateLoading,
+                isExtendLoading = isExtendLoading,
                 onEmit = {
                     when (uiConnection.type) {
                         is ConnectionType.Sign -> {
@@ -97,7 +99,7 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con
                                 val chainId = account.dropLast(account.lastIndex - lastDelimiterIndex + 1)
                                 val event = getAllEventsByChainId(uiConnection.type.namespaces.values.first(), account).first()
                                 WalletKit.emitSessionEvent(
-                                    Wallet.Params.SessionEmit(uiConnection.type.topic, Wallet.Model.SessionEvent(event, "someData"), chainId),
+                                    Wallet.Params.SessionEmit(uiConnection.type.topic, Wallet.Model.SessionEvent(event, "test"), chainId),
                                     onSuccess = {
                                         isEmitLoading = false
                                         composableScope.launch(Dispatchers.Main) {
@@ -137,12 +139,12 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con
                                             methods = entry.value.methods,
                                             events = entry.value.events,
                                         ),
-                                        "solana" to Wallet.Model.Namespace.Session(
-                                            chains = listOf("solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"),
-                                            accounts = listOf("solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:3AJ5ACUXvTC5tc8QudGt8R7thzAZXUQtVnCNj26e1qxT"),
-                                            methods = listOf("solana_signTransaction"),
-                                            events = listOf()
-                                        )
+//                                        "solana" to Wallet.Model.Namespace.Session(
+//                                            chains = listOf("solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"),
+//                                            accounts = listOf("solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:3AJ5ACUXvTC5tc8QudGt8R7thzAZXUQtVnCNj26e1qxT"),
+//                                            methods = listOf("solana_signTransaction"),
+//                                            events = listOf()
+//                                        )
                                     ).toMutableMap()
                                 val params = Wallet.Params.SessionUpdate(uiConnection.type.topic, newNamespaces)
                                 WalletKit.updateSession(
@@ -172,6 +174,38 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con
                             }
                         }
                     }
+                },
+                onExtend = {
+                    when (uiConnection.type) {
+                        is ConnectionType.Sign -> {
+                            isExtendLoading = true
+                            try {
+                                val params = Wallet.Params.SessionExtend(uiConnection.type.topic)
+                                WalletKit.extendSession(
+                                    params,
+                                    onSuccess = {
+                                        isExtendLoading = false
+                                        composableScope.launch(Dispatchers.Main) {
+                                            Toast.makeText(context, "Session extended", Toast.LENGTH_SHORT).show()
+                                        }
+                                    },
+                                    onError = { error ->
+                                        isExtendLoading = false
+                                        Firebase.crashlytics.recordException(error.throwable)
+                                        composableScope.launch(Dispatchers.Main) {
+                                            Toast.makeText(context, "Session extend error. Error: ${error.throwable.message}", Toast.LENGTH_SHORT).show()
+                                        }
+                                    }
+                                )
+                            } catch (e: Exception) {
+                                isExtendLoading = false
+                                Firebase.crashlytics.recordException(e)
+                                composableScope.launch(Dispatchers.Main) {
+                                    Toast.makeText(context, "Session extend error. Error: ${e.message}", Toast.LENGTH_SHORT).show()
+                                }
+                            }
+                        }
+                    }
                 }
             )
             Spacer(modifier = Modifier.height(16.dp))
@@ -450,15 +484,17 @@ fun TopButtons(
     isEmitAndUpdateVisible: Boolean,
     isEmitLoading: Boolean,
     isUpdateLoading: Boolean,
+    isExtendLoading: Boolean,
     onEmit: () -> Unit,
-    onUpdate: () -> Unit
+    onUpdate: () -> Unit,
+    onExtend: () -> Unit
 ) {
     val color = Color(0xFF3496ff)
     val style = TextStyle(fontWeight = FontWeight.SemiBold, fontSize = 17.sp, color = color)
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(horizontal = 9.dp),
+            .padding(horizontal = 9.dp, vertical = 54.dp),
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
         val interactionSourceRow = remember { MutableInteractionSource() }
@@ -516,6 +552,26 @@ fun TopButtons(
                     )
                 }
             }
+            AnimatedContent(targetState = isExtendLoading, label = "Loading") { state ->
+                if (state) {
+                    CircularProgressIndicator(
+                        modifier = Modifier
+                            .size(48.dp)
+                            .padding(8.dp)
+                            .wrapContentWidth(align = Alignment.CenterHorizontally)
+                            .wrapContentHeight(align = Alignment.CenterVertically),
+                        color = color, strokeWidth = 4.dp
+                    )
+                } else {
+                    Text(
+                        modifier = Modifier
+                            .clip(RoundedCornerShape(5.dp))
+                            .clickable { onExtend() }
+                            .padding(horizontal = 5.dp, vertical = 5.dp),
+                        text = "Extend", style = style
+                    )
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt
index 00ec60febe..08204872ab 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt
@@ -52,7 +52,7 @@ class InboxViewModel(application: Application) : AndroidViewModel(application) {
         .filterIsInstance<Notify.Event.SubscriptionsChanged>()
         .debounce(500L)
         .map { event -> event.subscriptions }
-        .stateIn(viewModelScope, SharingStarted.Eagerly, NotifyClient.getActiveSubscriptions(Notify.Params.GetActiveSubscriptions(EthAccountDelegate.ethAccount)).values.toList())
+        .stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())//NotifyClient.getActiveSubscriptions(Notify.Params.GetActiveSubscriptions(EthAccountDelegate.ethAccount)).values.toList())
 
     private var _activeSubscriptions = emptyList<ActiveSubscriptionsUI>()
     private val getActiveSubscriptionTrigger = MutableSharedFlow<Unit>()
@@ -131,7 +131,7 @@ class InboxViewModel(application: Application) : AndroidViewModel(application) {
             .onEach { _explorerAppsTrigger.emit(Unit) }
             .launchIn(viewModelScope)
 
-        viewModelScope.launch { fetchExplorerApps() }
+//        viewModelScope.launch { fetchExplorerApps() }
     }
 
     private suspend fun fetchExplorerApps() {
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt
index a3d2d64af1..7543a7a7d3 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt
@@ -77,7 +77,7 @@ fun SettingsRoute(navController: NavHostController) {
 //        ),
         Section.SettingsSection(
             "Device", listOf(
-                Item.SettingCopyableItem("Client ID", viewModel.clientId),
+//                Item.SettingCopyableItem("Client ID", viewModel.clientId),
                 Item.SettingCopyableItem("Device token", deviceToken),
                 Item.SettingCopyableItem("App Version", BuildConfig.VERSION_NAME)
             )
diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt
index 5c919708ad..823c59d413 100644
--- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt
+++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt
@@ -16,7 +16,7 @@ import kotlinx.coroutines.launch
 class SettingsViewModel : ViewModel() {
     val caip10 = EthAccountDelegate.ethAccount
     val privateKey = EthAccountDelegate.privateKey
-    val clientId = CoreClient.Echo.clientId
+//    val clientId = CoreClient.Echo.clientId
 
 //    val solanaKeys get() = SolanaAccountDelegate.keys