diff --git a/app/build.gradle b/app/build.gradle
index 0202283f..a65a1c52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
         }
@@ -62,6 +62,11 @@ dependencies {
 
     // Web3Auth
     implementation project(":core")
+    api 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly('io.jsonwebtoken:jjwt-orgjson:0.11.5') {
+        exclude group: 'org.json', module: 'json' //provided by Android natively
+    }
 
     // Test
     testImplementation 'junit:junit:4.13.2'
diff --git a/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt b/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt
new file mode 100644
index 00000000..2a917d75
--- /dev/null
+++ b/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt
@@ -0,0 +1,8 @@
+package com.web3auth.app
+
+import com.web3auth.core.types.AuthConnection
+
+data class AuthConnectionLogin(
+    val name: String,
+    val authConnection: AuthConnection
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/web3auth/app/LoginVerifier.kt b/app/src/main/java/com/web3auth/app/LoginVerifier.kt
deleted file mode 100644
index 983a4911..00000000
--- a/app/src/main/java/com/web3auth/app/LoginVerifier.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.web3auth.app
-
-import com.web3auth.core.types.Provider
-
-data class LoginVerifier(
-    val name: String,
-    val loginProvider: Provider
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index 6032b162..a7e351b7 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -1,7 +1,6 @@
 package com.web3auth.app
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.text.method.ScrollingMovementMethod
 import android.util.Log
@@ -21,83 +20,113 @@ import com.google.gson.JsonArray
 import com.web3auth.core.Web3Auth
 import com.web3auth.core.isEmailValid
 import com.web3auth.core.isPhoneNumberValid
+import com.web3auth.core.types.AuthConnection
+import com.web3auth.core.types.AuthConnectionConfig
 import com.web3auth.core.types.BuildEnv
-import com.web3auth.core.types.ChainConfig
-import com.web3auth.core.types.ChainNamespace
-import com.web3auth.core.types.ExtraLoginOptions
 import com.web3auth.core.types.Language
-import com.web3auth.core.types.LoginConfigItem
 import com.web3auth.core.types.LoginParams
-import com.web3auth.core.types.MFALevel
-import com.web3auth.core.types.Network
-import com.web3auth.core.types.Provider
 import com.web3auth.core.types.ThemeModes
-import com.web3auth.core.types.TypeOfLogin
 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.json.JSONObject
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 import org.web3j.crypto.Credentials
 import java.util.concurrent.CompletableFuture
 
 class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     private lateinit var web3Auth: Web3Auth
 
-    private val verifierList: List<LoginVerifier> = listOf(
-        LoginVerifier("Google", Provider.GOOGLE),
-        LoginVerifier("Facebook", Provider.FACEBOOK),
-        LoginVerifier("Twitch", Provider.TWITCH),
-        LoginVerifier("Discord", Provider.DISCORD),
-        LoginVerifier("Reddit", Provider.REDDIT),
-        LoginVerifier("Apple", Provider.APPLE),
-        LoginVerifier("Github", Provider.GITHUB),
-        LoginVerifier("LinkedIn", Provider.LINKEDIN),
-        LoginVerifier("Twitter", Provider.TWITTER),
-        LoginVerifier("Line", Provider.LINE),
-        LoginVerifier("Hosted Email Passwordless", Provider.EMAIL_PASSWORDLESS),
-        LoginVerifier("SMS Passwordless", Provider.SMS_PASSWORDLESS),
-        LoginVerifier("JWT", Provider.JWT),
-        LoginVerifier("Farcaster", Provider.FARCASTER)
+    private val authConnectionList: List<AuthConnectionLogin> = listOf(
+        AuthConnectionLogin("Google", AuthConnection.GOOGLE),
+        AuthConnectionLogin("Facebook", AuthConnection.FACEBOOK),
+        AuthConnectionLogin("Twitch", AuthConnection.TWITCH),
+        AuthConnectionLogin("Discord", AuthConnection.DISCORD),
+        AuthConnectionLogin("Reddit", AuthConnection.REDDIT),
+        AuthConnectionLogin("Apple", AuthConnection.APPLE),
+        AuthConnectionLogin("Github", AuthConnection.GITHUB),
+        AuthConnectionLogin("LinkedIn", AuthConnection.LINKEDIN),
+        AuthConnectionLogin("Twitter", AuthConnection.TWITTER),
+        AuthConnectionLogin("Line", AuthConnection.LINE),
+        AuthConnectionLogin("Hosted Email Passwordless", AuthConnection.EMAIL_PASSWORDLESS),
+        AuthConnectionLogin("SMS Passwordless", AuthConnection.SMS_PASSWORDLESS),
+        AuthConnectionLogin("CUSTOM", AuthConnection.CUSTOM),
+        AuthConnectionLogin("Farcaster", AuthConnection.FARCASTER)
     )
 
-    private var selectedLoginProvider: Provider = Provider.GOOGLE
+    private var selectedLoginProvider: AuthConnection = AuthConnection.GOOGLE
 
     private val gson = Gson()
+    private var TEST_VERIFIER = "torus-test-health"
+    private var TORUS_TEST_EMAIL = "devnettestuser@tor.us"
+    var TEST_AGGREGRATE_VERIFIER = "torus-aggregate-sapphire-mainnet"
 
     private fun signIn() {
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
-        var extraLoginOptions: ExtraLoginOptions? = null
-        if (selectedLoginProvider == Provider.EMAIL_PASSWORDLESS) {
+        var loginHint: String? = null
+        if (selectedLoginProvider == AuthConnection.EMAIL_PASSWORDLESS) {
             val hintEmail = hintEmailEditText.text.toString()
             if (hintEmail.isBlank() || !hintEmail.isEmailValid()) {
                 Toast.makeText(this, "Please enter a valid Email.", Toast.LENGTH_LONG).show()
                 return
             }
-            extraLoginOptions = ExtraLoginOptions(login_hint = hintEmail)
+            loginHint = hintEmail
         }
 
-        if (selectedLoginProvider == Provider.SMS_PASSWORDLESS) {
+        if (selectedLoginProvider == AuthConnection.SMS_PASSWORDLESS) {
             val hintPhNo = hintEmailEditText.text.toString()
             if (hintPhNo.isBlank() || !hintPhNo.isPhoneNumberValid()) {
                 Toast.makeText(this, "Please enter a valid Number.", Toast.LENGTH_LONG).show()
                 return
             }
-            extraLoginOptions = ExtraLoginOptions(login_hint = hintPhNo)
+            loginHint = hintPhNo
         }
 
-        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.login(
+        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.connectTo(
             LoginParams(
                 selectedLoginProvider,
-                extraLoginOptions = extraLoginOptions,
-                mfaLevel = MFALevel.OPTIONAL
+                //authConnectionId = "w3ads",
+                //groupedAuthConnectionId = "aggregate-mobile",
+                loginHint = loginHint,
             )
         )
         loginCompletableFuture.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())
+            } else {
+                Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
+            }
+        }
+    }
+
+    private fun sfaSignIn() {
+        val idToken = "" //JwtUtils.generateIdToken(TORUS_TEST_EMAIL)
+        val web3AuthOptions =
+            Web3AuthOptions(
+                clientId = "YOUR_CLIENT_ID",
+                web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_MAINNET,
+                redirectUrl = "torusapp://org.torusresearch.web3authexample",
+            )
+        web3Auth = Web3Auth(
+            web3AuthOptions, this
+        )
+        val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.connectTo(
+            LoginParams(
+                authConnection = selectedLoginProvider,
+                authConnectionId = TEST_VERIFIER,
+                idToken = idToken,
+                groupedAuthConnectionId = TEST_AGGREGRATE_VERIFIER,
+            )
+        )
+        loginCompletableFuture.whenComplete { _, error ->
+            if (error == null) {
+                reRender()
+                println("PrivKey: " + web3Auth.getPrivateKey())
                 println("Web3Auth UserInfo" + web3Auth.getUserInfo())
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
@@ -119,17 +148,18 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     private fun reRender() {
         val contentTextView = findViewById<TextView>(R.id.contentTextView)
         val signInButton = findViewById<Button>(R.id.signInButton)
+        val sfaSignInButton = findViewById<Button>(R.id.sfaSignInButton)
         val signOutButton = findViewById<Button>(R.id.signOutButton)
         val launchWalletButton = findViewById<Button>(R.id.launchWalletButton)
         val signMsgButton = findViewById<Button>(R.id.signMsgButton)
         val btnSetUpMfa = findViewById<Button>(R.id.btnSetUpMfa)
         val btnManageMfa = findViewById<Button>(R.id.btn_manageMfa)
-        val spinner = findViewById<TextInputLayout>(R.id.verifierList)
+        val spinner = findViewById<TextInputLayout>(R.id.authConnectionList)
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
         var key: String? = null
         var userInfo: UserInfo? = null
         try {
-            key = web3Auth.getPrivkey()
+            key = web3Auth.getPrivateKey()
             userInfo = web3Auth.getUserInfo()
         } catch (ex: Exception) {
             print(ex)
@@ -142,6 +172,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             contentTextView.movementMethod = ScrollingMovementMethod()
             contentTextView.visibility = View.VISIBLE
             signInButton.visibility = View.GONE
+            sfaSignInButton.visibility = View.GONE
             signOutButton.visibility = View.VISIBLE
             launchWalletButton.visibility = View.VISIBLE
             signMsgButton.visibility = View.VISIBLE
@@ -153,6 +184,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             contentTextView.text = getString(R.string.not_logged_in)
             contentTextView.visibility = View.GONE
             signInButton.visibility = View.VISIBLE
+            sfaSignInButton.visibility = View.VISIBLE
             signOutButton.visibility = View.GONE
             btnSetUpMfa.visibility = View.GONE
             btnManageMfa.visibility = View.GONE
@@ -165,29 +197,51 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        val authConfig = ArrayList<AuthConnectionConfig>()
+        authConfig.add(
+            AuthConnectionConfig(
+                authConnection = AuthConnection.GOOGLE,
+                authConnectionId = "w3ads",
+                groupedAuthConnectionId = "aggregate-mobile",
+                clientId = "519228911939-snh959gvvmjieoo4j14kkaancbkjp34r.apps.googleusercontent.com"
+            )
+        )
+
+        authConfig.add(
+            AuthConnectionConfig(
+                authConnection = AuthConnection.CUSTOM,
+                authConnectionId = "auth0-test",
+                groupedAuthConnectionId = "aggregate-mobile",
+                clientId = "hUVVf4SEsZT7syOiL0gLU9hFEtm2gQ6O"
+            )
+        )
 
         val options = Web3AuthOptions(
-            clientId = "BFuUqebV5I8Pz5F7a5A2ihW7YVmbv_OHXnHYDv6OltAD5NGr6e-ViNvde3U4BHdn6HvwfkgobhVu4VwC-OSJkik",
-            network = Network.SAPPHIRE_DEVNET,
-            redirectUrl = Uri.parse("torusapp://org.torusresearch.web3authexample"),
-//            sdkUrl = "https://auth.mocaverse.xyz",
-//            walletSdkUrl = "https://lrc-mocaverse.web3auth.io",
-            whiteLabel = WhiteLabelData(
-                "Web3Auth Sample App", null, null, null,
-                Language.EN, ThemeModes.LIGHT, true,
-                hashMapOf(
-                    "primary" to "#123456",
-                    "onPrimary" to "#0000FF"
-                )
-            ),
-            loginConfig = hashMapOf(
-                "loginConfig" to LoginConfigItem(
-                    "web3auth-auth0-email-passwordless-sapphire-devnet",
-                    typeOfLogin = TypeOfLogin.JWT,
-                    clientId = "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C",
+            clientId = "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ",
+            web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_MAINNET,
+            redirectUrl = "torusapp://org.torusresearch.web3authexample",
+            //sdkUrl = "https://auth.mocaverse.xyz",
+            //walletSdkUrl = "https://lrc-mocaverse.web3auth.io",
+            walletServicesConfig = WalletServicesConfig(
+                whiteLabel = WhiteLabelData(
+                    "Web3Auth Sample App", null, null, null,
+                    Language.EN, ThemeModes.LIGHT, true,
+                    hashMapOf(
+                        "primary" to "#123456",
+                        "onPrimary" to "#0000FF"
+                    )
                 )
             ),
-            buildEnv = BuildEnv.PRODUCTION,
+            //authConnectionConfig = authConfig,
+            /*listOf(
+                            AuthConnectionConfig(
+                                authConnectionId = "web3auth-auth0-email-passwordless-sapphire-devnet",
+                                authConnection = AuthConnection.GOOGLE,
+                                clientId = "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C"
+                            )
+                        ),*/
+            authBuildEnv = BuildEnv.TESTING,
+            defaultChainId = "0x1",
             sessionTime = 86400,
         )
 
@@ -198,6 +252,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             options, this
         )
 
+        //Set intent result url from Web3Auth redirect
         web3Auth.setResultUrl(intent.data)
 
         // for session response
@@ -205,8 +260,8 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         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())
             } else {
                 //handle retry login
@@ -218,18 +273,15 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         val signInButton = findViewById<Button>(R.id.signInButton)
         signInButton.setOnClickListener { signIn() }
 
+        val sfaSignInButton = findViewById<Button>(R.id.sfaSignInButton)
+        sfaSignInButton.setOnClickListener { sfaSignIn() }
+
         val signOutButton = findViewById<Button>(R.id.signOutButton)
         signOutButton.setOnClickListener { signOut() }
 
         val launchWalletButton = findViewById<Button>(R.id.launchWalletButton)
         launchWalletButton.setOnClickListener {
-            val launchWalletCompletableFuture = web3Auth.launchWalletServices(
-                chainConfig = ChainConfig(
-                    chainId = "0x89",
-                    rpcTarget = "https://1rpc.io/matic",
-                    chainNamespace = ChainNamespace.EIP155
-                )
-            )
+            val launchWalletCompletableFuture = web3Auth.showWalletUI()
             launchWalletCompletableFuture.whenComplete { _, error ->
                 if (error == null) {
                     Log.d("MainActivity_Web3Auth", "Wallet launched successfully")
@@ -241,18 +293,14 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
 
         val signMsgButton = findViewById<Button>(R.id.signMsgButton)
         signMsgButton.setOnClickListener {
-            val credentials: Credentials = Credentials.create(web3Auth.getPrivkey())
+            val credentials: Credentials = Credentials.create(web3Auth.getPrivateKey())
             val params = JsonArray().apply {
                 add("Hello, World!")
                 add(credentials.address)
                 add("Android")
             }
             val signMsgCompletableFuture = web3Auth.request(
-                chainConfig = ChainConfig(
-                    chainId = "0x89",
-                    rpcTarget = "https://polygon-rpc.com/",
-                    chainNamespace = ChainNamespace.EIP155
-                ), "personal_sign", requestParams = params, appState = "web3Auth"
+                "personal_sign", requestParams = params, appState = "web3Auth"
             )
             signMsgCompletableFuture.whenComplete { signResult, error ->
                 if (error == null) {
@@ -288,7 +336,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         }
 
         val spinner = findViewById<AutoCompleteTextView>(R.id.spinnerTextView)
-        val loginVerifierList: List<String> = verifierList.map { item ->
+        val loginVerifierList: List<String> = authConnectionList.map { item ->
             item.name
         }
         val adapter: ArrayAdapter<String> =
@@ -305,24 +353,24 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     override fun onResume() {
         super.onResume()
         if (Web3Auth.getCustomTabsClosed()) {
-            Toast.makeText(this, "User closed the browser.", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "User closes the browser.", Toast.LENGTH_SHORT).show()
             web3Auth.setResultUrl(null)
             Web3Auth.setCustomTabsClosed(false)
         }
     }
 
     override fun onItemClick(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) {
-        selectedLoginProvider = verifierList[p2].loginProvider
+        selectedLoginProvider = authConnectionList[p2].authConnection
 
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
 
-        if (selectedLoginProvider == Provider.EMAIL_PASSWORDLESS) {
+        if (selectedLoginProvider == AuthConnection.EMAIL_PASSWORDLESS) {
             hintEmailEditText.hint = "Enter Email"
-        } else if (selectedLoginProvider == Provider.SMS_PASSWORDLESS) {
+        } else if (selectedLoginProvider == AuthConnection.SMS_PASSWORDLESS) {
             hintEmailEditText.hint = "Enter Phone Number"
         }
 
-        if (selectedLoginProvider == Provider.EMAIL_PASSWORDLESS || selectedLoginProvider == Provider.SMS_PASSWORDLESS) {
+        if (selectedLoginProvider == AuthConnection.EMAIL_PASSWORDLESS || selectedLoginProvider == AuthConnection.SMS_PASSWORDLESS) {
             hintEmailEditText.visibility = View.VISIBLE
         } else {
             hintEmailEditText.visibility = View.GONE
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c5f35f6a..fb1a4310 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     tools:context="com.web3auth.app.MainActivity">
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/verifierList"
+        android:id="@+id/authConnectionList"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
         android:backgroundTint="@color/black"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/verifierList" />
+        app:layout_constraintTop_toBottomOf="@id/authConnectionList" />
 
 
     <TextView
@@ -66,7 +66,20 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <Button
+        android:id="@+id/sfaSignInButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginBottom="8dp"
+        android:text="SFA Sign In"
+        android:textAllCaps="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/signInButton" />
 
     <Button
         android:id="@+id/signOutButton"
diff --git a/core/build.gradle b/core/build.gradle
index 2fcce83e..6c80ff25 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -17,10 +17,16 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            debuggable true
+        }
         release {
-            minifyEnabled true
+            minifyEnabled false
+            shrinkResources false
+            debuggable true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            consumerProguardFiles 'proguard-rules.pro', 'gson.pro', 'retrofit2.pro'
+            consumerProguardFiles 'proguard-rules.pro', 'gson.pro', 'retrofit2.pro', 'consumer-rules.pro'
         }
     }
     compileOptions {
@@ -74,17 +80,32 @@ dependencies {
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
 
+    //analytics library
+    implementation "com.segment.analytics.android:analytics:4.11.3"
+
+    api 'org.torusresearch:torus-utils-java:4.0.3'
+    api 'org.torusresearch:fetch-node-details-java:5.0.0'
+    implementation 'com.auth0.android:jwtdecode:2.0.2'
+
     // Test
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
 
-project.afterEvaluate {
+afterEvaluate {
+    // 1. Define the sources JAR task
+    task androidSourcesJar(type: Jar) {
+        archiveClassifier.set("sources")
+        from android.sourceSets.main.java.srcDirs
+    }
+
+    // 2. Add sources JAR to the publishing
     publishing {
         publications {
             release(MavenPublication) {
                 from components.release
+                artifact androidSourcesJar
             }
         }
     }
diff --git a/core/consumer-rules.pro b/core/consumer-rules.pro
index 3b084dad..954d5038 100644
--- a/core/consumer-rules.pro
+++ b/core/consumer-rules.pro
@@ -47,3 +47,20 @@
 -keep enum com.web3auth.core.types.ErrorCode {
     *;
 }
+
+-keep @kotlin.Metadata class * { *; }
+-keepclassmembers class * {
+    @kotlin.Metadata *;
+}
+-keepclassmembers class * {
+    <init>(...);
+}
+-keepattributes KotlinMetadata, Signature, InnerClasses, EnclosingMethod, *Annotation*
+-keepclassmembers class com.web3auth.core.** {
+    public <init>(...);
+}
+-keep @androidx.annotation.Keep class * { *; }
+-keepclassmembers class * {
+    @androidx.annotation.Keep *;
+}
+
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index 11be40a3..7e91441f 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -6,25 +6,27 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
+import com.auth0.android.jwt.JWT
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import com.web3auth.core.analytics.AnalyticsEvents
+import com.web3auth.core.analytics.AnalyticsManager
+import com.web3auth.core.analytics.AnalyticsSdkType
 import com.web3auth.core.api.ApiHelper
 import com.web3auth.core.api.ApiService
+import com.web3auth.core.keystore.IS_SFA
 import com.web3auth.core.keystore.KeyStoreManagerUtils
-import com.web3auth.core.types.ChainConfig
+import com.web3auth.core.keystore.SharedPrefsHelper
+import com.web3auth.core.types.AuthConnection
 import com.web3auth.core.types.ErrorCode
 import com.web3auth.core.types.ExtraLoginOptions
-import com.web3auth.core.types.InitOptions
-import com.web3auth.core.types.InitParams
-import com.web3auth.core.types.LoginConfigItem
 import com.web3auth.core.types.LoginParams
 import com.web3auth.core.types.MFALevel
+import com.web3auth.core.types.ProjectConfigResponse
 import com.web3auth.core.types.REDIRECT_URL
 import com.web3auth.core.types.RedirectResponse
-import com.web3auth.core.types.RequestData
 import com.web3auth.core.types.SessionResponse
-import com.web3auth.core.types.SignMessage
 import com.web3auth.core.types.SignResponse
 import com.web3auth.core.types.UnKnownException
 import com.web3auth.core.types.UserCancelledException
@@ -33,12 +35,23 @@ import com.web3auth.core.types.WEBVIEW_URL
 import com.web3auth.core.types.Web3AuthError
 import com.web3auth.core.types.Web3AuthOptions
 import com.web3auth.core.types.Web3AuthResponse
+import com.web3auth.core.types.Web3AuthSubVerifierInfo
 import com.web3auth.core.types.WebViewResultCallback
 import com.web3auth.session_manager_android.SessionManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.json.JSONArray
 import org.json.JSONObject
+import org.torusresearch.fetchnodedetails.FetchNodeDetails
+import org.torusresearch.fetchnodedetails.types.NodeDetails
+import org.torusresearch.torusutils.TorusUtils
+import org.torusresearch.torusutils.types.VerifierParams
+import org.torusresearch.torusutils.types.VerifyParams
+import org.torusresearch.torusutils.types.common.SessionToken
+import org.torusresearch.torusutils.types.common.TorusKey
+import org.torusresearch.torusutils.types.common.TorusOptions
+import org.web3j.crypto.Hash
 import java.util.Locale
 import java.util.concurrent.CompletableFuture
 
@@ -52,53 +65,57 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     private lateinit var manageMfaCompletableFuture: CompletableFuture<Boolean>
     private lateinit var signMsgCF: CompletableFuture<SignResponse>
 
+    private var nodeDetailManager: FetchNodeDetails =
+        FetchNodeDetails(web3AuthOptions.web3AuthNetwork)
+    private val torusUtils: TorusUtils
     private var web3AuthResponse: Web3AuthResponse? = null
     private var web3AuthOption = web3AuthOptions
-    private var sessionManager: SessionManager = SessionManager(
-        context,
-        web3AuthOptions.sessionTime ?: 30 * 86400,
-        web3AuthOptions.redirectUrl.toString()
-    )
-
-    /**
-     * Initializes the KeyStoreManager.
-     */
-    private fun initiateKeyStoreManager() {
-        KeyStoreManagerUtils.getKeyGenerator()
-    }
+    private var sessionManager: SessionManager
+    private var projectConfigResponse: ProjectConfigResponse? = null
+    private var loginParams: LoginParams? = null
+    private val startTime: Long = System.currentTimeMillis()
+    private var actionType: String? = null
+
+    init {
+        //Segment Analytics initialization
+        AnalyticsManager.initialize(context.applicationContext)
+        AnalyticsManager.identify(
+            web3AuthOptions.clientId, mapOf(
+                "web3auth_client_id" to web3AuthOptions.clientId,
+                "web3auth_network" to web3AuthOptions.web3AuthNetwork,
+            )
+        )
+        AnalyticsManager.setGlobalProperties(
+            mapOf(
+                "sdk_name" to AnalyticsSdkType.ANDROID,
+                "sdk_version" to AnalyticsEvents.SDK_VERSION,
+                "web3auth_client_id" to web3AuthOptions.clientId,
+                "web3auth_network" to web3AuthOptions.web3AuthNetwork,
+            )
+        )
 
-    private fun getInitOptions(): InitOptions {
-        return InitOptions(
-            clientId = web3AuthOption.clientId,
-            network = web3AuthOption.network.name.lowercase(Locale.ROOT),
-            redirectUrl = web3AuthOption.redirectUrl.toString(),
-            whiteLabel = web3AuthOption.whiteLabel?.let { gson.toJson(it) },
-            loginConfig = web3AuthOption.loginConfig?.let { gson.toJson(it) },
-            buildEnv = web3AuthOption.buildEnv?.name?.lowercase(Locale.ROOT),
-            mfaSettings = web3AuthOption.mfaSettings?.let { gson.toJson(it) },
-            sessionTime = web3AuthOption.sessionTime,
-            originData = web3AuthOption.originData?.let { gson.toJson(it) },
-            dashboardUrl = web3AuthOption.dashboardUrl
+        val torusOptions = TorusOptions(
+            web3AuthOptions.clientId, web3AuthOptions.web3AuthNetwork, null,
+            0, true
+        )
+        torusUtils = TorusUtils(torusOptions)
+        SharedPrefsHelper.init(context.applicationContext)
+        val isSFAValue = SharedPrefsHelper.getBoolean(IS_SFA)
+
+        //Session Manager initialization
+        sessionManager = SessionManager(
+            context,
+            web3AuthOptions.sessionTime,
+            web3AuthOptions.redirectUrl,
+            sessionNamespace = if (isSFAValue) "sfa" else ""
         )
     }
 
     /**
-     * Retrieves the initialization parameters as a JSONObject.
-     *
-     * @param params The optional login parameters required for initialization. Default is null.
-     * @return The initialization parameters as a JSONObject.
+     * Initializes the KeyStoreManager.
      */
-    private fun getInitParams(params: LoginParams?): InitParams {
-        return InitParams(
-            loginProvider = params?.loginProvider?.name?.lowercase(Locale.ROOT),
-            extraLoginOptions = params?.extraLoginOptions?.let { gson.toJson(it) },
-            redirectUrl = params?.redirectUrl?.toString() ?: web3AuthOption.redirectUrl.toString(),
-            mfaLevel = params?.mfaLevel?.name?.lowercase(Locale.ROOT),
-            curve = params?.curve?.name?.lowercase(Locale.ROOT),
-            dappShare = params?.dappShare,
-            appState = params?.appState,
-            dappUrl = params?.dappUrl
-        )
+    private fun initiateKeyStoreManager() {
+        KeyStoreManagerUtils.getKeyGenerator()
     }
 
     /**
@@ -110,22 +127,38 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     private fun processRequest(
         actionType: String, params: LoginParams?
     ) {
+        if ((actionType == "enable_mfa" || actionType == "manage_mfa") && !params?.idToken.isNullOrEmpty()) {
+            throwEnableMFAError(ErrorCode.ENABLE_MFA_NOT_ALLOWED)
+            return
+        }
         val sdkUrl = Uri.parse(web3AuthOption.sdkUrl)
 
-        val initOptions = if (actionType == "manage_mfa") {
-            getInitOptions().copy(redirectUrl = getInitOptions().dashboardUrl)
+        val initParamsJson = params?.let {
+            JSONObject(gson.toJson(it))
+        } ?: JSONObject()
+
+        if (actionType == "manage_mfa") {
+            initParamsJson.put("redirectUrl", web3AuthOption.dashboardUrl)
+            initParamsJson.put("dappUrl", web3AuthOption.redirectUrl)
         } else {
-            getInitOptions()
+            initParamsJson.put("redirectUrl", web3AuthOption.redirectUrl)
         }
 
-        val initParams = if (actionType == "manage_mfa") {
-            initOptions.dashboardUrl?.let { getInitParams(params).copy(redirectUrl = it) }
+        val redirectUrl = if (actionType == "manage_mfa") {
+            web3AuthOption.dashboardUrl
         } else {
-            getInitParams(params)
+            web3AuthOption.redirectUrl
         }
 
-        val initOptionsJson = JSONObject(gson.toJson(initOptions))
-        val initParamsJson = JSONObject(gson.toJson(initParams))
+        if (redirectUrl != null) {
+            web3AuthOption.redirectUrl = redirectUrl
+        }
+
+        val initOptionsJson = JSONObject(gson.toJson(web3AuthOption))
+        initOptionsJson.put(
+            "network",
+            web3AuthOption.web3AuthNetwork.toString().lowercase(Locale.ROOT)
+        )
 
         val sessionId = SessionManager.generateRandomSessionKey()
 
@@ -137,15 +170,17 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
 
         if (actionType == "enable_mfa" || actionType == "manage_mfa") {
             val userInfo = web3AuthResponse?.userInfo
-            initParamsJson.put("loginProvider", userInfo?.typeOfLogin)
-            var extraOptionsString = ""
+            initParamsJson.put("authConnection", userInfo?.authConnection)
+            initParamsJson.put("authConnectionId", userInfo?.authConnectionId)
+            initParamsJson.put("groupedAuthConnectionId", userInfo?.groupedAuthConnectionId)
+            val extraOptionsString: String
             var existingExtraLoginOptions = ExtraLoginOptions()
             if (initParamsJson.has("extraLoginOptions")) {
                 extraOptionsString = initParamsJson.getString("extraLoginOptions")
                 existingExtraLoginOptions =
                     gson.fromJson(extraOptionsString, ExtraLoginOptions::class.java)
             }
-            existingExtraLoginOptions.login_hint = userInfo?.verifierId
+            existingExtraLoginOptions.login_hint = userInfo?.userId
             initParamsJson.put("extraLoginOptions", gson.toJson(existingExtraLoginOptions))
             initParamsJson.put("mfaLevel", MFALevel.MANDATORY.name.lowercase(Locale.ROOT))
             val loginIdObject = mapOf("loginId" to sessionId, "platform" to "android")
@@ -153,8 +188,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                 "appState",
                 gson.toJson(loginIdObject).toByteArray(Charsets.UTF_8).toBase64URLString()
             )
-            initParamsJson.put("dappUrl", web3AuthOption.redirectUrl)
-            paramMap.put("sessionId", sessionManager.getSessionId())
+            paramMap.put("sessionId", SessionManager.getSessionIdFromStorage())
         }
         paramMap.put("params", initParamsJson)
 
@@ -197,9 +231,28 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         //fetch project config
         fetchProjectConfig().whenComplete { _, err ->
             if (err == null) {
+                val chainIds = web3AuthOption.chains?.chainId?.let { arrayOf(it) } ?: emptyArray()
+                val properties = mutableMapOf(
+                    "chain_ids" to chainIds,
+                    "chain_nameSpaces" to listOf("eip155", "solana", "other"),
+                    "logging_enabled" to web3AuthOption.enableLogging,
+                    "auth_build_env" to web3AuthOption.authBuildEnv,
+                    "auth_mfa_settings" to web3AuthOption.mfaSettings,
+                    "whitelabel_logo_light_enabled" to (web3AuthOption.whiteLabel?.logoLight != null),
+                    "whitelabel_logo_dark_enabled" to (web3AuthOption.whiteLabel?.logoDark != null),
+                    "whitelabel_theme_mode" to (web3AuthOption.whiteLabel?.theme),
+                    "duration" to System.currentTimeMillis() - startTime,
+                    "integration_type" to "android",
+                    "dapp_url" to this.loginParams?.dappUrl,
+                )
+
+                AnalyticsManager.trackEvent(
+                    AnalyticsEvents.SDK_INITIALIZATION_COMPLETED,
+                    properties
+                )
                 //authorize session
                 sessionManager.setSessionId(SessionManager.getSessionIdFromStorage())
-                this.authorizeSession(web3AuthOption.redirectUrl.toString(), baseContext)
+                this.authorizeSession(web3AuthOption.redirectUrl, baseContext)
                     .whenComplete { resp, error ->
                         runOnUIThread {
                             if (error == null) {
@@ -213,6 +266,15 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                         }
                     }
             } else {
+                AnalyticsManager.trackEvent(
+                    AnalyticsEvents.SDK_INITIALIZATION_FAILED,
+                    mutableMapOf<String, Any>(
+                        "integration_type" to AnalyticsSdkType.ANDROID,
+                        "dapp_url" to "this.loginParams?.dappUrl.toString()",
+                        "duration" to System.currentTimeMillis() - startTime,
+                        "error_message" to "Fetch project config API error. ${err.message}"
+                    )
+                )
                 initializeCf.completeExceptionally(err)
             }
         }
@@ -239,13 +301,34 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                 UnKnownException(error)
             )
 
-            if (::enableMfaCompletableFuture.isInitialized) enableMfaCompletableFuture.completeExceptionally(
-                UnKnownException(error)
-            )
+            if (::enableMfaCompletableFuture.isInitialized) {
+                enableMfaCompletableFuture.completeExceptionally(
+                    UnKnownException(error)
+                )
+                AnalyticsManager.trackEvent(
+                    AnalyticsEvents.MFA_ENABLEMENT_FAILED,
+                    mutableMapOf<String, Any>(
+                        "duration" to System.currentTimeMillis() - startTime,
+                        "error_message" to "MFA Enablement Failed: $error"
+                    )
+                )
+            }
 
-            if (::manageMfaCompletableFuture.isInitialized) manageMfaCompletableFuture.completeExceptionally(
-                UnKnownException(error)
-            )
+            if (::manageMfaCompletableFuture.isInitialized) {
+                manageMfaCompletableFuture.completeExceptionally(
+                    UnKnownException(error)
+                )
+                AnalyticsManager.trackEvent(
+                    AnalyticsEvents.MFA_MANAGEMENT_FAILED,
+                    mutableMapOf<String, Any>(
+                        "integration_type" to "android",
+                        "dapp_url" to this.loginParams?.dappUrl.toString(),
+                        "connector" to "auth",
+                        "duration" to System.currentTimeMillis() - startTime,
+                        "error_message" to "MFA Management Failed: $error"
+                    )
+                )
+            }
             return
         }
 
@@ -254,6 +337,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
             throwLoginError(ErrorCode.INVALID_LOGIN)
             throwEnableMFAError(ErrorCode.INVALID_LOGIN)
             throwManageMFAError(ErrorCode.INVALID_LOGIN)
+            actionType?.let { processRequestFailAnalytics(it, ErrorCode.INVALID_LOGIN) }
             return
         }
         val b64ParamString = decodeBase64URLString(b64Params).toString(Charsets.UTF_8)
@@ -261,6 +345,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         if (b64ParamString.contains("actionType")) {
             val response = gson.fromJson(b64ParamString, RedirectResponse::class.java)
             if (response.actionType == "manage_mfa") {
+                actionType?.let { processRequestCompleteAnalytics(it) }
                 if (::manageMfaCompletableFuture.isInitialized)
                     manageMfaCompletableFuture.complete(true)
                 return
@@ -275,8 +360,9 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
             sessionManager.setSessionId(sessionId)
 
             //Rehydrate Session
-            this.authorizeSession(web3AuthOption.redirectUrl.toString(), baseContext)
+            this.authorizeSession(web3AuthOption.redirectUrl, baseContext)
                 .whenComplete { resp, error ->
+
                     runOnUIThread {
                         if (error == null) {
                             web3AuthResponse = resp
@@ -284,10 +370,22 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                                 throwLoginError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwEnableMFAError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwManageMFAError(ErrorCode.SOMETHING_WENT_WRONG)
-                            } else if (web3AuthResponse?.privKey.isNullOrBlank() && web3AuthResponse?.factorKey.isNullOrBlank()) {
+                                actionType?.let {
+                                    processRequestFailAnalytics(
+                                        it,
+                                        ErrorCode.SOMETHING_WENT_WRONG
+                                    )
+                                }
+                            } else if (web3AuthResponse?.privateKey.isNullOrBlank() && web3AuthResponse?.factorKey.isNullOrBlank()) {
                                 throwLoginError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwEnableMFAError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwManageMFAError(ErrorCode.SOMETHING_WENT_WRONG)
+                                actionType?.let {
+                                    processRequestFailAnalytics(
+                                        it,
+                                        ErrorCode.SOMETHING_WENT_WRONG
+                                    )
+                                }
                             } else {
                                 web3AuthResponse?.sessionId?.let {
                                     SessionManager.saveSessionIdToStorage(it)
@@ -296,19 +394,27 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
 
                                 if (web3AuthResponse?.userInfo?.dappShare?.isNotEmpty() == true) {
                                     KeyStoreManagerUtils.encryptData(
-                                        web3AuthResponse?.userInfo?.verifier.plus(" | ")
-                                            .plus(web3AuthResponse?.userInfo?.verifierId),
+                                        web3AuthResponse?.userInfo?.authConnectionId.plus(" | ")
+                                            .plus(web3AuthResponse?.userInfo?.userId),
                                         web3AuthResponse?.userInfo?.dappShare!!,
                                     )
                                 }
+
+                                actionType?.let { processRequestCompleteAnalytics(it) }
+
                                 if (::loginCompletableFuture.isInitialized)
                                     loginCompletableFuture.complete(web3AuthResponse)
 
                                 if (::enableMfaCompletableFuture.isInitialized)
                                     enableMfaCompletableFuture.complete(true)
+
+                                if (::manageMfaCompletableFuture.isInitialized)
+                                    manageMfaCompletableFuture.complete(true)
+
                             }
                         } else {
                             print(error)
+                            actionType?.let { processRequestFailAnalytics(it) }
                         }
                     }
                 }
@@ -325,30 +431,279 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @param loginParams The login parameters required for authentication.
      * @return A CompletableFuture<Web3AuthResponse> representing the asynchronous operation, containing the Web3AuthResponse upon successful login.
      */
-    fun login(loginParams: LoginParams): CompletableFuture<Web3AuthResponse> {
-        //check for share
-        if (web3AuthOption.loginConfig != null) {
-            val loginConfigItem: LoginConfigItem? = web3AuthOption.loginConfig?.values?.first()
-            val share: String? =
-                KeyStoreManagerUtils.decryptData(loginConfigItem?.verifier.toString())
-            if (share?.isNotEmpty() == true) {
-                loginParams.dappShare = share
+    private fun login(loginParams: LoginParams): CompletableFuture<Web3AuthResponse> {
+        web3AuthOption.authConnectionConfig
+            ?.firstOrNull()
+            ?.let { config ->
+                val decryptedShare = KeyStoreManagerUtils.decryptData(config.authConnectionId)
+                if (!decryptedShare.isNullOrEmpty()) {
+                    loginParams.dappShare = decryptedShare
+                }
             }
-        }
 
-        //login
         processRequest("login", loginParams)
 
-        loginCompletableFuture = CompletableFuture<Web3AuthResponse>()
+        loginCompletableFuture = CompletableFuture()
+        return loginCompletableFuture
+    }
+
+    fun connectTo(
+        loginParams: LoginParams
+    ): CompletableFuture<Web3AuthResponse> {
+        actionType = "login"
+
+        this.loginParams = loginParams
+        sessionManager = SessionManager(
+            baseContext,
+            web3AuthOption.sessionTime,
+            web3AuthOption.redirectUrl,
+            sessionNamespace = if (!loginParams.idToken.isNullOrEmpty()) "sfa" else ""
+        )
+
+        val analyticsProps = mutableMapOf<String, Any>(
+            "connector" to "auth",
+            "auth_connection" to loginParams.authConnection,
+            "auth_connection_id" to loginParams.authConnectionId.toString(),
+            "group_auth_connection_id" to loginParams.groupedAuthConnectionId.toString(),
+            "chain_id" to web3AuthOption.defaultChainId.toString(),
+            "dapp_url" to loginParams.dappUrl.toString(),
+            "chain_id" to web3AuthOption.defaultChainId.toString(),
+            "chains" to (web3AuthOption.chains?.toString() ?: "[]"),
+        )
+
+        if (loginParams.idToken.isNullOrEmpty()) {
+            AnalyticsManager.trackEvent(
+                AnalyticsEvents.CONNECTION_STARTED,
+                analyticsProps + mutableMapOf<String, Any>(
+                    "is_sfa" to false,
+                )
+            )
+            if (!loginParams.loginHint.isNullOrEmpty()) {
+                val updatedExtraLoginOptions = loginParams.extraLoginOptions?.copy(
+                    login_hint = loginParams.loginHint
+                ) ?: ExtraLoginOptions(login_hint = loginParams.loginHint)
+
+                loginParams.copy(extraLoginOptions = updatedExtraLoginOptions)
+            } else {
+                loginParams
+            }.also {
+                login(it) // PnP login
+            }
+        } else {
+            SharedPrefsHelper.putBoolean(IS_SFA, true)
+            AnalyticsManager.trackEvent(
+                AnalyticsEvents.CONNECTION_STARTED,
+                analyticsProps + mutableMapOf<String, Any>(
+                    "is_sfa" to true,
+                )
+            )
+            loginParams.groupedAuthConnectionId?.let {
+                if (it.isNullOrEmpty()) {
+                    connect(loginParams, baseContext)
+                } else {
+                    val _loginParams = LoginParams(
+                        AuthConnection.CUSTOM,
+                        authConnectionId = loginParams.groupedAuthConnectionId,
+                        idToken = loginParams.idToken
+                    )
+                    val subVerifierInfoArray = arrayOf(
+                        Web3AuthSubVerifierInfo(
+                            loginParams.authConnectionId.toString(),
+                            idToken = loginParams.idToken.toString()
+                        )
+                    )
+                    connect(
+                        _loginParams,
+                        baseContext,
+                        subVerifierInfoArray = subVerifierInfoArray
+                    ) // SFA login
+                }
+            }
+            connect(loginParams, baseContext) // SFA login
+        }
+
+        loginCompletableFuture = CompletableFuture()
         return loginCompletableFuture
     }
 
+    private fun connect(
+        loginParams: LoginParams,
+        ctx: Context,
+        subVerifierInfoArray: Array<Web3AuthSubVerifierInfo>? = null,
+    ) {
+        val torusKey = subVerifierInfoArray.let {
+            if (it.isNullOrEmpty()) {
+                getTorusKey(loginParams)
+            } else {
+                getTorusKey(loginParams, it)
+            }
+        }
+
+        val privateKey = if (torusKey.finalKeyData?.privKey?.isEmpty() == true) {
+            torusKey.getoAuthKeyData().privKey
+        } else {
+            torusKey.finalKeyData?.privKey
+        }
+
+        var decodedUserInfo: UserInfo?
+
+        try {
+            val jwt = loginParams.idToken?.let { decodeJwt(it) }
+            jwt.let {
+                decodedUserInfo = UserInfo(
+                    email = it?.getClaim("email")?.asString() ?: "",
+                    name = it?.getClaim("name")?.asString() ?: "",
+                    profileImage = it?.getClaim("picture")?.asString() ?: "",
+                    authConnectionId = loginParams.authConnectionId.toString(),
+                    authConnection = AuthConnection.CUSTOM.name.lowercase(Locale.ROOT),
+                    groupedAuthConnectionId = loginParams.groupedAuthConnectionId ?: "",
+                    userId = it?.getClaim("user_id")?.asString() ?: "",
+                )
+            }
+        } catch (e: Exception) {
+            throw Exception(Web3AuthError.getError(ErrorCode.INVALID_LOGIN))
+        }
+
+        val response = Web3AuthResponse(
+            privateKey = privateKey.toString(),
+            signatures = getSignatureData(torusKey.sessionData.sessionTokenData),
+            userInfo = decodedUserInfo
+        )
+
+        val sessionId = SessionManager.generateRandomSessionKey()
+        sessionManager.setSessionId(sessionId)
+        sessionManager.createSession(gson.toJson(response), ctx)
+            .whenComplete { result, err ->
+                runOnUIThread {
+                    if (err == null) {
+                        web3AuthResponse = response
+                        SessionManager.saveSessionIdToStorage(result)
+                        sessionManager.setSessionId(result)
+                        val analyticsProps = mutableMapOf<String, Any>(
+                            "connector" to "auth",
+                            "auth_connection" to loginParams.authConnection.toString(),
+                            "auth_connection_id" to loginParams.authConnectionId.toString(),
+                            "group_auth_connection_id" to loginParams.groupedAuthConnectionId.toString(),
+                            "chain_id" to web3AuthOption.defaultChainId.toString(),
+                            "dapp_url" to loginParams.dappUrl.toString(),
+                            "chain_id" to web3AuthOption.defaultChainId.toString(),
+                            "chains" to (web3AuthOption.chains?.toString() ?: "[]"),
+                            "integration_type" to "android",
+                            "is_mfa_enabled" to (actionType == "enable_mfa"),
+                            "is_sfa" to true
+                        )
+                        val properties =
+                            analyticsProps + mapOf("duration" to System.currentTimeMillis() - startTime)
+
+                        AnalyticsManager.trackEvent(
+                            AnalyticsEvents.CONNECTION_COMPLETED,
+                            properties
+                        )
+                        if (::loginCompletableFuture.isInitialized)
+                            loginCompletableFuture.complete(web3AuthResponse)
+                    }
+                }
+            }
+    }
+
+    private fun getTorusKey(
+        loginParams: LoginParams,
+        subVerifierInfoArray: Array<Web3AuthSubVerifierInfo>? = null
+    ): TorusKey {
+        lateinit var retrieveSharesResponse: TorusKey
+
+        val userId = getUserIdFromJWT(loginParams.idToken.toString())
+        val nodeDetails: NodeDetails =
+            nodeDetailManager.getNodeDetails(loginParams.authConnectionId, userId)
+                .get()
+
+        subVerifierInfoArray?.let {
+            val aggregateIdTokenSeeds: ArrayList<String> = ArrayList()
+            val subVerifierIds: ArrayList<String> = ArrayList()
+            val verifyParams: ArrayList<VerifyParams> = ArrayList()
+
+            for (value: Web3AuthSubVerifierInfo in it) {
+                aggregateIdTokenSeeds.add(value.idToken)
+                val verifyParam = VerifyParams(userId, value.idToken)
+                verifyParams.add(verifyParam)
+                subVerifierIds.add(value.verifier)
+            }
+
+            aggregateIdTokenSeeds.sort()
+            val verifierParams = VerifierParams(
+                userId.toString(), null,
+                subVerifierIds.toTypedArray(), verifyParams.toTypedArray()
+            )
+
+            val aggregateIdToken = Hash.sha3String(
+                java.lang.String.join(
+                    29.toChar().toString(),
+                    aggregateIdTokenSeeds
+                )
+            ).replace("0x", "")
+            retrieveSharesResponse = torusUtils.retrieveShares(
+                nodeDetails.torusNodeEndpoints,
+                loginParams.authConnectionId.toString(),
+                verifierParams,
+                aggregateIdToken,
+                null
+            )
+        } ?: run {
+            val verifierParams = VerifierParams(userId.toString(), null, null, null)
+            retrieveSharesResponse = torusUtils.retrieveShares(
+                nodeDetails.torusNodeEndpoints,
+                loginParams.authConnectionId.toString(),
+                verifierParams,
+                loginParams.idToken.toString(),
+                null
+            )
+        }
+
+        val isUpgraded = retrieveSharesResponse.metadata?.isUpgraded
+
+        if (isUpgraded == true) {
+            throw Exception(Web3AuthError.getError(ErrorCode.USER_ALREADY_ENABLED_MFA))
+        }
+
+        return retrieveSharesResponse
+    }
+
+    private fun decodeJwt(token: String): JWT {
+        return try {
+            JWT(token)
+        } catch (e: Exception) {
+            throw IllegalArgumentException("Failed to decode JWT token", e)
+        }
+    }
+
+    private fun getUserIdFromJWT(token: String): String? {
+        return try {
+            val jwt = JWT(token)
+            jwt.getClaim("user_id").asString()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
+    private fun getSignatureData(sessionTokenData: List<SessionToken>): List<String> {
+        return sessionTokenData
+            .filterNotNull()
+            .map { session ->
+                """{"data":"${session.token}","sig":"${session.signature}"}"""
+            }
+    }
+
+
     /**
      * Logs out the user asynchronously.
      *
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun logout(): CompletableFuture<Void> {
+        AnalyticsManager.trackEvent(
+            AnalyticsEvents.LOGOUT_STARTED
+        )
         val logoutCompletableFuture: CompletableFuture<Void> = CompletableFuture()
         val sessionResponse: CompletableFuture<Boolean>? =
             sessionManager.invalidateSession(baseContext)
@@ -356,12 +711,23 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
             SessionManager.deleteSessionIdFromStorage()
             runOnUIThread {
                 if (error == null) {
+                    AnalyticsManager.trackEvent(
+                        AnalyticsEvents.LOGOUT_COMPLETED
+                    )
                     logoutCompletableFuture.complete(null)
                 } else {
+                    AnalyticsManager.trackEvent(
+                        AnalyticsEvents.LOGOUT_FAILED,
+                        mutableMapOf<String, Any>(
+                            "error_message" to "Logout Failed: ${error.message}"
+                        )
+                    )
                     logoutCompletableFuture.completeExceptionally(Exception(error))
                 }
+                AnalyticsManager.reset()
             }
         }
+        SharedPrefsHelper.clear()
         web3AuthResponse = Web3AuthResponse()
         return logoutCompletableFuture
     }
@@ -373,6 +739,16 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Boolean> representing the asynchronous operation, indicating whether MFA was successfully enabled.
      */
     fun enableMFA(loginParams: LoginParams? = null): CompletableFuture<Boolean> {
+        actionType = "enable_mfa"
+        AnalyticsManager.trackEvent(
+            AnalyticsEvents.MFA_ENABLEMENT_STARTED,
+            mutableMapOf<String, Any>(
+                "integration_type" to "android",
+                "dapp_url" to this.loginParams?.dappUrl.toString(),
+                "connector" to "auth",
+                "duration" to System.currentTimeMillis() - startTime,
+            )
+        )
         enableMfaCompletableFuture = CompletableFuture()
         if (web3AuthResponse?.userInfo?.isMfaEnabled == true) {
             throwEnableMFAError(ErrorCode.MFA_ALREADY_ENABLED)
@@ -389,6 +765,15 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
 
 
     fun manageMFA(loginParams: LoginParams? = null): CompletableFuture<Boolean> {
+        actionType = "manage_mfa"
+        AnalyticsManager.trackEvent(
+            AnalyticsEvents.MFA_MANAGEMENT_STARTED,
+            mutableMapOf<String, Any>(
+                "integration_type" to "android",
+                "dapp_url" to this.loginParams?.dappUrl.toString(),
+                "connector" to "auth"
+            )
+        )
         manageMfaCompletableFuture = CompletableFuture()
         if (web3AuthResponse?.userInfo?.isMfaEnabled == false) {
             throwManageMFAError(ErrorCode.MFA_NOT_ENABLED)
@@ -433,7 +818,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                             )
                         )
                     )
-                } else if (web3AuthResponse?.privKey.isNullOrBlank() && web3AuthResponse?.factorKey.isNullOrBlank()) {
+                } else if (web3AuthResponse?.privateKey.isNullOrBlank() && web3AuthResponse?.factorKey.isNullOrBlank()) {
                     sessionCompletableFuture.completeExceptionally(
                         Exception(
                             Web3AuthError.getError(ErrorCode.SOMETHING_WENT_WRONG)
@@ -450,7 +835,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     private fun fetchProjectConfig(): CompletableFuture<Boolean> {
         val projectConfigCompletableFuture: CompletableFuture<Boolean> = CompletableFuture()
         val web3AuthApi =
-            ApiHelper.getInstance(web3AuthOption.network.name).create(ApiService::class.java)
+            ApiHelper.getInstance(web3AuthOption.web3AuthNetwork.name)
+                .create(ApiService::class.java)
         if (!ApiHelper.isNetworkAvailable(baseContext)) {
             throw Exception(
                 Web3AuthError.getError(ErrorCode.RUNTIME_ERROR)
@@ -460,27 +846,44 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         scope.launch {
             try {
                 val result = web3AuthApi.fetchProjectConfig(
-                    web3AuthOption.clientId,
-                    web3AuthOption.network.name.lowercase()
+                    project_id = web3AuthOption.clientId,
+                    network = web3AuthOption.web3AuthNetwork.name.lowercase(),
+                    build_env = web3AuthOption.authBuildEnv.name.lowercase()
                 )
                 if (result.isSuccessful && result.body() != null) {
+                    projectConfigResponse = result.body()
+                    // Set global properties for analytics after fetching project config
+                    AnalyticsManager.setGlobalProperties(
+                        mapOf(
+                            "sdk_name" to AnalyticsSdkType.ANDROID,
+                            "sdk_version" to AnalyticsEvents.SDK_VERSION,
+                            "web3auth_client_id" to web3AuthOption.clientId,
+                            "web3auth_network" to web3AuthOption.web3AuthNetwork,
+                            "team_id" to projectConfigResponse?.teamId.toString(),
+                        )
+                    )
                     val response = result.body()
                     web3AuthOption.originData =
                         web3AuthOption.originData.mergeMaps(response?.whitelist?.signed_urls)
-                    if (response?.whitelabel != null) {
-                        if (web3AuthOption.whiteLabel == null) {
-                            web3AuthOption.whiteLabel = response.whitelabel
-                        } else {
-                            web3AuthOption.whiteLabel =
-                                web3AuthOption.whiteLabel!!.merge(response.whitelabel)
+                    response?.whitelabel?.let { whitelabel ->
+                        web3AuthOption.whiteLabel =
+                            web3AuthOption.whiteLabel?.merge(whitelabel) ?: whitelabel
+
+                        web3AuthOption.walletServicesConfig?.apply {
+                            whiteLabel = whiteLabel?.merge(whitelabel) ?: whitelabel
                         }
                     }
+                    web3AuthOption.authConnectionConfig =
+                        (web3AuthOption.authConnectionConfig.orEmpty() + projectConfigResponse?.embeddedWalletAuth.orEmpty())
+                    web3AuthOption.mfaSettings =
+                        web3AuthOption.mfaSettings?.merge(projectConfigResponse?.mfaSettings)
+                            ?: projectConfigResponse?.mfaSettings
                     projectConfigCompletableFuture.complete(true)
                 } else {
                     projectConfigCompletableFuture.completeExceptionally(
                         Exception(
                             Web3AuthError.getError(
-                                ErrorCode.RUNTIME_ERROR
+                                ErrorCode.PROJECT_CONFIG_NOT_FOUND_ERROR
                             )
                         )
                     )
@@ -517,23 +920,48 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     /**
      * Launches the wallet services asynchronously.
      *
-     * @param chainConfig The configuration details of the blockchain network.
      * @param path The path where the wallet services will be launched. Default value is "wallet".
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
-    fun launchWalletServices(
-        chainConfig: ChainConfig,
-        path: String? = "wallet"
+    fun showWalletUI(
+        path: String? = "wallet",
     ): CompletableFuture<Void> {
+        AnalyticsManager.trackEvent(
+            AnalyticsEvents.WALLET_UI_CLICKED,
+            mutableMapOf<String, Any>(
+                "integration_type" to "android",
+                "dapp_url" to this.loginParams?.dappUrl.toString(),
+            )
+        )
         val launchWalletServiceCF: CompletableFuture<Void> = CompletableFuture()
         val savedSessionId = SessionManager.getSessionIdFromStorage()
         if (savedSessionId.isNotBlank()) {
             val sdkUrl = Uri.parse(web3AuthOption.walletSdkUrl)
 
-            val initOptions = JSONObject(gson.toJson(getInitOptions()))
-            initOptions.put(
-                "chainConfig", gson.toJson(chainConfig)
-            )
+            // If chains are not present in project config, throw an error
+            if (projectConfigResponse?.chains == null) {
+                throw Exception(Web3AuthError.getError(ErrorCode.PROJECT_CONFIG_NOT_FOUND_ERROR))
+            }
+            val initOptions = JSONObject(gson.toJson(web3AuthOption)).apply {
+                put("network", web3AuthOption.web3AuthNetwork.toString().lowercase(Locale.ROOT))
+                projectConfigResponse?.chains?.let {
+                    put("chains", gson.toJson(it))
+                    put(
+                        "defaultChainId",
+                        it.firstOrNull()?.chainId ?: web3AuthOption.defaultChainId ?: "0x1"
+                    )
+                    put(
+                        "chainId",
+                        it.firstOrNull()?.chainId ?: web3AuthOption.defaultChainId ?: "0x1"
+                    )
+                }
+                projectConfigResponse?.embeddedWalletAuth?.let {
+                    put("embeddedWalletAuth", JSONArray(gson.toJson(it)))
+                }
+                projectConfigResponse?.smartAccounts?.let {
+                    put("accountAbstractionConfig", JSONObject(gson.toJson(it)))
+                }
+            }
 
             val paramMap = JSONObject()
             paramMap.put(
@@ -550,6 +978,10 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                     )
                     walletMap.addProperty("sessionId", savedSessionId)
                     walletMap.addProperty("platform", "android")
+                    val isSFAValue = SharedPrefsHelper.getBoolean(IS_SFA)
+                    if (isSFAValue) {
+                        walletMap.addProperty("sessionNamespace", "sfa")
+                    }
 
                     val walletHash =
                         "b64Params=" + gson.toJson(walletMap).toByteArray(Charsets.UTF_8)
@@ -568,6 +1000,15 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                 }
             }
         } else {
+            AnalyticsManager.trackEvent(
+                AnalyticsEvents.WALLET_SERVICES_FAILED,
+                mutableMapOf<String, Any>(
+                    "integration_type" to "android",
+                    "dapp_url" to this.loginParams?.dappUrl.toString(),
+                    "duration" to System.currentTimeMillis() - startTime,
+                    "error" to "Wallet Services Error: Session ID is not found. Please login first."
+                )
+            )
             launchWalletServiceCF.completeExceptionally(Exception("Please login first to launch wallet"))
         }
         return launchWalletServiceCF
@@ -576,29 +1017,54 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     /**
      * Signs a message asynchronously.
      *
-     * @param chainConfig The configuration details of the blockchain network.
      * @param method The method name of the request.
      * @param requestParams The parameters of the request in JSON array format.
      * @param path The path where the signing service is located. Default value is "wallet/request".
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun request(
-        chainConfig: ChainConfig,
         method: String,
         requestParams: JsonArray,
         path: String? = "wallet/request",
         appState: String? = null
     ): CompletableFuture<SignResponse> {
+        AnalyticsManager.trackEvent(
+            AnalyticsEvents.REQUEST_FUNCTION_STARTED
+        )
         signMsgCF = CompletableFuture()
         WebViewActivity.webViewResultCallback = this
 
         val sessionId = SessionManager.getSessionIdFromStorage()
         if (sessionId.isNotBlank()) {
             val sdkUrl = Uri.parse(web3AuthOption.walletSdkUrl)
-            val initOptions = JSONObject(gson.toJson(getInitOptions()))
-            initOptions.put(
-                "chainConfig", gson.toJson(chainConfig)
-            )
+
+            // If chains are not present in project config, throw an error
+            if (projectConfigResponse?.chains == null) {
+                throw Exception(Web3AuthError.getError(ErrorCode.PROJECT_CONFIG_NOT_FOUND_ERROR))
+            }
+
+            val initOptions = JSONObject(gson.toJson(web3AuthOption))
+            initOptions.apply {
+                put("network", web3AuthOption.web3AuthNetwork.toString().lowercase(Locale.ROOT))
+                projectConfigResponse?.chains?.let {
+                    put("chains", gson.toJson(it))
+                    put(
+                        "defaultChainId",
+                        it.firstOrNull()?.chainId ?: web3AuthOption.defaultChainId ?: "0x1"
+                    )
+                    put(
+                        "chainId",
+                        it.firstOrNull()?.chainId ?: web3AuthOption.defaultChainId ?: "0x1"
+                    )
+                }
+                projectConfigResponse?.embeddedWalletAuth?.let {
+                    initOptions.put("embeddedWalletAuth", JSONArray(gson.toJson(it)))
+                }
+                projectConfigResponse?.smartAccounts?.let {
+                    put("accountAbstractionConfig", JSONObject(gson.toJson(it)))
+                }
+            }
+
             val paramMap = JSONObject()
             paramMap.put(
                 "options", initOptions
@@ -609,16 +1075,22 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
 
             loginIdCf.whenComplete { loginId, error ->
                 if (error == null) {
-                    val signMessageMap = SignMessage(
-                        loginId = loginId,
-                        sessionId = sessionId,
-                        request = RequestData(
-                            method = method,
-                            params = gson.toJson(requestParams)
+                    val signMessageMap = mutableMapOf<String, Any>(
+                        "loginId" to loginId,
+                        "sessionId" to sessionId,
+                        "platform" to "android",
+                        "request" to mapOf(
+                            "method" to method,
+                            "params" to gson.toJson(requestParams)
                         ),
-                        appState = appState.let { it }
+                        "appState" to gson.toJson(appState)
                     )
 
+                    val isSFAValue = SharedPrefsHelper.getBoolean(IS_SFA)
+                    if (isSFAValue) {
+                        signMessageMap["sessionNamespace"] = "sfa"
+                    }
+
                     val signMessageHash =
                         "b64Params=" + gson.toJson(signMessageMap).toByteArray(Charsets.UTF_8)
                             .toBase64URLString()
@@ -631,12 +1103,19 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                     //print("message signing url: => $url")
                     val intent = Intent(baseContext, WebViewActivity::class.java)
                     intent.putExtra(WEBVIEW_URL, url.toString())
-                    intent.putExtra(REDIRECT_URL, web3AuthOption.redirectUrl.toString())
+                    intent.putExtra(REDIRECT_URL, web3AuthOption.redirectUrl)
                     baseContext.startActivity(intent)
                 }
             }
         } else {
             runOnUIThread {
+                AnalyticsManager.trackEvent(
+                    AnalyticsEvents.REQUEST_FUNCTION_FAILED,
+                    mutableMapOf<String, Any>(
+                        "duration" to System.currentTimeMillis() - startTime,
+                        "error" to "Request Function Error: Session ID is not found. Please login first."
+                    )
+                )
                 signMsgCF.completeExceptionally(Exception("Please login first to launch wallet"))
             }
         }
@@ -687,14 +1166,14 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      *
      * @return The private key as a string.
      */
-    fun getPrivkey(): String {
+    fun getPrivateKey(): String {
         val privKey: String? = if (web3AuthResponse == null) {
             ""
         } else {
-            if (web3AuthOption.useCoreKitKey == true) {
+            if (web3AuthOption.useSFAKey == true) {
                 web3AuthResponse?.coreKitKey
             } else {
-                web3AuthResponse?.privKey
+                web3AuthResponse?.privateKey
             }
         }
         return privKey
@@ -706,11 +1185,11 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      *
      * @return The Ed25519 private key as a string.
      */
-    fun getEd25519PrivKey(): String {
+    fun getEd25519PrivateKey(): String {
         val ed25519Key: String? = if (web3AuthResponse == null) {
             null
         } else {
-            if (web3AuthOption.useCoreKitKey == true) {
+            if (web3AuthOption.useSFAKey == true) {
                 web3AuthResponse?.coreKitEd25519PrivKey
             } else {
                 web3AuthResponse?.ed25519PrivKey
@@ -747,6 +1226,55 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         }
     }
 
+    private fun processRequestFailAnalytics(actionType: String, error: ErrorCode? = null) {
+        val event = when (actionType) {
+            "login" -> AnalyticsEvents.CONNECTION_FAILED
+            "enable_mfa" -> AnalyticsEvents.MFA_ENABLEMENT_FAILED
+            else -> AnalyticsEvents.MFA_ENABLEMENT_FAILED
+        }
+
+        val properties = mapOf(
+            "connector" to "auth",
+            "auth_connection" to loginParams?.authConnection,
+            "auth_connection_id" to loginParams?.authConnectionId.toString(),
+            "group_auth_connection_id" to loginParams?.groupedAuthConnectionId.toString(),
+            "chain_id" to web3AuthOption.defaultChainId.toString(),
+            "dapp_url" to loginParams?.dappUrl.toString(),
+            "chain_id" to web3AuthOption.defaultChainId.toString(),
+            "chains" to (web3AuthOption.chains?.toString() ?: "[]"),
+            "duration" to System.currentTimeMillis() - startTime,
+            "error_message" to (error?.name ?: "Unknown Error")
+        )
+
+        AnalyticsManager.trackEvent(event, properties)
+    }
+
+    private fun processRequestCompleteAnalytics(actionType: String) {
+        val event = when (actionType) {
+            "login" -> AnalyticsEvents.CONNECTION_COMPLETED
+            "enable_mfa" -> AnalyticsEvents.MFA_ENABLEMENT_COMPLETED
+            else -> AnalyticsEvents.MFA_MANAGEMENT_COMPLETED
+        }
+
+        val analyticsProps = mutableMapOf<String, Any>(
+            "connector" to "auth",
+            "auth_connection" to loginParams?.authConnection.toString(),
+            "auth_connection_id" to loginParams?.authConnectionId.toString(),
+            "group_auth_connection_id" to loginParams?.groupedAuthConnectionId.toString(),
+            "chain_id" to web3AuthOption.defaultChainId.toString(),
+            "dapp_url" to loginParams?.dappUrl.toString(),
+            "chain_id" to web3AuthOption.defaultChainId.toString(),
+            "chains" to (web3AuthOption.chains?.toString() ?: "[]"),
+            "integration_type" to "android",
+            "is_mfa_enabled" to (actionType == "enable_mfa"),
+            "is_sfa" to false
+        )
+        val properties =
+            analyticsProps + mapOf("duration" to System.currentTimeMillis() - startTime)
+
+        AnalyticsManager.trackEvent(event, properties)
+    }
+
     companion object {
         @JvmStatic
         private var isCustomTabsClosed: Boolean = false
@@ -765,11 +1293,24 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     override fun onSignResponseReceived(signResponse: SignResponse?) {
         if (signResponse != null) {
             signMsgCF.complete(signResponse)
+            AnalyticsManager.trackEvent(
+                AnalyticsEvents.REQUEST_FUNCTION_COMPLETED,
+                mutableMapOf<String, Any>(
+                    "duration" to System.currentTimeMillis() - startTime,
+                )
+            )
         }
     }
 
     override fun onWebViewCancelled() {
         signMsgCF.completeExceptionally(Exception("User cancelled the operation."))
+        AnalyticsManager.trackEvent(
+            AnalyticsEvents.REQUEST_FUNCTION_FAILED,
+            mutableMapOf<String, Any>(
+                "duration" to System.currentTimeMillis() - startTime,
+                "error" to "User cancelled the operation."
+            )
+        )
     }
 }
 
diff --git a/core/src/main/java/com/web3auth/core/analytics/AnalyticsConstant.kt b/core/src/main/java/com/web3auth/core/analytics/AnalyticsConstant.kt
new file mode 100644
index 00000000..844dd854
--- /dev/null
+++ b/core/src/main/java/com/web3auth/core/analytics/AnalyticsConstant.kt
@@ -0,0 +1,36 @@
+package com.web3auth.core.analytics
+
+object AnalyticsEvents {
+    const val SDK_INITIALIZATION_COMPLETED = "SDK Initialization Completed"
+    const val SDK_INITIALIZATION_FAILED = "SDK Initialization Failed"
+    const val CONNECTION_STARTED = "Connection Started"
+    const val CONNECTION_COMPLETED = "Connection Completed"
+    const val CONNECTION_FAILED = "Connection Failed"
+    const val MFA_ENABLEMENT_STARTED = "MFA Enablement Started"
+    const val MFA_ENABLEMENT_COMPLETED = "MFA Enablement Completed"
+    const val MFA_ENABLEMENT_FAILED = "MFA Enablement Failed"
+    const val MFA_MANAGEMENT_STARTED = "MFA Management Started"
+    const val MFA_MANAGEMENT_FAILED = "MFA Management Failed"
+    const val MFA_MANAGEMENT_COMPLETED = "MFA Management Completed"
+    const val WALLET_UI_CLICKED = "Wallet UI Clicked"
+    const val WALLET_SERVICES_FAILED = "Wallet Services Failed"
+    const val LOGOUT_STARTED = "Logout Started"
+    const val LOGOUT_COMPLETED = "Logout Completed"
+    const val LOGOUT_FAILED = "Logout Failed"
+    const val REQUEST_FUNCTION_STARTED = "Request Function Started"
+    const val REQUEST_FUNCTION_COMPLETED = "Request Function Completed"
+    const val REQUEST_FUNCTION_FAILED = "Request Function Failed"
+
+    const val SDK_VERSION = "10.0.0"
+}
+
+object AnalyticsSdkType {
+    const val ANDROID = "android"
+}
+
+object SegmentKeys {
+    const val SEGMENT_WRITE_KEY = "f6LbNqCeVRf512ggdME4b6CyflhF1tsX" // Production key
+    const val SEGMENT_WRITE_KEY_DEV = "rpE5pCcpA6ME2oFu2TbuVydhOXapjHs3" // Development key
+}
+
+
diff --git a/core/src/main/java/com/web3auth/core/analytics/AnalyticsManager.kt b/core/src/main/java/com/web3auth/core/analytics/AnalyticsManager.kt
new file mode 100644
index 00000000..eba80edc
--- /dev/null
+++ b/core/src/main/java/com/web3auth/core/analytics/AnalyticsManager.kt
@@ -0,0 +1,69 @@
+package com.web3auth.core.analytics
+
+import android.content.Context
+import com.segment.analytics.Analytics
+import com.segment.analytics.Properties
+import com.segment.analytics.Traits
+import com.web3auth.core.BuildConfig
+
+internal object AnalyticsManager {
+
+    private const val SEGMENT_WRITE_KEY =
+        SegmentKeys.SEGMENT_WRITE_KEY // Use (SEGMENT_WRITE_KEY) in production builds and (SEGMENT_WRITE_KEY_DEV) in development/testing builds
+    private var analytics: Analytics? = null
+    private var isInitialized = false
+
+    private val globalProperties: MutableMap<String, Any> = mutableMapOf()
+
+    fun initialize(context: Context) {
+        if (isInitialized) return
+
+        analytics = Analytics.Builder(context.applicationContext, SEGMENT_WRITE_KEY)
+            .trackApplicationLifecycleEvents()
+            .recordScreenViews()
+            .build()
+
+        Analytics.setSingletonInstance(analytics)
+        isInitialized = true
+    }
+
+    fun setGlobalProperties(properties: Map<String, Any>) {
+        globalProperties.putAll(properties)
+    }
+
+    fun trackEvent(eventName: String, properties: Map<String, Any?>? = null) {
+        if (!isInitialized) return
+        if (isSkipped()) return
+
+        val combinedProps = Properties().apply {
+            globalProperties.forEach { (k, v) -> putValue(k, v) }
+            properties?.forEach { (k, v) -> putValue(k, v) }
+        }
+
+        analytics?.track(eventName, combinedProps)
+    }
+
+    fun identify(userId: String, traits: Map<String, Any>? = null) {
+        if (!isInitialized) return
+        if (isSkipped()) return
+
+        val traitsObj = traits?.let {
+            Traits().apply {
+                it.forEach { (k, v) -> putValue(k, v) }
+            }
+        }
+
+        analytics?.identify(userId, traitsObj, null)
+    }
+
+    fun reset() {
+        analytics?.reset()
+        isInitialized = false
+        globalProperties.clear()
+    }
+
+    private fun isSkipped(): Boolean {
+        return BuildConfig.DEBUG
+    }
+}
+
diff --git a/core/src/main/java/com/web3auth/core/api/ApiHelper.kt b/core/src/main/java/com/web3auth/core/api/ApiHelper.kt
index 93b4132a..eb007052 100644
--- a/core/src/main/java/com/web3auth/core/api/ApiHelper.kt
+++ b/core/src/main/java/com/web3auth/core/api/ApiHelper.kt
@@ -5,23 +5,23 @@ import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
 import com.google.gson.GsonBuilder
-import com.web3auth.core.types.Network
 import com.web3auth.session_manager_android.BuildConfig
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 object ApiHelper {
     // TODO: Abstract this to a single common source, i.e torus-common, then add these to here and fetch-node-details, etc respectively
-    val SIGNER_MAP: Map<Network, String> = mapOf(
-        Network.MAINNET to "https://signer.web3auth.io",
-        Network.TESTNET to "https://signer.web3auth.io",
-        Network.CYAN to "https://signer-polygon.web3auth.io",
-        Network.AQUA to "https://signer-polygon.web3auth.io",
-        Network.SAPPHIRE_MAINNET to "https://signer.web3auth.io",
-        Network.SAPPHIRE_DEVNET to "https://signer.web3auth.io"
+    private val SIGNER_MAP: Map<Web3AuthNetwork, String> = mapOf(
+        Web3AuthNetwork.MAINNET to "https://signer.web3auth.io",
+        Web3AuthNetwork.TESTNET to "https://signer.web3auth.io",
+        Web3AuthNetwork.CYAN to "https://signer-polygon.web3auth.io",
+        Web3AuthNetwork.AQUA to "https://signer-polygon.web3auth.io",
+        Web3AuthNetwork.SAPPHIRE_MAINNET to "https://signer.web3auth.io",
+        Web3AuthNetwork.SAPPHIRE_DEVNET to "https://signer.web3auth.io"
     )
 
     private const val sessionBaseUrl = "https://session.web3auth.io"
@@ -39,7 +39,7 @@ object ApiHelper {
     private val builder = GsonBuilder().disableHtmlEscaping().create()
 
     fun getInstance(network: String): Retrofit {
-        return Retrofit.Builder().baseUrl(SIGNER_MAP[Network.valueOf(network)])
+        return Retrofit.Builder().baseUrl(SIGNER_MAP[Web3AuthNetwork.valueOf(network)])
             .addConverterFactory(GsonConverterFactory.create(builder))
             .client(okHttpClient)
             .build()
diff --git a/core/src/main/java/com/web3auth/core/api/ApiService.kt b/core/src/main/java/com/web3auth/core/api/ApiService.kt
index 84eb069d..1eda0cf2 100644
--- a/core/src/main/java/com/web3auth/core/api/ApiService.kt
+++ b/core/src/main/java/com/web3auth/core/api/ApiService.kt
@@ -7,9 +7,9 @@ import retrofit2.http.Query
 
 interface ApiService {
 
-    @GET("/api/configuration")
+    @GET("/api/v2/configuration")
     suspend fun fetchProjectConfig(
         @Query("project_id") project_id: String, @Query("network") network: String,
-        @Query("whitelist") whitelist: String = "true"
+        @Query("build_env") build_env: String
     ): Response<ProjectConfigResponse>
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/keystore/SharedPrefsHelper.kt b/core/src/main/java/com/web3auth/core/keystore/SharedPrefsHelper.kt
new file mode 100644
index 00000000..2e6a4f4e
--- /dev/null
+++ b/core/src/main/java/com/web3auth/core/keystore/SharedPrefsHelper.kt
@@ -0,0 +1,43 @@
+package com.web3auth.core.keystore
+
+import android.content.Context
+import android.content.SharedPreferences
+
+object SharedPrefsHelper {
+
+    private const val PREF_NAME = "com.web3auth.sdk.prefs"
+    private const val MODE = Context.MODE_PRIVATE
+    private var prefs: SharedPreferences? = null
+
+    fun init(context: Context) {
+        if (prefs == null) {
+            prefs = context.applicationContext.getSharedPreferences(PREF_NAME, MODE)
+        }
+    }
+
+    fun putString(key: String, value: String) {
+        prefs?.edit()?.putString(key, value)?.apply()
+    }
+
+    fun getString(key: String, defaultValue: String? = null): String? {
+        return prefs?.getString(key, defaultValue)
+    }
+
+    fun putBoolean(key: String, value: Boolean) {
+        prefs?.edit()?.putBoolean(key, value)?.apply()
+    }
+
+    fun getBoolean(key: String, defaultValue: Boolean = false): Boolean {
+        return prefs?.getBoolean(key, defaultValue) ?: defaultValue
+    }
+
+    fun clear() {
+        prefs?.edit()?.clear()?.apply()
+    }
+
+    fun remove(key: String) {
+        prefs?.edit()?.remove(key)?.apply()
+    }
+}
+
+const val IS_SFA = "isSFA"
diff --git a/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt b/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
similarity index 91%
rename from core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt
rename to core/src/main/java/com/web3auth/core/types/AuthConnection.kt
index fa900d4b..5b5d2aa4 100644
--- a/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt
+++ b/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 
 @Keep
-enum class TypeOfLogin {
+enum class AuthConnection {
     @SerializedName("google")
     GOOGLE,
 
@@ -47,8 +47,8 @@ enum class TypeOfLogin {
     @SerializedName("email_passwordless")
     EMAIL_PASSWORDLESS,
 
-    @SerializedName("jwt")
-    JWT,
+    @SerializedName("custom")
+    CUSTOM, //for jwt
 
     @SerializedName("sms_passwordless")
     SMS_PASSWORDLESS,
diff --git a/core/src/main/java/com/web3auth/core/types/LoginConfigItem.kt b/core/src/main/java/com/web3auth/core/types/AuthConnectionConfig.kt
similarity index 67%
rename from core/src/main/java/com/web3auth/core/types/LoginConfigItem.kt
rename to core/src/main/java/com/web3auth/core/types/AuthConnectionConfig.kt
index 27384135..c8f682d8 100644
--- a/core/src/main/java/com/web3auth/core/types/LoginConfigItem.kt
+++ b/core/src/main/java/com/web3auth/core/types/AuthConnectionConfig.kt
@@ -3,13 +3,13 @@ package com.web3auth.core.types
 import androidx.annotation.Keep
 
 @Keep
-data class LoginConfigItem(
-    @Keep var verifier: String,
-    @Keep var typeOfLogin: TypeOfLogin,
+data class AuthConnectionConfig(
+    @Keep var authConnectionId: String,
+    @Keep var authConnection: AuthConnection,
     @Keep var name: String? = null,
     @Keep var description: String? = null,
     @Keep var clientId: String,
-    @Keep var verifierSubIdentifier: String? = null,
+    @Keep var groupedAuthConnectionId: String? = null,
     @Keep var logoHover: String? = null,
     @Keep var logoLight: String? = null,
     @Keep var logoDark: String? = null,
@@ -17,4 +17,5 @@ data class LoginConfigItem(
     @Keep var showOnModal: Boolean? = true,
     @Keep var showOnDesktop: Boolean? = true,
     @Keep var showOnMobile: Boolean? = true,
+    @Keep val jwtParameters: ExtraLoginOptions? = null,
 )
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/BuildEnv.kt b/core/src/main/java/com/web3auth/core/types/BuildEnv.kt
index 1f1966bb..3912ad87 100644
--- a/core/src/main/java/com/web3auth/core/types/BuildEnv.kt
+++ b/core/src/main/java/com/web3auth/core/types/BuildEnv.kt
@@ -1,7 +1,9 @@
 package com.web3auth.core.types
 
+import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 
+@Keep
 enum class BuildEnv {
     @SerializedName("production")
     PRODUCTION,
diff --git a/core/src/main/java/com/web3auth/core/types/ChainConfig.kt b/core/src/main/java/com/web3auth/core/types/ChainConfig.kt
index 9980a9ea..b5d8a988 100644
--- a/core/src/main/java/com/web3auth/core/types/ChainConfig.kt
+++ b/core/src/main/java/com/web3auth/core/types/ChainConfig.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 import java.io.Serializable
 
 @Keep
-data class ChainConfig(
+data class Chains(
     @Keep val chainNamespace: ChainNamespace = ChainNamespace.EIP155,
     @Keep val decimals: Int? = 18,
     @Keep val blockExplorerUrl: String? = null,
diff --git a/core/src/main/java/com/web3auth/core/types/ChainNamespace.kt b/core/src/main/java/com/web3auth/core/types/ChainNamespace.kt
index bb941ba7..8d91e605 100644
--- a/core/src/main/java/com/web3auth/core/types/ChainNamespace.kt
+++ b/core/src/main/java/com/web3auth/core/types/ChainNamespace.kt
@@ -9,5 +9,8 @@ enum class ChainNamespace {
     EIP155,
 
     @SerializedName("solana")
-    SOLANA
+    SOLANA,
+
+    @SerializedName("other")
+    OTHER
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/ExtraLoginOptions.kt b/core/src/main/java/com/web3auth/core/types/ExtraLoginOptions.kt
index 1bc777ee..4a66910e 100644
--- a/core/src/main/java/com/web3auth/core/types/ExtraLoginOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/ExtraLoginOptions.kt
@@ -1,6 +1,7 @@
 package com.web3auth.core.types
 
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
 import java.io.Serializable
 
 @Keep
@@ -9,8 +10,10 @@ data class ExtraLoginOptions(
     @Keep private var domain: String? = null,
     @Keep private var client_id: String? = null,
     @Keep private var leeway: String? = null,
-    @Keep private var verifierIdField: String? = null,
-    @Keep private var isVerifierIdCaseSensitive: Boolean? = null,
+    @Keep private var userIdField: String? = null,
+    @Keep private var isUserIdCaseSensitive: Boolean? = null,
+    @Keep private var access_token: String? = null,
+    @Keep private var flow_type: EmailFlowType = EmailFlowType.code,
     @Keep private var display: Display? = null,
     @Keep private var prompt: Prompt? = null,
     @Keep private var max_age: String? = null,
@@ -27,3 +30,12 @@ data class ExtraLoginOptions(
     @Keep private var nonce: String? = null,
     @Keep private var redirect_uri: String? = null
 ) : Serializable
+
+@Keep
+enum class EmailFlowType {
+    @SerializedName("link")
+    link,
+
+    @SerializedName("code")
+    code,
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/InitOptions.kt b/core/src/main/java/com/web3auth/core/types/InitOptions.kt
index 4e514dff..86112228 100644
--- a/core/src/main/java/com/web3auth/core/types/InitOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/InitOptions.kt
@@ -8,7 +8,7 @@ data class InitOptions(
     @Keep val network: String,
     @Keep var redirectUrl: String? = null,
     @Keep val whiteLabel: String? = null,
-    @Keep val loginConfig: String? = null,
+    @Keep val authConnectionConfig: String? = null,
     @Keep val buildEnv: String? = null,
     @Keep val mfaSettings: String? = null,
     @Keep val sessionTime: Int? = null,
diff --git a/core/src/main/java/com/web3auth/core/types/InitParams.kt b/core/src/main/java/com/web3auth/core/types/InitParams.kt
index c62756bf..cf53ed77 100644
--- a/core/src/main/java/com/web3auth/core/types/InitParams.kt
+++ b/core/src/main/java/com/web3auth/core/types/InitParams.kt
@@ -4,7 +4,9 @@ import androidx.annotation.Keep
 
 @Keep
 data class InitParams(
-    @Keep val loginProvider: String? = null,
+    @Keep val authConnection: String? = null,
+    @Keep val authConnectionId: String? = null,
+    @Keep val groupedAuthConnectionId: String? = null,
     @Keep val extraLoginOptions: String? = null,
     @Keep val redirectUrl: String,
     @Keep val mfaLevel: String? = null,
diff --git a/core/src/main/java/com/web3auth/core/types/LoginParams.kt b/core/src/main/java/com/web3auth/core/types/LoginParams.kt
index 95141022..2286f80b 100644
--- a/core/src/main/java/com/web3auth/core/types/LoginParams.kt
+++ b/core/src/main/java/com/web3auth/core/types/LoginParams.kt
@@ -1,16 +1,18 @@
 package com.web3auth.core.types
 
-import android.net.Uri
 import androidx.annotation.Keep
 
 @Keep
 data class LoginParams(
-    @Keep val loginProvider: Provider,
-    @Keep var dappShare: String? = null,
-    @Keep val extraLoginOptions: ExtraLoginOptions? = null,
-    @Keep @Transient var redirectUrl: Uri? = null,
+    @Keep val authConnection: AuthConnection,
+    @Keep val authConnectionId: String? = null,
+    @Keep val groupedAuthConnectionId: String? = null,
     @Keep val appState: String? = null,
     @Keep val mfaLevel: MFALevel? = null,
+    @Keep val extraLoginOptions: ExtraLoginOptions? = null,
+    @Keep var dappShare: String? = null,
     @Keep val curve: Curve? = Curve.SECP256K1,
-    @Keep val dappUrl: String? = null,
+    @Keep var dappUrl: String? = null,
+    @Keep var loginHint: String? = null,
+    @Keep val idToken: String? = null,
 )
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/MfaSettings.kt b/core/src/main/java/com/web3auth/core/types/MfaSettings.kt
index 38783391..e4f844bf 100644
--- a/core/src/main/java/com/web3auth/core/types/MfaSettings.kt
+++ b/core/src/main/java/com/web3auth/core/types/MfaSettings.kt
@@ -10,4 +10,16 @@ data class MfaSettings(
     @Keep private var passwordFactor: MfaSetting? = null,
     @Keep private var passkeysFactor: MfaSetting? = null,
     @Keep private var authenticatorFactor: MfaSetting? = null,
-)
\ No newline at end of file
+) {
+    fun merge(other: MfaSettings?): MfaSettings {
+        if (other == null) return this
+        return MfaSettings(
+            deviceShareFactor = other.deviceShareFactor ?: this.deviceShareFactor,
+            backUpShareFactor = other.backUpShareFactor ?: this.backUpShareFactor,
+            socialBackupFactor = other.socialBackupFactor ?: this.socialBackupFactor,
+            passwordFactor = other.passwordFactor ?: this.passwordFactor,
+            passkeysFactor = other.passkeysFactor ?: this.passkeysFactor,
+            authenticatorFactor = other.authenticatorFactor ?: this.authenticatorFactor
+        )
+    }
+}
diff --git a/core/src/main/java/com/web3auth/core/types/Network.kt b/core/src/main/java/com/web3auth/core/types/Network.kt
deleted file mode 100644
index 852d18f5..00000000
--- a/core/src/main/java/com/web3auth/core/types/Network.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.web3auth.core.types
-
-import androidx.annotation.Keep
-import com.google.gson.annotations.SerializedName
-
-@Keep
-enum class Network {
-    @SerializedName("mainnet")
-    MAINNET,
-
-    @SerializedName("testnet")
-    TESTNET,
-
-    @SerializedName("cyan")
-    CYAN,
-
-    @SerializedName("aqua")
-    AQUA,
-
-    @SerializedName("sapphire_devnet")
-    SAPPHIRE_DEVNET,
-
-    @SerializedName("sapphire_mainnet")
-    SAPPHIRE_MAINNET
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/ProjectConfigResponse.kt b/core/src/main/java/com/web3auth/core/types/ProjectConfigResponse.kt
index e6c3748e..eda30282 100644
--- a/core/src/main/java/com/web3auth/core/types/ProjectConfigResponse.kt
+++ b/core/src/main/java/com/web3auth/core/types/ProjectConfigResponse.kt
@@ -1,6 +1,7 @@
 package com.web3auth.core.types
 
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
 
 @Keep
 data class WhitelistResponse(
@@ -10,9 +11,89 @@ data class WhitelistResponse(
 
 @Keep
 data class ProjectConfigResponse(
-    @Keep val whitelabel: WhiteLabelData? = null,
-    @Keep val sms_otp_enabled: Boolean,
-    @Keep val wallet_connect_enabled: Boolean,
-    @Keep val wallet_connect_project_id: String?,
+    @Keep var userDataInIdToken: Boolean? = true,
+    @Keep val sessionTime: Int? = 30 * 86400,
+    @Keep val enableKeyExport: Boolean? = false,
     @Keep val whitelist: WhitelistResponse?,
+    @Keep val chains: List<Chains>? = null,
+    @Keep val smartAccounts: SmartAccountsConfig? = null,
+    @Keep val walletUiConfig: WalletUiConfig? = null,
+    @Keep val embeddedWalletAuth: List<AuthConnectionConfig>? = null,
+    @Keep val sms_otp_enabled: Boolean?,
+    @Keep val wallet_connect_enabled: Boolean?,
+    @Keep val walletConnectProjectId: String?,
+    @Keep val whitelabel: WhiteLabelData? = null,
+    @Keep val teamId: Int? = null,
+    @Keep val mfaSettings: MfaSettings? = null
+)
+
+@Keep
+data class SmartAccountsConfig(
+    @SerializedName("smartAccountType")
+    val smartAccountType: SmartAccountType,
+
+    @SerializedName("chains")
+    val chains: List<ChainConfig>
+)
+
+@Keep
+data class ChainConfig(
+    @SerializedName("chainId")
+    val chainId: String,
+
+    @SerializedName("bundlerConfig")
+    val bundlerConfig: BundlerConfig,
+
+    @SerializedName("paymasterConfig")
+    val paymasterConfig: PaymasterConfig? = null
+)
+
+@Keep
+data class BundlerConfig(
+    @SerializedName("url")
+    val url: String
 )
+
+@Keep
+data class PaymasterConfig(
+    @SerializedName("url")
+    val url: String
+)
+
+@Keep
+enum class SmartAccountType {
+    @SerializedName("metamask")
+    METAMASK,
+
+    @SerializedName("biconomy")
+    BICONOMY,
+
+    @SerializedName("kernel")
+    KERNEL,
+
+    @SerializedName("safe")
+    SAFE,
+
+    @SerializedName("trust")
+    TRUST,
+
+    @SerializedName("light")
+    LIGHT,
+
+    @SerializedName("simple")
+    SIMPLE,
+
+    @SerializedName("nexus")
+    NEXUS
+}
+
+@Keep
+enum class SmartAccountWalletScope {
+    @SerializedName("embedded")
+    EMBEDDED,
+
+    @SerializedName("all")
+    ALL
+}
+
+
diff --git a/core/src/main/java/com/web3auth/core/types/Provider.kt b/core/src/main/java/com/web3auth/core/types/Provider.kt
deleted file mode 100644
index 9e6b3762..00000000
--- a/core/src/main/java/com/web3auth/core/types/Provider.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.web3auth.core.types
-
-import androidx.annotation.Keep
-import com.google.gson.annotations.SerializedName
-
-@Keep
-enum class Provider {
-    @SerializedName("google")
-    GOOGLE,
-
-    @SerializedName("facebook")
-    FACEBOOK,
-
-    @SerializedName("reddit")
-    REDDIT,
-
-    @SerializedName("discord")
-    DISCORD,
-
-    @SerializedName("twitch")
-    TWITCH,
-
-    @SerializedName("apple")
-    APPLE,
-
-    @SerializedName("line")
-    LINE,
-
-    @SerializedName("github")
-    GITHUB,
-
-    @SerializedName("kakao")
-    KAKAO,
-
-    @SerializedName("linkedin")
-    LINKEDIN,
-
-    @SerializedName("twitter")
-    TWITTER,
-
-    @SerializedName("weibo")
-    WEIBO,
-
-    @SerializedName("wechat")
-    WECHAT,
-
-    @SerializedName("email_passwordless")
-    EMAIL_PASSWORDLESS,
-
-    @SerializedName("jwt")
-    JWT,
-
-    @SerializedName("sms_passwordless")
-    SMS_PASSWORDLESS,
-
-    @SerializedName("farcaster")
-    FARCASTER
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/TorusGenericContainer.kt b/core/src/main/java/com/web3auth/core/types/TorusGenericContainer.kt
new file mode 100644
index 00000000..85895ec7
--- /dev/null
+++ b/core/src/main/java/com/web3auth/core/types/TorusGenericContainer.kt
@@ -0,0 +1,9 @@
+package com.web3auth.core.types
+
+import androidx.annotation.Keep
+import java.io.Serializable
+
+@Keep
+data class TorusGenericContainer(
+    @Keep val params: Map<String, String>
+) : Serializable
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/UserInfo.kt b/core/src/main/java/com/web3auth/core/types/UserInfo.kt
index 503fa51b..8b1babd2 100644
--- a/core/src/main/java/com/web3auth/core/types/UserInfo.kt
+++ b/core/src/main/java/com/web3auth/core/types/UserInfo.kt
@@ -7,10 +7,10 @@ data class UserInfo (
     @Keep var email: String = "",
     @Keep var name: String = "",
     @Keep var profileImage: String = "",
-    @Keep var aggregateVerifier: String = "",
-    @Keep var verifier: String = "",
-    @Keep var verifierId: String = "",
-    @Keep var typeOfLogin: String = "",
+    @Keep var groupedAuthConnectionId: String = "",
+    @Keep var authConnectionId: String = "",
+    @Keep var userId: String = "",
+    @Keep var authConnection: String = "",
     @Keep var dappShare: String = "",
     @Keep var idToken: String = "",
     @Keep var oAuthIdToken: String = "",
diff --git a/core/src/main/java/com/web3auth/core/types/WalletServicesConfig.kt b/core/src/main/java/com/web3auth/core/types/WalletServicesConfig.kt
new file mode 100644
index 00000000..11ed7f46
--- /dev/null
+++ b/core/src/main/java/com/web3auth/core/types/WalletServicesConfig.kt
@@ -0,0 +1,27 @@
+package com.web3auth.core.types
+
+import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
+
+@Keep
+data class WalletServicesConfig(
+    @Keep val confirmationStrategy: ConfirmationStrategy? = ConfirmationStrategy.DEFAULT,
+    @Keep var whiteLabel: WhiteLabelData? = null
+)
+
+@Keep
+enum class ConfirmationStrategy {
+    @SerializedName("popup")
+    POPUP,
+
+    @SerializedName("modal")
+    MODAL,
+
+    @SerializedName("auto-approve")
+    AUTO_APPROVE,
+
+    @SerializedName("default")
+    DEFAULT
+}
+
+
diff --git a/core/src/main/java/com/web3auth/core/types/WalletUiConfig.kt b/core/src/main/java/com/web3auth/core/types/WalletUiConfig.kt
new file mode 100644
index 00000000..1cb0b1d7
--- /dev/null
+++ b/core/src/main/java/com/web3auth/core/types/WalletUiConfig.kt
@@ -0,0 +1,40 @@
+package com.web3auth.core.types
+
+import com.google.gson.annotations.SerializedName
+
+data class WalletUiConfig(
+    val enablePortfolioWidget: Boolean? = null,
+    val enableConfirmationModal: Boolean? = null,
+    val enableWalletConnect: Boolean? = null,
+    val enableTokenDisplay: Boolean? = null,
+    val enableNftDisplay: Boolean? = null,
+    val enableShowAllTokensButton: Boolean? = null,
+    val enableBuyButton: Boolean? = null,
+    val enableSendButton: Boolean? = null,
+    val enableSwapButton: Boolean? = null,
+    val enableReceiveButton: Boolean? = null,
+    val portfolioWidgetPosition: ButtonPositionType? = null,
+    val defaultPortfolio: DefaultPortfolioType? = null
+)
+
+enum class ButtonPositionType {
+    @SerializedName("bottom-left")
+    BOTTOM_LEFT,
+
+    @SerializedName("top-left")
+    TOP_LEFT,
+
+    @SerializedName("bottom-right")
+    BOTTOM_RIGHT,
+
+    @SerializedName("top-right")
+    TOP_RIGHT
+}
+
+enum class DefaultPortfolioType {
+    @SerializedName("token")
+    TOKEN,
+
+    @SerializedName("nft")
+    NFT
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthError.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthError.kt
index a96dc8a9..64cfd3ee 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthError.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthError.kt
@@ -46,6 +46,18 @@ object Web3AuthError {
             ErrorCode.USER_CANCELLED -> {
                 "User Cancelled"
             }
+
+            ErrorCode.USER_ALREADY_ENABLED_MFA -> {
+                "User has already enabled MFA"
+            }
+
+            ErrorCode.PROJECT_CONFIG_NOT_FOUND_ERROR -> {
+                "Project configuration not found. Please check your project settings."
+            }
+
+            ErrorCode.ENABLE_MFA_NOT_ALLOWED -> {
+                "Enabling MFA is not allowed for this user."
+            }
         }
     }
 }
@@ -61,5 +73,8 @@ enum class ErrorCode {
     INVALID_LOGIN,
     MFA_ALREADY_ENABLED,
     MFA_NOT_ENABLED,
-    USER_CANCELLED
+    USER_CANCELLED,
+    USER_ALREADY_ENABLED_MFA,
+    PROJECT_CONFIG_NOT_FOUND_ERROR,
+    ENABLE_MFA_NOT_ALLOWED
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
index a5420421..2a5e4bec 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
@@ -1,28 +1,38 @@
 package com.web3auth.core.types
 
-import android.net.Uri
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 
 @Keep
 data class Web3AuthOptions(
-    val clientId: String,
-    val network: Network,
-    var buildEnv: BuildEnv? = BuildEnv.PRODUCTION,
-    @Transient var redirectUrl: Uri,
-    var sdkUrl: String = getSdkUrl(buildEnv),
-    var whiteLabel: WhiteLabelData? = null,
-    val loginConfig: HashMap<String, LoginConfigItem>? = null,
-    val useCoreKitKey: Boolean? = false,
-    val chainNamespace: ChainNamespace? = ChainNamespace.EIP155,
-    val mfaSettings: MfaSettings? = null,
-    val sessionTime: Int? = 30 * 86400,
-    var walletSdkUrl: String? = getWalletSdkUrl(buildEnv),
-    var dashboardUrl: String? = getDashboardUrl(buildEnv),
-    var originData: Map<String, String>? = null
+    @Keep val clientId: String,
+    @Keep var redirectUrl: String,
+    @Keep var originData: Map<String, String>? = null,
+    @SerializedName("buildEnv")
+    @Keep var authBuildEnv: BuildEnv = BuildEnv.PRODUCTION,
+    @Keep var sdkUrl: String = getSdkUrl(authBuildEnv),
+    @Keep var storageServerUrl: String? = null,
+    @Keep var sessionSocketUrl: String? = null,
+    @Keep var authConnectionConfig: List<AuthConnectionConfig>? = emptyList(),
+    @Keep var whiteLabel: WhiteLabelData? = null,
+    @Keep var dashboardUrl: String? = getDashboardUrl(authBuildEnv),
+    @Keep var accountAbstractionConfig: String? = null,
+    @Keep var walletSdkUrl: String? = getWalletSdkUrl(authBuildEnv),
+    @Keep var includeUserDataInToken: Boolean? = true,
+    @Keep var chains: Chains? = null,
+    @Keep var defaultChainId: String? = "0x1",
+    @Keep var enableLogging: Boolean = false,
+    @Keep val sessionTime: Int = 30 * 86400,
+    @SerializedName("network")
+    @Keep val web3AuthNetwork: Web3AuthNetwork,
+    @Keep val useSFAKey: Boolean? = false,
+    @Keep val walletServicesConfig: WalletServicesConfig? = null,
+    @Keep var mfaSettings: MfaSettings? = null,
 ) {
     init {
         if (dashboardUrl == null) {
-            dashboardUrl = getDashboardUrl(buildEnv)
+            dashboardUrl = getDashboardUrl(authBuildEnv)
         }
     }
 }
@@ -78,9 +88,9 @@ fun getDashboardUrl(buildEnv: BuildEnv?): String {
     return sdkUrl
 }
 
-const val authServiceVersion = "v9"
-const val walletServicesVersion = "v4"
-const val authDashboardVersion = "v9"
+const val authServiceVersion = "v10"
+const val walletServicesVersion = "v5"
+const val authDashboardVersion = "v10"
 const val walletAccountConstant = "wallet/account"
 const val WEBVIEW_URL = "walletUrl"
 const val REDIRECT_URL = "redirectUrl"
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
index b936e613..d7c21bcd 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
@@ -1,10 +1,12 @@
 package com.web3auth.core.types
 
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
 
 @Keep
 data class Web3AuthResponse(
-    val privKey: String? = null,
+    @SerializedName("privKey")
+    val privateKey: String? = null,
     val ed25519PrivKey: String? = null,
     val userInfo: UserInfo? = null,
     val error: String? = null,
@@ -16,6 +18,7 @@ data class Web3AuthResponse(
     val tssShareIndex: Int? = null,
     val tssPubKey: String? = null,
     val tssShare: String? = null,
+    val tssTag: String? = null,
     val tssNonce: Int? = null,
     val nodeIndexes: List<Int>? = null,
     val keyMode: String? = null,
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthSubVerifierInfo.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthSubVerifierInfo.kt
new file mode 100644
index 00000000..0abc7bf5
--- /dev/null
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthSubVerifierInfo.kt
@@ -0,0 +1,6 @@
+package com.web3auth.core.types
+
+class Web3AuthSubVerifierInfo(
+    var verifier: String,
+    var idToken: String
+)
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d60aa07e..c8bf435e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Nov 22 12:32:04 SGT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME