diff --git a/datawedgeprofileintentswrapper/src/main/java/com/zebra/datawedgeprofileenums/SC_E_AIM_MODE.java b/datawedgeprofileintentswrapper/src/main/java/com/zebra/datawedgeprofileenums/SC_E_AIM_MODE.java
index ff3c1fa..0a308aa 100644
--- a/datawedgeprofileintentswrapper/src/main/java/com/zebra/datawedgeprofileenums/SC_E_AIM_MODE.java
+++ b/datawedgeprofileintentswrapper/src/main/java/com/zebra/datawedgeprofileenums/SC_E_AIM_MODE.java
@@ -1,8 +1,8 @@
 package com.zebra.datawedgeprofileenums;
 
 public enum SC_E_AIM_MODE {
-    ON("1"),
-    OFF("0");
+    ON("on"),
+    OFF("off");
 
     private String enumString;
     private SC_E_AIM_MODE(String confName)
diff --git a/datawedgeprofileintentswrapper/src/main/java/com/zebra/datawedgeprofileintents/SettingsPlugins/PluginScanner.java b/datawedgeprofileintentswrapper/src/main/java/com/zebra/datawedgeprofileintents/SettingsPlugins/PluginScanner.java
index e095a5d..ac6a450 100644
--- a/datawedgeprofileintentswrapper/src/main/java/com/zebra/datawedgeprofileintents/SettingsPlugins/PluginScanner.java
+++ b/datawedgeprofileintentswrapper/src/main/java/com/zebra/datawedgeprofileintents/SettingsPlugins/PluginScanner.java
@@ -636,6 +636,17 @@ public Bundle getBarcodePluginBundleForSwitchParams() throws Exception {
         // Pass everything to the bundle
         Bundle barcodeProps = new Bundle();
 
+        barcodeProps.putString("scanner_input_enabled", scanner_input_enabled ? "true" : "false");
+
+        // Use this for Datawedge < 6.7
+        //barcodeProps.putString("scanner_selection", scanner_selection);
+
+        // Use this for Datawedge < 6.7
+        //barcodeProps.putString("scanner_selection", "AUTO");
+        // Use this for Datawedge >= 6.7
+        barcodeProps.putString("scanner_selection_by_identifier",scanner_selection_by_identifier.toString());
+
+
         // Setup decoders
         setupDecoders(barcodeProps);