diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt
index 9f1587db0cb1b8940d6ff563f96e810614815716..df9ed1edec12693a72cd2fec00641c7c503b72d0 100644
--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -606,732 +606,732 @@ ID = buf_test
 
 ID = VCD_VARIABLE_FRAME_NUMBER_TX_ENB
     DESC = VCD variable FRAME_NUMBER_TX_ENB
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_FRAME_NUMBER_RX_ENB
     DESC = VCD variable FRAME_NUMBER_RX_ENB
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RUNTIME_TX_ENB
     DESC = VCD variable RUNTIME_TX_ENB
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RUNTIME_RX_ENB
     DESC = VCD variable RUNTIME_RX_ENB
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_FRAME_NUMBER_TX_UE
     DESC = VCD variable FRAME_NUMBER_TX_UE
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_FRAME_NUMBER_RX_UE
     DESC = VCD variable FRAME_NUMBER_RX_UE
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_SLOT_NUMBER_TX_UE
     DESC = VCD variable SLOT_NUMBER_TX_UE
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_SLOT_NUMBER_RX_UE
     DESC = VCD variable SLOT_NUMBER_RX_UE
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX_UE
     DESC = VCD variable SUBFRAME_NUMBER_TX_UE
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX_UE
     DESC = VCD variable SUBFRAME_NUMBER_RX_UE
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_MISSED_SLOTS_ENB
     DESC = VCD variable MISSED_SLOTS_ENB
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_DAQ_MBOX
     DESC = VCD variable DAQ_MBOX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_UE_OFFSET_MBOX
     DESC = VCD variable UE_OFFSET_MBOX
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_UE_RX_OFFSET
     DESC = VCD variable UE_RX_OFFSET
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_DIFF
     DESC = VCD variable DIFF
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_HW_SUBFRAME
     DESC = VCD variable HW_SUBFRAME
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_HW_FRAME
     DESC = VCD variable HW_FRAME
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_HW_SUBFRAME_RX
     DESC = VCD variable HW_SUBFRAME_RX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_HW_FRAME_RX
     DESC = VCD variable HW_FRAME_RX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_TXCNT
     DESC = VCD variable TXCNT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RXCNT
     DESC = VCD variable RXCNT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_TRX_TS
     DESC = VCD variable TRX_TS
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_TRX_TST
     DESC = VCD variable TRX_TST
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_TX_TS
     DESC = VCD variable TX_TS
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RX_TS
     DESC = VCD variable RX_TS
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RX_HWCNT
     DESC = VCD variable RX_HWCNT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RX_LHWCNT
     DESC = VCD variable RX_LHWCNT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_TX_HWCNT
     DESC = VCD variable TX_HWCNT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_TX_LHWCNT
     DESC = VCD variable TX_LHWCNT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RX_PCK
     DESC = VCD variable RX_PCK
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_TX_PCK
     DESC = VCD variable TX_PCK
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RX_SEQ_NUM
     DESC = VCD variable RX_SEQ_NUM
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RX_SEQ_NUM_PRV
     DESC = VCD variable RX_SEQ_NUM_PRV
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_TX_SEQ_NUM
     DESC = VCD variable TX_SEQ_NUM
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_CNT
     DESC = VCD variable CNT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_DUMMY_DUMP
     DESC = VCD variable DUMMY_DUMP
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_ITTI_SEND_MSG
     DESC = VCD variable ITTI_SEND_MSG
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_ITTI_POLL_MSG
     DESC = VCD variable ITTI_POLL_MSG
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_ITTI_RECV_MSG
     DESC = VCD variable ITTI_RECV_MSG
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_ITTI_ALLOC_MSG
     DESC = VCD variable ITTI_ALLOC_MSG
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_MP_ALLOC
     DESC = VCD variable MP_ALLOC
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_MP_FREE
     DESC = VCD variable MP_FREE
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_UE_INST_CNT_RX
     DESC = VCD variable UE_INST_CNT_RX
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_UE_INST_CNT_TX
     DESC = VCD variable UE_INST_CNT_TX
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 
 #functions
 
 ID = VCD_FUNCTION_RT_SLEEP
     DESC = VCD function RT_SLEEP
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_TRX_READ
     DESC = VCD function TRX_READ
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_TRX_WRITE
     DESC = VCD function TRX_WRITE
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX0
     DESC = VCD function eNB_PROC_TX0
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX0
     DESC = VCD function eNB_PROC_RX0
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX1
     DESC = VCD function eNB_PROC_TX1
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX1
     DESC = VCD function eNB_PROC_RX1
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX2
     DESC = VCD function eNB_PROC_TX2
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX2
     DESC = VCD function eNB_PROC_RX2
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX3
     DESC = VCD function eNB_PROC_TX3
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX3
     DESC = VCD function eNB_PROC_RX3
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX4
     DESC = VCD function eNB_PROC_TX4
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX4
     DESC = VCD function eNB_PROC_RX4
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX5
     DESC = VCD function eNB_PROC_TX5
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX5
     DESC = VCD function eNB_PROC_RX5
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX6
     DESC = VCD function eNB_PROC_TX6
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX6
     DESC = VCD function eNB_PROC_RX6
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX7
     DESC = VCD function eNB_PROC_TX7
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX7
     DESC = VCD function eNB_PROC_RX7
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX8
     DESC = VCD function eNB_PROC_TX8
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX8
     DESC = VCD function eNB_PROC_RX8
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_TX9
     DESC = VCD function eNB_PROC_TX9
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_RX9
     DESC = VCD function eNB_PROC_RX9
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_THREAD_TX
     DESC = VCD function UE_THREAD_TX
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_THREAD_RX
     DESC = VCD function UE_THREAD_RX
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_TX
     DESC = VCD function eNB_TX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_RX
     DESC = VCD function eNB_RX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_TRX
     DESC = VCD function eNB_TRX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_TM
     DESC = VCD function eNB_TM
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_RX_SLEEP
     DESC = VCD function eNB_RX_SLEEP
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_TX_SLEEP
     DESC = VCD function eNB_TX_SLEEP
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_PROC_SLEEP
     DESC = VCD function eNB_PROC_SLEEP
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_TRX_READ_RF
     DESC = VCD function TRX_READ_RF
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_TRX_WRITE_RF
     DESC = VCD function TRX_WRITE_RF
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_SYNCH
     DESC = VCD function UE_SYNCH
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_SLOT_FEP
     DESC = VCD function UE_SLOT_FEP
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_RRC_MEASUREMENTS
     DESC = VCD function UE_RRC_MEASUREMENTS
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_GAIN_CONTROL
     DESC = VCD function UE_GAIN_CONTROL
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_ADJUST_SYNCH
     DESC = VCD function UE_ADJUST_SYNCH
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_MEASUREMENT_PROCEDURES
     DESC = VCD function UE_MEASUREMENT_PROCEDURES
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_PDCCH_PROCEDURES
     DESC = VCD function UE_PDCCH_PROCEDURES
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_PBCH_PROCEDURES
     DESC = VCD function UE_PBCH_PROCEDURES
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_TX
     DESC = VCD function PHY_PROCEDURES_ENB_TX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX
     DESC = VCD function PHY_PROCEDURES_ENB_RX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX
     DESC = VCD function PHY_PROCEDURES_UE_TX
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_UE_RX
     DESC = VCD function PHY_PROCEDURES_UE_RX
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_LTE
     DESC = VCD function PHY_PROCEDURES_ENB_LTE
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_UE_LTE
     DESC = VCD function PHY_PROCEDURES_UE_LTE
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PDSCH_THREAD
     DESC = VCD function PDSCH_THREAD
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_THREAD0
     DESC = VCD function DLSCH_THREAD0
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_THREAD1
     DESC = VCD function DLSCH_THREAD1
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_THREAD2
     DESC = VCD function DLSCH_THREAD2
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_THREAD3
     DESC = VCD function DLSCH_THREAD3
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_THREAD4
     DESC = VCD function DLSCH_THREAD4
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_THREAD5
     DESC = VCD function DLSCH_THREAD5
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_THREAD6
     DESC = VCD function DLSCH_THREAD6
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_THREAD7
     DESC = VCD function DLSCH_THREAD7
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_DECODING0
     DESC = VCD function DLSCH_DECODING0
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_DECODING1
     DESC = VCD function DLSCH_DECODING1
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_DECODING2
     DESC = VCD function DLSCH_DECODING2
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_DECODING3
     DESC = VCD function DLSCH_DECODING3
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_DECODING4
     DESC = VCD function DLSCH_DECODING4
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_DECODING5
     DESC = VCD function DLSCH_DECODING5
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_DECODING6
     DESC = VCD function DLSCH_DECODING6
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_DECODING7
     DESC = VCD function DLSCH_DECODING7
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RX_PDCCH
     DESC = VCD function RX_PDCCH
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DCI_DECODING
     DESC = VCD function DCI_DECODING
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RX_PHICH
     DESC = VCD function RX_PHICH
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_UE_CONFIG_SIB2
     DESC = VCD function PHY_UE_CONFIG_SIB2
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_CONFIG_SIB1_ENB
     DESC = VCD function PHY_CONFIG_SIB1_ENB
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_CONFIG_SIB2_ENB
     DESC = VCD function PHY_CONFIG_SIB2_ENB
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_CONFIG_DEDICATED_ENB
     DESC = VCD function PHY_CONFIG_DEDICATED_ENB
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_UE_COMPUTE_PRACH
     DESC = VCD function PHY_UE_COMPUTE_PRACH
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING
     DESC = VCD function PHY_ENB_ULSCH_DECODING
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_ENB_SFGEN
     DESC = VCD function PHY_ENB_SFGEN
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_ENB_PRACH_RX
     DESC = VCD function PHY_ENB_PRACH_RX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_ENB_PDCCH_TX
     DESC = VCD function PHY_ENB_PDCCH_TX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_ENB_RS_TX
     DESC = VCD function PHY_ENB_RS_TX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_GENERATE_PRACH
     DESC = VCD function UE_GENERATE_PRACH
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_ULSCH_MODULATION
     DESC = VCD function UE_ULSCH_MODULATION
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_ULSCH_ENCODING
     DESC = VCD function UE_ULSCH_ENCODING
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_ULSCH_SCRAMBLING
     DESC = VCD function UE_ULSCH_SCRAMBLING
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_ENB_DLSCH_MODULATION
     DESC = VCD function ENB_DLSCH_MODULATION
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_ENB_DLSCH_ENCODING
     DESC = VCD function ENB_DLSCH_ENCODING
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_ENB_DLSCH_SCRAMBLING
     DESC = VCD function ENB_DLSCH_SCRAMBLING
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_MACPHY_INIT
     DESC = VCD function MACPHY_INIT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_MACPHY_EXIT
     DESC = VCD function MACPHY_EXIT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_ENB_DLSCH_ULSCH_SCHEDULER
     DESC = VCD function ENB_DLSCH_ULSCH_SCHEDULER
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_FILL_RAR
     DESC = VCD function FILL_RAR
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_TERMINATE_RA_PROC
     DESC = VCD function TERMINATE_RA_PROC
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_INITIATE_RA_PROC
     DESC = VCD function INITIATE_RA_PROC
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_CANCEL_RA_PROC
     DESC = VCD function CANCEL_RA_PROC
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_GET_DCI_SDU
     DESC = VCD function GET_DCI_SDU
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_GET_DLSCH_SDU
     DESC = VCD function GET_DLSCH_SDU
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RX_SDU
     DESC = VCD function RX_SDU
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_MRBCH_PHY_SYNC_FAILURE
     DESC = VCD function MRBCH_PHY_SYNC_FAILURE
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_SR_INDICATION
     DESC = VCD function SR_INDICATION
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_DLSCH_PREPROCESSOR
     DESC = VCD function DLSCH_PREPROCESSOR
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_SCHEDULE_DLSCH
     DESC = VCD function SCHEDULE_DLSCH
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_FILL_DLSCH_DCI
     DESC = VCD function FILL_DLSCH_DCI
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_OUT_OF_SYNC_IND
     DESC = VCD function OUT_OF_SYNC_IND
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_DECODE_SI
     DESC = VCD function UE_DECODE_SI
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_DECODE_CCCH
     DESC = VCD function UE_DECODE_CCCH
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_DECODE_BCCH
     DESC = VCD function UE_DECODE_BCCH
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_SEND_SDU
     DESC = VCD function UE_SEND_SDU
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_GET_SDU
     DESC = VCD function UE_GET_SDU
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_GET_RACH
     DESC = VCD function UE_GET_RACH
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_PROCESS_RAR
     DESC = VCD function UE_PROCESS_RAR
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_SCHEDULER
     DESC = VCD function UE_SCHEDULER
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_GET_SR
     DESC = VCD function UE_GET_SR
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UE_SEND_MCH_SDU
     DESC = VCD function UE_SEND_MCH_SDU
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RLC_DATA_REQ
     DESC = VCD function RLC_DATA_REQ
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_MAC_RLC_STATUS_IND
     DESC = VCD function MAC_RLC_STATUS_IND
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_MAC_RLC_DATA_REQ
     DESC = VCD function MAC_RLC_DATA_REQ
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_MAC_RLC_DATA_IND
     DESC = VCD function MAC_RLC_DATA_IND
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RLC_UM_TRY_REASSEMBLY
     DESC = VCD function RLC_UM_TRY_REASSEMBLY
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RLC_UM_CHECK_TIMER_DAR_TIME_OUT
     DESC = VCD function RLC_UM_CHECK_TIMER_DAR_TIME_OUT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RLC_UM_RECEIVE_PROCESS_DAR
     DESC = VCD function RLC_UM_RECEIVE_PROCESS_DAR
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PDCP_RUN
     DESC = VCD function PDCP_RUN
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PDCP_DATA_REQ
     DESC = VCD function PDCP_DATA_REQ
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PDCP_DATA_IND
     DESC = VCD function PDCP_DATA_IND
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PDCP_APPLY_SECURITY
     DESC = VCD function PDCP_APPLY_SECURITY
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PDCP_VALIDATE_SECURITY
     DESC = VCD function PDCP_VALIDATE_SECURITY
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RRC_RX_TX
     DESC = VCD function RRC_RX_TX
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RRC_MAC_CONFIG
     DESC = VCD function RRC_MAC_CONFIG
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RRC_UE_DECODE_SIB1
     DESC = VCD function RRC_UE_DECODE_SIB1
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_RRC_UE_DECODE_SI
     DESC = VCD function RRC_UE_DECODE_SI
-    GROUP = ALL:VCD:UE
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_GTPV1U_ENB_TASK
     DESC = VCD function GTPV1U_ENB_TASK
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_GTPV1U_PROCESS_UDP_REQ
     DESC = VCD function GTPV1U_PROCESS_UDP_REQ
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_GTPV1U_PROCESS_TUNNEL_DATA_REQ
     DESC = VCD function GTPV1U_PROCESS_TUNNEL_DATA_REQ
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_UDP_ENB_TASK
     DESC = VCD function UDP_ENB_TASK
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_EMU_TRANSPORT
     DESC = VCD function EMU_TRANSPORT
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_LOG_RECORD
     DESC = VCD function LOG_RECORD
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_ITTI_ENQUEUE_MESSAGE
     DESC = VCD function ITTI_ENQUEUE_MESSAGE
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_ITTI_DUMP_ENQUEUE_MESSAGE
     DESC = VCD function ITTI_DUMP_ENQUEUE_MESSAGE
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_ITTI_DUMP_ENQUEUE_MESSAGE_MALLOC
     DESC = VCD function ITTI_DUMP_ENQUEUE_MESSAGE_MALLOC
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_ITTI_RELAY_THREAD
     DESC = VCD function ITTI_RELAY_THREAD
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_TEST
     DESC = VCD function TEST
-    GROUP = ALL:VCD:ENB
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value