diff --git a/android-aggregate-verifier-example/app/build.gradle b/android-aggregate-verifier-example/app/build.gradle
index 6fdaa6b..1858aaa 100644
--- a/android-aggregate-verifier-example/app/build.gradle
+++ b/android-aggregate-verifier-example/app/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.9.1'
-    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.4'
+    implementation 'com.github.web3auth:web3auth-android-sdk:10.0.0'
     implementation 'org.web3j:core:4.8.7-android'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/android-aggregate-verifier-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt b/android-aggregate-verifier-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
index 1acca2f..2567916 100644
--- a/android-aggregate-verifier-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
+++ b/android-aggregate-verifier-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
@@ -1,7 +1,6 @@
 package com.sbz.web3authdemoapp
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -11,7 +10,21 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.google.gson.Gson
 import com.web3auth.core.Web3Auth
-import com.web3auth.core.types.*
+import com.web3auth.core.types.AuthConnection
+import com.web3auth.core.types.AuthConnectionConfig
+import com.web3auth.core.types.BuildEnv
+import com.web3auth.core.types.ExtraLoginOptions
+import com.web3auth.core.types.Language
+import com.web3auth.core.types.LoginParams
+import com.web3auth.core.types.MfaSetting
+import com.web3auth.core.types.MfaSettings
+import com.web3auth.core.types.ThemeModes
+import com.web3auth.core.types.UserInfo
+import com.web3auth.core.types.WalletServicesConfig
+import com.web3auth.core.types.Web3AuthOptions
+import com.web3auth.core.types.Web3AuthResponse
+import com.web3auth.core.types.WhiteLabelData
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 import org.web3j.crypto.Credentials
 import org.web3j.crypto.Hash
 import org.web3j.crypto.RawTransaction
@@ -32,9 +45,17 @@ import java.util.concurrent.CompletableFuture
 
 class MainActivity : AppCompatActivity() {
 
+    companion object {
+        private const val GROUPED_AUTH_CONNECTION_ID = "aggregate-sapphire"
+        private const val GOOGLE_AUTH_CONNECTION_ID = "w3a-google"
+        private const val AUTH0_AUTH_CONNECTION_ID = "w3a-a0-email-passwordless"
+        private const val AUTH0_DOMAIN = "https://web3auth.au.auth0.com"
+        private const val DEFAULT_CHAIN_ID = "0xaa36a7" // Sepolia
+    }
+
     private lateinit var web3Auth: Web3Auth
     private lateinit var web3: Web3j
-    private lateinit var credentials: Credentials
+    private var credentials: Credentials? = null
     private val rpcUrl = "https://1rpc.io/sepolia"
     private val gson = Gson()
 
@@ -43,69 +64,79 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
         web3 = Web3j.build(HttpService(rpcUrl))
 
+        val whiteLabelData = WhiteLabelData(
+            "Web3Auth Android Example",
+            null,
+            "https://cryptologos.cc/logos/ethereum-eth-logo.png",
+            "https://cryptologos.cc/logos/ethereum-eth-logo.png",
+            Language.EN,
+            ThemeModes.LIGHT,
+            true,
+            hashMapOf("primary" to "#eb5424")
+        )
+
+        val authConnections = listOf(
+            AuthConnectionConfig(
+                authConnectionId = GOOGLE_AUTH_CONNECTION_ID,
+                authConnection = AuthConnection.GOOGLE,
+                clientId = getString(R.string.web3auth_google_client_id),
+                groupedAuthConnectionId = GROUPED_AUTH_CONNECTION_ID
+            ),
+            AuthConnectionConfig(
+                authConnectionId = AUTH0_AUTH_CONNECTION_ID,
+                authConnection = AuthConnection.CUSTOM,
+                clientId = getString(R.string.web3auth_auth0_client_id),
+                groupedAuthConnectionId = GROUPED_AUTH_CONNECTION_ID,
+                jwtParameters = ExtraLoginOptions(
+                    domain = AUTH0_DOMAIN,
+                    userIdField = "email",
+                    isUserIdCaseSensitive = false
+                )
+            )
+        )
+
         web3Auth = Web3Auth(
-           Web3AuthOptions(
-               clientId = getString(R.string.web3auth_project_id), // pass over your Web3Auth Client ID from Developer Dashboard
-               network = Network.SAPPHIRE_MAINNET, // pass over the network you want to use (MAINNET or TESTNET or CYAN, AQUA, SAPPHIRE_MAINNET or SAPPHIRE_TESTNET)
-               buildEnv = BuildEnv.PRODUCTION,
-               redirectUrl = Uri.parse("com.sbz.web3authdemoapp://auth"), // your app's redirect URL
-               whiteLabel = WhiteLabelData(
-                   "Web3Auth Android Example",
-                   null,
-                   "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-                   "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-                   Language.EN,
-                   ThemeModes.LIGHT,
-                   true,
-                   hashMapOf(
-                       "primary" to "#eb5424"
-                   )
-               ),
-               mfaSettings = MfaSettings(
-                   deviceShareFactor = MfaSetting(true, 1, true),
-                   socialBackupFactor = MfaSetting(true, 2, true),
-                   passwordFactor = MfaSetting(true, 3, false),
-                   backUpShareFactor = MfaSetting(true, 4, false),
-               ),
-               loginConfig = hashMapOf(
-                   "google" to LoginConfigItem(
-                       verifier = "aggregate-sapphire",
-                       verifierSubIdentifier= "w3a-google",
-                       typeOfLogin = TypeOfLogin.GOOGLE,
-                       name = "Aggregate Login",
-                       clientId = getString(R.string.web3auth_google_client_id)
-                    ),
-                   "jwt" to LoginConfigItem(
-                       verifier = "aggregate-sapphire",
-                       verifierSubIdentifier= "w3a-a0-email-passwordless",
-                       typeOfLogin = TypeOfLogin.JWT,
-                       name = "Aggregate Login",
-                       clientId = getString(R.string.web3auth_auth0_client_id)
-                   )
-               )
-           ), context = this
+            Web3AuthOptions(
+                clientId = getString(R.string.web3auth_project_id),
+                web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_MAINNET,
+                authBuildEnv = BuildEnv.PRODUCTION,
+                redirectUrl = "com.sbz.web3authdemoapp://auth",
+                whiteLabel = whiteLabelData,
+                walletServicesConfig = WalletServicesConfig(whiteLabel = whiteLabelData),
+                authConnectionConfig = authConnections,
+                mfaSettings = MfaSettings(
+                    deviceShareFactor = MfaSetting(true, 1, true),
+                    socialBackupFactor = MfaSetting(true, 2, true),
+                    passwordFactor = MfaSetting(true, 3, false),
+                    backUpShareFactor = MfaSetting(true, 4, false),
+                ),
+                defaultChainId = DEFAULT_CHAIN_ID
+            ), this
         )
 
-        // Handle user signing in when app is not alive
         web3Auth.setResultUrl(intent?.data)
 
-        // Call initialize() in onCreate() to check for any existing session.
         val sessionResponse: CompletableFuture<Void> = web3Auth.initialize()
         sessionResponse.whenComplete { _, error ->
             if (error == null) {
+                setCredentialsIfPresent()
                 reRender()
-                println("PrivKey: " + web3Auth.getPrivkey())
-                println("ed25519PrivKey: " + web3Auth.getEd25519PrivKey())
-                println("Web3Auth UserInfo" + web3Auth.getUserInfo())
-                credentials = Credentials.create(web3Auth.getPrivkey())
-                Log.d("MainActivity_Web3Auth", web3Auth.getUserInfo().toString())
+                try {
+                    println("PrivKey: ${web3Auth.getPrivateKey()}")
+                    println("ed25519PrivKey: ${web3Auth.getEd25519PrivateKey()}")
+                } catch (ex: Exception) {
+                    Log.d("MainActivity_Web3Auth", ex.message ?: "Unable to fetch keys")
+                }
+                println("Web3Auth UserInfo ${web3Auth.getUserInfo()}")
+                Log.d(
+                    "MainActivity_Web3Auth",
+                    web3Auth.getUserInfo()?.toString() ?: "No user logged in"
+                )
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
-                // Ideally, you should initiate the login function here.
             }
         }
 
-        // Setup UI and event handlers
         val signInGoogleButton = findViewById<Button>(R.id.signInGoogle)
         signInGoogleButton.setOnClickListener { signInGoogle() }
 
@@ -129,7 +160,9 @@ class MainActivity : AppCompatActivity() {
         getMessageButton.visibility = View.GONE
 
         val getTransactionButton = findViewById<Button>(R.id.getTransaction)
-        getTransactionButton.setOnClickListener { sendTransaction(0.001, "0xeaA8Af602b2eDE45922818AE5f9f7FdE50cFa1A8") }
+        getTransactionButton.setOnClickListener {
+            sendTransaction(0.001, "0xeaA8Af602b2eDE45922818AE5f9f7FdE50cFa1A8")
+        }
         getTransactionButton.visibility = View.GONE
 
         val getEnableMFAButton = findViewById<Button>(R.id.enableMFA)
@@ -143,8 +176,6 @@ class MainActivity : AppCompatActivity() {
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-
-        // Handle user signing in when app is active
         web3Auth.setResultUrl(intent?.data)
     }
 
@@ -158,12 +189,23 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun signInEP() {
-        val selectedLoginProvider = Provider.JWT
-        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.login(LoginParams(selectedLoginProvider, extraLoginOptions = ExtraLoginOptions(domain = "https://web3auth.au.auth0.com", verifierIdField = "email", isVerifierIdCaseSensitive = false)))
+        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> =
+            web3Auth.connectTo(
+                LoginParams(
+                    authConnection = AuthConnection.CUSTOM,
+                    authConnectionId = AUTH0_AUTH_CONNECTION_ID,
+                    groupedAuthConnectionId = GROUPED_AUTH_CONNECTION_ID,
+                    extraLoginOptions = ExtraLoginOptions(
+                        domain = AUTH0_DOMAIN,
+                        userIdField = "email",
+                        isUserIdCaseSensitive = false
+                    )
+                )
+            )
 
         loginCompletableFuture.whenComplete { _, error ->
             if (error == null) {
-                credentials = Credentials.create(web3Auth.getPrivkey())
+                setCredentialsIfPresent()
                 reRender()
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
@@ -172,12 +214,18 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun signInGoogle() {
-        val selectedLoginProvider = Provider.GOOGLE
-        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.login(LoginParams(selectedLoginProvider))
+        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> =
+            web3Auth.connectTo(
+                LoginParams(
+                    authConnection = AuthConnection.GOOGLE,
+                    authConnectionId = GOOGLE_AUTH_CONNECTION_ID,
+                    groupedAuthConnectionId = GROUPED_AUTH_CONNECTION_ID,
+                )
+            )
 
         loginCompletableFuture.whenComplete { _, error ->
             if (error == null) {
-                credentials = Credentials.create(web3Auth.getPrivkey())
+                setCredentialsIfPresent()
                 reRender()
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
@@ -186,70 +234,52 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun enableMFA() {
-        val loginParams = prepareLoginParams()
-        val completableFuture = web3Auth.enableMFA(loginParams)
-        completableFuture.whenComplete{_, error ->
+        val completableFuture = web3Auth.enableMFA()
+        completableFuture.whenComplete { _, error ->
             if (error == null) {
-                Log.d("MainActivity_Web3Auth", "Launched successfully")
-                // Add your logic
+                Log.d("MainActivity_Web3Auth", "MFA launched successfully")
             } else {
-                // Add your logic on error
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
             }
         }
     }
 
-    private fun prepareLoginParams(): LoginParams {
-        val loginParams = if(web3Auth.getUserInfo()!!.typeOfLogin == TypeOfLogin.GOOGLE.name) {
-            LoginParams(Provider.GOOGLE)
-        } else {
-            LoginParams(Provider.JWT, extraLoginOptions = ExtraLoginOptions(domain = "https://web3auth.au.auth0.com", verifierIdField = "email", isVerifierIdCaseSensitive = false))
-        }
-        return loginParams
-    }
-
     private fun launchWalletServices() {
-        val completableFuture = web3Auth.launchWalletServices(
-           ChainConfig(
-                chainId = "0x1",
-                rpcTarget = "https://1rpc.io/eth",
-                ticker = "ETH",
-                chainNamespace = ChainNamespace.EIP155
-            )
-        )
-
-        completableFuture.whenComplete{_, error ->
-            if(error == null) {
-                // Add your logic
+        val completableFuture = web3Auth.showWalletUI()
+        completableFuture.whenComplete { _, error ->
+            if (error == null) {
                 Log.d("MainActivity_Web3Auth", "Wallet services launched successfully")
             } else {
-                // Add your logic for error
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
             }
         }
     }
 
     private fun getAddress(): String {
+        val activeCredentials = requireCredentials() ?: return ""
         val contentTextView = findViewById<TextView>(R.id.contentTextView)
-        val publicAddress = credentials.address
+        val publicAddress = activeCredentials.address
         contentTextView.text = publicAddress
         println("Address:, $publicAddress")
         return publicAddress
     }
 
     private fun getBalance(): BigInteger? {
+        val activeCredentials = requireCredentials() ?: return null
         val contentTextView = findViewById<TextView>(R.id.contentTextView)
-        val publicAddress = credentials.address
-        val ethBalance: EthGetBalance = web3.ethGetBalance(publicAddress, DefaultBlockParameterName.LATEST).sendAsync().get()
+        val publicAddress = activeCredentials.address
+        val ethBalance: EthGetBalance =
+            web3.ethGetBalance(publicAddress, DefaultBlockParameterName.LATEST).sendAsync().get()
         contentTextView.text = ethBalance.balance.toString()
         println("Balance: ${ethBalance.balance}")
         return ethBalance.balance
     }
 
     private fun signMessage(message: String): String {
+        val activeCredentials = requireCredentials() ?: return ""
         val contentTextView = findViewById<TextView>(R.id.contentTextView)
         val hashedData = Hash.sha3(message.toByteArray(StandardCharsets.UTF_8))
-        val signature = Sign.signMessage(hashedData, credentials.ecKeyPair)
+        val signature = Sign.signMessage(hashedData, activeCredentials.ecKeyPair)
         val r = Numeric.toHexString(signature.r)
         val s = Numeric.toHexString(signature.s).substring(2)
         val v = Numeric.toHexString(signature.v).substring(2)
@@ -260,14 +290,18 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun sendTransaction(amount: Double, recipientAddress: String): String? {
+        val activeCredentials = requireCredentials() ?: return null
         val contentTextView = findViewById<TextView>(R.id.contentTextView)
-        val ethGetTransactionCount: EthGetTransactionCount = web3.ethGetTransactionCount(credentials.address, DefaultBlockParameterName.LATEST).sendAsync().get()
+        val ethGetTransactionCount: EthGetTransactionCount =
+            web3.ethGetTransactionCount(
+                activeCredentials.address,
+                DefaultBlockParameterName.LATEST
+            ).sendAsync().get()
         val nonce: BigInteger = ethGetTransactionCount.transactionCount
         val value: BigInteger = Convert.toWei(amount.toString(), Convert.Unit.ETHER).toBigInteger()
         val gasLimit: BigInteger = BigInteger.valueOf(21000)
         val chainId: EthChainId = web3.ethChainId().sendAsync().get()
 
-        // Raw Transaction
         val rawTransaction: RawTransaction = RawTransaction.createTransaction(
             chainId.chainId.toLong(),
             nonce,
@@ -279,10 +313,11 @@ class MainActivity : AppCompatActivity() {
             BigInteger.valueOf(6000000000000)
         )
 
-        val signedMessage: ByteArray = TransactionEncoder.signMessage(rawTransaction, credentials)
+        val signedMessage: ByteArray = TransactionEncoder.signMessage(rawTransaction, activeCredentials)
         val hexValue: String = Numeric.toHexString(signedMessage)
-        val ethSendTransaction: EthSendTransaction = web3.ethSendRawTransaction(hexValue).sendAsync().get()
-        return if(ethSendTransaction.error != null) {
+        val ethSendTransaction: EthSendTransaction =
+            web3.ethSendRawTransaction(hexValue).sendAsync().get()
+        return if (ethSendTransaction.error != null) {
             println("Tx Error: ${ethSendTransaction.error.message}")
             contentTextView.text = "Tx Error: ${ethSendTransaction.error.message}"
             ethSendTransaction.error.message
@@ -294,12 +329,13 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun signOut() {
-        val logoutCompletableFuture =  web3Auth.logout()
+        val logoutCompletableFuture = web3Auth.logout()
         logoutCompletableFuture.whenComplete { _, error ->
             if (error == null) {
+                credentials = null
                 reRender()
             } else {
-                Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong" )
+                Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
             }
         }
         recreate()
@@ -320,13 +356,13 @@ class MainActivity : AppCompatActivity() {
         var key: String? = null
         var userInfo: UserInfo? = null
         try {
-            key = web3Auth.getPrivkey()
+            key = web3Auth.getPrivateKey()
             userInfo = web3Auth.getUserInfo()
         } catch (ex: Exception) {
-            print(ex)
+            Log.d("MainActivity_Web3Auth", ex.message ?: "Unable to fetch session")
         }
         println(userInfo)
-        if (key is String && key.isNotEmpty()) {
+        if (!key.isNullOrEmpty()) {
             contentTextView.text = gson.toJson(userInfo) + "\n Private Key: " + key
             contentTextView.visibility = View.VISIBLE
             signInEPButton.visibility = View.GONE
@@ -352,4 +388,24 @@ class MainActivity : AppCompatActivity() {
             getLaunchWalletServicesButton.visibility = View.GONE
         }
     }
-}
\ No newline at end of file
+
+    private fun setCredentialsIfPresent() {
+        try {
+            val privateKey = web3Auth.getPrivateKey()
+            if (privateKey.isNotBlank()) {
+                credentials = Credentials.create(privateKey)
+            }
+        } catch (ex: Exception) {
+            Log.d("MainActivity_Web3Auth", ex.message ?: "No private key available")
+        }
+    }
+
+    private fun requireCredentials(): Credentials? {
+        val activeCredentials = credentials
+        if (activeCredentials == null) {
+            Toast.makeText(this, "Please login first.", Toast.LENGTH_SHORT).show()
+            return null
+        }
+        return activeCredentials
+    }
+}
diff --git a/android-auth0-example/app/build.gradle b/android-auth0-example/app/build.gradle
index 3b896f0..47bdd52 100644
--- a/android-auth0-example/app/build.gradle
+++ b/android-auth0-example/app/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.9.1'
-    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.4'
+    implementation 'com.github.web3auth:web3auth-android-sdk:10.0.0'
     implementation 'org.web3j:core:4.8.7-android'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/android-auth0-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt b/android-auth0-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
index 1dcd3ba..b1fb39c 100644
--- a/android-auth0-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
+++ b/android-auth0-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
@@ -1,7 +1,6 @@
 package com.sbz.web3authdemoapp
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -12,6 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.google.gson.Gson
 import com.web3auth.core.Web3Auth
 import com.web3auth.core.types.*
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 import org.web3j.crypto.Credentials
 import org.web3j.crypto.Hash
 import org.web3j.crypto.RawTransaction
@@ -38,7 +38,6 @@ class MainActivity : AppCompatActivity() {
     private val gson = Gson()
     private lateinit var web3: Web3j
     private lateinit var credentials: Credentials
-    private lateinit var loginParams: LoginParams
     private val rpcUrl = "https://1rpc.io/sepolia"
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -46,41 +45,35 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         web3 = Web3j.build(HttpService(rpcUrl))
-        loginParams = LoginParams(Provider.JWT, extraLoginOptions = ExtraLoginOptions(domain = "https://web3auth.au.auth0.com", verifierIdField = "sub"))
 
         web3Auth = Web3Auth(
            Web3AuthOptions(
-
                clientId = getString(R.string.web3auth_project_id), // pass over your Web3Auth Client ID from Developer Dashboard
-               network = Network.SAPPHIRE_MAINNET, // pass over the network you want to use (MAINNET or TESTNET or CYAN)
-               buildEnv = BuildEnv.PRODUCTION,
-               redirectUrl = Uri.parse("com.sbz.web3authdemoapp://auth"), // your app's redirect URL
+               web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_MAINNET, // pass over the network you want to use
+               redirectUrl = "com.sbz.web3authdemoapp://auth", // your app's redirect URL
                // Optional parameters
-               whiteLabel = WhiteLabelData(
-                   "Web3Auth Android Auth0 Example",
-                   null,
-                   "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-                   "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-                   Language.EN,
-                   ThemeModes.LIGHT,
-                   true,
-                   hashMapOf(
-                       "primary" to "#eb5424"
+               walletServicesConfig = WalletServicesConfig(
+                   whiteLabel = WhiteLabelData(
+                       "Web3Auth Android Auth0 Example",
+                       null,
+                       "https://cryptologos.cc/logos/ethereum-eth-logo.png",
+                       "https://cryptologos.cc/logos/ethereum-eth-logo.png",
+                       Language.EN,
+                       ThemeModes.LIGHT,
+                       true,
+                       hashMapOf(
+                           "primary" to "#eb5424"
+                       )
                    )
                ),
-               mfaSettings = MfaSettings(
-                   deviceShareFactor = MfaSetting(true, 1, true),
-                   socialBackupFactor = MfaSetting(true, 2, true),
-                   passwordFactor = MfaSetting(true, 3, false),
-                   backUpShareFactor = MfaSetting(true, 4, false),
-               ),
-               loginConfig = hashMapOf("jwt" to LoginConfigItem(
-                   verifier = "w3a-auth0-demo",
-                   typeOfLogin = TypeOfLogin.JWT,
-                   name = "Auth0 Login",
-                   clientId = getString(R.string.web3auth_auth0_client_id)
-               ))
-           ), context = this
+               authConnectionConfig = listOf(
+                   AuthConnectionConfig(
+                       authConnection = AuthConnection.CUSTOM,
+                       authConnectionId = "w3a-auth0-demo",
+                       clientId = getString(R.string.web3auth_auth0_client_id)
+                   )
+               )
+           ), this
        )
 
         // Handle user signing in when app is not alive
@@ -91,10 +84,10 @@ class MainActivity : AppCompatActivity() {
         sessionResponse.whenComplete { _, error ->
             if (error == null) {
                 reRender()
-                println("PrivKey: " + web3Auth.getPrivkey())
-                println("ed25519PrivKey: " + web3Auth.getEd25519PrivKey())
+                println("PrivKey: " + web3Auth.getPrivateKey())
+                println("ed25519PrivKey: " + web3Auth.getEd25519PrivateKey())
                 println("Web3Auth UserInfo" + web3Auth.getUserInfo())
-                credentials = Credentials.create(web3Auth.getPrivkey())
+                credentials = Credentials.create(web3Auth.getPrivateKey())
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
                 // Ideally, you should initiate the login function here.
@@ -151,19 +144,34 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun signIn() {
-        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.login(loginParams)
-
-    //    For Email Passwordless, use the below code and pass email id into extraLoginOptions of LoginParams.
-    //    val selectedLoginProvider = Provider.EMAIL_PASSWORDLESS
-    //    val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.login(LoginParams(selectedLoginProvider, extraLoginOptions = ExtraLoginOptions(login_hint = "shahbaz.web3@gmail.com")))
-
-    //    For login with Custom JWT, use the below code and pass email id into extraLoginOptions of LoginParams.
-    //    val selectedLoginProvider = Provider.JWT
-    //    val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.login(LoginParams(selectedLoginProvider, extraLoginOptions = ExtraLoginOptions(id_token = "<id-token>", domain: "your-domain")))
+        val extraLoginOptionsData = ExtraLoginOptions(
+            domain = "https://web3auth.au.auth0.com"
+        )
+        val loginParams = LoginParams(
+            authConnection = AuthConnection.CUSTOM,
+            authConnectionId = "w3a-auth0-demo",
+            extraLoginOptions = extraLoginOptionsData
+        )
+        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.connectTo(loginParams)
+
+    //    For Email Passwordless, use the below code and pass email id into loginHint of LoginParams.
+    //    val loginParams = LoginParams(
+    //        authConnection = AuthConnection.EMAIL_PASSWORDLESS,
+    //        loginHint = "shahbaz.web3@gmail.com"
+    //    )
+    //    val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.connectTo(loginParams)
+
+    //    For login with Custom JWT, use the below code and pass idToken into LoginParams.
+    //    val loginParams = LoginParams(
+    //        authConnection = AuthConnection.CUSTOM,
+    //        authConnectionId = "your-verifier-id",
+    //        idToken = "<id-token>"
+    //    )
+    //    val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.connectTo(loginParams)
 
         loginCompletableFuture.whenComplete { _, error ->
             if (error == null) {
-                credentials = Credentials.create(web3Auth.getPrivkey())
+                credentials = Credentials.create(web3Auth.getPrivateKey())
                 reRender()
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong" )
@@ -172,7 +180,14 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun enableMFA() {
-
+        val extraLoginOptionsData = ExtraLoginOptions(
+            domain = "https://web3auth.au.auth0.com"
+        )
+        val loginParams = LoginParams(
+            authConnection = AuthConnection.CUSTOM,
+            authConnectionId = "w3a-auth0-demo",
+            extraLoginOptions = extraLoginOptionsData
+        )
         val completableFuture = web3Auth.enableMFA(loginParams)
 
         completableFuture.whenComplete{_, error ->
@@ -187,21 +202,11 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun launchWalletServices() {
-        val completableFuture = web3Auth.launchWalletServices(
-            ChainConfig(
-                chainId = "0x1",
-                rpcTarget = "https://1rpc.io/eth",
-                ticker = "ETH",
-                chainNamespace = ChainNamespace.EIP155
-            )
-        )
-
-        completableFuture.whenComplete{_, error ->
-            if(error == null) {
-                // Add your logic
-                Log.d("MainActivity_Web3Auth", "Wallet services launched successfully")
+        val launchWalletCompletableFuture = web3Auth.showWalletUI()
+        launchWalletCompletableFuture.whenComplete { _, error ->
+            if (error == null) {
+                Log.d("MainActivity_Web3Auth", "Wallet launched successfully")
             } else {
-                // Add your logic for error
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
             }
         }
@@ -297,7 +302,7 @@ class MainActivity : AppCompatActivity() {
         var key: String? = null
         var userInfo: UserInfo? = null
         try {
-            key = web3Auth.getPrivkey()
+            key = web3Auth.getPrivateKey()
             userInfo = web3Auth.getUserInfo()
         } catch (ex: Exception) {
             print(ex)
diff --git a/android-firebase-example/app/build.gradle b/android-firebase-example/app/build.gradle
index 60ed32c..9fd09ff 100644
--- a/android-firebase-example/app/build.gradle
+++ b/android-firebase-example/app/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.9.1'
-    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.4'
+    implementation 'com.github.web3auth:web3auth-android-sdk:10.0.0'
     implementation 'org.web3j:core:4.8.7-android'
     implementation platform('com.google.firebase:firebase-bom:31.0.2')
     implementation 'com.google.firebase:firebase-auth-ktx'
diff --git a/android-firebase-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt b/android-firebase-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
index 0c11e8e..c1084eb 100644
--- a/android-firebase-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
+++ b/android-firebase-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
@@ -1,8 +1,6 @@
 package com.sbz.web3authdemoapp
 
-import android.content.ContentValues.TAG
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -19,6 +17,7 @@ import com.google.gson.Gson
 import com.google.gson.JsonArray
 import com.web3auth.core.Web3Auth
 import com.web3auth.core.types.*
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 import org.web3j.crypto.Credentials
 import org.web3j.crypto.Hash
 import org.web3j.crypto.RawTransaction
@@ -47,45 +46,53 @@ class MainActivity : AppCompatActivity() {
     private val rpcUrl = "https://1rpc.io/sepolia"
 
     private val gson = Gson()
+    companion object {
+        private const val TAG = "MainActivity_Web3Auth"
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        auth = Firebase.auth
+        try {
+            auth = Firebase.auth
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to initialize Firebase Auth", e)
+            Toast.makeText(this, "Failed to initialize Firebase: ${e.message}",
+                Toast.LENGTH_LONG).show()
+            return
+        }
         web3 = Web3j.build(HttpService(rpcUrl))
 
         web3Auth = Web3Auth(
            Web3AuthOptions(
                clientId = getString(R.string.web3auth_project_id), // pass over your Web3Auth Client ID from Developer Dashboard
-               network = Network.SAPPHIRE_MAINNET, // pass over the network you want to use (MAINNET or TESTNET or CYAN, AQUA, SAPPHIRE_MAINNET or SAPPHIRE_TESTNET)
-               buildEnv = BuildEnv.PRODUCTION,
-               redirectUrl = Uri.parse("com.sbz.web3authdemoapp://auth"), // your app's redirect URL
+               web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_MAINNET, // pass over the network you want to use
+               redirectUrl = "com.sbz.web3authdemoapp://auth", // your app's redirect URL
+               
                // Optional parameters
-               whiteLabel = WhiteLabelData(
-                   "Web3Auth Android FireBase Example",
-                   null,
-                   "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-                   "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-                   Language.EN,
-                   ThemeModes.LIGHT,
-                   true,
-                   hashMapOf(
-                       "primary" to "#eb5424"
-                   )
-               ),
-               mfaSettings = MfaSettings(
-                   deviceShareFactor = MfaSetting(true, 1, true),
-                   socialBackupFactor = MfaSetting(true, 2, true),
-                   passwordFactor = MfaSetting(true, 3, false),
-                   backUpShareFactor = MfaSetting(true, 4, false),
+               walletServicesConfig = WalletServicesConfig(
+                   whiteLabel = WhiteLabelData(
+                       "Web3Auth Android FireBase Example",
+                       null,
+                       "https://cryptologos.cc/logos/ethereum-eth-logo.png",
+                       "https://cryptologos.cc/logos/ethereum-eth-logo.png",
+                       Language.EN,
+                       ThemeModes.LIGHT,
+                       true,
+                       hashMapOf(
+                           "primary" to "#eb5424"
+                       )
+                   ),
+
                ),
-               loginConfig = hashMapOf("jwt" to LoginConfigItem(
-                   verifier = "w3a-firebase-demo",
-                   typeOfLogin = TypeOfLogin.JWT,
-                   name = "Firebase login",
-                   clientId = getString(R.string.web3auth_project_id)
-               ))
-           ), context = this
+               authConnectionConfig = listOf(
+                   AuthConnectionConfig(
+                       authConnection = AuthConnection.CUSTOM,
+                       authConnectionId = "w3a-firebase-demo",
+                       clientId = getString(R.string.web3auth_project_id)
+                   )
+               )
+           ), this
        )
 
         // Handle user signing in when app is not alive
@@ -96,10 +103,10 @@ class MainActivity : AppCompatActivity() {
         sessionResponse.whenComplete { _, error ->
             if (error == null) {
                 reRender()
-                println("PrivKey: " + web3Auth.getPrivkey())
-                println("ed25519PrivKey: " + web3Auth.getEd25519PrivKey())
+                println("PrivKey: " + web3Auth.getPrivateKey())
+                println("ed25519PrivKey: " + web3Auth.getEd25519PrivateKey())
                 println("Web3Auth UserInfo" + web3Auth.getUserInfo())
-                credentials = Credentials.create(web3Auth.getPrivkey())
+                credentials = Credentials.create(web3Auth.getPrivateKey())
 
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
@@ -157,37 +164,111 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun signIn() {
-        auth.signInWithEmailAndPassword("android@firebase.com", "Android@Web3Auth")
-            .addOnCompleteListener(this) { task ->
+        try {
+            if (!::auth.isInitialized) {
+                Log.e(TAG, "Firebase Auth is not initialized")
+                Toast.makeText(this, "Firebase Auth is not initialized",
+                    Toast.LENGTH_SHORT).show()
+                return
+            }
+            Log.d(TAG, "Attempting Firebase sign in...")
+            auth.signInWithEmailAndPassword("android@firebase.com", "Android@Web3Auth")
+                .addOnCompleteListener(this) { task ->
                 if (task.isSuccessful) {
                     // Sign in success, update UI with the signed-in user's information
                     Log.d(TAG, "signInWithEmail:success")
                     val user = auth.currentUser
-                    user!!.getIdToken(true).addOnSuccessListener { result ->
-                        val idToken = result.token
-                        //Do whatever
-                        Log.d(TAG, "GetTokenResult result = $idToken")
-                        val selectedLoginProvider = Provider.JWT
-                        val loginParams = LoginParams(selectedLoginProvider, extraLoginOptions = ExtraLoginOptions(domain= "firebase", id_token = idToken, verifierIdField = "sub"))
-                        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.login(loginParams)
-
-                        loginCompletableFuture.whenComplete {  _, error ->
-                            if (error == null) {
-                                credentials = Credentials.create(web3Auth.getPrivkey())
-                                reRender()
-                            } else {
-                                Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong" )
+                    if (user != null) {
+                        user.getIdToken(true).addOnSuccessListener { result ->
+                            try {
+                                val idToken = result.token
+                                //Do whatever
+                                Log.d(TAG, "GetTokenResult result = $idToken")
+                                if (idToken != null) {
+                                    if (!::web3Auth.isInitialized) {
+                                        Log.e(TAG, "Web3Auth is not initialized")
+                                        if (!isFinishing && !isDestroyed) {
+                                            Toast.makeText(this@MainActivity, "Web3Auth is not initialized",
+                                                Toast.LENGTH_SHORT).show()
+                                        }
+                                        return@addOnSuccessListener
+                                    }
+                                    val loginParams = LoginParams(
+                                        authConnection = AuthConnection.CUSTOM,
+                                        authConnectionId = "w3a-firebase-demo",
+                                        idToken = idToken
+                                    )
+                                    val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.connectTo(loginParams)
+
+                                    loginCompletableFuture.whenComplete { _, error ->
+                                        runOnUiThread {
+                                            if (isFinishing || isDestroyed) {
+                                                Log.w(TAG, "Activity is finishing/destroyed, skipping UI update")
+                                                return@runOnUiThread
+                                            }
+                                            if (error == null) {
+                                                credentials = Credentials.create(web3Auth.getPrivateKey())
+                                                reRender()
+                                            } else {
+                                                Log.e(TAG, "Web3Auth login failed", error)
+                                                error.printStackTrace()
+                                                Toast.makeText(this@MainActivity, "Web3Auth login failed: ${error.message}",
+                                                    Toast.LENGTH_SHORT).show()
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    Log.e(TAG, "ID token is null")
+                                    if (!isFinishing && !isDestroyed) {
+                                        Toast.makeText(this@MainActivity, "Failed to get ID token.",
+                                            Toast.LENGTH_SHORT).show()
+                                    }
+                                }
+                            } catch (e: Exception) {
+                                Log.e(TAG, "Exception in getIdToken success callback", e)
+                                e.printStackTrace()
+                                if (!isFinishing && !isDestroyed) {
+                                    Toast.makeText(this@MainActivity, "Error processing ID token: ${e.message}",
+                                        Toast.LENGTH_SHORT).show()
+                                }
+                            }
+                        }.addOnFailureListener { exception ->
+                            Log.e(TAG, "Failed to get ID token", exception)
+                            exception.printStackTrace()
+                            if (!isFinishing && !isDestroyed) {
+                                Toast.makeText(this@MainActivity, "Failed to get ID token: ${exception.message}",
+                                    Toast.LENGTH_SHORT).show()
                             }
                         }
+                    } else {
+                        Log.e(TAG, "Current user is null after successful sign in")
+                        if (!isFinishing && !isDestroyed) {
+                            Toast.makeText(this@MainActivity, "User is null after sign in.",
+                                Toast.LENGTH_SHORT).show()
+                        }
                     }
                 } else {
                     // If sign in fails, display a message to the user.
-                    Log.w(TAG, "signInWithEmail:failure", task.exception)
-                    Toast.makeText(baseContext, "Authentication failed.",
-                        Toast.LENGTH_SHORT).show()
-
+                    val exception = task.exception
+                    Log.e(TAG, "signInWithEmail:failure", exception)
+                    val errorMessage = when {
+                        exception?.message?.contains("no user record") == true -> 
+                            "User does not exist. Please create the user in Firebase Console first."
+                        exception?.message?.contains("password") == true -> 
+                            "Invalid password."
+                        else -> 
+                            "Authentication failed: ${exception?.message ?: "Unknown error"}"
+                    }
+                    Toast.makeText(this@MainActivity, errorMessage,
+                        Toast.LENGTH_LONG).show()
                 }
             }
+        } catch (e: Exception) {
+            Log.e(TAG, "Exception during sign in", e)
+            e.printStackTrace()
+            Toast.makeText(this, "Sign in error: ${e.message}",
+                Toast.LENGTH_SHORT).show()
+        }
     }
 
     private fun signOut() {
@@ -221,19 +302,15 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun prepareLoginParams(result: GetTokenResult): LoginParams {
-        val selectedLoginProvider = Provider.JWT
-        return LoginParams(selectedLoginProvider, extraLoginOptions = ExtraLoginOptions(domain= "firebase", id_token = result.token, verifierIdField = "sub"))
+        return LoginParams(
+            authConnection = AuthConnection.CUSTOM,
+            authConnectionId = "w3a-firebase-demo",
+            idToken = result.token
+        )
     }
 
     private fun launchWalletServices() {
-        val completableFuture = web3Auth.launchWalletServices(
-            ChainConfig(
-                chainId = "0x1",
-                rpcTarget = "https://1rpc.io/eth",
-                ticker = "ETH",
-                chainNamespace = ChainNamespace.EIP155
-            )
-        )
+        val completableFuture = web3Auth.showWalletUI()
 
         completableFuture.whenComplete{_, error ->
             if(error == null) {
@@ -325,7 +402,7 @@ class MainActivity : AppCompatActivity() {
         var key: String? = null
         var userInfo: UserInfo? = null
         try {
-            key = web3Auth.getPrivkey()
+            key = web3Auth.getPrivateKey()
             userInfo = web3Auth.getUserInfo()
         } catch (ex: Exception) {
             print(ex)
diff --git a/android-quick-start/app/build.gradle b/android-quick-start/app/build.gradle
index 02a0202..7f7d227 100644
--- a/android-quick-start/app/build.gradle
+++ b/android-quick-start/app/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.9.1'
     // IMP START - Installation
-    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.4'
+    implementation 'com.github.web3auth:web3auth-android-sdk:10.0.0'
     // IMP END - Installation
     implementation 'org.web3j:core:4.8.7-android'
     testImplementation 'junit:junit:4.13.2'
diff --git a/android-quick-start/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt b/android-quick-start/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
index 88be727..04d79ea 100644
--- a/android-quick-start/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
+++ b/android-quick-start/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
@@ -2,7 +2,6 @@
 package com.sbz.web3authdemoapp
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -16,6 +15,7 @@ import com.google.gson.Gson
 import com.web3auth.core.Web3Auth
 // IMP END - Quick Start
 import com.web3auth.core.types.*
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 import org.web3j.crypto.Credentials
 import org.web3j.crypto.Hash
 import org.web3j.crypto.RawTransaction
@@ -54,9 +54,8 @@ class MainActivity : AppCompatActivity() {
         web3Auth = Web3Auth(
             Web3AuthOptions(
                 clientId = getString(R.string.web3auth_project_id),
-                network = Network.SAPPHIRE_MAINNET, // pass over the network you want to use (MAINNET or TESTNET or CYAN, AQUA, SAPPHIRE_MAINNET or SAPPHIRE_TESTNET)
-                buildEnv = BuildEnv.PRODUCTION,
-                redirectUrl = Uri.parse("com.sbz.web3authdemoapp://auth")
+                web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_MAINNET, // pass over the network you want to use
+                redirectUrl = "com.sbz.web3authdemoapp://auth"
             ), this
         )
         // IMP END - Initialize Web3Auth
@@ -68,10 +67,10 @@ class MainActivity : AppCompatActivity() {
         sessionResponse.whenComplete { _, error ->
             if (error == null) {
                 reRender()
-                println("PrivKey: " + web3Auth.getPrivkey())
-                println("ed25519PrivKey: " + web3Auth.getEd25519PrivKey())
+                println("PrivKey: " + web3Auth.getPrivateKey())
+                println("ed25519PrivKey: " + web3Auth.getEd25519PrivateKey())
                 println("Web3Auth UserInfo" + web3Auth.getUserInfo())
-                credentials = Credentials.create(web3Auth.getPrivkey())
+                credentials = Credentials.create(web3Auth.getPrivateKey())
                 web3 = Web3j.build(HttpService(rpcUrl))
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
@@ -125,17 +124,20 @@ class MainActivity : AppCompatActivity() {
     private fun signIn() {
         val email = emailInput.text.toString()
         // IMP START - Login
-        val selectedLoginProvider = Provider.EMAIL_PASSWORDLESS   // Can be GOOGLE, FACEBOOK, TWITCH etc.
-        val loginParams = LoginParams(selectedLoginProvider, extraLoginOptions = ExtraLoginOptions(login_hint = email))
+        val selectedLoginProvider = AuthConnection.EMAIL_PASSWORDLESS   // Can be GOOGLE, FACEBOOK, TWITCH etc.
+        val loginParams = LoginParams(
+            selectedLoginProvider,
+            loginHint = email
+        )
         val loginCompletableFuture: CompletableFuture<Web3AuthResponse> =
-            web3Auth.login(loginParams)
+            web3Auth.connectTo(loginParams)
         // IMP END - Login
 
         loginCompletableFuture.whenComplete { _, error ->
             if (error == null) {
                 // Set the sessionId from Web3Auth in App State
                 // This will be used when making blockchain calls with Web3j
-                credentials = Credentials.create(web3Auth.getPrivkey())
+                credentials = Credentials.create(web3Auth.getPrivateKey())
                 web3 = Web3j.build(HttpService(rpcUrl))
                 reRender()
             } else {
@@ -176,7 +178,7 @@ class MainActivity : AppCompatActivity() {
         var key: String? = null
         var userInfo: UserInfo? = null
         try {
-            key = web3Auth.getPrivkey()
+            key = web3Auth.getPrivateKey()
             // IMP START - Get User Info
             userInfo = web3Auth.getUserInfo()
             // IMP END - Get User Info
diff --git a/android-solana-example/app/build.gradle.kts b/android-solana-example/app/build.gradle.kts
index 953273b..2de51fc 100644
--- a/android-solana-example/app/build.gradle.kts
+++ b/android-solana-example/app/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
-    implementation("com.github.Web3Auth:web3auth-android-sdk:9.0.4")
+    implementation("com.github.Web3Auth:web3auth-android-sdk:10.0.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
diff --git a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelper.kt b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelper.kt
index 1d260e7..e029f38 100644
--- a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelper.kt
+++ b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelper.kt
@@ -14,6 +14,6 @@ interface Web3AuthHelper {
     fun getUserInfo(): UserInfo
     suspend fun initialize(): CompletableFuture<Void>
 
-    suspend fun setResultUrl(uri: Uri?): Unit
+    fun setResultUrl(uri: Uri?)
     suspend fun isUserAuthenticated(): Boolean
-}
\ No newline at end of file
+}
diff --git a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelperImpl.kt b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelperImpl.kt
index 53c4d7e..bf036d2 100644
--- a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelperImpl.kt
+++ b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelperImpl.kt
@@ -11,7 +11,7 @@ class Web3AuthHelperImpl(
     private val web3Auth: Web3Auth
 ): Web3AuthHelper {
     override suspend fun login(loginParams: LoginParams): CompletableFuture<Web3AuthResponse> {
-       return web3Auth.login(loginParams)
+       return web3Auth.connectTo(loginParams)
     }
 
     override suspend fun logOut(): CompletableFuture<Void> {
@@ -19,7 +19,7 @@ class Web3AuthHelperImpl(
     }
 
     override fun getSolanaPrivateKey(): String {
-        return web3Auth.getEd25519PrivKey()
+        return web3Auth.getEd25519PrivateKey()
     }
 
     override fun getUserInfo(): UserInfo {
@@ -39,12 +39,15 @@ class Web3AuthHelperImpl(
        }
     }
 
-    override suspend fun setResultUrl(uri: Uri?) {
-        return web3Auth.setResultUrl(uri)
+    override fun setResultUrl(uri: Uri?) {
+        web3Auth.setResultUrl(uri)
     }
 
-    override suspend fun isUserAuthenticated(): Boolean {
-        return web3Auth.getPrivkey().isNotEmpty()
-    }
+    override suspend fun isUserAuthenticated(): Boolean =
+        try {
+            web3Auth.getPrivateKey().isNotEmpty()
+        } catch (_: Exception) {
+            false
+        }
 
-}
\ No newline at end of file
+}
diff --git a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthSampleConfig.kt b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthSampleConfig.kt
new file mode 100644
index 0000000..ede36a1
--- /dev/null
+++ b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthSampleConfig.kt
@@ -0,0 +1,11 @@
+package com.example.androidsolanaexample.data
+
+object Web3AuthSampleConfig {
+    const val CLIENT_ID =
+        "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ"
+    const val REDIRECT_URL = "com.example.androidsolanaexample://auth"
+    const val GOOGLE_AUTH_CONNECTION_ID = "w3ads"
+    const val GOOGLE_CLIENT_ID =
+        "519228911939-snh959gvvmjieoo4j14kkaancbkjp34r.apps.googleusercontent.com"
+    const val GROUPED_AUTH_CONNECTION_ID = "aggregate-mobile"
+}
diff --git a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/di/appModule.kt b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/di/appModule.kt
index bb5bf34..0ad5b41 100644
--- a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/di/appModule.kt
+++ b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/di/appModule.kt
@@ -1,19 +1,28 @@
 package com.example.androidsolanaexample.di
 
 import android.content.Context
-import android.net.Uri
 import com.example.androidsolanaexample.data.SolanaUseCaseImpl
 import com.example.androidsolanaexample.data.Web3AuthHelper
 import com.example.androidsolanaexample.data.Web3AuthHelperImpl
+import com.example.androidsolanaexample.data.Web3AuthSampleConfig
 import com.example.androidsolanaexample.domain.SolanaUseCase
 import com.example.androidsolanaexample.viewmodel.MainViewModel
 import com.web3auth.core.Web3Auth
-import com.web3auth.core.types.Network
+import com.web3auth.core.types.AuthConnection
+import com.web3auth.core.types.AuthConnectionConfig
+import com.web3auth.core.types.BuildEnv
+import com.web3auth.core.types.Language
+import com.web3auth.core.types.MfaSetting
+import com.web3auth.core.types.MfaSettings
+import com.web3auth.core.types.ThemeModes
 import com.web3auth.core.types.Web3AuthOptions
+import com.web3auth.core.types.WalletServicesConfig
+import com.web3auth.core.types.WhiteLabelData
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.sol4k.Connection
 import org.sol4k.RpcUrl
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 
 val appModule = module {
     single {
@@ -30,13 +39,42 @@ val appModule = module {
 }
 
 private fun getWeb3AuthHelper(context: Context): Web3AuthHelper {
+    val whiteLabelData = WhiteLabelData(
+        appName = "Web3Auth Solana Example",
+        logoLight = "https://cryptologos.cc/logos/solana-sol-logo.png",
+        logoDark = "https://cryptologos.cc/logos/solana-sol-logo.png",
+        defaultLanguage = Language.EN,
+        mode = ThemeModes.LIGHT,
+        useLogoLoader = true,
+        theme = hashMapOf("primary" to "#14F195")
+    )
+
+    val authConnections = listOf(
+        AuthConnectionConfig(
+            authConnectionId = Web3AuthSampleConfig.GOOGLE_AUTH_CONNECTION_ID,
+            authConnection = AuthConnection.GOOGLE,
+            clientId = Web3AuthSampleConfig.GOOGLE_CLIENT_ID,
+            groupedAuthConnectionId = Web3AuthSampleConfig.GROUPED_AUTH_CONNECTION_ID
+        )
+    )
+
     val web3Auth: Web3Auth = Web3Auth(
         Web3AuthOptions(
-            clientId = "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ",
-            network = Network.SAPPHIRE_MAINNET,
-            redirectUrl = Uri.parse( "com.example.androidsolanaexample://auth")
+            clientId = Web3AuthSampleConfig.CLIENT_ID,
+            web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_MAINNET,
+            authBuildEnv = BuildEnv.TESTING,
+            redirectUrl = Web3AuthSampleConfig.REDIRECT_URL,
+            authConnectionConfig = authConnections,
+            whiteLabel = whiteLabelData,
+            walletServicesConfig = WalletServicesConfig(whiteLabel = whiteLabelData),
+            mfaSettings = MfaSettings(
+                deviceShareFactor = MfaSetting(true, 1, true),
+                socialBackupFactor = MfaSetting(true, 2, true),
+                passwordFactor = MfaSetting(true, 3, false),
+                backUpShareFactor = MfaSetting(true, 4, false),
+            )
         ), context
     )
 
     return Web3AuthHelperImpl(web3Auth)
-}
\ No newline at end of file
+}
diff --git a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/viewmodel/MainViewModel.kt b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/viewmodel/MainViewModel.kt
index 8233f65..9afae52 100644
--- a/android-solana-example/app/src/main/java/com/example/androidsolanaexample/viewmodel/MainViewModel.kt
+++ b/android-solana-example/app/src/main/java/com/example/androidsolanaexample/viewmodel/MainViewModel.kt
@@ -4,9 +4,10 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.androidsolanaexample.data.Web3AuthHelper
+import com.example.androidsolanaexample.data.Web3AuthSampleConfig
 import com.example.androidsolanaexample.domain.SolanaUseCase
+import com.web3auth.core.types.AuthConnection
 import com.web3auth.core.types.LoginParams
-import com.web3auth.core.types.Provider
 import com.web3auth.core.types.UserInfo
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -34,7 +35,11 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper, private val sola
         solanaKeyPair = Keypair.fromSecretKey(solanaPrivateKey().hexToByteArray())
     }
     fun login(){
-        val loginParams = LoginParams(loginProvider = Provider.GOOGLE)
+        val loginParams = LoginParams(
+            authConnection = AuthConnection.GOOGLE,
+            authConnectionId = Web3AuthSampleConfig.GOOGLE_AUTH_CONNECTION_ID,
+            groupedAuthConnectionId = Web3AuthSampleConfig.GROUPED_AUTH_CONNECTION_ID
+        )
         viewModelScope.launch {
             try {
                 web3AuthHelper.login(loginParams = loginParams).await()
@@ -98,9 +103,7 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper, private val sola
     }
 
     fun setResultUrl(uri: Uri?) {
-        viewModelScope.launch {
-            web3AuthHelper.setResultUrl(uri)
-        }
+        web3AuthHelper.setResultUrl(uri)
     }
 
      fun signAndSendTransaction(onSign: (hash: String?, error: String?) -> Unit) {
@@ -133,4 +136,4 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper, private val sola
            e.localizedMessage?.let { onAvailable( null, it) }
        }
     }
-}
\ No newline at end of file
+}