diff --git a/demo-app-threeds/.gitignore b/demo-app-threeds/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/demo-app-threeds/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/demo-app-threeds/build.gradle b/demo-app-threeds/build.gradle
new file mode 100644
index 00000000..cb3ffce2
--- /dev/null
+++ b/demo-app-threeds/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'io.hyperswitch.demo_app_threeds'
+    compileSdk 36
+
+    defaultConfig {
+        applicationId "io.hyperswitch.demo_app_threeds"
+        minSdk 24
+        targetSdk 36
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation (project(":hyperswitch-sdk-android-threeDS-trident"))
+    implementation (project(":hyperswitch-sdk-android-authentication"))
+
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+
+
+    implementation libs.fuel
+    implementation libs.kotlin.coroutines
+    implementation libs.androidx.preference
+    implementation 'org.slf4j:slf4j-nop:2.0.17'
+    androidTestImplementation('com.wix:detox:+')
+}
\ No newline at end of file
diff --git a/demo-app-threeds/proguard-rules.pro b/demo-app-threeds/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/demo-app-threeds/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/demo-app-threeds/src/androidTest/java/io/hyperswitch/demo_app_threeds/ExampleInstrumentedTest.kt b/demo-app-threeds/src/androidTest/java/io/hyperswitch/demo_app_threeds/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..72b74d32
--- /dev/null
+++ b/demo-app-threeds/src/androidTest/java/io/hyperswitch/demo_app_threeds/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package io.hyperswitch.demo_app_threeds
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("io.hyperswitch.demo_app_threeds", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/demo-app-threeds/src/main/AndroidManifest.xml b/demo-app-threeds/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..aea25576
--- /dev/null
+++ b/demo-app-threeds/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Iohyperswitch">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Iohyperswitch">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/demo-app-threeds/src/main/java/io/hyperswitch/demo_app_threeds/MainActivity.kt b/demo-app-threeds/src/main/java/io/hyperswitch/demo_app_threeds/MainActivity.kt
new file mode 100644
index 00000000..47e1dd0c
--- /dev/null
+++ b/demo-app-threeds/src/main/java/io/hyperswitch/demo_app_threeds/MainActivity.kt
@@ -0,0 +1,538 @@
+package io.hyperswitch.demo_app_threeds
+
+import android.app.Activity
+import android.os.Bundle
+import android.util.Log
+import android.widget.Button
+import android.widget.TextView
+import io.hyperswitch.threeds.models.ThreeDSEnvironment
+import io.hyperswitch.threeds.api.*
+import io.hyperswitch.threeds.models.ChallengeParameters
+import io.hyperswitch.threeds.provider.ProviderRegistry
+import io.hyperswitch.threeds.trident.TridentProviderFactory
+import io.hyperswitch.authentication.AuthenticationSession
+import okhttp3.*
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import java.io.IOException
+
+class MainActivity : Activity() {
+
+    private lateinit var statusText: TextView
+    private var publishKey: String = ""
+    private var paymentIntentClientSecret: String = ""
+
+    // New merchant-facing API objects
+    private lateinit var authenticationSession: AuthenticationSession
+    private var service: ThreeDSService? = null
+    private var transaction: ThreeDSTransaction? = null
+    private var aReqParams: AuthenticationRequestParameters? = null
+    private var challengeParameters: ChallengeParameters? = null
+
+
+    private val apiKey = ""
+    private val profileId = ""
+    private val baseUrl = ""
+    private var authenticationId: String? = null
+    // Eligibility response data
+    private var threeDsServerTransactionId: String? = null
+    private var messageVersion: String? = null
+    private var directoryServerId: String? = null
+
+    // HTTP client - use singleton to avoid creating multiple instances
+    private val httpClient by lazy {
+        OkHttpClient.Builder()
+            .connectTimeout(15, java.util.concurrent.TimeUnit.SECONDS)
+            .readTimeout(15, java.util.concurrent.TimeUnit.SECONDS)
+            .writeTimeout(15, java.util.concurrent.TimeUnit.SECONDS)
+            .build()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        statusText = findViewById(R.id.statusText)
+
+        // Register providers for testing
+        ProviderRegistry.registerProvider(TridentProviderFactory())
+
+
+        authenticationSession = AuthenticationSession(
+            activity = this,
+            publishableKey = publishKey
+        )
+
+        setupButtons()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        // Clean up resources to prevent memory leaks
+        service = null
+        transaction = null
+        aReqParams = null
+        challengeParameters = null
+
+        Log.d("ThreeDSTest", "Cleared activity references")
+
+        // Cancel any pending HTTP calls
+        try {
+            httpClient.dispatcher.executorService.shutdown()
+        } catch (e: Exception) {
+            Log.w("ThreeDSTest", "Error shutting down HTTP client: ${e.message}")
+        }
+    }
+
+    private fun setupButtons() {
+        findViewById<Button>(R.id.btnInit3DS).setOnClickListener {
+            setStatus("Step 1: Initializing Authentication Session...")
+            initializeAndCreateAuthentication()
+        }
+
+        findViewById<Button>(R.id.btnGenerateAReq).setOnClickListener {
+            setStatus("Step 2: Creating Transaction and Generating AReq...")
+            createTransactionAndGenerateAReq()
+        }
+
+        findViewById<Button>(R.id.btnReceiveChallenge).setOnClickListener {
+            setStatus("Step 3: Making Authentication API Call...")
+            makeAuthenticationApiCall()
+        }
+
+        findViewById<Button>(R.id.btnDoChallenge).setOnClickListener {
+            setStatus("Step 4: Performing Challenge...")
+            performChallenge()
+        }
+    }
+
+    private fun initializeAndCreateAuthentication() {
+        try {
+            setStatus("🔧 Initializing 3DS SDK...")
+
+            // Create 3DS configuration - clean and simple!
+            val configuration = io.hyperswitch.threeds.models.ThreeDSConfiguration(
+                environment = ThreeDSEnvironment.SANDBOX,
+                preferredProvider = io.hyperswitch.threeds.models.ThreeDSProviderType.TRIDENT,
+                uiCustomization = null
+            )
+
+            authenticationSession.initThreeDSSession(
+                clientSecret = paymentIntentClientSecret,
+                configuration = configuration
+            ) { result ->
+                when (result) {
+                    is ThreeDSResult.Success -> {
+                        service = result.value
+                        setStatus("✅ 3DS SDK initialized via Authentication SDK. Making API call to create authentication...")
+                        createAuthenticationApiCall()
+                    }
+                    is ThreeDSResult.Error -> {
+                        setStatus("❌ Error: ${result.message}")
+                        Log.e("ThreeDSTest", "Init error: ${result.error?.code}")
+                    }
+                }
+            }
+
+        } catch (e: Exception) {
+            setStatus("❌ Error initializing session: ${e.message}")
+            Log.e("ThreeDSTest", "Error in initializeAndCreateAuthentication", e)
+        }
+    }
+
+    private fun createAuthenticationApiCall() {
+        val requestBody = JSONObject().apply {
+            put("amount", 1050)
+            put("currency", "EUR")
+            put("acquirer_details", JSONObject().apply {
+                put("acquirer_merchant_id", "12134")
+                put("acquirer_bin", "438309")
+                put("merchant_country_code", "004")
+            })
+            put("authentication_connector", "juspaythreedsserver")
+        }
+
+        val request = Request.Builder()
+            .url("$baseUrl/authentication")
+            .post(requestBody.toString().toRequestBody("application/json".toMediaType()))
+            .addHeader("X-Profile-Id", profileId)
+            .addHeader("Content-Type", "application/json")
+            .addHeader("api-key", apiKey)
+            .build()
+
+        httpClient.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                runOnUiThread {
+                    setStatus("❌ API Error: ${e.message}")
+                }
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                val responseBody = response.body?.string()
+                response.close()
+
+                runOnUiThread {
+                    if (response.isSuccessful) {
+                        Log.d("ThreeDSTest", "Auth Create Response: $responseBody")
+                        try {
+                            val jsonResponse = JSONObject(responseBody ?: "")
+                            authenticationId = jsonResponse.getString("authentication_id")
+                            setStatus("✅ Authentication created successfully. ID: $authenticationId")
+                            // Now call eligibility API
+                            callEligibilityApiCall()
+                        } catch (e: Exception) {
+                            setStatus("❌ Error parsing response: ${e.message}")
+                        }
+                    } else {
+                        setStatus("❌ API Error: ${response.code} - ${response.message}")
+                    }
+                }
+            }
+        })
+    }
+
+    private fun callEligibilityApiCall() {
+        if (authenticationId == null) {
+            setStatus("❌ Error: Authentication ID is required for eligibility call")
+            return
+        }
+
+        setStatus("🔄 Making eligibility API call...")
+        // Create request body for eligibility check with proper structure
+        val requestBody = JSONObject().apply {
+            put("payment_method", "card")
+            put("payment_method_data", JSONObject().apply {
+                put("card", JSONObject().apply {
+                    put("card_number", "5522604003479299")
+                    put("card_exp_month", "02")
+                    put("card_exp_year", "30")
+                    put("card_holder_name", "joseph Doe")
+                    put("card_cvc", "666")
+                })
+            })
+            put ("payment_method_type","debit")
+            put("billing", JSONObject().apply {
+                put("address", JSONObject().apply {
+                    put("line1", "1467")
+                    put("line2", "Harrison Street")
+                    put("line3", "Harrison Street")
+                    put("city", "San Fransico")
+                    put("state", "CA")
+                    put("zip", "94122")
+                    put("country", "US")
+                    put("first_name", "PiX")
+                })
+                put("phone", JSONObject().apply {
+                    put("number", "123456789")
+                    put("country_code", "12")
+                })
+            })
+            put("shipping", JSONObject().apply {
+                put("address", JSONObject().apply {
+                    put("line1", "1467")
+                    put("line2", "Harrison Street")
+                    put("line3", "Harrison Street")
+                    put("city", "San Fransico")
+                    put("state", "California")
+                    put("zip", "94122")
+                    put("country", "US")
+                    put("first_name", "PiX")
+                })
+                put("phone", JSONObject().apply {
+                    put("number", "123456789")
+                    put("country_code", "12")
+                })
+            })
+            put("email", "sahkasssslplanet@gmail.com")
+            put("browser_information", JSONObject().apply {
+                put("user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36")
+                put("accept_header", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8")
+                put("language", "nl-NL")
+                put("color_depth", 24)
+                put("screen_height", 723)
+                put("screen_width", 1536)
+                put("time_zone", 0)
+                put("java_enabled", true)
+                put("java_script_enabled", true)
+                put("ip_address", "115.99.183.2")
+            })
+        }
+
+        val request = Request.Builder()
+            .url("$baseUrl/authentication/$authenticationId/eligibility")
+            .post(requestBody.toString().toRequestBody("application/json".toMediaType()))
+            .addHeader("Content-Type", "application/json")
+            .addHeader("api-key", apiKey)
+            .build()
+
+        httpClient.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                runOnUiThread {
+                    setStatus("❌ Eligibility API Error: ${e.message}")
+                }
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                val responseBody = response.body?.string()
+                response.close()
+
+                runOnUiThread {
+                    if (response.isSuccessful) {
+                        Log.d("ThreeDSTest", "Eligibility Response: $responseBody")
+                        try {
+                            val jsonResponse = JSONObject(responseBody ?: "")
+
+                            // Extract eligibility response data
+                            val eligibilityParams = jsonResponse.optJSONObject("eligibility_response_params")
+                            val threeDsData = eligibilityParams?.optJSONObject("ThreeDsData")
+
+                            if (threeDsData != null) {
+                                threeDsServerTransactionId = threeDsData.optString("three_ds_server_transaction_id")
+                                messageVersion = threeDsData.optString("message_version")
+                                directoryServerId = threeDsData.optString("directory_server_id")
+
+                                setStatus("✅ Eligibility completed - ready for transaction creation")
+                            } else {
+                                setStatus("✅ Eligibility completed - no 3DS data found")
+                            }
+                        } catch (e: Exception) {
+                            setStatus("❌ Error parsing eligibility response: ${e.message}")
+                        }
+                    } else {
+                        setStatus("❌ Eligibility API Error: ${response.code} - ${response.message}")
+                    }
+                }
+            }
+        })
+    }
+
+    private fun createTransactionAndGenerateAReq() {
+        try {
+            if (service == null) {
+                setStatus("❌ Error: Please initialize authentication service first")
+                return
+            }
+
+            if (authenticationId == null) {
+                setStatus("❌ Error: Please create authentication first")
+                return
+            }
+
+            setStatus("🔄 Creating transaction...")
+
+            // Clean callback pattern with when() statement
+            service!!.createTransaction(
+                directoryServerId = directoryServerId,
+                messageVersion = messageVersion ?: "2.2.0",
+                cardNetwork = "VISA"
+            ) { result ->
+                when (result) {
+                    is ThreeDSResult.Success -> {
+                        transaction = result.value
+                        setStatus("🔄 Generating AReq parameters...")
+
+                        // Get authentication request parameters
+                        transaction!!.getAuthenticationRequestParameters { paramsResult ->
+                            runOnUiThread {
+                                when (paramsResult) {
+                                    is ThreeDSResult.Success -> {
+                                        aReqParams = paramsResult.value
+                                        Log.d("areqqdemoapp", aReqParams.toString())
+                                        setStatus("✅ AReq generated - SDK Transaction ID: ${paramsResult.value.sdkTransactionID}")
+                                    }
+                                    is ThreeDSResult.Error -> {
+                                        setStatus("❌ Failed to generate AReq: ${paramsResult.message}")
+                                        Log.e("ThreeDSTest", "AReq error: ${paramsResult.error?.code}")
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    is ThreeDSResult.Error -> {
+                        setStatus("❌ Transaction creation failed: ${result.message}")
+                        Log.e("ThreeDSTest", "Transaction error: ${result.error?.code}")
+                    }
+                }
+            }
+
+        } catch (e: Exception) {
+            setStatus("❌ Error creating transaction: ${e.message}")
+            Log.e("ThreeDSTest", "Error in createTransactionAndGenerateAReq", e)
+        }
+    }
+
+    private fun makeAuthenticationApiCall() {
+        try {
+            if (authenticationId == null || aReqParams == null) {
+                setStatus("❌ Error: Please complete previous steps first")
+                return
+            }
+
+            setStatus("🔄 Making authentication API call...")
+
+            val requestBody = JSONObject().apply {
+                put("device_channel", "APP")
+                put("threeds_method_comp_ind", "N")
+                put("sdk_information", JSONObject().apply {
+                    put("sdk_app_id", aReqParams!!.sdkAppID)
+                    put("sdk_enc_data", aReqParams!!.deviceData) // Map deviceData to sdk_enc_data
+                    put("sdk_trans_id", aReqParams!!.sdkTransactionID)
+                    put("sdk_reference_number", aReqParams!!.sdkReferenceNumber)
+                    put("sdk_max_timeout", 5)
+
+                    // Parse and add sdk_ephem_pub_key if available
+                    aReqParams!!.sdkEphemeralPublicKey?.let { ephemeralKey ->
+                        try {
+                            val ephemeralKeyJson = JSONObject(ephemeralKey)
+                            put("sdk_ephem_pub_key", ephemeralKeyJson)
+                        } catch (e: Exception) {
+                            Log.w("ThreeDSTest", "Failed to parse sdkEphemeralPublicKey: ${e.message}")
+                        }
+                    }
+                })
+            }
+
+            val request = Request.Builder()
+                .url("$baseUrl/authentication/$authenticationId/authenticate")
+                .post(requestBody.toString().toRequestBody("application/json".toMediaType()))
+                .addHeader("Content-Type", "application/json")
+                .addHeader("api-key", apiKey)
+                .build()
+
+            httpClient.newCall(request).enqueue(object : Callback {
+                override fun onFailure(call: Call, e: IOException) {
+                    runOnUiThread {
+                        setStatus("❌ API Error: ${e.message}")
+                    }
+                }
+
+                override fun onResponse(call: Call, response: Response) {
+                    val responseBody = response.body?.string()
+                    response.close()
+
+                    runOnUiThread {
+                        if (response.isSuccessful) {
+                            Log.d("ThreeDSTest", "Auth Response: $responseBody")
+                            try {
+                                val jsonResponse = JSONObject(responseBody ?: "")
+                                val transStatus = jsonResponse.optString("trans_status", "")
+
+                                if (transStatus == "C") {
+                                    // Challenge required - extract challenge parameters
+                                    challengeParameters = ChallengeParameters(
+                                        threeDSServerTransactionId = jsonResponse.optString("three_ds_server_transaction_id", ""),
+                                        acsTransactionId = jsonResponse.optString("acs_trans_id", ""),
+                                        acsReferenceNumber = jsonResponse.optString("acs_reference_number", ""),
+                                        acsSignedContent = jsonResponse.optString("acs_signed_content", ""),
+                                        threeDSRequestorAppURL = jsonResponse.optString("three_ds_requestor_app_url", ""),
+                                        transStatus = transStatus
+                                    )
+                                    setStatus("✅ Challenge required - Status: $transStatus")
+                                } else {
+                                    setStatus("✅ Authentication completed - Status: $transStatus")
+                                }
+                            } catch (e: Exception) {
+                                setStatus("❌ Error parsing response: ${e.message}")
+                            }
+                        } else {
+                            setStatus("❌ API Error: ${response.code} - ${response.message}")
+                        }
+                    }
+                }
+            })
+
+        } catch (e: Exception) {
+            setStatus("❌ Error making authentication API call: ${e.message}")
+            Log.e("ThreeDSTest", "Error in makeAuthenticationApiCall", e)
+        }
+    }
+
+    private fun performChallenge() {
+        try {
+            if (service == null || transaction == null) {
+                setStatus("❌ Error: Please complete previous steps first")
+                return
+            }
+
+            // Check if challenge is required based on transaction status
+            if (challengeParameters != null && challengeParameters!!.transStatus == "C") {
+                setStatus("🔄 Challenge required, starting challenge flow...")
+
+                val challengeStatusReceiver = object : ChallengeStatusReceiver {
+                    override fun completed(completionEvent: CompletionEvent) {
+                        setStatus("✅ Challenge completed successfully - Transaction ID: ${completionEvent.transactionId}")
+                    }
+
+                    override fun cancelled() {
+                        setStatus("🚫 Challenge cancelled by user")
+                    }
+
+                    override fun timedout() {
+                        setStatus("⏰ Challenge timed out")
+                    }
+
+                    override fun protocolError(protocolErrorEvent: ProtocolErrorEvent) {
+                        setStatus("❌ Protocol error - Error: ${protocolErrorEvent.errorMessage.errorDescription}")
+                    }
+
+                    override fun runtimeError(runtimeErrorEvent: RuntimeErrorEvent) {
+                        setStatus("❌ Runtime error - Error: ${runtimeErrorEvent.errorMessage}")
+                    }
+                }
+
+                runOnUiThread {
+                    transaction!!.doChallenge(
+                        activity = this@MainActivity,
+                        challengeParameters = challengeParameters!!,
+                        challengeStatusReceiver = challengeStatusReceiver,
+                        timeout = 5
+                    )
+                }
+
+            } else {
+                val status = challengeParameters?.transStatus ?: "unknown"
+                setStatus("✅ No challenge required - Status: $status")
+            }
+
+        } catch (e: Exception) {
+            setStatus("❌ Error performing challenge: ${e.message}")
+            Log.e("ThreeDSTest", "Error in performChallenge", e)
+        }
+    }
+
+    private fun logDiscoveredProviders() {
+        try {
+            // Import ThreeDSManager to access provider info
+            val availableProviders = io.hyperswitch.threeds.ThreeDSManager.getAvailableProviders()
+            val providerInfo = io.hyperswitch.threeds.ThreeDSManager.getProviderInfo()
+
+            Log.d("ThreeDSTest", "=== Auto-Discovered 3DS Providers ===")
+            Log.d("ThreeDSTest", "Total providers found: ${availableProviders.size}")
+
+            providerInfo.forEach { info ->
+                Log.d("ThreeDSTest", "Provider: ${info.type.name}")
+                Log.d("ThreeDSTest", "  Version: ${info.version}")
+                Log.d("ThreeDSTest", "  Priority: ${info.priority}")
+                Log.d("ThreeDSTest", "  Features: ${info.supportedFeatures.joinToString(", ")}")
+            }
+
+            if (availableProviders.isEmpty()) {
+                Log.w("ThreeDSTest", "⚠️ No providers discovered! Check dependencies.")
+            } else {
+                Log.d("ThreeDSTest", "✅ Auto-discovery successful!")
+            }
+
+            Log.d("ThreeDSTest", "====================================")
+        } catch (e: Exception) {
+            Log.e("ThreeDSTest", "Error logging providers: ${e.message}", e)
+        }
+    }
+
+    private fun setStatus(message: String) {
+        runOnUiThread {
+            statusText.text = message
+            Log.d("ThreeDSTest", message)
+        }
+    }
+}
diff --git a/demo-app-threeds/src/main/res/drawable/ic_launcher_background.xml b/demo-app-threeds/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..07d5da9c
--- /dev/null
+++ b/demo-app-threeds/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/demo-app-threeds/src/main/res/drawable/ic_launcher_foreground.xml b/demo-app-threeds/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..2b068d11
--- /dev/null
+++ b/demo-app-threeds/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/demo-app-threeds/src/main/res/layout/activity_main.xml b/demo-app-threeds/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..e8ca1d98
--- /dev/null
+++ b/demo-app-threeds/src/main/res/layout/activity_main.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Unified 3DS Demo"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:layout_marginBottom="32dp" />
+
+    <TextView
+        android:id="@+id/statusText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Ready to test 3DS authentication"
+        android:textSize="16sp"
+        android:gravity="center"
+        android:layout_marginBottom="32dp"
+        android:minHeight="100dp" />
+
+    <Button
+        android:id="@+id/btnInit3DS"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="1. Initialize 3DS"
+        android:layout_marginBottom="8dp" />
+
+    <Button
+        android:id="@+id/btnGenerateAReq"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="2. Create Transaction &amp; Get AReq"
+        android:layout_marginBottom="8dp" />
+
+    <Button
+        android:id="@+id/btnReceiveChallenge"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="3. Make Authentication API Call"
+        android:layout_marginBottom="8dp" />
+
+    <Button
+        android:id="@+id/btnDoChallenge"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="4. Perform Challenge"
+        android:layout_marginBottom="8dp" />
+
+</LinearLayout>
diff --git a/demo-app-threeds/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo-app-threeds/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..6f3b755b
--- /dev/null
+++ b/demo-app-threeds/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/demo-app-threeds/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo-app-threeds/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..6f3b755b
--- /dev/null
+++ b/demo-app-threeds/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/demo-app-threeds/src/main/res/mipmap-hdpi/ic_launcher.webp b/demo-app-threeds/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 00000000..c209e78e
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/demo-app-threeds/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..b2dfe3d1
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-mdpi/ic_launcher.webp b/demo-app-threeds/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 00000000..4f0f1d64
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/demo-app-threeds/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..62b611da
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-xhdpi/ic_launcher.webp b/demo-app-threeds/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 00000000..948a3070
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/demo-app-threeds/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..1b9a6956
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/demo-app-threeds/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..28d4b77f
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/demo-app-threeds/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..9287f508
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/demo-app-threeds/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..aa7d6427
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/demo-app-threeds/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/demo-app-threeds/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..9126ae37
Binary files /dev/null and b/demo-app-threeds/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/demo-app-threeds/src/main/res/values/colors.xml b/demo-app-threeds/src/main/res/values/colors.xml
new file mode 100644
index 00000000..f8c6127d
--- /dev/null
+++ b/demo-app-threeds/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/demo-app-threeds/src/main/res/values/strings.xml b/demo-app-threeds/src/main/res/values/strings.xml
new file mode 100644
index 00000000..72d40e06
--- /dev/null
+++ b/demo-app-threeds/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">demo-app-threeDS</string>
+</resources>
\ No newline at end of file
diff --git a/demo-app-threeds/src/main/res/values/themes.xml b/demo-app-threeds/src/main/res/values/themes.xml
new file mode 100644
index 00000000..afd4556c
--- /dev/null
+++ b/demo-app-threeds/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Iohyperswitch" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
\ No newline at end of file
diff --git a/demo-app-threeds/src/test/java/io/hyperswitch/demo_app_threeds/ExampleUnitTest.kt b/demo-app-threeds/src/test/java/io/hyperswitch/demo_app_threeds/ExampleUnitTest.kt
new file mode 100644
index 00000000..14a78d1e
--- /dev/null
+++ b/demo-app-threeds/src/test/java/io/hyperswitch/demo_app_threeds/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package io.hyperswitch.demo_app_threeds
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/demo-app/build.gradle b/demo-app/build.gradle
index 340d3f17..f9b74748 100644
--- a/demo-app/build.gradle
+++ b/demo-app/build.gradle
@@ -7,7 +7,14 @@ plugins {
 android {
     namespace 'io.hyperswitch.demoapp'
     compileSdk rootProject.ext.compileSdkVersion
-
+    splits {
+        abi {
+            enable true
+            reset()
+            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            universalApk false // Don’t build the big one
+        }
+    }
     defaultConfig {
         applicationId "io.hyperswitch.demoapp"
         minSdk rootProject.ext.minSdkVersion
@@ -75,9 +82,14 @@ android {
 
 dependencies {
     implementation project(':app')
+    implementation project(':hyperswitch-sdk-android-threeDS-trident')
+
+//    implementation "io.hyperswitch:modular-3ds-api:1.0.0"
+//    implementation "io.hyperswitch:modular-3ds-trident:1.0.0"
+
     implementation libs.fuel
     implementation libs.kotlin.coroutines
     implementation libs.androidx.preference
     implementation 'org.slf4j:slf4j-nop:2.0.17'
     androidTestImplementation('com.wix:detox:+')
-}
\ No newline at end of file
+}
diff --git a/hyperswitch-sdk-android-authentication/build.gradle b/hyperswitch-sdk-android-authentication/build.gradle
index 091aaa9a..97490337 100644
--- a/hyperswitch-sdk-android-authentication/build.gradle
+++ b/hyperswitch-sdk-android-authentication/build.gradle
@@ -27,4 +27,5 @@ android {
 
 dependencies {
     api project(':hyperswitch-sdk-android-click-to-pay')
+    api project(':hyperswitch-sdk-android-threeDS')
 }
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/AuthenticationSession.kt b/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/AuthenticationSession.kt
index 697f0a5a..48e4da54 100644
--- a/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/AuthenticationSession.kt
+++ b/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/AuthenticationSession.kt
@@ -153,4 +153,21 @@ class AuthenticationSession(
             request3DSAuthentication
         )
     }
+
+    /**
+     * Initializes a 3DS authentication session.
+     * 
+     * Creates a ThreeDSAuthenticationSession and initializes it with the provided configuration.
+     *
+     * @param clientSecret The client secret from the payment intent
+     * @param configuration The 3DS configuration settings
+     * @param callback Callback with result containing the initialized ThreeDSService or error
+     */
+    fun initThreeDSSession(
+        clientSecret: String,
+        configuration: io.hyperswitch.threeds.models.ThreeDSConfiguration,
+        callback: (io.hyperswitch.threeds.api.ThreeDSResult<io.hyperswitch.threeds.api.ThreeDSService>) -> Unit
+    ) {
+        authenticationSessionLauncher.initThreeDSSession(clientSecret, configuration, callback)
+    }
 }
diff --git a/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/AuthenticationSessionLauncher.kt b/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/AuthenticationSessionLauncher.kt
index 12f6b476..c9abc68d 100644
--- a/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/AuthenticationSessionLauncher.kt
+++ b/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/AuthenticationSessionLauncher.kt
@@ -82,8 +82,13 @@ interface AuthenticationSessionLauncher {
      * This method sets up the necessary components for handling
      * 3D Secure authentication flows.
      *
-     * @throws Exception if 3DS session initialization fails
+     * @param clientSecret The client secret from the payment intent
+     * @param configuration The 3DS configuration settings
+     * @param callback Callback with result containing the initialized ThreeDSService or error
      */
-    @Throws(Exception::class)
-    suspend fun initThreeDSSession()
+    fun initThreeDSSession(
+        clientSecret: String,
+        configuration: io.hyperswitch.threeds.models.ThreeDSConfiguration,
+        callback: (io.hyperswitch.threeds.api.ThreeDSResult<io.hyperswitch.threeds.api.ThreeDSService>) -> Unit
+    )
 }
diff --git a/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/DefaultAuthenticationSessionLauncher.kt b/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/DefaultAuthenticationSessionLauncher.kt
index 93891f3a..90e69b58 100644
--- a/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/DefaultAuthenticationSessionLauncher.kt
+++ b/hyperswitch-sdk-android-authentication/src/main/kotlin/io/hyperswitch/authentication/DefaultAuthenticationSessionLauncher.kt
@@ -17,8 +17,8 @@ import io.hyperswitch.click_to_pay.ClickToPaySession
  * @property merchantId Stored merchant identifier
  */
 class DefaultAuthenticationSessionLauncher(
-    activity: Activity,
-    publishableKey: String,
+    private val activity: Activity,
+    private val publishableKey: String,
     customBackendUrl: String? = null,
     customLogUrl: String? = null,
     customParams: Bundle? = null,
@@ -127,9 +127,39 @@ class DefaultAuthenticationSessionLauncher(
 
     /**
      * Initializes a 3DS authentication session.
-     * 
-     * Currently a no-op placeholder for future 3DS functionality.
+     *
+     * @param clientSecret The client secret from the payment intent
+     * @param configuration The 3DS configuration settings
+     * @param callback Callback with result containing the initialized ThreeDSService or error
      */
-    @Throws(Exception::class)
-    override suspend fun initThreeDSSession() {}
+    override fun initThreeDSSession(
+        clientSecret: String,
+        configuration: io.hyperswitch.threeds.models.ThreeDSConfiguration,
+        callback: (io.hyperswitch.threeds.api.ThreeDSResult<io.hyperswitch.threeds.api.ThreeDSService>) -> Unit
+    ) {
+        try {
+            val threeDSSession = io.hyperswitch.threeds.api.ThreeDSAuthenticationSession(
+                activity = activity,
+                apiKey = publishableKey
+            )
+            
+            threeDSSession.initThreeDsSession(
+                clientSecret = clientSecret,
+                configuration = configuration,
+                callback = callback
+            )
+        } catch (e: Exception) {
+            callback(
+                io.hyperswitch.threeds.api.ThreeDSResult.Error(
+                    message = e.message ?: "Unknown error during 3DS initialization",
+                    error = io.hyperswitch.threeds.models.ThreeDSError(
+                        code = io.hyperswitch.threeds.models.ThreeDSError.INIT_EXCEPTION,
+                        message = e.message ?: "Unknown error",
+                        details = e.toString(),
+                        errorType = io.hyperswitch.threeds.models.ErrorType.INITIALIZATION_ERROR
+                    )
+                )
+            )
+        }
+    }
 }
diff --git a/hyperswitch-sdk-android-threeDS-trident/.gitignore b/hyperswitch-sdk-android-threeDS-trident/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS-trident/build.gradle b/hyperswitch-sdk-android-threeDS-trident/build.gradle
new file mode 100644
index 00000000..331000b6
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/build.gradle
@@ -0,0 +1,35 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'io.hyperswitch.threeds.trident'
+    compileSdk 36
+
+    defaultConfig {
+        minSdk 24
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    api(project(":hyperswitch-sdk-android-threeDS"))
+
+    implementation("in.juspay:trident:1.0.8-rc.04")
+    implementation("in.juspay:hypersmshandler:2.1.25")
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+}
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS-trident/consumer-rules.pro b/hyperswitch-sdk-android-threeDS-trident/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/hyperswitch-sdk-android-threeDS-trident/proguard-rules.pro b/hyperswitch-sdk-android-threeDS-trident/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS-trident/src/androidTest/java/io/hyperswitch/threeds/trident/ExampleInstrumentedTest.kt b/hyperswitch-sdk-android-threeDS-trident/src/androidTest/java/io/hyperswitch/threeds/trident/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..741bb635
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/src/androidTest/java/io/hyperswitch/threeds/trident/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package io.hyperswitch.threeds.trident
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("io.hyperswitch.threeds.trident.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS-trident/src/main/AndroidManifest.xml b/hyperswitch-sdk-android-threeDS-trident/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a5918e68
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentConfigurator.kt b/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentConfigurator.kt
new file mode 100644
index 00000000..195ed898
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentConfigurator.kt
@@ -0,0 +1,28 @@
+package io.hyperswitch.threeds.trident
+
+import `in`.juspay.trident.core.ConfigParameters
+
+/**
+ * Configurator class for Trident SDK configuration parameters.
+ * Similar to HsTridentConfigurator from the example.
+ */
+object TridentConfigurator {
+    
+    lateinit var configParams: ConfigParameters
+        private set
+    
+    /**
+     * Set up configuration parameters for Trident SDK.
+     * This should be called before initializing the SDK.
+     */
+    fun setConfigParameters() {
+        configParams = ConfigParameters()
+    }
+    
+    /**
+     * Check if configuration parameters have been set.
+     */
+    fun isConfigured(): Boolean {
+        return ::configParams.isInitialized
+    }
+}
diff --git a/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentProviderFactory.kt b/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentProviderFactory.kt
new file mode 100644
index 00000000..3c485c89
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentProviderFactory.kt
@@ -0,0 +1,49 @@
+package io.hyperswitch.threeds.trident
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.models.ThreeDSConfiguration
+import io.hyperswitch.threeds.models.ThreeDSProviderType
+import io.hyperswitch.threeds.provider.ProviderFactory
+import io.hyperswitch.threeds.provider.ThreeDSProvider
+
+/**
+ * Factory for creating Trident ThreeDSProvider instances.
+ * This factory is automatically discovered and registered by the provider registry.
+ */
+@Keep
+class TridentProviderFactory : ProviderFactory {
+    
+    override fun getProviderType(): ThreeDSProviderType = ThreeDSProviderType.TRIDENT
+    
+    override fun getProviderVersion(): String = "1.0.8-rc.04"
+    
+    override fun getSupportedFeatures(): List<String> {
+        return listOf("3DS2", "frictionless", "challenge", "app-based")
+    }
+    
+    override fun createProvider(): ThreeDSProvider {
+        return TridentThreeDSProvider()
+    }
+    
+    override fun isAvailable(): Boolean {
+        return try {
+            // Check if Trident SDK classes are available
+            Class.forName("in.juspay.trident.core.ThreeDS2Service")
+            true
+        } catch (e: ClassNotFoundException) {
+            false
+        } catch (e: Exception) {
+            false
+        }
+    }
+    
+    override fun supportsConfiguration(configuration: ThreeDSConfiguration): Boolean {
+        // Check if this factory can create a provider that supports the given configuration
+        return isAvailable() && TridentThreeDSProvider().supportsConfiguration(configuration)
+    }
+    
+    override fun getPriority(): Int {
+        // Higher priority than mock provider, but can be adjusted based on preference
+        return 100
+    }
+}
diff --git a/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentThreeDSProvider.kt b/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentThreeDSProvider.kt
new file mode 100644
index 00000000..dc85cc11
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/src/main/java/io/hyperswitch/threeds/trident/TridentThreeDSProvider.kt
@@ -0,0 +1,426 @@
+package io.hyperswitch.threeds.trident
+
+import android.app.Activity
+import android.content.Context
+import android.util.Log
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.callbacks.AuthParametersCallback
+import io.hyperswitch.threeds.callbacks.ChallengeCallback
+import io.hyperswitch.threeds.callbacks.InitializationCallback
+import io.hyperswitch.threeds.callbacks.TransactionCallback
+import io.hyperswitch.threeds.models.*
+import io.hyperswitch.threeds.provider.ThreeDSProvider
+import `in`.juspay.trident.core.FileHelper
+import `in`.juspay.trident.core.Logger
+import `in`.juspay.trident.core.SdkHelper
+import `in`.juspay.trident.core.ThreeDS2Service
+import `in`.juspay.trident.core.Transaction
+import `in`.juspay.trident.data.ChallengeParameters as TridentChallengeParameters
+import `in`.juspay.trident.data.ChallengeStatusReceiver
+import `in`.juspay.trident.data.CompletionEvent
+import `in`.juspay.trident.data.ProtocolErrorEvent
+import `in`.juspay.trident.data.RuntimeErrorEvent
+import org.json.JSONObject
+import java.util.concurrent.ConcurrentHashMap
+
+
+/**
+ * Trident implementation of ThreeDSProvider using Juspay's Trident SDK.
+ * Provides 3DS authentication capabilities through the Trident SDK.
+ */
+@Keep
+class TridentThreeDSProvider : ThreeDSProvider {
+
+    private var isInitialized = false
+    private var configuration: ThreeDSConfiguration? = null
+    private var threeDS2Service: ThreeDS2Service? = null
+    @Volatile
+    private var currentTransaction: Transaction? = null
+    private var context: Context? = null
+    private val transactions = ConcurrentHashMap<String, Transaction>()
+
+    // SDK Helper implementation
+    private val sdkHelper = object : SdkHelper {
+        override val logger = object : Logger {
+            override fun addLogToPersistedQueue(logLine: JSONObject) {
+                // Log to persistent queue if needed
+            }
+
+            override fun track(logLine: JSONObject) {
+                // Track logs if needed
+                Log.d("logg",logLine.toString())
+            }
+        }
+
+        override val fileHelper = object : FileHelper {
+            override fun renewFile(endpoint: String, fileName: String, startTime: Long) {
+                // Renew file if needed
+            }
+
+            override fun readFromFile(fileName: String): String {
+                return fileName
+            }
+        }
+    }
+
+    override fun initialize(
+        context: Context,
+        configuration: ThreeDSConfiguration,
+        callback: InitializationCallback
+    ) {
+        this.configuration = configuration
+        this.context = context
+
+        try {
+            // Create Trident SDK instance with helper
+            threeDS2Service = ThreeDS2Service.createNewInstance(sdkHelper)
+
+            // Set up configuration parameters
+            TridentConfigurator.setConfigParameters()
+
+            // Initialize Trident SDK with context and proper config parameters
+            threeDS2Service?.initialise(context, TridentConfigurator.configParams, "en-US", null)
+
+            Log.d("TridentProvider", "Trident SDK initialized successfully")
+
+            // Mark as initialized only after successful initialization
+            isInitialized = true
+            callback.onInitializationSuccess()
+
+        } catch (e: Exception) {
+            // Check if it's already initialized - this is acceptable
+            if (e.message?.contains("ThreeDS2Service is already initialized", ignoreCase = true) == true) {
+                Log.d("TridentProvider", "Trident SDK already initialized")
+                isInitialized = true
+                callback.onInitializationSuccess()
+            } else {
+                Log.e("TridentProvider", "Failed to initialize Trident SDK: ${e.message}")
+                isInitialized = false
+                callback.onInitializationFailure(
+                    ThreeDSError(
+                        code = ThreeDSError.INIT_FAILED,
+                        message = "Failed to initialize Trident SDK: ${e.message}",
+                        details = e.toString(),
+                        errorType = ErrorType.PROVIDER_ERROR
+                    )
+                )
+            }
+        }
+    }
+
+    /**
+     * Check if the Trident SDK is properly initialized and ready for transactions
+     */
+    private fun isTridentSDKReady(): Boolean {
+        return threeDS2Service != null && context != null && isInitialized
+    }
+
+    override fun isInitialized(): Boolean = isInitialized
+
+    override fun getSDKVersion(): String {
+        return threeDS2Service?.getSDKVersion() ?: "trident-1.0.8-rc.04"
+    }
+
+    override fun getProviderType(): ThreeDSProviderType =
+        ThreeDSProviderType.TRIDENT
+
+    override fun createTransaction(
+        request: TransactionRequest,
+        callback: TransactionCallback
+    ) {
+        if (!isTridentSDKReady()) {
+            val errorMessage = when {
+                !isInitialized -> "Provider not initialized"
+                threeDS2Service == null -> "ThreeDS2Service is null - SDK service not properly initialized"
+                context == null -> "Context not set - Call initializeWithContext() first"
+                else -> "Trident SDK not ready for transactions"
+            }
+
+            callback.onTransactionFailure(
+                ThreeDSError(
+                    code = ThreeDSError.SDK_NOT_READY,
+                    message = errorMessage,
+                    details = "Ensure provider is initialized and context is set before creating transactions",
+                    errorType = ErrorType.PROVIDER_ERROR
+                )
+            )
+            return
+        }
+
+        try {
+            // Get directory server ID based on card network
+            val directoryServerId = when (request.cardNetwork?.uppercase()) {
+                "VISA" -> ThreeDS2Service.getDirectoryServerId("VISA")
+                "MASTERCARD", "MC" -> ThreeDS2Service.getDirectoryServerId("MASTERCARD")
+                "AMEX", "AMERICAN_EXPRESS" -> ThreeDS2Service.getDirectoryServerId("AMEX")
+                else -> ThreeDS2Service.getDirectoryServerId("VISA") // Default to VISA
+            }
+
+            Log.d("TridentProvider", "Creating transaction with directory server ID: $directoryServerId, message version: ${request.messageVersion}")
+
+            // Create transaction using Trident SDK with callback
+            threeDS2Service?.createTransaction(
+                directoryServerID = directoryServerId,
+                messageVersion = request.messageVersion,
+                onTransaction = { sdkTransaction ->
+                    Log.d("TridentProvider", "Transaction created successfully")
+                    currentTransaction = sdkTransaction
+
+                    // Store transaction for later retrieval
+                    val transactionId = "txn_${System.currentTimeMillis()}"
+                    transactions[transactionId] = sdkTransaction
+
+                    // Get authentication request parameters immediately
+                    val aReq = sdkTransaction.getAuthenticationRequestParameters()
+
+                    if (aReq != null) {
+                        Log.d("TridentProvider", "Authentication request parameters obtained successfully")
+                        callback.onTransactionSuccess(
+                            TransactionResponse(
+                                transactionId = transactionId,
+                                sdkTransactionId = aReq.sdkTransactionID,
+                                serverTransactionId = aReq.sdkTransactionID, // Use SDK transaction ID as server transaction ID
+                                acsTransactionId = null,
+                                dsTransactionId = null,
+                                messageVersion = request.messageVersion,
+                                deviceData = aReq.deviceData,
+                                sdkAppId = aReq.sdkAppID,
+                                sdkEncryptionData = "", // Not available in Trident SDK
+//                                sdkEphemeralPublicKey = transformEphemeralKeyJson(aReq.sdkEphemeralPublicKey)?:"",
+                                sdkEphemeralPublicKey = aReq.sdkEphemeralPublicKey?:"",
+
+                                sdkReferenceNumber = aReq.sdkReferenceNumber
+                            )
+                        )
+                    } else {
+                        Log.e("TridentProvider", "Authentication request parameters were null")
+                        callback.onTransactionFailure(
+                            ThreeDSError(
+                                code = ThreeDSError.TRANSACTION_FAILED,
+                                message = "Failed to get authentication parameters",
+                                details = "Authentication request parameters were null",
+                                errorType = ErrorType.PROVIDER_ERROR
+                            )
+                        )
+                    }
+                }
+            )
+
+        } catch (e: Exception) {
+            Log.e("TridentProvider", "Exception in createTransaction: ${e.message}", e)
+            callback.onTransactionFailure(
+                ThreeDSError(
+                    code = ThreeDSError.TRANSACTION_ERROR,
+                    message = "Transaction creation error: ${e.message}",
+                    details = e.toString(),
+                    errorType = ErrorType.PROVIDER_ERROR
+                )
+            )
+        }
+    }
+
+    override fun getAuthenticationRequestParameters(
+        transactionId: String,
+        callback: AuthParametersCallback
+    ) {
+        if (!isInitialized) {
+            callback.onAuthParametersFailure(
+                ThreeDSError(
+                    code = ThreeDSError.NOT_INITIALIZED,
+                    message = "Provider not initialized",
+                    details = null,
+                    errorType = ErrorType.PROVIDER_ERROR
+                )
+            )
+            return
+        }
+
+        try {
+            // Get the transaction by ID from our stored transactions
+            val transaction = transactions[transactionId] ?: currentTransaction
+
+            if (transaction != null) {
+                val result = transaction.getAuthenticationRequestParameters()
+                if (result != null) {
+                    callback.onAuthParametersSuccess(
+                        AuthenticationParameters(
+                            deviceData = result.deviceData,
+                            sdkTransactionId = result.sdkTransactionID,
+                            sdkAppId = result.sdkAppID,
+                            sdkEncryptionData = "", // Not available in Trident SDK
+//                            sdkEphemeralPublicKey =  transformEphemeralKeyJson(result.sdkEphemeralPublicKey) ?: "",
+                            sdkEphemeralPublicKey =  result.sdkEphemeralPublicKey ?: "",
+
+                            sdkReferenceNumber = result.sdkReferenceNumber,
+                            messageVersion = result.messageVersion,
+                            threeDSCompInd = "Y"
+                        )
+                    )
+                } else {
+                    callback.onAuthParametersFailure(
+                        ThreeDSError(
+                            code = ThreeDSError.AUTH_PARAMS_FAILED,
+                            message = "Failed to get authentication parameters",
+                            details = "Trident SDK returned null parameters",
+                            errorType = ErrorType.PROVIDER_ERROR
+                        )
+                    )
+                }
+            } else {
+                callback.onAuthParametersFailure(
+                    ThreeDSError(
+                        code = ThreeDSError.TRANSACTION_NOT_FOUND,
+                        message = "Transaction not found",
+                        details = "No transaction found with ID: $transactionId",
+                        errorType = ErrorType.PROVIDER_ERROR
+                    )
+                )
+            }
+
+        } catch (e: Exception) {
+            callback.onAuthParametersFailure(
+                ThreeDSError(
+                    code = ThreeDSError.AUTH_PARAMS_ERROR,
+                    message = "Authentication parameters error: ${e.message}",
+                    details = e.toString(),
+                    errorType = ErrorType.PROVIDER_ERROR
+                )
+            )
+        }
+    }
+
+    override fun doChallenge(
+        activity: Activity,
+        parameters: ChallengeParameters,
+        timeout: Int,
+        callback: ChallengeCallback
+    ) {
+        if (!isInitialized) {
+            callback.onChallengeFailure(
+                ThreeDSError(
+                    code = ThreeDSError.NOT_INITIALIZED,
+                    message = "Provider not initialized",
+                    details = null,
+                    errorType = ErrorType.PROVIDER_ERROR
+                )
+            )
+            return
+        }
+
+        try {
+            // Use current transaction for challenge
+            val transaction = currentTransaction
+
+            if (transaction != null) {
+                // Create Trident challenge parameters using the correct constructor
+                val tridentChallengeParams = TridentChallengeParameters(
+                    threeDSServerTransactionID = parameters.threeDSServerTransactionId ?: "",
+                    acsTransactionID = parameters.acsTransactionId ?: "",
+                    acsRefNumber = parameters.acsReferenceNumber ?: "",
+                    acsSignedContent = parameters.acsSignedContent ?: "",
+                    threeDSRequestorAppURL = parameters.threeDSRequestorAppURL
+                )
+                
+                // Create challenge status receiver
+                val challengeStatusReceiver = object : ChallengeStatusReceiver {
+                    override fun completed(completionEvent: CompletionEvent) {
+                        callback.onChallengeSuccess(
+                            ChallengeResult(
+                                transactionId = completionEvent.sdkTransactionId ?: "",
+                                status = AuthenticationStatus.Y,
+                                authenticationValue = completionEvent.transactionStatus ?: "",
+                                eci = completionEvent.transactionStatus ?: ""
+                            )
+                        )
+                    }
+
+                    override fun cancelled() {
+                        callback.onChallengeCancelled()
+                    }
+
+                    override fun timedout() {
+                        callback.onChallengeFailure(
+                            ThreeDSError(
+                                code = ThreeDSError.CHALLENGE_TIMEOUT,
+                                message = "Challenge timed out",
+                                details = "Challenge flow timed out",
+                                errorType = ErrorType.CHALLENGE_ERROR
+                            )
+                        )
+                    }
+
+                    override fun protocolError(protocolErrorEvent: ProtocolErrorEvent) {
+                        callback.onChallengeFailure(
+                            ThreeDSError(
+                                code = ThreeDSError.PROTOCOL_ERROR,
+                                message = "Protocol error during challenge",
+                                details = protocolErrorEvent.errorMessage?.errorDescription ?: "Unknown protocol error",
+                                errorType = ErrorType.CHALLENGE_ERROR
+                            )
+                        )
+                    }
+
+                    override fun runtimeError(runtimeErrorEvent: RuntimeErrorEvent) {
+                        callback.onChallengeFailure(
+                            ThreeDSError(
+                                code = ThreeDSError.RUNTIME_ERROR,
+                                message = "Runtime error during challenge",
+                                details = runtimeErrorEvent.errorMessage ?: "Unknown runtime error",
+                                errorType = ErrorType.CHALLENGE_ERROR
+                            )
+                        )
+                    }
+                }
+
+                // Use timeout parameter directly (already in minutes)
+                val timeoutInMinutes = timeout.coerceAtLeast(5)
+                transaction.doChallenge(
+                    activity,
+                    tridentChallengeParams,
+                    challengeStatusReceiver,
+                    timeoutInMinutes,
+                    "{}" // bankDetails
+                )
+
+            } else {
+                callback.onChallengeFailure(
+                    ThreeDSError(
+                        code = ThreeDSError.TRANSACTION_NOT_FOUND,
+                        message = "Transaction not found for challenge",
+                        details = "No current transaction available",
+                        errorType = ErrorType.PROVIDER_ERROR
+                    )
+                )
+            }
+
+        } catch (e: Exception) {
+            callback.onChallengeFailure(
+                ThreeDSError(
+                    code = ThreeDSError.CHALLENGE_ERROR,
+                    message = "Challenge error: ${e.message}",
+                    details = e.toString(),
+                    errorType = ErrorType.PROVIDER_ERROR
+                )
+            )
+        }
+    }
+
+    override fun cleanup() {
+        try {
+            // Cleanup Trident SDK resources
+            transactions.clear()
+            currentTransaction = null
+            threeDS2Service = null
+            context = null
+            isInitialized = false
+            configuration = null
+        } catch (e: Exception) {
+            // Log cleanup error but don't throw
+            Log.w("TridentProvider", "Error during cleanup: ${e.message}")
+        }
+    }
+
+    override fun supportsConfiguration(configuration: ThreeDSConfiguration): Boolean {
+        return true
+    }
+}
diff --git a/hyperswitch-sdk-android-threeDS-trident/src/test/java/io/hyperswitch/threeds/trident/ExampleUnitTest.kt b/hyperswitch-sdk-android-threeDS-trident/src/test/java/io/hyperswitch/threeds/trident/ExampleUnitTest.kt
new file mode 100644
index 00000000..20175992
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS-trident/src/test/java/io/hyperswitch/threeds/trident/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package io.hyperswitch.threeds.trident
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS/.gitignore b/hyperswitch-sdk-android-threeDS/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS/build.gradle b/hyperswitch-sdk-android-threeDS/build.gradle
new file mode 100644
index 00000000..6065367e
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/build.gradle
@@ -0,0 +1,31 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'io.hyperswitch.threeds'
+    compileSdk 36
+
+    defaultConfig {
+        minSdk 24
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.10.1")
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+}
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS/consumer-rules.pro b/hyperswitch-sdk-android-threeDS/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/hyperswitch-sdk-android-threeDS/proguard-rules.pro b/hyperswitch-sdk-android-threeDS/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS/src/androidTest/java/io/hyperswitch/threeds/ExampleInstrumentedTest.kt b/hyperswitch-sdk-android-threeDS/src/androidTest/java/io/hyperswitch/threeds/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..de3a4bbe
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/androidTest/java/io/hyperswitch/threeds/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package io.hyperswitch.threeds
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("io.hyperswitch.threeds.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS/src/main/AndroidManifest.xml b/hyperswitch-sdk-android-threeDS/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a5918e68
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/ThreeDSManager.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/ThreeDSManager.kt
new file mode 100644
index 00000000..85c87c60
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/ThreeDSManager.kt
@@ -0,0 +1,276 @@
+package io.hyperswitch.threeds
+
+import android.content.Context
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.callbacks.AuthParametersCallback
+import io.hyperswitch.threeds.callbacks.ChallengeCallback
+import io.hyperswitch.threeds.callbacks.InitializationCallback
+import io.hyperswitch.threeds.callbacks.TransactionCallback
+import io.hyperswitch.threeds.models.*
+import io.hyperswitch.threeds.provider.ProviderRegistry
+import io.hyperswitch.threeds.provider.ThreeDSProvider
+
+/**
+ * Main entry point for the Hyperswitch 3DS library.
+ * Provides a unified API for 3DS authentication across different providers.
+ */
+@Keep
+class ThreeDSManager private constructor() {
+    
+    private var currentProvider: ThreeDSProvider? = null
+    private var configuration: ThreeDSConfiguration? = null
+    private var isInitialized = false
+    
+    companion object {
+        @Volatile
+        private var INSTANCE: ThreeDSManager? = null
+        
+        /**
+         * Get the singleton instance of ThreeDSManager.
+         */
+        @Keep
+        @JvmStatic
+        fun getInstance(): ThreeDSManager {
+            return INSTANCE ?: synchronized(this) {
+                INSTANCE ?: ThreeDSManager().also { INSTANCE = it }
+            }
+        }
+        
+        /**
+         * Get list of available provider types.
+         */
+        @Keep
+        @JvmStatic
+        fun getAvailableProviders(): List<io.hyperswitch.threeds.models.ThreeDSProviderType> {
+            return ProviderRegistry.getAvailableProviders()
+                .filter { it.isAvailable() }
+                .map { it.getProviderType() }
+        }
+        
+        /**
+         * Get detailed information about available providers.
+         */
+        @Keep
+        @JvmStatic
+        fun getProviderInfo(): List<ProviderInfo> {
+            return ProviderRegistry.getAvailableProviders()
+                .filter { it.isAvailable() }
+                .map { factory ->
+                    ProviderInfo(
+                        type = factory.getProviderType(),
+                        version = factory.getProviderVersion(),
+                        priority = factory.getPriority(),
+                        supportedFeatures = factory.getSupportedFeatures()
+                    )
+                }
+        }
+    }
+    
+    /**
+     * Initialize the 3DS manager with the given configuration.
+     * This will automatically select the best available provider.
+     */
+    @Keep
+    fun initialize(
+        context: Context,
+        configuration: ThreeDSConfiguration,
+        callback: InitializationCallback
+    ) {
+        try {
+            this.configuration = configuration
+            
+            // Select provider based on configuration
+            val provider = selectProvider(configuration)
+            if (provider == null) {
+                callback.onInitializationFailure(
+                    ThreeDSError(
+                        code = ThreeDSError.NO_PROVIDER,
+                        message = "No suitable 3DS provider found",
+                        details = "Available providers: ${getAvailableProviders()}",
+                        errorType = ErrorType.CONFIGURATION_ERROR
+                    )
+                )
+                return
+            }
+            
+            currentProvider = provider
+            
+            // Initialize the selected provider with context
+            provider.initialize(context, configuration, object : InitializationCallback {
+                override fun onInitializationSuccess() {
+                    isInitialized = true
+                    callback.onInitializationSuccess()
+                }
+                
+                override fun onInitializationFailure(error: ThreeDSError) {
+                    isInitialized = false
+                    currentProvider = null
+                    callback.onInitializationFailure(error)
+                }
+            })
+            
+        } catch (e: Exception) {
+            callback.onInitializationFailure(
+                ThreeDSError(
+                    code = ThreeDSError.INIT_EXCEPTION,
+                    message = "Initialization failed with exception",
+                    details = e.message,
+                    errorType = ErrorType.INITIALIZATION_ERROR
+                )
+            )
+        }
+    }
+    
+    /**
+     * Create a 3DS transaction.
+     * This is the first step in the 3DS authentication flow.
+     */
+    @Keep
+    fun createTransaction(
+        request: TransactionRequest,
+        callback: TransactionCallback
+    ) {
+        val provider = currentProvider
+        if (provider == null || !isInitialized) {
+            callback.onTransactionFailure(
+                ThreeDSError(
+                    code = ThreeDSError.NOT_INITIALIZED,
+                    message = "ThreeDSManager is not initialized",
+                    details = "Call initialize() first",
+                    errorType = ErrorType.CONFIGURATION_ERROR
+                )
+            )
+            return
+        }
+        
+        provider.createTransaction(request, callback)
+    }
+    
+    /**
+     * Get authentication request parameters for the transaction.
+     * These parameters are sent to the 3DS Server for authentication.
+     */
+    @Keep
+    fun getAuthenticationRequestParameters(
+        transactionId: String,
+        callback: AuthParametersCallback
+    ) {
+        val provider = currentProvider
+        if (provider == null || !isInitialized) {
+            callback.onAuthParametersFailure(
+                ThreeDSError(
+                    code = ThreeDSError.NOT_INITIALIZED,
+                    message = "ThreeDSManager is not initialized",
+                    details = "Call initialize() first",
+                    errorType = ErrorType.CONFIGURATION_ERROR
+                )
+            )
+            return
+        }
+        
+        provider.getAuthenticationRequestParameters(transactionId, callback)
+    }
+    
+    /**
+     * Handle challenge flow when required by the issuer.
+     * This is the 4th core function in the 3DS flow.
+     * 
+     * @param activity Activity context for showing challenge UI
+     * @param parameters Challenge parameters from backend
+     * @param timeout Timeout in minutes (minimum 5)
+     * @param callback Challenge completion callback
+     */
+    @Keep
+    fun doChallenge(
+        activity: android.app.Activity,
+        parameters: ChallengeParameters,
+        timeout: Int,
+        callback: ChallengeCallback
+    ) {
+        val provider = currentProvider
+        if (provider == null || !isInitialized) {
+            callback.onChallengeFailure(
+                ThreeDSError(
+                    code = ThreeDSError.NOT_INITIALIZED,
+                    message = "ThreeDSManager is not initialized",
+                    details = "Call initialize() first",
+                    errorType = ErrorType.CONFIGURATION_ERROR
+                )
+            )
+            return
+        }
+        
+        provider.doChallenge(activity, parameters, timeout, callback)
+    }
+    
+    
+    /**
+     * Get the currently active provider type.
+     */
+    @Keep
+    fun getCurrentProvider(): io.hyperswitch.threeds.models.ThreeDSProviderType? {
+        return currentProvider?.getProviderType()
+    }
+    
+    /**
+     * Get the currently active provider instance.
+     * This is used internally by the unified API for provider-specific operations.
+     */
+    @Keep
+    fun getCurrentProviderInstance(): ThreeDSProvider? {
+        return currentProvider
+    }
+    
+    /**
+     * Check if the manager is initialized and ready to use.
+     */
+    @Keep
+    fun isInitialized(): Boolean {
+        return isInitialized && currentProvider?.isInitialized() == true
+    }
+    
+    /**
+     * Clean up resources and reset the manager.
+     */
+    @Keep
+    fun cleanup() {
+        currentProvider?.cleanup()
+        currentProvider = null
+        configuration = null
+        isInitialized = false
+    }
+    
+    /**
+     * Select the best provider based on configuration and availability.
+     */
+    private fun selectProvider(configuration: ThreeDSConfiguration): ThreeDSProvider? {
+        val availableFactories = ProviderRegistry.getAvailableProviders()
+            .filter { it.isAvailable() && it.supportsConfiguration(configuration) }
+        
+        if (availableFactories.isEmpty()) {
+            return null
+        }
+        
+        // If preferred provider is specified, try to use it
+        configuration.preferredProvider?.let { preferredType ->
+            availableFactories.find { it.getProviderType() == preferredType }
+                ?.let { return it.createProvider() }
+        }
+        
+        // Otherwise, select by priority
+        return availableFactories
+            .maxByOrNull { it.getPriority() }
+            ?.createProvider()
+    }
+}
+
+/**
+ * Information about a 3DS provider.
+ */
+@Keep
+data class ProviderInfo(
+    @Keep val type: io.hyperswitch.threeds.models.ThreeDSProviderType,
+    @Keep val version: String,
+    @Keep val priority: Int,
+    @Keep val supportedFeatures: List<String>
+)
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/AuthenticationRequestParameters.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/AuthenticationRequestParameters.kt
new file mode 100644
index 00000000..5b4bd6c4
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/AuthenticationRequestParameters.kt
@@ -0,0 +1,14 @@
+package io.hyperswitch.threeds.api
+
+/**
+ * Authentication request parameters for 3DS
+ * Note: Some fields are nullable as not all 3DS providers expose them separately.
+ * For example, Cardinal bundles sdkAppID and sdkReferenceNumber in the encrypted device data.
+ */
+data class AuthenticationRequestParameters(
+    val sdkTransactionID: String,
+    val sdkAppID: String?,
+    val sdkReferenceNumber: String?,
+    val sdkEphemeralPublicKey: String?,
+    val deviceData: String
+)
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/AuthenticationResult.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/AuthenticationResult.kt
new file mode 100644
index 00000000..af679afa
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/AuthenticationResult.kt
@@ -0,0 +1,16 @@
+package io.hyperswitch.threeds.api
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.models.ThreeDSError
+
+/**
+ * Result of 3DS operations.
+ * Simple sealed class for clean when() statements.
+ */
+@Keep
+sealed class ThreeDSResult<out T> {
+    @Keep
+    data class Success<T>(val value: T) : ThreeDSResult<T>()
+    @Keep
+    data class Error(val message: String, val error: ThreeDSError? = null) : ThreeDSResult<Nothing>()
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ChallengeEvents.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ChallengeEvents.kt
new file mode 100644
index 00000000..90010a2b
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ChallengeEvents.kt
@@ -0,0 +1,40 @@
+package io.hyperswitch.threeds.api
+
+/**
+ * Challenge completion event
+ */
+data class CompletionEvent(
+    val transactionId: String
+)
+
+/**
+ * Protocol error event during challenge
+ */
+data class ProtocolErrorEvent(
+    val errorMessage: ErrorMessage
+)
+
+/**
+ * Runtime error event during challenge
+ */
+data class RuntimeErrorEvent(
+    val errorMessage: String
+)
+
+/**
+ * Error message details
+ */
+data class ErrorMessage(
+    val errorDescription: String
+)
+
+/**
+ * Challenge status receiver interface
+ */
+interface ChallengeStatusReceiver {
+    fun completed(completionEvent: CompletionEvent)
+    fun cancelled()
+    fun timedout()
+    fun protocolError(protocolErrorEvent: ProtocolErrorEvent)
+    fun runtimeError(runtimeErrorEvent: RuntimeErrorEvent)
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSAuthenticationSession.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSAuthenticationSession.kt
new file mode 100644
index 00000000..641314c0
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSAuthenticationSession.kt
@@ -0,0 +1,47 @@
+package io.hyperswitch.threeds.api
+
+import android.app.Activity
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.ThreeDSManager
+import io.hyperswitch.threeds.callbacks.InitializationCallback
+import io.hyperswitch.threeds.models.ThreeDSConfiguration
+import io.hyperswitch.threeds.models.ThreeDSError
+
+/**
+ * Main entry point for 3DS authentication.
+ * Merchants create this with their Activity and API key, then initialize a session.
+ */
+@Keep
+class ThreeDSAuthenticationSession(
+    private val activity: Activity,
+    private val apiKey: String
+) {
+    
+    private val threeDSManager = ThreeDSManager.getInstance()
+    
+    /**
+     * Initialize a 3DS session with the given configuration.
+     * 
+     * @param clientSecret The client secret for authentication
+     * @param configuration The 3DS configuration
+     * @param callback Callback with ThreeDSResult containing the initialized service
+     *
+     */
+    @Keep
+    fun initThreeDsSession(
+        clientSecret: String,
+        configuration: ThreeDSConfiguration,
+        callback: (ThreeDSResult<ThreeDSService>) -> Unit
+    ) {
+        threeDSManager.initialize(activity, configuration, object : InitializationCallback {
+            override fun onInitializationSuccess() {
+                val service = ThreeDSService(threeDSManager)
+                callback(ThreeDSResult.Success(service))
+            }
+            
+            override fun onInitializationFailure(error: ThreeDSError) {
+                callback(ThreeDSResult.Error(error.message, error))
+            }
+        })
+    }
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSService.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSService.kt
new file mode 100644
index 00000000..71b475ce
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSService.kt
@@ -0,0 +1,49 @@
+package io.hyperswitch.threeds.api
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.ThreeDSManager
+import io.hyperswitch.threeds.callbacks.TransactionCallback
+import io.hyperswitch.threeds.models.ThreeDSError
+import io.hyperswitch.threeds.models.TransactionRequest
+
+/**
+ * 3DS Service for creating transactions.
+ * Returned after successful SDK initialization.
+ * Use this to create 3DS transactions.
+ */
+@Keep
+class ThreeDSService internal constructor(
+    private val threeDSManager: ThreeDSManager
+) {
+    
+    /**
+     * @param directoryServerId The directory server ID (optional)
+     * @param messageVersion The 3DS message version (e.g., "2.2.0")
+     * @param cardNetwork The card network (e.g., "VISA", "MASTERCARD")
+     * @param callback Callback with ThreeDSResult
+     */
+    @Keep
+    fun createTransaction(
+        directoryServerId: String?,
+        messageVersion: String,
+        cardNetwork: String,
+        callback: (ThreeDSResult<ThreeDSTransaction>) -> Unit
+    ) {
+        val transactionRequest = TransactionRequest(
+            messageVersion = messageVersion,
+            directoryServerId = directoryServerId,
+            cardNetwork = cardNetwork
+        )
+        
+        threeDSManager.createTransaction(transactionRequest, object : TransactionCallback {
+            override fun onTransactionSuccess(response: io.hyperswitch.threeds.models.TransactionResponse) {
+                val transaction = ThreeDSTransaction(response.transactionId, threeDSManager)
+                callback(ThreeDSResult.Success(transaction))
+            }
+            
+            override fun onTransactionFailure(error: ThreeDSError) {
+                callback(ThreeDSResult.Error(error.message, error))
+            }
+        })
+    }
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSTransaction.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSTransaction.kt
new file mode 100644
index 00000000..4cdd7720
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/api/ThreeDSTransaction.kt
@@ -0,0 +1,100 @@
+package io.hyperswitch.threeds.api
+
+import android.app.Activity
+import android.os.Looper
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.ThreeDSManager
+import io.hyperswitch.threeds.callbacks.AuthParametersCallback
+import io.hyperswitch.threeds.callbacks.ChallengeCallback
+import io.hyperswitch.threeds.models.AuthenticationParameters
+import io.hyperswitch.threeds.models.ThreeDSError
+import io.hyperswitch.threeds.models.ChallengeParameters
+import io.hyperswitch.threeds.models.ChallengeResult
+
+
+@Keep
+class ThreeDSTransaction internal constructor(
+    private val transactionId: String,
+    private val threeDSManager: ThreeDSManager
+) {
+
+    /**
+     * @param callback Callback with ThreeDSResult
+     */
+    @Keep
+    fun getAuthenticationRequestParameters(
+        callback: (ThreeDSResult<AuthenticationRequestParameters>) -> Unit
+    ) {
+        threeDSManager.getAuthenticationRequestParameters(transactionId, object : AuthParametersCallback {
+            override fun onAuthParametersSuccess(parameters: AuthenticationParameters) {
+                val unifiedParams = AuthenticationRequestParameters(
+                    sdkTransactionID = parameters.sdkTransactionId,
+                    sdkAppID = parameters.sdkAppId,
+                    sdkReferenceNumber = parameters.sdkReferenceNumber,
+                    sdkEphemeralPublicKey = parameters.sdkEphemeralPublicKey,
+                    deviceData = parameters.deviceData
+                )
+                callback(ThreeDSResult.Success(unifiedParams))
+            }
+
+            override fun onAuthParametersFailure(error: ThreeDSError) {
+                callback(ThreeDSResult.Error(error.message, error))
+            }
+        })
+    }
+
+    /**
+     * Perform challenge flow.
+     *
+     * **IMPORTANT**: This method MUST be called from the main (UI) thread.
+     *
+     * @param activity The Activity that will host the challenge UI
+     * @param challengeParameters The challenge parameters from the backend response
+     * @param challengeStatusReceiver Callback to receive challenge status updates
+     * @param timeout Timeout in minutes (minimum 5)
+     * @throws IllegalStateException if not called from main thread
+     */
+    fun doChallenge(
+        activity: Activity,
+        challengeParameters: ChallengeParameters,
+        challengeStatusReceiver: ChallengeStatusReceiver,
+        timeout: Int
+    ) {
+        // Enforce main thread requirement
+        if (Looper.myLooper() != Looper.getMainLooper()) {
+            throw IllegalStateException(
+                "doChallenge() must be called from the main thread. " +
+                        "Current thread: ${Thread.currentThread().name}. " +
+                        "Use withContext(Dispatchers.Main) { } or runOnUiThread { } to switch to main thread."
+            )
+        }
+
+        val internalCallback = object : ChallengeCallback {
+            override fun onChallengeSuccess(result: ChallengeResult) {
+                challengeStatusReceiver.completed(CompletionEvent(result.transactionId))
+            }
+
+            override fun onChallengeCancelled() {
+                challengeStatusReceiver.cancelled()
+            }
+
+            override fun onChallengeFailure(error: ThreeDSError) {
+                when (error.code) {
+                    ThreeDSError.CHALLENGE_TIMEOUT -> challengeStatusReceiver.timedout()
+                    ThreeDSError.PROTOCOL_ERROR -> challengeStatusReceiver.protocolError(
+                        ProtocolErrorEvent(ErrorMessage(error.message))
+                    )
+                    else -> challengeStatusReceiver.runtimeError(
+                        RuntimeErrorEvent(error.message)
+                    )
+                }
+            }
+
+            override fun onChallengeTimeout() {
+                challengeStatusReceiver.timedout()
+            }
+        }
+
+        threeDSManager.doChallenge(activity, challengeParameters, timeout, internalCallback)
+    }
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/AuthParametersCallback.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/AuthParametersCallback.kt
new file mode 100644
index 00000000..6e8c4c73
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/AuthParametersCallback.kt
@@ -0,0 +1,24 @@
+package io.hyperswitch.threeds.callbacks
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.models.AuthenticationParameters
+import io.hyperswitch.threeds.models.ThreeDSError
+
+/**
+ * Callback interface for getting authentication request parameters.
+ */
+@Keep
+interface AuthParametersCallback {
+    
+    /**
+     * Called when authentication parameters are successfully retrieved.
+     */
+    @Keep
+    fun onAuthParametersSuccess(parameters: AuthenticationParameters)
+    
+    /**
+     * Called when getting authentication parameters fails.
+     */
+    @Keep
+    fun onAuthParametersFailure(error: ThreeDSError)
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/ChallengeCallback.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/ChallengeCallback.kt
new file mode 100644
index 00000000..09429f2b
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/ChallengeCallback.kt
@@ -0,0 +1,40 @@
+package io.hyperswitch.threeds.callbacks
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.models.ChallengeResult
+import io.hyperswitch.threeds.models.ThreeDSError
+
+/**
+ * Callback interface for 3DS challenge flow operations.
+ */
+@Keep
+interface ChallengeCallback {
+
+    /**
+     * Called when the challenge flow is completed successfully.
+     *
+     * @param result The challenge result containing authentication outcome
+     */
+    @Keep
+    fun onChallengeSuccess(result: ChallengeResult)
+
+    /**
+     * Called when the challenge flow fails.
+     *
+     * @param error Details about the challenge failure
+     */
+    @Keep
+    fun onChallengeFailure(error: ThreeDSError)
+
+    /**
+     * Called when the challenge flow is cancelled by the user.
+     */
+    @Keep
+    fun onChallengeCancelled()
+
+    /**
+     * Called when the challenge UI times out.
+     */
+    @Keep
+    fun onChallengeTimeout()
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/InitializationCallback.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/InitializationCallback.kt
new file mode 100644
index 00000000..14d00aca
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/InitializationCallback.kt
@@ -0,0 +1,25 @@
+package io.hyperswitch.threeds.callbacks
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.models.ThreeDSError
+
+/**
+ * Callback interface for 3DS provider initialization.
+ */
+@Keep
+interface InitializationCallback {
+    
+    /**
+     * Called when the provider initialization is successful.
+     */
+    @Keep
+    fun onInitializationSuccess()
+    
+    /**
+     * Called when the provider initialization fails.
+     * 
+     * @param error Details about the initialization failure
+     */
+    @Keep
+    fun onInitializationFailure(error: ThreeDSError)
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/TransactionCallback.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/TransactionCallback.kt
new file mode 100644
index 00000000..46af0895
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/callbacks/TransactionCallback.kt
@@ -0,0 +1,24 @@
+package io.hyperswitch.threeds.callbacks
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.models.ThreeDSError
+import io.hyperswitch.threeds.models.TransactionResponse
+
+/**
+ * Callback interface for transaction creation operations.
+ */
+@Keep
+interface TransactionCallback {
+    
+    /**
+     * Called when transaction creation is successful.
+     */
+    @Keep
+    fun onTransactionSuccess(response: TransactionResponse)
+    
+    /**
+     * Called when transaction creation fails.
+     */
+    @Keep
+    fun onTransactionFailure(error: ThreeDSError)
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ChallengeParameters.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ChallengeParameters.kt
new file mode 100644
index 00000000..b5be4795
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ChallengeParameters.kt
@@ -0,0 +1,54 @@
+package io.hyperswitch.threeds.models
+
+import androidx.annotation.Keep
+
+/**
+ * Parameters for challenge flow presentation.
+ */
+@Keep
+data class ChallengeParameters(
+    @Keep val threeDSServerTransactionId: String,
+    @Keep val acsTransactionId: String,
+    @Keep val acsReferenceNumber: String,
+    @Keep val acsSignedContent: String,
+    @Keep val challengeWindowSize: ChallengeWindowSize = ChallengeWindowSize.FULL_SCREEN,
+    @Keep val threeDSRequestorAppURL: String? = null,
+    @Keep val transStatus: String
+)
+
+/**
+ * Result of challenge flow completion.
+ */
+@Keep
+data class ChallengeResult(
+    @Keep val transactionId: String,
+    @Keep val status: AuthenticationStatus,
+    @Keep val authenticationValue: String?,
+    @Keep val eci: String?,
+    @Keep val timestamp: Long = System.currentTimeMillis()
+)
+
+/**
+ * Challenge window size options.
+ */
+@Keep
+enum class ChallengeWindowSize {
+    @Keep FULL_SCREEN,
+    @Keep EXTRA_SMALL,
+    @Keep SMALL,
+    @Keep MEDIUM,
+    @Keep LARGE
+}
+
+/**
+ * Authentication status values per EMVCo 3DS spec.
+ */
+@Keep
+enum class AuthenticationStatus {
+    @Keep Y,  // Authentication successful
+    @Keep N,  // Not authenticated
+    @Keep U,  // Unable to authenticate
+    @Keep A,  // Attempts processing performed
+    @Keep C,  // Challenge required
+    @Keep R   // Rejected
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSConfiguration.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSConfiguration.kt
new file mode 100644
index 00000000..e9f601d5
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSConfiguration.kt
@@ -0,0 +1,25 @@
+package io.hyperswitch.threeds.models
+
+import androidx.annotation.Keep
+
+/**
+ * Configuration for 3DS SDK initialization.
+ */
+@Keep
+data class ThreeDSConfiguration(
+    @Keep val environment: ThreeDSEnvironment = ThreeDSEnvironment.SANDBOX,
+    @Keep val directoryServerId: String = "",
+    @Keep val uiCustomization: UiCustomization? = null,
+    @Keep val enableLogging: Boolean = false,
+    @Keep val preferredProvider: ThreeDSProviderType? = null,
+    @Keep val serverJwt: String? = null
+)
+
+/**
+ * 3DS environment enumeration.
+ */
+@Keep
+enum class ThreeDSEnvironment {
+    @Keep SANDBOX,
+    @Keep PRODUCTION
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSError.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSError.kt
new file mode 100644
index 00000000..ab2334e5
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSError.kt
@@ -0,0 +1,52 @@
+package io.hyperswitch.threeds.models
+
+import androidx.annotation.Keep
+
+/**
+ * Error information for 3DS operations.
+ */
+@Keep
+data class ThreeDSError(
+    @Keep val code: String,
+    @Keep val message: String,
+    @Keep val details: String?,
+    @Keep val errorType: ErrorType,
+    @Keep val timestamp: Long = System.currentTimeMillis()
+) {
+    companion object {
+        const val INIT_FAILED = "INIT_FAILED"
+        const val NOT_INITIALIZED = "NOT_INITIALIZED"
+        const val SDK_NOT_READY = "SDK_NOT_READY"
+        
+        const val TRANSACTION_ERROR = "TRANSACTION_ERROR"
+        const val TRANSACTION_FAILED = "TRANSACTION_FAILED"
+        const val TRANSACTION_NOT_FOUND = "TRANSACTION_NOT_FOUND"
+        
+        const val AUTH_PARAMS_ERROR = "AUTH_PARAMS_ERROR"
+        const val AUTH_PARAMS_FAILED = "AUTH_PARAMS_FAILED"
+        
+        const val CHALLENGE_ERROR = "CHALLENGE_ERROR"
+        const val CHALLENGE_TIMEOUT = "CHALLENGE_TIMEOUT"
+        const val PROTOCOL_ERROR = "PROTOCOL_ERROR"
+        const val RUNTIME_ERROR = "RUNTIME_ERROR"
+        
+        const val NO_PROVIDER = "NO_PROVIDER"
+        const val INIT_EXCEPTION = "INIT_EXCEPTION"
+    }
+}
+
+/**
+ * Types of 3DS errors.
+ */
+@Keep
+enum class ErrorType {
+    @Keep INITIALIZATION_ERROR,
+    @Keep AUTHENTICATION_ERROR,
+    @Keep CHALLENGE_ERROR,
+    @Keep NETWORK_ERROR,
+    @Keep CONFIGURATION_ERROR,
+    @Keep PROVIDER_ERROR,
+    @Keep TIMEOUT_ERROR,
+    @Keep USER_CANCELLED,
+    @Keep UNKNOWN_ERROR
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSProviderType.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSProviderType.kt
new file mode 100644
index 00000000..1f993363
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/ThreeDSProviderType.kt
@@ -0,0 +1,20 @@
+package io.hyperswitch.threeds.models
+
+import androidx.annotation.Keep
+
+/**
+ * Enum representing available 3DS provider types.
+ * 
+ * Example:
+ * ```
+ * val config = ThreeDSConfiguration.Builder()
+ *     .setPreferredProvider(ThreeDSProviderType.TRIDENT)
+ *     .build()
+ * ```
+ */
+@Keep
+enum class ThreeDSProviderType {
+    @Keep TRIDENT,
+    @Keep NETCETERA,
+    @Keep CARDINAL
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/TransactionRequest.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/TransactionRequest.kt
new file mode 100644
index 00000000..4bc85883
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/TransactionRequest.kt
@@ -0,0 +1,51 @@
+package io.hyperswitch.threeds.models
+
+import androidx.annotation.Keep
+
+/**
+ * Transaction request for creating a 3DS transaction.
+ * This is the first step in the 3DS authentication flow.
+ * Matches the merchant implementation pattern: createTransaction(directoryServerId, messageVersion, cardNetwork)
+ */
+@Keep
+data class TransactionRequest(
+    @Keep val messageVersion: String,        // From eligibility API response
+    @Keep val directoryServerId: String?,    // From eligibility API response
+    @Keep val cardNetwork: String?           // Merchant specifies: "VISA", "MASTERCARD", etc.
+)
+
+/**
+ * Response from creating a 3DS transaction.
+ */
+@Keep
+data class TransactionResponse(
+    @Keep val transactionId: String,
+    @Keep val sdkTransactionId: String,
+    @Keep val serverTransactionId: String,
+    @Keep val acsTransactionId: String?,
+    @Keep val dsTransactionId: String?,
+    @Keep val messageVersion: String,
+    @Keep val deviceData: String?,
+    @Keep val sdkAppId: String?,
+    @Keep val sdkEncryptionData: String?,
+    @Keep val sdkEphemeralPublicKey: String?,
+    @Keep val sdkReferenceNumber: String?
+)
+
+/**
+ * Authentication parameters returned from getAuthenticationRequestParameters.
+ * These parameters are sent to the 3DS Server for authentication.
+ * Note: Some fields are nullable as not all 3DS providers expose them separately.
+ * For example, Cardinal bundles sdkAppId and sdkReferenceNumber in the encrypted device data.
+ */
+@Keep
+data class AuthenticationParameters(
+    @Keep val deviceData: String,
+    @Keep val sdkTransactionId: String,
+    @Keep val sdkAppId: String?,
+    @Keep val sdkEncryptionData: String?,
+    @Keep val sdkEphemeralPublicKey: String?,
+    @Keep val sdkReferenceNumber: String?,
+    @Keep val messageVersion: String,
+    @Keep val threeDSCompInd: String?
+)
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/UiCustomization.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/UiCustomization.kt
new file mode 100644
index 00000000..2578e98c
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/models/UiCustomization.kt
@@ -0,0 +1,65 @@
+package io.hyperswitch.threeds.models
+
+import androidx.annotation.Keep
+
+/**
+ * UI customization options for challenge flow.
+ */
+@Keep
+data class UiCustomization(
+    @Keep val toolbarCustomization: ToolbarCustomization?,
+    @Keep val labelCustomization: LabelCustomization?,
+    @Keep val textBoxCustomization: TextBoxCustomization?,
+    @Keep val buttonCustomization: ButtonCustomization?
+)
+
+/**
+ * Toolbar customization options.
+ */
+@Keep
+data class ToolbarCustomization(
+    @Keep val backgroundColor: String?,
+    @Keep val headerText: String?,
+    @Keep val buttonText: String?,
+    @Keep val textColor: String?,
+    @Keep val textFontName: String?,
+    @Keep val textFontSize: Int?
+)
+
+/**
+ * Label customization options.
+ */
+@Keep
+data class LabelCustomization(
+    @Keep val headingTextColor: String?,
+    @Keep val headingTextFontName: String?,
+    @Keep val headingTextFontSize: Int?,
+    @Keep val textColor: String?,
+    @Keep val textFontName: String?,
+    @Keep val textFontSize: Int?
+)
+
+/**
+ * Text box customization options.
+ */
+@Keep
+data class TextBoxCustomization(
+    @Keep val textColor: String?,
+    @Keep val textFontName: String?,
+    @Keep val textFontSize: Int?,
+    @Keep val borderColor: String?,
+    @Keep val borderWidth: Int?,
+    @Keep val cornerRadius: Int?
+)
+
+/**
+ * Button customization options.
+ */
+@Keep
+data class ButtonCustomization(
+    @Keep val backgroundColor: String?,
+    @Keep val textColor: String?,
+    @Keep val textFontName: String?,
+    @Keep val textFontSize: Int?,
+    @Keep val cornerRadius: Int?
+)
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ProviderFactory.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ProviderFactory.kt
new file mode 100644
index 00000000..c972d1d8
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ProviderFactory.kt
@@ -0,0 +1,61 @@
+package io.hyperswitch.threeds.provider
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.models.ThreeDSConfiguration
+import io.hyperswitch.threeds.models.ThreeDSProviderType
+
+/**
+ * Factory interface for creating 3DS provider instances.
+ * Each provider implementation should provide a factory that implements this interface.
+ */
+@Keep
+interface ProviderFactory {
+    
+    /**
+     * Create a new instance of the 3DS provider.
+     * This should return a fresh, uninitialized provider instance.
+     */
+    @Keep
+    fun createProvider(): ThreeDSProvider
+    
+    /**
+     * Get the type of provider this factory creates.
+     */
+    @Keep
+    fun getProviderType(): ThreeDSProviderType
+    
+    /**
+     * Get the version of the provider implementation.
+     */
+    @Keep
+    fun getProviderVersion(): String
+    
+    /**
+     * Check if this provider is available in the current environment.
+     * This should verify that all required dependencies are present.
+     */
+    @Keep
+    fun isAvailable(): Boolean
+    
+    /**
+     * Get the priority of this provider for automatic selection.
+     * Higher values indicate higher priority.
+     * Default providers should use values 0-100, custom providers can use higher values.
+     */
+    @Keep
+    fun getPriority(): Int
+    
+    /**
+     * Check if this provider supports the given configuration.
+     * Used for provider selection and validation.
+     */
+    @Keep
+    fun supportsConfiguration(configuration: ThreeDSConfiguration): Boolean
+    
+    /**
+     * Get a list of supported features by this provider.
+     * This can be used for feature detection and provider comparison.
+     */
+    @Keep
+    fun getSupportedFeatures(): List<String>
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ProviderRegistry.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ProviderRegistry.kt
new file mode 100644
index 00000000..0ad07adb
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ProviderRegistry.kt
@@ -0,0 +1,173 @@
+package io.hyperswitch.threeds.provider
+
+import android.util.Log
+import androidx.annotation.Keep
+
+/**
+ * Registry for managing available 3DS providers.
+ * Automatically discovers and registers available providers at runtime.
+ */
+@Keep
+object ProviderRegistry {
+    
+    private const val TAG = "ProviderRegistry"
+    
+    private val registeredFactories = mutableListOf<ProviderFactory>()
+    private var autoDiscoveryCompleted = false
+    
+    /**
+     * List of known provider factory class names.
+     * Add new provider factories here to enable auto-discovery.
+     */
+    private val knownProviderFactories = listOf(
+        "io.hyperswitch.threeds.trident.TridentProviderFactory",
+        "io.hyperswitch.threeds.netcetera.NetceteraProviderFactory",
+        "io.hyperswitch.threeds_cardinal.CardinalProviderFactory",
+    )
+    
+    /**
+     * Automatically discover and register available providers.
+     * This is called lazily on first access to ensure providers are ready.
+     */
+    @Keep
+    private fun autoDiscoverProviders() {
+        synchronized(registeredFactories) {
+            if (autoDiscoveryCompleted) {
+                return
+            }
+            
+            Log.d(TAG, "Starting auto-discovery of 3DS providers...")
+            
+            for (factoryClassName in knownProviderFactories) {
+                try {
+                    // Try to load the factory class
+                    val factoryClass = Class.forName(factoryClassName)
+                    val factory = factoryClass.getDeclaredConstructor().newInstance() as ProviderFactory
+                    
+                    // Check if the provider is available (SDK dependencies present)
+                    if (factory.isAvailable()) {
+                        // Only register if not already registered
+                        val existingFactory = registeredFactories.find { 
+                            it.getProviderType() == factory.getProviderType() 
+                        }
+                        
+                        if (existingFactory == null) {
+                            registeredFactories.add(factory)
+                            Log.d(TAG, "Auto-registered provider: ${factory.getProviderType().name} " +
+                                    "v${factory.getProviderVersion()} (priority: ${factory.getPriority()})")
+                        } else {
+                            Log.d(TAG, "Provider ${factory.getProviderType().name} already registered, skipping")
+                        }
+                    } else {
+                        Log.d(TAG, "Provider ${factory.getProviderType().name} not available (SDK not in classpath)")
+                    }
+                } catch (e: ClassNotFoundException) {
+                    // Provider module not included in dependencies, skip silently
+                    Log.d(TAG, "Provider factory not found: $factoryClassName (module not included)")
+                } catch (e: Exception) {
+                    // Log other errors but continue with other providers
+                    Log.w(TAG, "Error loading provider factory $factoryClassName: ${e.message}")
+                }
+            }
+            
+            autoDiscoveryCompleted = true
+            Log.d(TAG, "Auto-discovery completed. Registered ${registeredFactories.size} provider(s)")
+        }
+    }
+    
+    /**
+     * Ensure auto-discovery has been performed.
+     * Called internally before accessing providers.
+     */
+    @Keep
+    private fun ensureAutoDiscovery() {
+        if (!autoDiscoveryCompleted) {
+            autoDiscoverProviders()
+        }
+    }
+    
+    /**
+     * Register a provider factory manually.
+     * This is used for testing and custom provider registration.
+     * Manual registration takes precedence over auto-discovered providers.
+     */
+    @Keep
+    fun registerProvider(factory: ProviderFactory) {
+        synchronized(registeredFactories) {
+            // Remove existing factory with same type
+            registeredFactories.removeAll { it.getProviderType() == factory.getProviderType() }
+            registeredFactories.add(factory)
+            Log.d(TAG, "Manually registered provider: ${factory.getProviderType().name}")
+        }
+    }
+    
+    /**
+     * Unregister a provider factory.
+     */
+    @Keep
+    fun unregisterProvider(providerType: io.hyperswitch.threeds.models.ThreeDSProviderType) {
+        synchronized(registeredFactories) {
+            registeredFactories.removeAll { it.getProviderType() == providerType }
+        }
+    }
+    
+    /**
+     * Get all available provider factories.
+     * Automatically discovers providers if not already done.
+     */
+    @Keep
+    fun getAvailableProviders(): List<ProviderFactory> {
+        ensureAutoDiscovery()
+        synchronized(registeredFactories) {
+            return registeredFactories.toList()
+        }
+    }
+    
+    /**
+     * Get a specific provider factory by type.
+     * Automatically discovers providers if not already done.
+     */
+    @Keep
+    fun getProvider(type: io.hyperswitch.threeds.models.ThreeDSProviderType): ProviderFactory? {
+        ensureAutoDiscovery()
+        synchronized(registeredFactories) {
+            return registeredFactories.find { it.getProviderType() == type }
+        }
+    }
+    
+    /**
+     * Clear all registered providers.
+     * Useful for testing.
+     */
+    @Keep
+    fun clearProviders() {
+        synchronized(registeredFactories) {
+            registeredFactories.clear()
+        }
+    }
+    
+    /**
+     * Get providers sorted by priority (highest first).
+     * Automatically discovers providers if not already done.
+     */
+    @Keep
+    fun getProvidersByPriority(): List<ProviderFactory> {
+        ensureAutoDiscovery()
+        synchronized(registeredFactories) {
+            return registeredFactories.sortedByDescending { it.getPriority() }
+        }
+    }
+    
+    /**
+     * Force re-discovery of providers.
+     * Useful for testing or when providers are added dynamically.
+     */
+    @Keep
+    fun rediscoverProviders() {
+        synchronized(registeredFactories) {
+            autoDiscoveryCompleted = false
+            registeredFactories.clear()
+            autoDiscoverProviders()
+        }
+    }
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ThreeDSProvider.kt b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ThreeDSProvider.kt
new file mode 100644
index 00000000..246eaf6a
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/main/java/io/hyperswitch/threeds/provider/ThreeDSProvider.kt
@@ -0,0 +1,99 @@
+package io.hyperswitch.threeds.provider
+
+import androidx.annotation.Keep
+import io.hyperswitch.threeds.callbacks.AuthParametersCallback
+import io.hyperswitch.threeds.callbacks.ChallengeCallback
+import io.hyperswitch.threeds.callbacks.InitializationCallback
+import io.hyperswitch.threeds.callbacks.TransactionCallback
+import io.hyperswitch.threeds.models.ChallengeParameters
+import io.hyperswitch.threeds.models.ThreeDSConfiguration
+import io.hyperswitch.threeds.models.ThreeDSProviderType
+import io.hyperswitch.threeds.models.TransactionRequest
+
+/**
+ * Core interface that all 3DS providers must implement.
+ * This provides a unified API for different 3DS SDKs (Netcetera, Cardinal Commerce, etc.)
+ */
+@Keep
+interface ThreeDSProvider {
+    
+    /**
+     * Initialize the 3DS provider with the given configuration.
+     * This should be called before any other operations.
+     */
+    @Keep
+    fun initialize(
+        context: android.content.Context,
+        configuration: ThreeDSConfiguration,
+        callback: InitializationCallback
+    )
+    
+    /**
+     * Check if the provider is properly initialized and ready to use.
+     */
+    @Keep
+    fun isInitialized(): Boolean
+    
+    /**
+     * Get the SDK version of the underlying 3DS implementation.
+     */
+    @Keep
+    fun getSDKVersion(): String
+    
+    /**
+     * Get the provider type (e.g., TRIDENT, NETCETERA, CARDINAL).
+     */
+    @Keep
+    fun getProviderType(): ThreeDSProviderType
+    
+    /**
+     * Create a 3DS transaction.
+     * This is the first step in the 3DS authentication flow.
+     */
+    @Keep
+    fun createTransaction(
+        request: TransactionRequest,
+        callback: TransactionCallback
+    )
+    
+    /**
+     * Get authentication request parameters for the transaction.
+     * These parameters are sent to the 3DS Server for authentication.
+     */
+    @Keep
+    fun getAuthenticationRequestParameters(
+        transactionId: String,
+        callback: AuthParametersCallback
+    )
+    
+    /**
+     * Handle challenge flow when required by the issuer.
+     * This presents the challenge UI to the user.
+     * Renamed from handleChallenge to match the 4 core functions pattern.
+     * 
+     * @param activity Activity context for showing challenge UI
+     * @param parameters Challenge parameters from backend
+     * @param timeout Timeout in minutes (minimum 5)
+     * @param callback Challenge completion callback
+     */
+    @Keep
+    fun doChallenge(
+        activity: android.app.Activity,
+        parameters: ChallengeParameters,
+        timeout: Int,
+        callback: ChallengeCallback
+    )
+    
+    /**
+     * Clean up resources and reset the provider state.
+     */
+    @Keep
+    fun cleanup()
+    
+    /**
+     * Check if the provider supports the given configuration.
+     * Used for provider selection and validation.
+     */
+    @Keep
+    fun supportsConfiguration(configuration: ThreeDSConfiguration): Boolean
+}
diff --git a/hyperswitch-sdk-android-threeDS/src/test/java/io/hyperswitch/threeds/ExampleUnitTest.kt b/hyperswitch-sdk-android-threeDS/src/test/java/io/hyperswitch/threeds/ExampleUnitTest.kt
new file mode 100644
index 00000000..9e2f71e4
--- /dev/null
+++ b/hyperswitch-sdk-android-threeDS/src/test/java/io/hyperswitch/threeds/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package io.hyperswitch.threeds
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 91e1afef..d2b229d5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,6 +15,8 @@ rootProject.name = 'io.hyperswitch'
 include ':app'
 include ':demo-app'
 include ':demo-app-lite'
+include ':demo-app-threeds'
+
 include ':hyperswitch-sdk-android-api'
 include ':hyperswitch-sdk-android-authentication'
 include ':hyperswitch-sdk-android-click-to-pay'
@@ -24,3 +26,5 @@ include ':hyperswitch-sdk-android-logger'
 include ':hyperswitch-sdk-android-scancard'
 include ':hyperswitch-sdk-android-webview-utils'
 includeBuild('../node_modules/@react-native/gradle-plugin')
+include ':hyperswitch-sdk-android-threeDS'
+include ':hyperswitch-sdk-android-threeDS-trident'