diff --git a/demo/build.gradle b/demo/build.gradle
index eb282d35..ba320754 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -71,8 +71,9 @@ dependencies {
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation project(':library')
+  implementation 'com.google.android.material:material:1.10.0'
 
-	testImplementation 'junit:junit:4.13.2'
+  testImplementation 'junit:junit:4.13.2'
   androidTestImplementation 'androidx.test.ext:junit:1.1.5'
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
   androidTestImplementation platform('androidx.compose:compose-bom:2023.09.00')
diff --git a/demo/src/main/java/com/paypal/messagesdemo/XmlActivity.kt b/demo/src/main/java/com/paypal/messagesdemo/XmlActivity.kt
index 7b4362bd..95875bab 100644
--- a/demo/src/main/java/com/paypal/messagesdemo/XmlActivity.kt
+++ b/demo/src/main/java/com/paypal/messagesdemo/XmlActivity.kt
@@ -3,24 +3,30 @@ package com.paypal.messagesdemo
 import android.os.Bundle
 import android.util.Log
 import android.view.View
+import android.widget.Button
+import android.widget.EditText
+import android.widget.RadioGroup
 import android.widget.Toast
+import android.widget.ToggleButton
 import androidx.appcompat.app.AppCompatActivity
-import com.paypal.messages.PayPalMessageView
+import androidx.compose.ui.graphics.Color
+import com.google.android.material.switchmaterial.SwitchMaterial
 import com.paypal.messages.config.PayPalMessageOfferType
-import com.paypal.messages.config.message.PayPalMessageConfig
-import com.paypal.messages.config.message.PayPalMessageData
-import com.paypal.messages.config.message.PayPalMessageEvents
 import com.paypal.messages.config.message.PayPalMessageStyle
 import com.paypal.messages.config.message.PayPalMessageViewState
 import com.paypal.messages.config.message.style.PayPalMessageAlign
 import com.paypal.messages.config.message.style.PayPalMessageColor
 import com.paypal.messages.config.message.style.PayPalMessageLogoType
+import com.paypal.messages.io.Api
 import com.paypal.messagesdemo.databinding.ActivityMessageBinding
-import com.paypal.messages.config.PayPalEnvironment as Environment
 
 class XmlActivity : AppCompatActivity() {
 	private lateinit var binding: ActivityMessageBinding
 	private val TAG = "XmlActivity"
+	private var logoType: PayPalMessageLogoType = PayPalMessageLogoType.PRIMARY
+	private var color: PayPalMessageColor = PayPalMessageColor.BLACK
+	private var alignment: PayPalMessageAlign = PayPalMessageAlign.LEFT
+	private var offerType: PayPalMessageOfferType? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -29,23 +35,169 @@ class XmlActivity : AppCompatActivity() {
 
 		val payPalMessage = binding.payPalMessage
 		val progressBar = binding.progressBar
-		val reloadButton = binding.reloadButton
 
-		// TODO add example of adding MessageView here instead of in XML
+		val editedClientId: EditText? = findViewById<EditText>(R.id.clientId)
+
+		val logoTypeRadioGroup = findViewById<RadioGroup>(R.id.logoTypeRadioGroup)
+		logoTypeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+			logoType = when (checkedId) {
+				R.id.stylePrimary -> PayPalMessageLogoType.PRIMARY
+				R.id.styleInline -> PayPalMessageLogoType.INLINE
+				R.id.styleAlternative -> PayPalMessageLogoType.ALTERNATIVE
+				R.id.styleNone -> PayPalMessageLogoType.NONE
+				else -> PayPalMessageLogoType.PRIMARY
+			}
+		}
+
+		val colorRadioGroup = findViewById<RadioGroup>(R.id.colorRadioGroup)
+		colorRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+			color = when (checkedId) {
+				R.id.styleBlack -> PayPalMessageColor.BLACK
+				R.id.styleWhite -> PayPalMessageColor.WHITE
+				R.id.styleMonochrome -> PayPalMessageColor.MONOCHROME
+				R.id.styleGrayscale -> PayPalMessageColor.GRAYSCALE
+				else -> PayPalMessageColor.BLACK
+			}
+		}
+
+		val alignmentRadioGroup = findViewById<RadioGroup>(R.id.alignmentRadioGroup)
+		alignmentRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+			alignment = when (checkedId) {
+				R.id.styleLeft -> PayPalMessageAlign.LEFT
+				R.id.styleCenter -> PayPalMessageAlign.CENTER
+				R.id.styleRight -> PayPalMessageAlign.RIGHT
+				else -> PayPalMessageAlign.LEFT
+			}
+		}
+
+		val shortTerm = findViewById<ToggleButton>(R.id.shortTerm)
+		val longTerm = findViewById<ToggleButton>(R.id.longTerm)
+		val payIn1 = findViewById<ToggleButton>(R.id.payIn1)
+		val credit = findViewById<ToggleButton>(R.id.credit)
+
+		fun updateOfferUi (offerName: PayPalMessageOfferType?, isChecked: Boolean) {
+			shortTerm.isChecked = false
+			longTerm.isChecked = false
+			payIn1.isChecked = false
+			credit.isChecked = false
+			offerType = null
+
+			if ( offerName == PayPalMessageOfferType.PAY_LATER_SHORT_TERM && isChecked) {
+				shortTerm.isChecked = true
+				offerType = PayPalMessageOfferType.PAY_LATER_SHORT_TERM
+			} else if ( offerName == PayPalMessageOfferType.PAY_LATER_LONG_TERM && isChecked) {
+				longTerm.isChecked = true
+				offerType = PayPalMessageOfferType.PAY_LATER_LONG_TERM
+			} else if ( offerName == PayPalMessageOfferType.PAY_LATER_PAY_IN_1 && isChecked) {
+				payIn1.isChecked = true
+				offerType = PayPalMessageOfferType.PAY_LATER_PAY_IN_1
+			} else if ( offerName == PayPalMessageOfferType.PAYPAL_CREDIT_NO_INTEREST && isChecked) {
+				credit.isChecked = true
+				offerType = PayPalMessageOfferType.PAYPAL_CREDIT_NO_INTEREST
+			}
+
+			payPalMessage.setOfferType(offerType = offerType)
+
+		}
+
+		shortTerm.setOnCheckedChangeListener { _, isChecked ->
+			updateOfferUi(PayPalMessageOfferType.PAY_LATER_SHORT_TERM, isChecked)
+		}
+		longTerm.setOnCheckedChangeListener { _, isChecked ->
+			updateOfferUi(PayPalMessageOfferType.PAY_LATER_LONG_TERM, isChecked)
+		}
+		payIn1.setOnCheckedChangeListener { _, isChecked ->
+			updateOfferUi(PayPalMessageOfferType.PAY_LATER_PAY_IN_1, isChecked)
+		}
+		credit.setOnCheckedChangeListener { _, isChecked ->
+			updateOfferUi(PayPalMessageOfferType.PAYPAL_CREDIT_NO_INTEREST, isChecked)
+		}
+
+		val amount = findViewById<EditText>(R.id.amount)
+		val buyerCountry = findViewById<EditText>(R.id.buyerCountry)
+		val stageTag = findViewById<EditText>(R.id.stageTag)
+
+
+		val ignoreCache = findViewById<SwitchMaterial>(R.id.ignoreCache)
+		val devTouchpoint = findViewById<SwitchMaterial>(R.id.devTouchpoint)
+
+		// Get the data from the selected options
+		fun updateMessageData() {
+			Api.devTouchpoint = devTouchpoint.isChecked
+			Api.ignoreCache = ignoreCache.isChecked
+
+			if ( editedClientId?.text.toString().isNotBlank() ) {
+				payPalMessage.setClientId(editedClientId?.text.toString())
+			} else {
+				payPalMessage.setClientId("")
+			}
+
+			if ( amount?.text.toString().isNotBlank() ) {
+				payPalMessage.setAmount(amount?.text.toString().toDouble())
+			} else {
+				payPalMessage.setAmount(null)
+			}
 
+			if ( buyerCountry?.text.toString().isNotBlank() ) {
+				payPalMessage.setBuyerCountry(buyerCountry?.text.toString())
+			} else {
+				payPalMessage.setBuyerCountry("US")
+			}
+
+			if ( color === PayPalMessageColor.WHITE ) {
+				payPalMessage.setBackgroundColor(Color.Black.hashCode())
+			} else {
+				payPalMessage.setBackgroundColor(Color.White.hashCode())
+			}
+
+			if ( stageTag?.text.toString().isNotBlank() ) {
+				Api.stageTag = stageTag?.text.toString()
+			} else {
+				Api.stageTag = null
+			}
+
+			payPalMessage.setStyle(PayPalMessageStyle(textAlign = alignment, color = color, logoType = logoType))
+			payPalMessage.refresh()
+		}
+
+		// Restore default options
+		val resetButton = findViewById<Button>(R.id.reset)
+		resetButton.setOnClickListener {
+			// Reset UI
+			logoTypeRadioGroup.check(R.id.stylePrimary)
+			colorRadioGroup.check(R.id.styleBlack)
+			alignmentRadioGroup.check(R.id.styleLeft)
+			updateOfferUi(null, false)
+			ignoreCache.isChecked = false
+			devTouchpoint.isChecked = false
+			amount.setText("")
+			buyerCountry.setText("")
+
+			updateMessageData()
+		}
+
+		// Request message based on options
+		val submitButton = findViewById<Button>(R.id.submit)
+		submitButton.setOnClickListener {
+			updateMessageData()
+		}
+
+		// TODO add example of adding MessageView here instead of in XML
 		payPalMessage.setViewStates(
 			PayPalMessageViewState(
 				onLoading = {
 					Log.d(TAG, "onLoading")
 					progressBar.visibility = View.VISIBLE
-					reloadButton.isEnabled = false
+					resetButton.isEnabled = false
+					submitButton.isEnabled = false
 					Toast.makeText(this, "Loading Content...", Toast.LENGTH_SHORT).show()
 				},
 				onError = {
 					Log.d(TAG, "onError")
 					progressBar.visibility = View.INVISIBLE
 					runOnUiThread {
-						reloadButton.isEnabled = true
+						resetButton.isEnabled = true
+						submitButton.isEnabled = true
 						Toast.makeText(this, it.javaClass.toString() + ":" + it.message + ":" + it.paypalDebugId, Toast.LENGTH_LONG).show()
 					}
 					it.message?.let { it1 -> Log.d("XmlActivity Error", it1) }
@@ -55,7 +207,8 @@ class XmlActivity : AppCompatActivity() {
 					Log.d(TAG, "onSuccess")
 					progressBar.visibility = View.INVISIBLE
 					runOnUiThread {
-						reloadButton.isEnabled = true
+						resetButton.isEnabled = true
+						submitButton.isEnabled = true
 						Toast.makeText(this, "Success Getting Content", Toast.LENGTH_SHORT).show()
 					}
 				},
@@ -63,33 +216,4 @@ class XmlActivity : AppCompatActivity() {
 		)
 	}
 
-	/**
-	 * Prevents unused warnings inside of [PayPalMessageView] and [PayPalMessageConfig]
-	 */
-	@Suppress("unused")
-	fun useUnusedFunctions() {
-		binding = ActivityMessageBinding.inflate(layoutInflater)
-		setContentView(binding.root)
-
-		val message = binding.payPalMessage
-		val config = PayPalMessageConfig()
-		config.setGlobalAnalytics("", "")
-		message.setConfig(config)
-
-		message.setData(PayPalMessageData())
-		message.setClientId(EnvVars.getClientId(Environment.LIVE))
-		message.setAmount(1.0)
-		message.setPlacement("placement")
-		message.setOfferType(PayPalMessageOfferType.PAY_LATER_SHORT_TERM)
-		message.setBuyerCountry("country")
-
-		message.setActionEventCallbacks(PayPalMessageEvents())
-
-		message.setViewStateCallbacks(PayPalMessageViewState())
-
-		message.setStyle(PayPalMessageStyle())
-		message.setColor(PayPalMessageColor.BLACK)
-		message.setLogoType(PayPalMessageLogoType.PRIMARY)
-		message.setTextAlignment(PayPalMessageAlign.CENTER)
-	}
 }
diff --git a/demo/src/main/res/layout/activity_message.xml b/demo/src/main/res/layout/activity_message.xml
index 727429f1..e87ea3a1 100644
--- a/demo/src/main/res/layout/activity_message.xml
+++ b/demo/src/main/res/layout/activity_message.xml
@@ -5,27 +5,256 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context="com.paypal.messagesdemo.XmlActivity"
->
+	tools:ignore="HardcodedText"
+	android:layout_weight="1">
 	<LinearLayout
 		android:id="@+id/linearLayout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:padding="16dp"
-	>
+		android:padding="16dp">
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="48dp">
+			<TextView
+				android:text="Client ID"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:id="@+id/clientIdLabel"
+				android:layout_weight="1"
+				android:textSize="16sp"
+				android:textStyle="bold"/>
+			<EditText
+				android:importantForAutofill="no"
+				android:text="@string/client_id"
+				android:layout_width="wrap_content"
+				android:layout_height="48dp"
+				android:inputType="text"
+				android:ems="10"
+				android:id="@+id/clientId"
+				android:hint="Add Client ID"/>
+		</TableRow>
+
+		<TextView
+			android:text="Style Options"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:id="@+id/styleOptionsLabel"
+			android:paddingTop="12dp"
+			android:paddingBottom="12dp"
+			android:textStyle="bold"
+			android:textSize="16sp"/>
+
+		<RadioGroup
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:orientation="horizontal"
+			android:id="@+id/logoTypeRadioGroup">
+			<RadioButton
+				android:text="Primary"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:checked="true"
+				android:id="@+id/stylePrimary"/>
+			<RadioButton
+				android:text="Inline"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleInline"/>
+			<RadioButton
+				android:text="Alternative"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleAlternative"/>
+			<RadioButton
+				android:text="None"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleNone"/>
+		</RadioGroup>
+
+		<RadioGroup
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:orientation="horizontal"
+			android:id="@+id/colorRadioGroup">
+
+			<RadioButton
+				android:text="Black"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleBlack" android:checked="true"/>
+			<RadioButton
+				android:text="White"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleWhite"/>
+			<RadioButton
+				android:text="Monochrome"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleMonochrome"/>
+			<RadioButton
+				android:text="Grayscale"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleGrayscale"/>
+
+		</RadioGroup>
+		<RadioGroup
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:orientation="horizontal"
+			android:id="@+id/alignmentRadioGroup">
+			<RadioButton
+				android:text="Left"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleLeft" android:checked="true"/>
+			<RadioButton
+				android:text="Center"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleCenter"/>
+			<RadioButton
+				android:text="Right"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/styleRight"/>
+		</RadioGroup>
 
 		<TextView
+			android:text="Offer Type"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			android:text="@string/header_kotlin"
-			android:textAppearance="@android:style/TextAppearance.Material.Headline"
-		/>
+			android:id="@+id/offerTypeLabel"
+			android:paddingTop="12dp"
+			android:paddingBottom="12dp"
+			android:textStyle="bold"
+			android:textSize="16sp"/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="48dp">
+			<ToggleButton
+				android:text="Short Term"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent" android:id="@+id/shortTerm" android:layout_weight="1"
+				android:textSize="11sp"
+				android:textOn="Short Term" android:textOff="Short Term"/>
+			<ToggleButton
+				android:text="Long Term"
+				android:layout_width="wrap_content"
+				android:textSize="11sp"
+				android:layout_height="match_parent" android:id="@+id/longTerm" android:layout_weight="1"
+				android:textOn="Long Term" android:textOff="Long Term"/>
+			<ToggleButton
+				android:text="Pay in 1"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent" android:id="@+id/payIn1" android:layout_weight="1"
+				android:textSize="12sp"
+				android:textOn="Pay in 1" android:textOff="Pay in 1"/>
+			<ToggleButton
+				android:text="Credit"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent" android:id="@+id/credit" android:layout_weight="1"
+				android:textSize="12sp"
+				android:textOn="Credit" android:textOff="Credit"/>
+		</LinearLayout>
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="48dp">
+			<TextView
+				android:text="Amount"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:id="@+id/amountLabel"
+				android:layout_weight="1"
+				android:textStyle="bold"
+				android:textSize="16sp"/>
+			<EditText
+				android:importantForAutofill="no"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:inputType="text"
+				android:ems="10"
+				android:id="@+id/amount"
+				android:hint="0.00"/>
+
+		</TableRow>
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="48dp">
+
+			<TextView
+				android:text="Buyer Country"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:id="@+id/buyerCountryLabel"
+				android:layout_weight="1"
+				android:textStyle="bold"
+				android:textSize="16sp"/>
+			<EditText
+				android:importantForAutofill="no"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:inputType="text"
+				android:ems="10"
+				android:id="@+id/buyerCountry" android:hint="US"/>
+
+		</TableRow>
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="48dp">
+			<TextView
+				android:text="Stage Tag"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:id="@+id/stageTagLabel"
+				android:textStyle="bold"
+				android:textSize="16sp" android:layout_weight="1"/>
+			<EditText
+				android:importantForAutofill="no"
+				android:text=""
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:inputType="text"
+				android:ems="10"
+				android:id="@+id/stageTag" android:hint="Add Stage Tag" android:layout_weight="1"/>
+		</LinearLayout>
+
+		<RadioGroup
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:orientation="horizontal">
+
+			<com.google.android.material.switchmaterial.SwitchMaterial
+				android:text="Ignore Cache"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/ignoreCache"
+				android:textStyle="bold"
+				android:layout_weight="1"/>
+
+			<com.google.android.material.switchmaterial.SwitchMaterial
+				android:text="Dev Touchpoint"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/devTouchpoint"
+				android:textStyle="bold"
+				android:layout_weight="1"/>
+
+		</RadioGroup>
+
 		<androidx.constraintlayout.widget.ConstraintLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-		>
+			android:paddingTop="24dp">
 			<com.paypal.messages.PayPalMessageView
 				android:id="@+id/payPalMessage"
 				android:layout_width="0dp"
@@ -35,10 +264,7 @@
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:paypal_client_id="@string/client_id"
-				app:paypal_logo_type="alternative"
-				app:paypal_text_color="monochrome"
-				android:tag="PayPal"
-			/>
+				android:tag="PayPal"/>
 			<ProgressBar
 				android:id="@+id/progressBar"
 				android:layout_width="wrap_content"
@@ -51,60 +277,31 @@
 				app:layout_constraintBottom_toBottomOf="parent"
 			/>
 		</androidx.constraintlayout.widget.ConstraintLayout>
-		<Button
-			android:id="@+id/reloadButton"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:padding="16dp"
-			android:enabled="false"
-			android:text="@string/reload_label"
-			tools:ignore="VisualLintButtonSize"
-		/>
-
-		<!-- XML PayPal Message -->
-		<!--
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			android:text="@string/header_xml"
-			android:textAppearance="@android:style/TextAppearance.Material.Headline"
-		/>
-		<androidx.constraintlayout.widget.ConstraintLayout
+
+		<LinearLayout
+			android:orientation="horizontal"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp">
-			<com.paypal.paypalmessageslibrary.PayPalMessage
+			android:layout_height="match_parent">
+
+			<Button
+				android:id="@+id/reset"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/reload_label"
+				android:layout_marginTop="24dp"/>
+			<View
 				android:layout_width="0dp"
 				android:layout_height="0dp"
-				app:layout_constraintTop_toTopOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:message_amount="500.00"
-				android:tag="PayPal"
+				android:layout_weight="1"
 			/>
-			<ProgressBar
+			<Button
+				android:text="Submit"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:indeterminate="true"
-				android:visibility="invisible"
-				app:layout_constraintTop_toTopOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintBottom_toBottomOf="parent"
-			/>
-		</androidx.constraintlayout.widget.ConstraintLayout>
-		<Button
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:padding="16dp"
-			android:enabled="false"
-			android:text="@string/reload_label"
-			tools:ignore="VisualLintButtonSize"
-		/>
-		-->
+				android:id="@+id/submit"
+				android:layout_marginTop="24dp"/>
+
+		</LinearLayout>
+
 	</LinearLayout>
 </ScrollView>
diff --git a/demo/src/main/res/values/strings.xml b/demo/src/main/res/values/strings.xml
index a1f7183f..d369785b 100644
--- a/demo/src/main/res/values/strings.xml
+++ b/demo/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <resources>
-	<string name="app_name">PayPal Messages</string>
+	<string name="app_name">Message Configuration</string>
 	<string name="header_kotlin">Kotlin PayPal Message</string>
-	<string name="header_xml">XML PayPal Message</string>
-	<string name="reload_label">Reload Message</string>
+	<string name="reload_label">Reset</string>
 </resources>
diff --git a/library/src/main/java/com/paypal/messages/PayPalMessageView.kt b/library/src/main/java/com/paypal/messages/PayPalMessageView.kt
index 76f4926e..01a28de9 100644
--- a/library/src/main/java/com/paypal/messages/PayPalMessageView.kt
+++ b/library/src/main/java/com/paypal/messages/PayPalMessageView.kt
@@ -207,14 +207,11 @@ class PayPalMessageView @JvmOverloads constructor(
 
 	/**
 	 * Update the [MessageConfig] style currently associated with the [PayPalMessageView] component
-	 *
-	 * This function will also trigger an update in the component to get the new content based on the provided configuration
 	 */
 	fun setStyle(style: MessageStyle?) {
 		color = style?.color ?: Color.BLACK
 		alignment = style?.textAlign ?: Align.LEFT
 		logoType = style?.logoType ?: LogoType.PRIMARY
-		updateMessageContent()
 	}
 
 	/**
@@ -253,8 +250,6 @@ class PayPalMessageView @JvmOverloads constructor(
 
 	/**
 	 * Updates the offerType used in [MessageConfig] for the current [PayPalMessageView].
-	 *
-	 * This function will also trigger an update in the component content to reflect the changes with the [MessageConfig] updated offerType
 	 */
 	fun setOfferType(offerType: OfferType?) {
 		if (this.offerType != offerType) {
@@ -263,7 +258,6 @@ class PayPalMessageView @JvmOverloads constructor(
 //                if (offerType != null) {
 //                    modal?.setOfferType(offerType)
 //                }
-			updateMessageContent()
 		}
 	}
 
@@ -381,7 +375,7 @@ class PayPalMessageView @JvmOverloads constructor(
 			}
 			// Apply disclaimer style
 			messageDisclaimer?.let { builder.setupDisclaimer(color, it) }
-			// Apply the everything to the text view
+			// Apply everything to the text view
 			messageTextView.apply {
 				visibility = View.VISIBLE
 				setTextColor(ContextCompat.getColor(context, color.colorResId))
diff --git a/library/src/main/java/com/paypal/messages/io/Api.kt b/library/src/main/java/com/paypal/messages/io/Api.kt
index d40c020b..9649deff 100644
--- a/library/src/main/java/com/paypal/messages/io/Api.kt
+++ b/library/src/main/java/com/paypal/messages/io/Api.kt
@@ -23,6 +23,9 @@ object Api {
 	private val client = OkHttpClient()
 	private val gson = Gson()
 	var environment = Env.SANDBOX
+	var devTouchpoint: Boolean = false
+	var ignoreCache: Boolean = false
+	var stageTag: String? = null
 	var instanceId: UUID? = null
 	var originatingInstanceId: UUID? = null
 	var sessionId: UUID? = null
@@ -48,7 +51,9 @@ object Api {
 
 	private fun HttpUrl.Builder.setMessageDataQuery(config: MessageConfig, hash: String?) {
 		addQueryParameter("client_id", config.data?.clientId)
-		addQueryParameter("devTouchpoint", "false")
+		addQueryParameter("devTouchpoint", devTouchpoint.toString())
+		addQueryParameter("ignore_cache", ignoreCache.toString())
+		if ( !stageTag.isNullOrBlank() ) { addQueryParameter("stage_tag", stageTag) }
 		addQueryParameter("env", environment.name.lowercase())
 		addQueryParameter("logo_type", config.style.logoType.name.lowercase())
 		addQueryParameter("instance_id", instanceId.toString())