diff --git a/session/inc/kvh2xml.h b/session/inc/kvh2xml.h
index eb25976..bd2b601 100644
--- a/session/inc/kvh2xml.h
+++ b/session/inc/kvh2xml.h
@@ -36,7 +36,7 @@
 */
 
 enum AllKeyIds{
-	STREAM_TYPE = 0xA1000000,    /**< @h2xmle_name{Stream} */
+	STREAMRX = 0xA1000000,       /**< @h2xmle_name{Stream} */
 	DEVICERX = 0xA2000000,       /**< @h2xmle_name{DeviceRX} */
 	DEVICETX = 0xA3000000,       /**< @h2xmle_name{DeviceTX} */
 	VOLUME = 0xA4000000,         /**< @h2xmle_name{Volume} */
@@ -45,25 +45,28 @@
 	PAUSE = 0xA7000000,          /**< @h2xmle_name{Pause} */
 	MUTE = 0xA8000000,           /**< @h2xmle_name{Mute} */
 	CHANNELS = 0xA9000000,       /**< @h2xmle_name{Channels} */
-	FLUENCE = 0xAA000000,       /**< @h2xmle_name{Fluence} */
+	ECNS = 0xAA000000,           /**< @h2xmle_name{ECNS} */
 	INSTANCE = 0xAB000000,       /**< @h2xmle_name{Instance} */
 	DEVICEPP_RX = 0xAC000000,    /**< @h2xmle_name{DevicePP_Rx} */
 	DEVICEPP_TX = 0xAD000000,    /**< @h2xmle_name{DevicePP_Tx} */
 	MEDIAFMTID = 0xae000000,
+	STREAMTX = 0xb1000000,
 	EQUALIZER_SWITCH = 0xb2000000,
 	VIRTUALIZER_SWITCH = 0xb9000000,
 	REVERB_SWITCH = 0xb8000000,
 	PBE_SWITCH = 0xb6000000,
 	BASS_BOOST_SWITCH = 0xb7000000,
 	STREAM_SLOWTALK = 0xbb000000,
-	STREAM_MUXDEMUX = 0xbd000000
+	STREAM_CONFIG = 0xbc000000,
+	STREAM_MUXDEMUX = 0xbd000000,
+	TAG_KEY_SLOT_MASK = 0xe0000000
 };
 
 /**
-	@h2xmlk_key {STREAM_TYPE}
+	@h2xmlk_key {STREAMRX}
 	@h2xmlk_description {Type of Stream}
 */
-enum Key_Stream {
+enum Key_StreamRX {
 	PCM_LL_PLAYBACK = 0xA1000001, /**< @h2xmle_name {PCM_LL_Playback}*/
 	PCM_RECORD = 0xA1000002,      /**< @h2xmle_name {PCM_Record}*/
 	PCM_LOOPBACK = 0xA1000003,    /**< @h2xmle_name {PCM_Loopback}*/
@@ -73,6 +76,8 @@
 	VOICE_UI_EC_REF_PATH = 0xA1000007,/**< @h2xmle_name {Voice_UI_EC_Ref_Path}*/
 	VOIP_TX_EC_REF_PATH = 0xA1000008,   /**< @h2xmle_name {Voip_Tx_EC_Ref_Path}*/
 	PCM_RECORD_EC_REF_PATH = 0xA1000009,/**< @h2xmle_name {PCM_Record_EC_Ref_Path}*/
+	COMPRESSED_OFFLOAD_PLAYBACK = 0xa100000a,
+	HAPTICS_PLAYBACK = 0xa1000015,
 };
 
 
@@ -92,13 +97,16 @@
 */
 enum Key_DeviceRX {
 	SPEAKER = 0xA2000001, /**< @h2xmle_name {Speaker}*/
+	HANDSET = 0xa2000004,
+	HAPTICS_DEVICE = 0xa2000009,
 };
 /**
 	@h2xmlk_key {DEVICETX}
 	@h2xmlk_description {Tx Device}
 */
 enum Key_DeviceTX {
-	HANDSETMIC = 0xA3000001, /**< @h2xmle_name {HandsetMic}*/
+	HANDSETMIC = 0xA3000004, /**< @h2xmle_name {HandsetMic}*/
+	HANDSETMIC_VA = 0xa3000006
 };
 
 /**
@@ -106,20 +114,25 @@
 	@h2xmlk_description {Rx Device Post/Pre Processing Chain}
 */
 enum Key_DevicePP_RX {
-	LL_DEFAULT_PP = 0xAC000001, /**< @h2xmle_name {Audio_LL_Default_PP} @h2xmlk_description {Low Latency Default Playback}*/
+	DEVICEPP_RX_DEFAULT = 0xAC000001, /**< @h2xmle_name {Audio_LL_Default_PP} @h2xmlk_description {Low Latency Default Playback}*/
+	DEVICEPP_RX_AUDIO_MBDRC = 0xac000002,
 };
 /**
 	@h2xmlk_key {DEVICEPP_TX}
 	@h2xmlk_description {Tx Device Post/Pre Processing Chain}
 */
 enum Key_DevicePP_TX {
-	VOICE_FLUENCE_FFECNS  = 0xAD000001, /**< @h2xmle_name {Voice_Fluence_FFECNS} @h2xmlk_description {Used in Voice UI use-cases}*/
-	AUDIO_FLUENCE_SMECNS  = 0xAD000002, /**< @h2xmle_name {Audio_Fluence_SMECNS} @h2xmlk_description {Single Mic ECNS }*/
-	AUDIO_FLUENCE_ENDFIRE = 0xAD000003, /**< @h2xmle_name {Audio_Fluence_Endfire} @h2xmlk_description {EndFire_ECNS - Typically used for dual mic capture scenarios}*/
-	AUDIO_FLUENCE_PRO     = 0xAD000004, /**< @h2xmle_name {Audio_Fluence_Pro} @h2xmlk_description {Multi MIC scenarios ; at least 3 or more Micss}*/
+	DEVICEPP_TX_FLUENCE_FFECNS        = 0xAD000001, /**< @h2xmle_name {Voice_Fluence_FFECNS} @h2xmlk_description {Used in Voice UI use-cases}*/
+	DEVICEPP_TX_AUDIO_FLUENCE_SMECNS  = 0xAD000002, /**< @h2xmle_name {Audio_Fluence_SMECNS} @h2xmlk_description {Single Mic ECNS }*/
+	DEVICEPP_TX_AUDIO_FLUENCE_ENDFIRE = 0xAD000003, /**< @h2xmle_name {Audio_Fluence_Endfire} @h2xmlk_description {EndFire_ECNS - Typically used for dual mic capture scenarios}*/
+	DEVICEPP_TX_AUDIO_FLUENCE_PRO     = 0xAD000004, /**< @h2xmle_name {Audio_Fluence_Pro} @h2xmlk_description {Multi MIC scenarios ; at least 3 or more Micss}*/
 };
 
 
+enum Key_StreamConfig {
+	STREAM_CFG_VUI_SVA = 0xbc000001,
+};
+
 /**
 	@h2xmlk_key {VOLUME}
 	@h2xmlk_description {Volume}
@@ -196,25 +209,30 @@
 	CHANNELS_7 = 7, /**< @h2xmle_name {CHS_7}*/
 	CHANNELS_8 = 8, /**< @h2xmle_name {CHS_8}*/
 };
+
 /**
-	@h2xmlk_key {FLUENCE}
-	@h2xmlk_description {Fluence}
+	@h2xmlk_key {ECNS}
+	@h2xmlk_description {ECNS}
 */
-enum Key_Fluence {
-	FLUENCE_OFF = 0, /**< @h2xmle_name {Off}*/
-	FLUENCE_ON = 1, /**< @h2xmle_name {On}*/
+enum Key_ECNS {
+	ECNS_OFF = 0, /**< @h2xmle_name {ECNS_Off}*/
+	ECNS_ON = 1, /**< @h2xmle_name {ECNS_On}*/
+	EC_ON = 2,
+	NS_ON = 3,
 };
+
 /**
 	@h2xmlk_gkeys
 	@h2xmlk_description {Graph Keys}
 */
 enum Graph_Keys {
-	gk_Stream = STREAM_TYPE,
+	gk_StreamRX = STREAMRX,
 	gk_DeviceRX = DEVICERX,
 	gk_DeviceTX = DEVICETX,
 	gk_DevicePP_RX = DEVICEPP_RX,
 	gk_DevicePP_TX = DEVICEPP_TX,
 	gk_Instance = INSTANCE,
+	gk_StreamTX = STREAMTX,
 };
 /**
 	@h2xmlk_ckeys
@@ -263,13 +281,13 @@
 	tk1_Mute = MUTE,
 };
 
-#define TAG_FLUENCE  0xC000000A
+#define TAG_ECNS  0xC000000A
 /**
-	@h2xmlk_modTag {"device_fluence", TAG_FLUENCE}
-	@h2xmlk_description {Fluence On/Off}
+	@h2xmlk_modTag {"device_ecns", TAG_ECNS}
+	@h2xmlk_description {Ecns On/Off}
 */
-enum TAG_FLUENCE_Keys {
-	tk1_Fluence = FLUENCE,
+enum TAG_ECNS_Keys {
+	tk1_Ecns = ECNS,
 };
 
 #define TAG_STREAM_VOLUME  0xC000000D
@@ -338,7 +356,7 @@
 	tk1_BASS_BOOST_Switch = BASS_BOOST_SWITCH,
 };
 
-#define TAG_PSPD_MFC  0xc0000019
+#define PER_STREAM_PER_DEVICE_MFC  0xc0000019
 
 // Same enum names as TAG_DEVICE_PP_MFC_Keys
 /*enum TAG_PSPD_MFC_Keys {
@@ -365,6 +383,12 @@
 	tk1_Stream_MuxDemux= STREAM_MUXDEMUX,
 };
 
+#define TAG_DEVICE_MUX  0xc0000040
+
+enum TAG_DEVICE_MUX_Keys {
+	tk1_SlotMask= TAG_KEY_SLOT_MASK,
+};
+
 /**
 	@h2xmlk_modTagList
 */