diff --git a/Skyflow/build.gradle b/Skyflow/build.gradle
index fd6bf75..e473ff4 100644
--- a/Skyflow/build.gradle
+++ b/Skyflow/build.gradle
@@ -10,7 +10,7 @@ ext {
     mGroupId = "com.skyflowapi.android"
     mArtifactId = "skyflow-android-sdk"
     mVersionCode = 1
-    mVersionName = "1.24.0"
+    mVersionName = "1.24.0-dev.c02211e"
 
     mLibraryName = "skyflow-android"
     mLibraryDescription = "Skyflow’s android SDK can be used to securely collect, tokenize, and display sensitive data in the mobile without exposing your front-end infrastructure to sensitive data."
diff --git a/Skyflow/src/main/kotlin/Skyflow/CardMetadata.kt b/Skyflow/src/main/kotlin/Skyflow/CardMetadata.kt
index 05fd864..363a206 100644
--- a/Skyflow/src/main/kotlin/Skyflow/CardMetadata.kt
+++ b/Skyflow/src/main/kotlin/Skyflow/CardMetadata.kt
@@ -2,6 +2,6 @@ package Skyflow
 
 import Skyflow.collect.elements.utils.CardType
 
-class CardMetadata(var scheme: Array<CardType>) {
+class CardMetadata(var scheme: Array<CardType> = arrayOf()) {
 
 }
\ No newline at end of file
diff --git a/Skyflow/src/main/kotlin/Skyflow/core/elements/state/StateforText.kt b/Skyflow/src/main/kotlin/Skyflow/core/elements/state/StateforText.kt
index ba2eafc..138c842 100644
--- a/Skyflow/src/main/kotlin/Skyflow/core/elements/state/StateforText.kt
+++ b/Skyflow/src/main/kotlin/Skyflow/core/elements/state/StateforText.kt
@@ -29,8 +29,8 @@ class StateforText internal constructor(val tf: TextField) : State(tf.columnName
     }
 
     private fun getCardSchemeString(): String {
-        return if (tf.cardType === CardType.EMPTY) ""
-        else tf.cardType.toString()
+        return if (tf.cardType === CardType.EMPTY || !tf.isCustomCardBrandSelected) ""
+        else tf.cardType.defaultName.uppercase()
     }
 
     override fun show(): String {
@@ -69,13 +69,15 @@ class StateforText internal constructor(val tf: TextField) : State(tf.columnName
         state.put("isRequired", isRequired)
         state.put("isFocused", isFocused)
         state.put("isValid", isValid)
-        state.put("selectedCardScheme", selectedCardScheme)
         var value = ""
         if (env == Env.DEV) {
             value = tf.getValue()
         } else if (env == Env.PROD && tf.fieldType == SkyflowElementType.CARD_NUMBER) {
             value = CardType.getBin(tf.getValue())
         }
+        if (tf.fieldType == SkyflowElementType.CARD_NUMBER) {
+            state.put("selectedCardScheme", selectedCardScheme)
+        }
         state.put("value", value)
         return state
     }