diff --git a/CANape/CANape.ini b/CANape/CANape.ini
index 081c788..e58b638 100644
--- a/CANape/CANape.ini
+++ b/CANape/CANape.ini
@@ -6,7 +6,7 @@
 ;-------------------------------------------------------------------------------
 
 [!!!!!_CONSISTENCY_CHECK_START_SECTION_!!!!!]
-GUID={3E32ADB4-C84B-4412-BCFC-7390AA77D052}
+GUID={6A00AF01-208D-4111-9320-BADA8CEFEBBF}
 
 [FILE_INFO]
 Identification=CANape-Project-File
@@ -22,8 +22,8 @@ CreationTime=22:29
 CreationDate=09/06/2020 ; Month/Day/Year
 Protected=0
 CurrentWindowsACP=1252
-ModificationTime=14:38
-ModificationDate=07/29/2024 ; Month/Day/Year
+ModificationTime=12:44
+ModificationDate=07/31/2024 ; Month/Day/Year
 
 [CANAPE]
 
@@ -1091,20 +1091,20 @@ SHOWGRID=0
 RIGHTPANE2HEIGHT=-2
 TREEX=530
 TREEY=1709
-ACTIVEPANE=0
-SELECTED_TREENODE=Geräte/xcp_lite_Device
+ACTIVEPANE=1
+SELECTED_TREENODE=Geräte/xcp_lite_Device/Protokoll
 FIRSTVISIBLE_TREENODE=Geräte
-TREEEXPAND_COUNT=6
+TREEEXPAND_COUNT=7
 TREEEXPAND_0=Geräte
-TREEEXPAND_1=Geräte/xcp_lite_Device/Protokoll
-TREEEXPAND_2=Netzwerke
+TREEEXPAND_1=Geräte/xcp_lite_Device
+TREEEXPAND_2=Geräte/xcp_lite_Device/Protokoll
 LAST_FOCUSED_LISTCOLUMN=0
 LAST_FOCUSED_LISTINDEX=0
 LAST_TOP_LISTINDEX=0
-TREEEXPAND_3=Netzwerke/ETH_1_Network
-TREEEXPAND_4=Netzwerke/ETH_1_Network/xcp_lite_Device
-TREEEXPAND_5=Netzwerke/ETH_1_Network/xcp_lite_Device/Protokoll
-TREEEXPAND_6=Netzwerke/ETH_1_Network/xcp_lite_Device
+TREEEXPAND_3=Netzwerke
+TREEEXPAND_4=Netzwerke/ETH_1_Network
+TREEEXPAND_5=Netzwerke/ETH_1_Network/xcp_lite_Device
+TREEEXPAND_6=Netzwerke/ETH_1_Network/xcp_lite_Device/Protokoll
 ScreenDPIinSection=192
 POSX_dpi96=463
 POSY_dpi96=88
@@ -1140,13 +1140,13 @@ ColWidthDisplay=384
 ShowMore=0
 MoreHeight=588
 ScreenDPIinSection=192
-WindowLeft=2328
-WindowTop=1334
+WindowLeft=2157
+WindowTop=834
 WindowWidth=1248
 WindowHeight=260
 MoreHeight_dpi96=294
-WindowLeft_dpi96=1164
-WindowTop_dpi96=667
+WindowLeft_dpi96=1079
+WindowTop_dpi96=417
 
 MoreHeight=441
 ScreenDPIinSection=144
@@ -1626,8 +1626,8 @@ FIELD_DISPLAY_CSUS_HEIGHT_dpi96=0
 FIELD_DISPLAY_REMARK_HEIGHT_dpi96=0
 FIELD_DISPLAY_DATE_HEIGHT_dpi96=0
 FIELD_DISPLAY_SD_FIELDS_HEIGHT_dpi96=0
-PREDEFINED_ENTRY_00=<PREDEFINED-ENTRY><NAME></NAME><CS-ENTRY><STATE>---</STATE><DATE>2024-07-29T14:25:59</DATE><CSUS></CSUS><CSPR></CSPR><CSWP></CSWP><CSTO></CSTO><CSTV></CSTV><CSPI></CSPI><CSDI></CSDI></CS-ENTRY></PREDEFINED-ENTRY>
-PREDEFINED_ENTRY_01=<PREDEFINED-ENTRY><NAME></NAME><CS-ENTRY><STATE>changed</STATE><DATE>2024-07-29T14:25:59</DATE><CSUS></CSUS><CSPR></CSPR><CSWP></CSWP><CSTO></CSTO><CSTV></CSTV><CSPI></CSPI><CSDI></CSDI></CS-ENTRY></PREDEFINED-ENTRY>
+PREDEFINED_ENTRY_00=<PREDEFINED-ENTRY><NAME></NAME><CS-ENTRY><STATE>---</STATE><DATE>2024-07-31T12:25:48</DATE><CSUS></CSUS><CSPR></CSPR><CSWP></CSWP><CSTO></CSTO><CSTV></CSTV><CSPI></CSPI><CSDI></CSDI></CS-ENTRY></PREDEFINED-ENTRY>
+PREDEFINED_ENTRY_01=<PREDEFINED-ENTRY><NAME></NAME><CS-ENTRY><STATE>changed</STATE><DATE>2024-07-31T12:25:48</DATE><CSUS></CSUS><CSPR></CSPR><CSWP></CSWP><CSTO></CSTO><CSTV></CSTV><CSPI></CSPI><CSDI></CSDI></CS-ENTRY></PREDEFINED-ENTRY>
 
 [RIBBON]
 ISMINIMIZED=0
@@ -2981,7 +2981,7 @@ OVERRUN_HANDLING=0
 
 
 
-EVENT_COUNT=13
+EVENT_COUNT=14
 
 EVENT_CHANNEL_0=0x0000
 EVENT_CHANNEL_1=0x0001
@@ -3040,15 +3040,15 @@ EVENT_MAX_DAQ_LIST_8=255
 EVENT_MAX_DAQ_LIST_9=255
 
 EVENT_NAME_0=mainloop
-EVENT_NAME_1=task1
-EVENT_NAME_2=task1_points
-EVENT_NAME_3=task2_inst_1
-EVENT_NAME_4=task2_inst_2
-EVENT_NAME_5=task2_inst_3
-EVENT_NAME_6=task2_inst_4
-EVENT_NAME_7=task2_inst_5
-EVENT_NAME_8=task2_inst_6
-EVENT_NAME_9=task2_inst_7
+EVENT_NAME_1=mainloop_counter2
+EVENT_NAME_2=task1
+EVENT_NAME_3=task1_points
+EVENT_NAME_4=task2_inst_1
+EVENT_NAME_5=task2_inst_2
+EVENT_NAME_6=task2_inst_3
+EVENT_NAME_7=task2_inst_4
+EVENT_NAME_8=task2_inst_5
+EVENT_NAME_9=task2_inst_6
 
 EVENT_MULTISAMPLES_0=0
 EVENT_MULTISAMPLES_1=0
@@ -3266,7 +3266,7 @@ PACKET_CTR=0
 
 
 
-HOST=192.168.0.83
+HOST=172.19.11.24
 PORT=5555
 LOCAL_PORT=9999
 TRANSPORT_LAYER_PROTOCOL=1
@@ -3379,7 +3379,7 @@ EVENT_SAMPLE_UNIT_10=3
 EVENT_MODE_10=4
 EVENT_PRIO_10=0
 EVENT_MAX_DAQ_LIST_10=255
-EVENT_NAME_10=task2_inst_8
+EVENT_NAME_10=task2_inst_7
 EVENT_MULTISAMPLES_10=0
 EVENT_MIN_CYCLE_TIME_CYCLE_10=0
 EVENT_MIN_CYCLE_TIME_UNIT_10=9
@@ -3390,7 +3390,7 @@ EVENT_SAMPLE_UNIT_11=3
 EVENT_MODE_11=4
 EVENT_PRIO_11=0
 EVENT_MAX_DAQ_LIST_11=255
-EVENT_NAME_11=task2_inst_9
+EVENT_NAME_11=task2_inst_8
 EVENT_MULTISAMPLES_11=0
 EVENT_MIN_CYCLE_TIME_CYCLE_11=0
 EVENT_MIN_CYCLE_TIME_UNIT_11=9
@@ -3407,18 +3407,18 @@ EVENT_SAMPLE_UNIT_12=3
 EVENT_MODE_12=4
 EVENT_PRIO_12=0
 EVENT_MAX_DAQ_LIST_12=255
-EVENT_NAME_12=task2_static
+EVENT_NAME_12=task2_inst_9
 EVENT_MULTISAMPLES_12=0
 EVENT_MIN_CYCLE_TIME_CYCLE_12=0
 EVENT_MIN_CYCLE_TIME_UNIT_12=9
 EVENT_DPM_SUPPORTED_12=0
-EVENT_CHANNEL_13=0x000A
-EVENT_CYCLE_13=15
+EVENT_CHANNEL_13=0x000D
+EVENT_CYCLE_13=0
 EVENT_SAMPLE_UNIT_13=3
 EVENT_MODE_13=4
 EVENT_PRIO_13=0
 EVENT_MAX_DAQ_LIST_13=255
-EVENT_NAME_13=mainloop_10
+EVENT_NAME_13=task2_static
 EVENT_MULTISAMPLES_13=0
 EVENT_MIN_CYCLE_TIME_CYCLE_13=0
 EVENT_MIN_CYCLE_TIME_UNIT_13=9
@@ -5007,10 +5007,10 @@ COUNT=5
 [DlgCommentWrapper]
 
 ScreenDPIinSection=192
-WindowLeft=2277
-WindowLeft_dpi96=1139
-WindowTop=1241
-WindowTop_dpi96=621
+WindowLeft=2106
+WindowLeft_dpi96=1053
+WindowTop=691
+WindowTop_dpi96=346
 WindowWidth=1350
 WindowWidth_dpi96=675
 WindowHeight=923
@@ -5130,10 +5130,10 @@ HEIGHT=1
 
 [DlgMdfComment]
 ScreenDPIinSection=192
-WindowLeft=2290
-WindowLeft_dpi96=1145
-WindowTop=1299
-WindowTop_dpi96=650
+WindowLeft=2119
+WindowLeft_dpi96=1060
+WindowTop=749
+WindowTop_dpi96=375
 WindowWidth=1324
 WindowWidth_dpi96=662
 WindowHeight=786
@@ -5278,203 +5278,6 @@ SortUpward=1
 [xcp_lite_ECDMVariants]
 ECDM_DEVICE=0
 
-[MEASUREMENT_DISPLAY_SELECT]
-ScreenDPIinSection=192
-POSX=574
-POSX_dpi96=287
-POSY=524
-POSY_dpi96=262
-SIZEX=1874
-SIZEX_dpi96=937
-SIZEY=1554
-SIZEY_dpi96=777
-SHOWTOOLBAR=1
-SHOWSTATUSBAR=1
-SHOWGRID=0
-RIGHTPANE2HEIGHT=2
-RIGHTPANE2HEIGHT_dpi96=1
-TREEX=380
-TREEX_dpi96=190
-TREEY=1363
-TREEY_dpi96=682
-ACTIVEPANE=0
-SELECTED_TREENODE=Messsignale
-FIRSTVISIBLE_TREENODE=Messoptionen
-TREEEXPAND_COUNT=1
-TREEEXPAND_0=Messsignale
-LAST_FOCUSED_LISTCOLUMN=0
-LAST_FOCUSED_LISTINDEX=10
-LAST_TOP_LISTINDEX=0
-DAQLISTS=2
-STATUSBAR_BYTES=1
-DIALOGFILEEXTEXPORT=vsf
-LABELLISTMEAMODE=0
-LABELLISTBUSSIGNALMODE=0
-TEXT_SEARCH=counter
-VXIIColumnsAdded=0
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS_CUSTOM]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS_KEY]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS_SYSTEM]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=196608
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS_SYSTEM_DEVICE]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_KNOWN_DYNAMIC_COLUMNS_NORMAL]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-VERSION=100
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_NORMAL]
-ScreenDPIinSection=192
-ColumnCount=7
-Column_0=65542, 66
-Column_0_dpi96=65542, 33
-Column_1=34, 124
-Column_1_dpi96=34, 62
-Column_2=31, 306
-Column_2_dpi96=31, 153
-Column_3=65540, 298
-Column_3_dpi96=65540, 149
-Column_4=65541, 140
-Column_4_dpi96=65541, 70
-Column_5=1, 180
-Column_5_dpi96=1, 90
-Column_6=98305, 160
-Column_6_dpi96=98305, 80
-ColumnIdSort=65540
-SortUpward=1
-VERSION=100
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_RECORDER]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-VERSION=100
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_RECORDER_BUSLOGGING]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_RECORDERS]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_SOUNDS]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_TARA_ACTIVE_SIGNALS]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_TARA_ALL_SIGNALS]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_VIO]
-ScreenDPIinSection=192
-ColumnCount=0
-ColumnIdSort=-1
-SortUpward=1
-
-[MEASUREMENT_DISPLAY_SELECT_DYNAMIC_COLUMNS]
-Count=0
-
-[DEVICE_EXPLORER_COLUMNLIST_CHANNELS]
-ScreenDPIinSection=192
-ColumnCount=4
-Column_0=0, 306
-Column_0_dpi96=0, 153
-Column_1=1245185, 132
-Column_1_dpi96=1245185, 66
-Column_2=1245186, 66
-Column_2_dpi96=1245186, 33
-Column_3=1245187, 106
-Column_3_dpi96=1245187, 53
-ColumnIdSort=-1
-SortUpward=1
-
-[DEVICE_EXPLORER_COLUMNLIST_DEVICES]
-ScreenDPIinSection=192
-ColumnCount=10
-Column_0=34, 64
-Column_0_dpi96=34, 32
-Column_1=0, 172
-Column_1_dpi96=0, 86
-Column_2=131078, 104
-Column_2_dpi96=131078, 52
-Column_3=131103, 98
-Column_3_dpi96=131103, 49
-Column_4=131079, 178
-Column_4_dpi96=131079, 89
-Column_5=262145, 298
-Column_5_dpi96=262145, 149
-Column_6=131085, 248
-Column_6_dpi96=131085, 124
-Column_7=131080, 160
-Column_7_dpi96=131080, 80
-Column_8=131081, 180
-Column_8_dpi96=131081, 90
-Column_9=196609, 192
-Column_9_dpi96=196609, 96
-ColumnIdSort=-1
-SortUpward=1
-
-[DEVICE_EXPLORER_COLUMNLIST_NETWORKS]
-ScreenDPIinSection=192
-ColumnCount=6
-Column_0=34, 64
-Column_0_dpi96=34, 32
-Column_1=0, 304
-Column_1_dpi96=0, 152
-Column_2=983041, 192
-Column_2_dpi96=983041, 96
-Column_3=983042, 530
-Column_3_dpi96=983042, 265
-Column_4=983043, 252
-Column_4_dpi96=983043, 126
-Column_5=983044, 300
-Column_5_dpi96=983044, 150
-ColumnIdSort=-1
-SortUpward=1
-
 [test_ECDMVariants]
 ECDM_DEVICE=0
 
@@ -5630,6 +5433,64 @@ MODE=12
 VALUE_COUNT=0
 HISTORY_COUNT=0
 
+[DEVICE_EXPLORER_COLUMNLIST_CHANNELS]
+ScreenDPIinSection=192
+ColumnCount=4
+Column_0=0, 306
+Column_0_dpi96=0, 153
+Column_1=1245185, 132
+Column_1_dpi96=1245185, 66
+Column_2=1245186, 66
+Column_2_dpi96=1245186, 33
+Column_3=1245187, 106
+Column_3_dpi96=1245187, 53
+ColumnIdSort=-1
+SortUpward=1
+
+[DEVICE_EXPLORER_COLUMNLIST_DEVICES]
+ScreenDPIinSection=192
+ColumnCount=10
+Column_0=34, 64
+Column_0_dpi96=34, 32
+Column_1=0, 172
+Column_1_dpi96=0, 86
+Column_2=131078, 104
+Column_2_dpi96=131078, 52
+Column_3=131103, 98
+Column_3_dpi96=131103, 49
+Column_4=131079, 178
+Column_4_dpi96=131079, 89
+Column_5=262145, 298
+Column_5_dpi96=262145, 149
+Column_6=131085, 248
+Column_6_dpi96=131085, 124
+Column_7=131080, 160
+Column_7_dpi96=131080, 80
+Column_8=131081, 180
+Column_8_dpi96=131081, 90
+Column_9=196609, 192
+Column_9_dpi96=196609, 96
+ColumnIdSort=-1
+SortUpward=1
+
+[DEVICE_EXPLORER_COLUMNLIST_NETWORKS]
+ScreenDPIinSection=192
+ColumnCount=6
+Column_0=34, 64
+Column_0_dpi96=34, 32
+Column_1=0, 304
+Column_1_dpi96=0, 152
+Column_2=983041, 192
+Column_2_dpi96=983041, 96
+Column_3=983042, 530
+Column_3_dpi96=983042, 265
+Column_4=983043, 252
+Column_4_dpi96=983043, 126
+Column_5=983044, 300
+Column_5_dpi96=983044, 150
+ColumnIdSort=-1
+SortUpward=1
+
 [MEASUREMENT_DISPLAY]
 ScreenDPIinSection=192
 POSX=112
@@ -5659,7 +5520,7 @@ TREEEXPAND_2=Rekorderliste
 TREEEXPAND_3=Ereignisliste
 TREEEXPAND_4=Tara
 LAST_FOCUSED_LISTCOLUMN=0
-LAST_FOCUSED_LISTINDEX=16
+LAST_FOCUSED_LISTINDEX=1
 LAST_TOP_LISTINDEX=0
 DAQLISTS=2
 STATUSBAR_BYTES=1
@@ -5822,6 +5683,145 @@ SortUpward=1
 [MEASUREMENT_DISPLAY_DYNAMIC_COLUMNS]
 Count=0
 
+[MEASUREMENT_DISPLAY_SELECT]
+ScreenDPIinSection=192
+POSX=574
+POSX_dpi96=287
+POSY=524
+POSY_dpi96=262
+SIZEX=1874
+SIZEX_dpi96=937
+SIZEY=1554
+SIZEY_dpi96=777
+SHOWTOOLBAR=1
+SHOWSTATUSBAR=1
+SHOWGRID=0
+RIGHTPANE2HEIGHT=2
+RIGHTPANE2HEIGHT_dpi96=1
+TREEX=380
+TREEX_dpi96=190
+TREEY=1363
+TREEY_dpi96=682
+ACTIVEPANE=1
+SELECTED_TREENODE=Messsignale
+FIRSTVISIBLE_TREENODE=Messoptionen
+TREEEXPAND_COUNT=1
+TREEEXPAND_0=Messsignale
+LAST_FOCUSED_LISTCOLUMN=0
+LAST_FOCUSED_LISTINDEX=1
+LAST_TOP_LISTINDEX=0
+DAQLISTS=2
+STATUSBAR_BYTES=1
+DIALOGFILEEXTEXPORT=vsf
+LABELLISTMEAMODE=0
+LABELLISTBUSSIGNALMODE=0
+TEXT_SEARCH=counter
+VXIIColumnsAdded=0
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS_CUSTOM]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS_KEY]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS_SYSTEM]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=196608
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_EVENTS_SYSTEM_DEVICE]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_KNOWN_DYNAMIC_COLUMNS_NORMAL]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+VERSION=100
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_NORMAL]
+ScreenDPIinSection=192
+ColumnCount=7
+Column_0=65542, 66
+Column_0_dpi96=65542, 33
+Column_1=34, 124
+Column_1_dpi96=34, 62
+Column_2=31, 306
+Column_2_dpi96=31, 153
+Column_3=65540, 298
+Column_3_dpi96=65540, 149
+Column_4=65541, 140
+Column_4_dpi96=65541, 70
+Column_5=1, 180
+Column_5_dpi96=1, 90
+Column_6=98305, 160
+Column_6_dpi96=98305, 80
+ColumnIdSort=65540
+SortUpward=1
+VERSION=100
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_RECORDER]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+VERSION=100
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_RECORDER_BUSLOGGING]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_RECORDERS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_SOUNDS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_TARA_ACTIVE_SIGNALS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_TARA_ALL_SIGNALS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_COLUMNLIST_VIO]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_SELECT_DYNAMIC_COLUMNS]
+Count=0
+
 [POSTPROCESS_OPTIONS]
 POSTPROC_MODE=0
 
@@ -5829,5 +5829,5 @@ POSTPROC_MODE=0
 Count=0
 
 [~~~~~_CONSISTENCY_CHECK_END_SECTION_~~~~~]
-GUID={3E32ADB4-C84B-4412-BCFC-7390AA77D052}
+GUID={6A00AF01-208D-4111-9320-BADA8CEFEBBF}
 
diff --git a/CANape/XCPlite.cna b/CANape/XCPlite.cna
index 5220c59..ba36270 100644
--- a/CANape/XCPlite.cna
+++ b/CANape/XCPlite.cna
@@ -10,8 +10,8 @@ PrgDate=08.07.2024
 Description=
 CreationTime=23:25
 CreationDate=04/18/2021 ; Month/Day/Year
-ModificationTime=14:38
-ModificationDate=07/29/2024 ; Month/Day/Year
+ModificationTime=12:39
+ModificationDate=07/31/2024 ; Month/Day/Year
 Protected=0
 CurrentWindowsACP=1252
 
@@ -261,7 +261,7 @@ OptionCSVListSeparator=0
 OptionCSVExport=0
 OptionMARMFExport=0
 OptionMARMFExtended=0
-OptionSuppressCASLRuntimeErrors=0
+OptionSuppressCASLRuntimeErrors=1
 FromTime=-1
 FromActive=0
 FromTimePartActive=0
@@ -333,7 +333,7 @@ COUNT=5
 5=}
 
 [FUNCTION_OBJECT_1]
-Number=16
+Number=17
 Unit=
 Components=0
 TimeSeriesSaveMode=0
@@ -362,7 +362,7 @@ DisplayCount=2
 
 [FUNCTION_OBJECT_1_DISPLAY_1]
 Window=8
-Index=7
+Index=8
 Color=65535
 ApplyColorToBackground=0
 ColorFunction=0
@@ -386,7 +386,7 @@ LineWidth=1
 Precision=-2
 Digits=6
 Enabled=1
-StoredFocused=1
+StoredFocused=0
 SublMask=1
 MeaSublMask=0
 LockScaling=0
@@ -465,7 +465,7 @@ IsParameterFunctionResult=0
 Module=xcp_lite
 
 [FUNCTION_OBJECT_2]
-Number=17
+Number=18
 Unit=
 Components=0
 TimeSeriesSaveMode=0
@@ -540,7 +540,7 @@ GUID=DISPLAY_d65eb017-2a7e-497a-8a3d-06ecb8376e2b
 
 [FUNCTION_OBJECT_2_DISPLAY_2]
 Window=8
-Index=6
+Index=7
 Color=255
 ApplyColorToBackground=0
 ColorFunction=0
@@ -597,7 +597,7 @@ IsParameterFunctionResult=0
 Module=xcp_lite
 
 [FUNCTION_OBJECT_3]
-Number=18
+Number=19
 Unit=
 Components=0
 TimeSeriesSaveMode=0
@@ -672,7 +672,7 @@ GUID=DISPLAY_3e67d534-875c-447a-afa4-04fbf002c84b
 
 [FUNCTION_OBJECT_3_DISPLAY_2]
 Window=8
-Index=8
+Index=9
 Color=16711935
 ApplyColorToBackground=0
 ColorFunction=0
@@ -751,7 +751,7 @@ SubConfigsCount=0
 Count=0
 
 [MEASUREMENT_LIST]
-Count=17
+Count=18
 OfflineFileCount=0
 MeaCfgLabellistName=
 
@@ -771,7 +771,7 @@ DisplayCount=1
 
 [MEASUREMENT_OBJECT_10]
 Module=xcp_lite
-Name=channel_3
+Name=channel_2
 Disabled=0
 Mode=2147483653
 Rate=0
@@ -785,6 +785,66 @@ DisplayCount=1
 
 [MEASUREMENT_OBJECT_10_DISPLAY_1]
 Window=3
+Index=7
+Color=21930
+ApplyColorToBackground=0
+ColorFunction=0
+ColorFunctionScope=1
+LineTyp=2
+YMinHome=-200
+YMaxHome=200
+YMin=-200
+YMax=200
+XOffsetNS=0
+XOffset=0
+ValueFormat=3
+BitMask=1
+ShowYAxis=1
+Width=10
+LineStyle=1
+MarkerType=1
+SRMainValue=0
+InvalidValueDrawMode=3
+LineWidth=2
+Precision=-2
+Digits=6
+Enabled=1
+StoredFocused=0
+SublMask=1
+MeaSublMask=3
+LockScaling=0
+RightAxis=0
+MapMode=2
+OverlayGridColor=0
+ShadingMode=3
+EditOffset=1
+EditFactor=2
+WAxisLabel=
+XAxisLabel=
+YAxisLabel=
+AxisCaption=
+Row=0
+Col=0
+YAxis_ID=2
+AxisTemplate=
+GUID=DISPLAY_6bfc8c70-8ddc-4676-a754-45ecb1957527
+
+[MEASUREMENT_OBJECT_11]
+Module=xcp_lite
+Name=channel_3
+Disabled=0
+Mode=2147483654
+Rate=0
+Row=0
+Column=0
+MeaReferenced=1
+ArchivBy_1=Rekorder
+IsFallback=0
+HasManagedDisplay=0
+DisplayCount=1
+
+[MEASUREMENT_OBJECT_11_DISPLAY_1]
+Window=3
 Index=6
 Color=11184895
 ApplyColorToBackground=0
@@ -829,11 +889,11 @@ YAxis_ID=2
 AxisTemplate=
 GUID=DISPLAY_af726eb9-3178-4dfe-afce-87f52937a058
 
-[MEASUREMENT_OBJECT_11]
+[MEASUREMENT_OBJECT_12]
 Module=xcp_lite
 Name=channel_4
 Disabled=0
-Mode=2147483654
+Mode=2147483655
 Rate=0
 Row=0
 Column=0
@@ -843,7 +903,7 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_11_DISPLAY_1]
+[MEASUREMENT_OBJECT_12_DISPLAY_1]
 Window=3
 Index=5
 Color=43520
@@ -889,11 +949,11 @@ YAxis_ID=2
 AxisTemplate=
 GUID=DISPLAY_f8838ae2-d42d-4254-b1ef-0e4d00235ec5
 
-[MEASUREMENT_OBJECT_12]
+[MEASUREMENT_OBJECT_13]
 Module=xcp_lite
 Name=channel_5
 Disabled=0
-Mode=2147483655
+Mode=2147483656
 Rate=0
 Row=0
 Column=0
@@ -903,7 +963,7 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_12_DISPLAY_1]
+[MEASUREMENT_OBJECT_13_DISPLAY_1]
 Window=3
 Index=4
 Color=43690
@@ -949,11 +1009,11 @@ YAxis_ID=2
 AxisTemplate=
 GUID=DISPLAY_5316f15e-cd29-4a81-8d23-b63301664eab
 
-[MEASUREMENT_OBJECT_13]
+[MEASUREMENT_OBJECT_14]
 Module=xcp_lite
 Name=channel_6
 Disabled=0
-Mode=2147483656
+Mode=2147483657
 Rate=0
 Row=0
 Column=0
@@ -963,7 +1023,7 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_13_DISPLAY_1]
+[MEASUREMENT_OBJECT_14_DISPLAY_1]
 Window=3
 Index=3
 Color=33023
@@ -1009,11 +1069,11 @@ YAxis_ID=2
 AxisTemplate=
 GUID=DISPLAY_b5933642-3201-41ea-8349-98fce39bdcf3
 
-[MEASUREMENT_OBJECT_14]
+[MEASUREMENT_OBJECT_15]
 Module=xcp_lite
 Name=channel_7
 Disabled=0
-Mode=2147483657
+Mode=2147483658
 Rate=0
 Row=0
 Column=0
@@ -1023,7 +1083,7 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_14_DISPLAY_1]
+[MEASUREMENT_OBJECT_15_DISPLAY_1]
 Window=3
 Index=2
 Color=65450
@@ -1069,11 +1129,11 @@ YAxis_ID=2
 AxisTemplate=
 GUID=DISPLAY_f9d8418b-5fe5-4380-8f3e-f194517da47f
 
-[MEASUREMENT_OBJECT_15]
+[MEASUREMENT_OBJECT_16]
 Module=xcp_lite
 Name=channel_8
 Disabled=0
-Mode=2147483658
+Mode=2147483659
 Rate=0
 Row=0
 Column=0
@@ -1083,7 +1143,7 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_15_DISPLAY_1]
+[MEASUREMENT_OBJECT_16_DISPLAY_1]
 Window=3
 Index=1
 Color=16776960
@@ -1129,11 +1189,11 @@ YAxis_ID=2
 AxisTemplate=
 GUID=DISPLAY_a264452d-a480-42f5-8b83-1b20a7180a17
 
-[MEASUREMENT_OBJECT_16]
+[MEASUREMENT_OBJECT_17]
 Module=xcp_lite
 Name=channel_9
 Disabled=0
-Mode=2147483659
+Mode=2147483660
 Rate=0
 Row=0
 Column=0
@@ -1143,7 +1203,7 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_16_DISPLAY_1]
+[MEASUREMENT_OBJECT_17_DISPLAY_1]
 Window=3
 Index=0
 Color=11162965
@@ -1189,12 +1249,12 @@ YAxis_ID=2
 AxisTemplate=
 GUID=DISPLAY_38e26b38-ea9f-464e-95df-39d45a9aef6d
 
-[MEASUREMENT_OBJECT_17]
+[MEASUREMENT_OBJECT_18]
 Components=0
 Module=xcp_lite
 Name=$point_cloud$
 Disabled=1
-Mode=2147483650
+Mode=2147483651
 Rate=0
 Row=0
 Column=0
@@ -1206,7 +1266,7 @@ DisplayCount=0
 
 [MEASUREMENT_OBJECT_1_DISPLAY_1]
 Window=8
-Index=5
+Index=1
 Color=33023
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1252,7 +1312,7 @@ GUID=DISPLAY_a4718064-71a8-43ab-a26d-7b0b56d07687
 
 [MEASUREMENT_OBJECT_2]
 Module=xcp_lite
-Name=counter
+Name=mainloop_counter2
 Disabled=0
 Mode=2147483649
 Rate=0
@@ -1262,11 +1322,71 @@ MeaReferenced=1
 ArchivBy_1=Rekorder
 IsFallback=0
 HasManagedDisplay=0
-DisplayCount=2
+DisplayCount=1
 
 [MEASUREMENT_OBJECT_2_DISPLAY_1]
 Window=8
-Index=4
+Index=0
+Color=16744576
+ApplyColorToBackground=0
+ColorFunction=0
+ColorFunctionScope=1
+LineTyp=2
+YMinHome=0
+YMaxHome=100
+YMin=0
+YMax=100
+XOffsetNS=0
+XOffset=0
+ValueFormat=3
+BitMask=1
+ShowYAxis=1
+Width=10
+LineStyle=1
+MarkerType=1
+SRMainValue=0
+InvalidValueDrawMode=3
+LineWidth=1
+Precision=-2
+Digits=6
+Enabled=1
+StoredFocused=0
+SublMask=1
+MeaSublMask=0
+LockScaling=0
+RightAxis=0
+MapMode=2
+OverlayGridColor=0
+ShadingMode=3
+EditOffset=1
+EditFactor=2
+WAxisLabel=
+XAxisLabel=
+YAxisLabel=
+AxisCaption=
+Row=0
+Col=0
+YAxis_ID=0
+AxisTemplate=
+GUID=DISPLAY_63b3c865-c9d8-4f5f-ad70-00899dc935c0
+
+[MEASUREMENT_OBJECT_3]
+Module=xcp_lite
+Name=counter
+Disabled=0
+Mode=2147483650
+Rate=0
+Row=0
+Column=0
+MeaReferenced=1
+ArchivBy_1=Rekorder
+IsFallback=0
+HasManagedDisplay=0
+DisplayCount=2
+
+[MEASUREMENT_OBJECT_3_DISPLAY_1]
+Window=8
+Index=6
 Color=16744448
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1310,7 +1430,7 @@ YAxis_ID=0
 AxisTemplate=
 GUID=DISPLAY_3816e7cb-d393-4245-8621-60d726ebcfe4
 
-[MEASUREMENT_OBJECT_2_DISPLAY_2]
+[MEASUREMENT_OBJECT_3_DISPLAY_2]
 Window=3
 Index=9
 Color=16744448
@@ -1356,11 +1476,11 @@ YAxis_ID=0
 AxisTemplate=
 GUID=DISPLAY_2561bed0-8ac6-4731-a9eb-c3f475b324d8
 
-[MEASUREMENT_OBJECT_3]
+[MEASUREMENT_OBJECT_4]
 Module=xcp_lite
 Name=counter_u64
 Disabled=0
-Mode=2147483649
+Mode=2147483650
 Rate=0
 Row=0
 Column=0
@@ -1370,9 +1490,9 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_3_DISPLAY_1]
+[MEASUREMENT_OBJECT_4_DISPLAY_1]
 Window=8
-Index=3
+Index=5
 Color=65280
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1416,11 +1536,11 @@ YAxis_ID=0
 AxisTemplate=
 GUID=DISPLAY_7691d3bd-bcba-416d-8b8d-dd26b2a5fc34
 
-[MEASUREMENT_OBJECT_4]
+[MEASUREMENT_OBJECT_5]
 Module=xcp_lite
 Name=counter_u32
 Disabled=0
-Mode=2147483649
+Mode=2147483650
 Rate=0
 Row=0
 Column=0
@@ -1430,9 +1550,9 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_4_DISPLAY_1]
+[MEASUREMENT_OBJECT_5_DISPLAY_1]
 Window=8
-Index=2
+Index=4
 Color=255
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1476,11 +1596,11 @@ YAxis_ID=0
 AxisTemplate=
 GUID=DISPLAY_ed075cff-161d-441e-ab13-ef70dd70101d
 
-[MEASUREMENT_OBJECT_5]
+[MEASUREMENT_OBJECT_6]
 Module=xcp_lite
 Name=counter_u16
 Disabled=0
-Mode=2147483649
+Mode=2147483650
 Rate=0
 Row=0
 Column=0
@@ -1490,9 +1610,9 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_5_DISPLAY_1]
+[MEASUREMENT_OBJECT_6_DISPLAY_1]
 Window=8
-Index=1
+Index=3
 Color=16776960
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1536,11 +1656,11 @@ YAxis_ID=0
 AxisTemplate=
 GUID=DISPLAY_661e9d67-6e45-4854-9267-1189c1069d03
 
-[MEASUREMENT_OBJECT_6]
+[MEASUREMENT_OBJECT_7]
 Module=xcp_lite
 Name=counter_u8
 Disabled=0
-Mode=2147483649
+Mode=2147483650
 Rate=0
 Row=0
 Column=0
@@ -1550,9 +1670,9 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_6_DISPLAY_1]
+[MEASUREMENT_OBJECT_7_DISPLAY_1]
 Window=8
-Index=0
+Index=2
 Color=16711935
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1576,7 +1696,7 @@ LineWidth=1
 Precision=-2
 Digits=6
 Enabled=1
-StoredFocused=0
+StoredFocused=1
 SublMask=1
 MeaSublMask=0
 LockScaling=0
@@ -1596,11 +1716,11 @@ YAxis_ID=0
 AxisTemplate=
 GUID=DISPLAY_8ec39fbe-4cfc-405b-84f1-1beb1b99ea53
 
-[MEASUREMENT_OBJECT_7]
+[MEASUREMENT_OBJECT_8]
 Module=xcp_lite
 Name=array1
 Disabled=1
-Mode=2147483649
+Mode=2147483650
 Rate=0
 Row=0
 Column=0
@@ -1616,11 +1736,11 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=0
 
-[MEASUREMENT_OBJECT_8]
+[MEASUREMENT_OBJECT_9]
 Module=xcp_lite
 Name=channel_1
 Disabled=0
-Mode=2147483651
+Mode=2147483652
 Rate=0
 Row=0
 Column=0
@@ -1630,7 +1750,7 @@ IsFallback=0
 HasManagedDisplay=0
 DisplayCount=1
 
-[MEASUREMENT_OBJECT_8_DISPLAY_1]
+[MEASUREMENT_OBJECT_9_DISPLAY_1]
 Window=3
 Index=8
 Color=255
@@ -1676,66 +1796,6 @@ YAxis_ID=2
 AxisTemplate=
 GUID=DISPLAY_b65281b1-6d89-431f-848c-ff4f029b7ddf
 
-[MEASUREMENT_OBJECT_9]
-Module=xcp_lite
-Name=channel_2
-Disabled=0
-Mode=2147483652
-Rate=0
-Row=0
-Column=0
-MeaReferenced=1
-ArchivBy_1=Rekorder
-IsFallback=0
-HasManagedDisplay=0
-DisplayCount=1
-
-[MEASUREMENT_OBJECT_9_DISPLAY_1]
-Window=3
-Index=7
-Color=21930
-ApplyColorToBackground=0
-ColorFunction=0
-ColorFunctionScope=1
-LineTyp=2
-YMinHome=-200
-YMaxHome=200
-YMin=-200
-YMax=200
-XOffsetNS=0
-XOffset=0
-ValueFormat=3
-BitMask=1
-ShowYAxis=1
-Width=10
-LineStyle=1
-MarkerType=1
-SRMainValue=0
-InvalidValueDrawMode=3
-LineWidth=2
-Precision=-2
-Digits=6
-Enabled=1
-StoredFocused=0
-SublMask=1
-MeaSublMask=3
-LockScaling=0
-RightAxis=0
-MapMode=2
-OverlayGridColor=0
-ShadingMode=3
-EditOffset=1
-EditFactor=2
-WAxisLabel=
-XAxisLabel=
-YAxisLabel=
-AxisCaption=
-Row=0
-Col=0
-YAxis_ID=2
-AxisTemplate=
-GUID=DISPLAY_6bfc8c70-8ddc-4676-a754-45ecb1957527
-
 [MEASUREMENT_OPTIONS]
 RemainingRecordingTime=5000
 StopMeasurementOnRecorderStopped=0
@@ -1814,7 +1874,7 @@ GlobalCursorTimeNs=0
 GlobalTimeAxis=1
 GlobalTimeAxisStartTime=0
 GlobalTimeAxisEndTime=34366622088
-MainWindowPos=1, 1030, 18, 3502, 2069 ;cmd, x, y, w, h
+MainWindowPos=1, 1030, 68, 3502, 2069 ;cmd, x, y, w, h
 
 [PAR_COMMENT]
 1="Name",""
@@ -4287,7 +4347,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_9ceb89e6-e86a-43ef-8365-42987ca2f460
+GUID=DISPLAY_3a251c06-01c7-4146-a312-cfe3c7327f36
 
 [WINDOW_5_OBJECT_10]
 Type=2
@@ -4336,7 +4396,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_322e6750-5a76-4eb3-a41b-92b7acdcca1c
+GUID=DISPLAY_4ebb170f-8cab-4cd9-8f43-4233f4d1bbe2
 
 [WINDOW_5_OBJECT_11]
 Type=2
@@ -4385,7 +4445,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_eaf178de-7f13-4eb0-b006-74babc8847f8
+GUID=DISPLAY_25e07f2e-457c-43e7-995e-15f7009b527b
 
 [WINDOW_5_OBJECT_12]
 Type=2
@@ -4434,7 +4494,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_aecad35c-fe76-40e0-b61d-31bfdd877156
+GUID=DISPLAY_b911ea2b-9e19-433c-99ce-6847b77d72e0
 
 [WINDOW_5_OBJECT_13]
 Type=2
@@ -4483,7 +4543,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_c4f47b5c-928e-42fa-8aaa-28580475dca4
+GUID=DISPLAY_956ac468-e774-4159-8398-581dac4dcb25
 
 [WINDOW_5_OBJECT_14]
 Type=2
@@ -4532,7 +4592,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_fbdadd16-72db-4391-b7d6-2d648d500f4d
+GUID=DISPLAY_97c96f7a-9e7c-4c69-a433-26f9738dfb96
 
 [WINDOW_5_OBJECT_15]
 Type=2
@@ -4581,7 +4641,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_5cbd1eaf-51e7-498a-a192-dfd661b60b44
+GUID=DISPLAY_80d70cc9-6963-4213-ab03-53131095e8fe
 
 [WINDOW_5_OBJECT_16]
 Type=2
@@ -4630,7 +4690,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_8ef081e5-30ed-43ef-8e64-3339d1f45e05
+GUID=DISPLAY_4c3f63b1-54f4-45e0-9d2f-ed038c0cee44
 
 [WINDOW_5_OBJECT_2]
 Type=2
@@ -4679,7 +4739,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_6339cbb5-14f2-42e1-a2bd-4f8d3f73b959
+GUID=DISPLAY_68707be8-01e2-48e6-ac73-179618a5018a
 
 [WINDOW_5_OBJECT_3]
 Type=2
@@ -4728,7 +4788,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_fb9388f3-836b-41e4-b803-a0b7ee4d7f4f
+GUID=DISPLAY_979bbde8-663e-43e1-b9ea-dafcf81ae21d
 
 [WINDOW_5_OBJECT_4]
 Type=2
@@ -4777,7 +4837,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_b5b671ed-0021-418c-8488-2254fe2bc44f
+GUID=DISPLAY_1c0c1cb1-a571-4e9c-a01b-f8017e6d613b
 
 [WINDOW_5_OBJECT_5]
 Type=2
@@ -4826,7 +4886,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_acde4758-3a4c-4333-8acb-88365bafbe4b
+GUID=DISPLAY_54abeccf-c19d-4337-abfa-4e4897a23dfa
 
 [WINDOW_5_OBJECT_6]
 Type=2
@@ -4875,7 +4935,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_ec6419a5-5cf6-4fa3-a386-990f00076bd7
+GUID=DISPLAY_85f4276e-6b94-4f5a-83ab-609aa2d593cd
 
 [WINDOW_5_OBJECT_7]
 Type=2
@@ -4924,7 +4984,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_197c8deb-a846-492f-bc8f-46e92fc1cd6d
+GUID=DISPLAY_e970e771-6c1c-491d-a8b2-1e3cf32fa9fa
 
 [WINDOW_5_OBJECT_8]
 Type=2
@@ -4973,7 +5033,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_6190ec4d-fd59-4a06-981a-4cb40f9dbe70
+GUID=DISPLAY_289beb2a-15e2-4c7c-825f-9039d42842a7
 
 [WINDOW_5_OBJECT_9]
 Type=2
@@ -5022,7 +5082,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_0d151f66-5599-4ccb-bae6-4417b5599474
+GUID=DISPLAY_e0b7e0d3-0060-47e4-a692-b01ec4e28b11
 
 [WINDOW_6]
 ProgID=CNPTRACE.TraceCtrl.1
diff --git a/CANape/XCPlite.cnaxml b/CANape/XCPlite.cnaxml
index af3367f..cbd3455 100644
--- a/CANape/XCPlite.cnaxml
+++ b/CANape/XCPlite.cnaxml
@@ -201,7 +201,7 @@
       <property name="ManualClosedPanelsBarVisibility">false</property>
       <property name="RedrawContentWhenResizing">false</property>
       <property name="ShowFloatWindowsInTaskbar">false</property>
-      <property name="RestoreLayoutOptions.FloatPanelsRestoreOffset" OwnerType="DevExpress.Xpf.Docking.RestoreLayoutOptions" DependencyPropertyType="System.Windows.Point">516,179.5</property>
+      <property name="RestoreLayoutOptions.FloatPanelsRestoreOffset" OwnerType="DevExpress.Xpf.Docking.RestoreLayoutOptions" DependencyPropertyType="System.Windows.Point">516,204.5</property>
     </property>
   </XtraSerializer>
 </Root>
\ No newline at end of file
diff --git a/CANape/xcp_lite_autodetect.a2l b/CANape/xcp_lite_autodetect.a2l
index ccc0cdf..5499a63 100644
--- a/CANape/xcp_lite_autodetect.a2l
+++ b/CANape/xcp_lite_autodetect.a2l
@@ -130,28 +130,29 @@
             OPTIONAL_LEVEL1_CMD GET_VERSION
             /end PROTOCOL_LAYER
             /begin DAQ
-            DYNAMIC 0 13 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID
+            DYNAMIC 0 14 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID
             /begin TIMESTAMP_SUPPORTED
                 0x1 SIZE_DWORD UNIT_1US TIMESTAMP_FIXED
             /end TIMESTAMP_SUPPORTED
 
 /begin EVENT "mainloop" "mainloop" 0 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task1" "task1" 1 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task1_points" "task1_po" 2 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_1" "task2_in" 3 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_2" "task2_in" 4 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_3" "task2_in" 5 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_4" "task2_in" 6 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_5" "task2_in" 7 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_6" "task2_in" 8 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_7" "task2_in" 9 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_8" "task2_in" 10 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_9" "task2_in" 11 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_static" "task2_st" 12 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "mainloop_counter2" "mainloop" 1 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task1" "task1" 2 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task1_points" "task1_po" 3 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_1" "task2_in" 4 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_2" "task2_in" 5 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_3" "task2_in" 6 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_4" "task2_in" 7 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_5" "task2_in" 8 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_6" "task2_in" 9 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_7" "task2_in" 10 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_8" "task2_in" 11 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_9" "task2_in" 12 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_static" "task2_st" 13 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
 
             /end DAQ
 
-/begin XCP_ON_UDP_IP 0x104 5555 ADDRESS "192.168.0.83" /end XCP_ON_UDP_IP
+/begin XCP_ON_UDP_IP 0x104 5555 ADDRESS "172.19.11.24" /end XCP_ON_UDP_IP
 
         /end IF_DATA
 
@@ -202,35 +203,35 @@ CalPage2.ampl
 CalPage2.period
 /end REF_CHARACTERISTIC /end GROUP
 
-/begin MEASUREMENT array1 "" FLOAT64_IEEE NO_COMPU_METHOD 0 0 -1000000000000 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x1F7F4 ECU_ADDRESS_EXTENSION 2 MATRIX_DIM 256 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT array1 "" FLOAT64_IEEE NO_COMPU_METHOD 0 0 -1000000000000 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x2F7F4 ECU_ADDRESS_EXTENSION 2 MATRIX_DIM 256 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel "sine: f64" FLOAT64_IEEE channel.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xC0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 12 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel "sine: f64" FLOAT64_IEEE channel.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xD0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 13 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_1.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_1 "sine: f64" FLOAT64_IEEE channel_1.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x30000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_1 "sine: f64" FLOAT64_IEEE channel_1.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x40000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_2.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_2 "sine: f64" FLOAT64_IEEE channel_2.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x40000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_2 "sine: f64" FLOAT64_IEEE channel_2.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x50000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 5 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_3.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_3 "sine: f64" FLOAT64_IEEE channel_3.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x50000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 5 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_3 "sine: f64" FLOAT64_IEEE channel_3.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x60000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 6 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_4.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_4 "sine: f64" FLOAT64_IEEE channel_4.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x60000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 6 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_4 "sine: f64" FLOAT64_IEEE channel_4.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x70000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 7 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_5.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_5 "sine: f64" FLOAT64_IEEE channel_5.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x70000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 7 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_5 "sine: f64" FLOAT64_IEEE channel_5.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x80000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 8 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_6.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_6 "sine: f64" FLOAT64_IEEE channel_6.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x80000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 8 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_6 "sine: f64" FLOAT64_IEEE channel_6.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x90000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 9 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_7.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_7 "sine: f64" FLOAT64_IEEE channel_7.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x90000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 9 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_7 "sine: f64" FLOAT64_IEEE channel_7.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xA0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 10 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_8.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_8 "sine: f64" FLOAT64_IEEE channel_8.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xA0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 10 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_8 "sine: f64" FLOAT64_IEEE channel_8.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xB0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 11 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_9.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_9 "sine: f64" FLOAT64_IEEE channel_9.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xB0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 11 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter "" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x1F7E0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter_u16 "wrapping counter: u16" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x1F7E6 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter_u32 "wrapping counter: u32" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x1F7E8 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter_u64 "wrapping counter: u64" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x1F7EC ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter_u8 "wrapping counter: u8" UBYTE NO_COMPU_METHOD 0 0 0 255 PHYS_UNIT "" ECU_ADDRESS 0x1F7E5 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_9 "sine: f64" FLOAT64_IEEE channel_9.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xC0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 12 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter "" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x2F7E0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter_u16 "wrapping counter: u16" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x2F7E6 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter_u32 "wrapping counter: u32" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x2F7E8 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter_u64 "wrapping counter: u64" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x2F7EC ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter_u8 "wrapping counter: u8" UBYTE NO_COMPU_METHOD 0 0 0 255 PHYS_UNIT "" ECU_ADDRESS 0x2F7E5 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin MEASUREMENT mainloop_counter "counter on stack" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0xFFF0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT mainloop_counter2 "counter on heap" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin CHARACTERISTIC point_cloud "struct serializer demo" ASCII 0x20000 U8 0 NO_COMPU_METHOD 0 255 READ_ONLY NUMBER 64 ECU_ADDRESS_EXTENSION 2 
+/begin MEASUREMENT mainloop_counter2 "counter on heap" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x10000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin CHARACTERISTIC point_cloud "struct serializer demo" ASCII 0x30000 U8 0 NO_COMPU_METHOD 0 255 READ_ONLY NUMBER 64 ECU_ADDRESS_EXTENSION 2 
 /begin ANNOTATION ANNOTATION_LABEL "ObjectDescription" ANNOTATION_ORIGIN "application/dds" /begin ANNOTATION_TEXT
         "<DynamicObject> "
         "<RootType>Vector::PointCloud</RootType>"
@@ -247,9 +248,11 @@ CalPage2.period
 /end ANNOTATION_TEXT /end ANNOTATION
 /begin ANNOTATION ANNOTATION_LABEL "IsVlsd" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT  "true" /end ANNOTATION_TEXT /end ANNOTATION
 /begin ANNOTATION ANNOTATION_LABEL "MaxBufferNeeded" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "64" /end ANNOTATION_TEXT /end ANNOTATION
- /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
+ /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
 /begin GROUP mainloop "" /begin REF_MEASUREMENT
 mainloop_counter
+/end REF_MEASUREMENT /end GROUP
+/begin GROUP mainloop_counter2 "" /begin REF_MEASUREMENT
 mainloop_counter2
 /end REF_MEASUREMENT /end GROUP
 /begin GROUP task1 "" /begin REF_MEASUREMENT
@@ -263,31 +266,15 @@ counter_u8
 /begin GROUP task1_points "" /begin REF_MEASUREMENT
 point_cloud
 /end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_1 "" /begin REF_MEASUREMENT
+/begin GROUP task2_inst "" /begin REF_MEASUREMENT
 channel_1
-/end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_2 "" /begin REF_MEASUREMENT
 channel_2
-/end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_3 "" /begin REF_MEASUREMENT
 channel_3
-/end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_4 "" /begin REF_MEASUREMENT
 channel_4
-/end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_5 "" /begin REF_MEASUREMENT
 channel_5
-/end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_6 "" /begin REF_MEASUREMENT
 channel_6
-/end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_7 "" /begin REF_MEASUREMENT
 channel_7
-/end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_8 "" /begin REF_MEASUREMENT
 channel_8
-/end REF_MEASUREMENT /end GROUP
-/begin GROUP task2_inst_9 "" /begin REF_MEASUREMENT
 channel_9
 /end REF_MEASUREMENT /end GROUP
 /begin GROUP task2_static "" /begin REF_MEASUREMENT
diff --git a/examples/rayon_demo/CANape/CANape.ini b/examples/rayon_demo/CANape/CANape.ini
index 0c47dd4..6ae1887 100644
--- a/examples/rayon_demo/CANape/CANape.ini
+++ b/examples/rayon_demo/CANape/CANape.ini
@@ -6,7 +6,7 @@
 ;-------------------------------------------------------------------------------
 
 [!!!!!_CONSISTENCY_CHECK_START_SECTION_!!!!!]
-GUID={E1E212EB-5105-46F9-B787-4FED32FFE2D6}
+GUID={C4CE7638-E7EC-4129-A733-2CFCEFE6DBCF}
 
 [FILE_INFO]
 Identification=CANape-Project-File
@@ -20,8 +20,8 @@ PrgDate=08.07.2024
 Description=
 CreationTime=19:37
 CreationDate=06/23/2024 ; Month/Day/Year
-ModificationTime=22:10
-ModificationDate=07/30/2024 ; Month/Day/Year
+ModificationTime=01:01
+ModificationDate=08/01/2024 ; Month/Day/Year
 Protected=0
 CurrentWindowsACP=1252
 
@@ -1023,25 +1023,25 @@ ConfigurationJson={"RemoteServiceDataList":[{"DisplayName":"CANape Master","Ip":
 
 [DlgCommentWrapper]
 ScreenDPIinSection=192
-WindowLeft=1060
-WindowLeft_dpi96=530
-WindowTop=621
-WindowTop_dpi96=311
+WindowLeft=1197
+WindowLeft_dpi96=599
+WindowTop=643
+WindowTop_dpi96=322
 WindowWidth=1350
 WindowWidth_dpi96=675
-WindowHeight=893
-WindowHeight_dpi96=447
+WindowHeight=923
+WindowHeight_dpi96=462
 
 [DlgMdfComment]
 ScreenDPIinSection=192
-WindowLeft=1073
-WindowLeft_dpi96=537
-WindowTop=679
-WindowTop_dpi96=340
+WindowLeft=1210
+WindowLeft_dpi96=605
+WindowTop=701
+WindowTop_dpi96=351
 WindowWidth=1324
 WindowWidth_dpi96=662
-WindowHeight=756
-WindowHeight_dpi96=378
+WindowHeight=786
+WindowHeight_dpi96=393
 
 [DlgSaveConfigs]
 ScreenDPIinSection=192
@@ -1178,7 +1178,7 @@ COUNT=0
 
 [MEASUREMENT_0]
 FileId=Measurement1
-MeasurementId=e42c9f6a-e752-471c-8c0e-09652e92ff93
+MeasurementId=3f1c7d8a-9cbf-46b6-94cb-2dc67da3b638
 MeasurementMapped=0
 
 [MEASUREMENTS]
@@ -1390,7 +1390,7 @@ BEG_CAL_SERVICE=0x0
 END_CAL_SERVICE=0x0
 TEST_CONNECTION_PERIOD=0
 OVERRUN_HANDLING=0
-EVENT_COUNT=12
+EVENT_COUNT=13
 EVENT_CHANNEL_0=0x0000
 EVENT_CHANNEL_1=0x0001
 EVENT_CHANNEL_2=0x0002
@@ -1446,14 +1446,14 @@ EVENT_MAX_DAQ_LIST_6=255
 EVENT_MAX_DAQ_LIST_7=255
 EVENT_MAX_DAQ_LIST_8=255
 EVENT_NAME_0=mainloop
-EVENT_NAME_1=task_1
-EVENT_NAME_2=task_2
-EVENT_NAME_3=task_3
-EVENT_NAME_4=task_4
-EVENT_NAME_5=task_5
-EVENT_NAME_6=task_6
-EVENT_NAME_7=task_7
-EVENT_NAME_8=task_8
+EVENT_NAME_1=pixels
+EVENT_NAME_2=task_1
+EVENT_NAME_3=task_2
+EVENT_NAME_4=task_3
+EVENT_NAME_5=task_4
+EVENT_NAME_6=task_5
+EVENT_NAME_7=task_6
+EVENT_NAME_8=task_7
 EVENT_MULTISAMPLES_0=0
 EVENT_MULTISAMPLES_1=0
 EVENT_MULTISAMPLES_2=0
@@ -1488,7 +1488,7 @@ PSEUDO_CAN_ID_START=2415919104
 DSP_MODE=0
 DAQ_LIST_AUTODETECT=1
 DAQ_COUNT=0
-DAQ_CONFIG_ID=3150
+DAQ_CONFIG_ID=16094
 DAQ_START_STOP_ALL_DISABLED=0
 INIT_CAL_PAGE_SEGMENTWISE=0
 CALRAM_CHECK_INITIAL_PAGE=1
@@ -1705,8 +1705,8 @@ EVENT_PRIO_9=0
 EVENT_PRIO_10=0
 EVENT_MAX_DAQ_LIST_9=255
 EVENT_MAX_DAQ_LIST_10=255
-EVENT_NAME_9=task_9
-EVENT_NAME_10=task_10
+EVENT_NAME_9=task_8
+EVENT_NAME_10=task_9
 EVENT_MULTISAMPLES_9=0
 EVENT_MULTISAMPLES_10=0
 EVENT_MIN_CYCLE_TIME_CYCLE_9=0
@@ -1717,7 +1717,7 @@ EVENT_DPM_SUPPORTED_9=0
 EVENT_DPM_SUPPORTED_10=0
 MEMORY_SEGMENT_NAME_2=mandelbrot
 MEMORY_SEGMENT_TYPE_2=FLASH,DATA,INTERN
-MEMORY_SEGMENT_SIZE_2=0x00000020
+MEMORY_SEGMENT_SIZE_2=0x00000018
 MEMORY_SEGMENT_ADDR_2=0x80010000
 MEMORY_SEGMENT_ADDR_EXT_2=0x00
 MEMORY_SEGMENT_ATTRIBUTE_2=0x00000000
@@ -1725,7 +1725,7 @@ MEMORY_SEGMENT_FLASH_OFFSET_2=0x00000000
 MEMORY_SEGMENT_ADDRESS_MAPPING_2=
 CALRAM_SECTOR_NAME_2=mandelbrot
 CALRAM_SECTOR_TYPE_2=FLASH,DATA,INTERN
-CALRAM_SECTOR_SIZE_2=0x00000020
+CALRAM_SECTOR_SIZE_2=0x00000018
 CALRAM_SECTOR_ADDR_2=0x80010000
 CALRAM_SECTOR_ADDR_EXT_2=0x00
 CALRAM_SECTOR_ATTRIBUTE_2=0x00000000
@@ -1737,11 +1737,22 @@ EVENT_SAMPLE_UNIT_11=3
 EVENT_MODE_11=4
 EVENT_PRIO_11=0
 EVENT_MAX_DAQ_LIST_11=255
-EVENT_NAME_11=task_11
+EVENT_NAME_11=task_10
 EVENT_MULTISAMPLES_11=0
 EVENT_MIN_CYCLE_TIME_CYCLE_11=0
 EVENT_MIN_CYCLE_TIME_UNIT_11=9
 EVENT_DPM_SUPPORTED_11=0
+EVENT_CHANNEL_12=0x000C
+EVENT_CYCLE_12=0
+EVENT_SAMPLE_UNIT_12=3
+EVENT_MODE_12=4
+EVENT_PRIO_12=0
+EVENT_MAX_DAQ_LIST_12=255
+EVENT_NAME_12=task_11
+EVENT_MULTISAMPLES_12=0
+EVENT_MIN_CYCLE_TIME_CYCLE_12=0
+EVENT_MIN_CYCLE_TIME_UNIT_12=9
+EVENT_DPM_SUPPORTED_12=0
 
 [MODULES]
 CREATE_SYSTEM_DEVICE=1
@@ -1949,8 +1960,8 @@ COPY_COMPLETED_AS_READ_ONLY=0
 COPY_QUALITY_DATA=0
 CHANGED_FROM_LAST=0
 SD_FIELD_ORDER=0
-PREDEFINED_ENTRY_00=<PREDEFINED-ENTRY><NAME></NAME><CS-ENTRY><STATE>---</STATE><DATE>2024-07-30T22:02:41</DATE><CSUS></CSUS><CSPR></CSPR><CSWP></CSWP><CSTO></CSTO><CSTV></CSTV><CSPI></CSPI><CSDI></CSDI></CS-ENTRY></PREDEFINED-ENTRY>
-PREDEFINED_ENTRY_01=<PREDEFINED-ENTRY><NAME></NAME><CS-ENTRY><STATE>changed</STATE><DATE>2024-07-30T22:02:41</DATE><CSUS></CSUS><CSPR></CSPR><CSWP></CSWP><CSTO></CSTO><CSTV></CSTV><CSPI></CSPI><CSDI></CSDI></CS-ENTRY></PREDEFINED-ENTRY>
+PREDEFINED_ENTRY_00=<PREDEFINED-ENTRY><NAME></NAME><CS-ENTRY><STATE>---</STATE><DATE>2024-07-31T22:57:32</DATE><CSUS></CSUS><CSPR></CSPR><CSWP></CSWP><CSTO></CSTO><CSTV></CSTV><CSPI></CSPI><CSDI></CSDI></CS-ENTRY></PREDEFINED-ENTRY>
+PREDEFINED_ENTRY_01=<PREDEFINED-ENTRY><NAME></NAME><CS-ENTRY><STATE>changed</STATE><DATE>2024-07-31T22:57:32</DATE><CSUS></CSUS><CSPR></CSPR><CSWP></CSWP><CSTO></CSTO><CSTV></CSTV><CSPI></CSPI><CSDI></CSDI></CS-ENTRY></PREDEFINED-ENTRY>
 PREDEFINED_ENTRY_COUNT=2
 SD_FIELD_ENTRY_1=
 SD_FIELD_ENTRY_2=
@@ -2078,6 +2089,12 @@ COLUMNS_TYP1_CONTEXT1_ScreenDPI=192
 COLUMNS_TYP1_CONTEXT4=<Id:1048577,W:100><Id:1048594,W:80><Id:1048593,W:120><Id:1048576,W:240><Id:1048595,W:90><Id:1048580,W:110><Id:1048581,W:110><Id:1048620,W:200><Id:1048621,W:200><Id:1048585,W:240><Id:1048633,W:240><Id:1048622,W:240><Id:1048623,W:90><Id:1048638,W:90>
 COLUMNS_TYP1_CONTEXT4_dpi96=<Id:1048577,W:50><Id:1048594,W:40><Id:1048593,W:60><Id:1048576,W:120><Id:1048595,W:45><Id:1048580,W:55><Id:1048581,W:55><Id:1048620,W:100><Id:1048621,W:100><Id:1048585,W:120><Id:1048633,W:120><Id:1048622,W:120><Id:1048623,W:45><Id:1048638,W:45>
 COLUMNS_TYP1_CONTEXT4_ScreenDPI=192
+COLUMNS_TYP2097152_CONTEXT1=<Id:1048594,W:80><Id:1048593,W:120><Id:1048576,W:240><Id:1048602,W:100><Id:1048596,W:150><Id:1048601,W:90><Id:1048639,W:140><Id:1048640,W:140><Id:1048600,W:130><Id:1048626,W:200><Id:1048628,W:90><Id:1048629,W:110>
+COLUMNS_TYP2097152_CONTEXT1_dpi96=<Id:1048594,W:40><Id:1048593,W:60><Id:1048576,W:120><Id:1048602,W:50><Id:1048596,W:75><Id:1048601,W:45><Id:1048639,W:70><Id:1048640,W:70><Id:1048600,W:65><Id:1048626,W:100><Id:1048628,W:45><Id:1048629,W:55>
+COLUMNS_TYP2097152_CONTEXT1_ScreenDPI=192
+COLUMNS_TYP2097152_CONTEXT4=<Id:1048594,W:80><Id:1048593,W:120><Id:1048576,W:240><Id:1048580,W:110><Id:1048581,W:110><Id:1048622,W:240><Id:1048635,W:200><Id:1048636,W:200><Id:1048637,W:200>
+COLUMNS_TYP2097152_CONTEXT4_dpi96=<Id:1048594,W:40><Id:1048593,W:60><Id:1048576,W:120><Id:1048580,W:55><Id:1048581,W:55><Id:1048622,W:120><Id:1048635,W:100><Id:1048636,W:100><Id:1048637,W:100>
+COLUMNS_TYP2097152_CONTEXT4_ScreenDPI=192
 
 [VIEW_ITEM_DIALOG]
 ScreenDPIinSection=192
@@ -2145,10 +2162,10 @@ ColWidthDisplay=462
 ShowMore=0
 MoreHeight=566
 MoreHeight_dpi96=283
-WindowLeft=1114
-WindowLeft_dpi96=557
-WindowTop=748
-WindowTop_dpi96=374
+WindowLeft=1251
+WindowLeft_dpi96=626
+WindowTop=785
+WindowTop_dpi96=393
 WindowWidth=1242
 WindowWidth_dpi96=621
 WindowHeight=260
@@ -2167,7 +2184,7 @@ SIZEY_dpi96=700
 SHOWTOOLBAR=1
 SHOWSTATUSBAR=1
 SHOWGRID=0
-RIGHTPANE2HEIGHT=-1
+RIGHTPANE2HEIGHT=-2
 RIGHTPANE2HEIGHT_dpi96=-1
 TREEX=450
 TREEX_dpi96=225
@@ -2516,10 +2533,12 @@ SELECT_SORT_COLUMN_ID=31
 SELECT_SORT_UPWARD=1
 LAST_PAGE_NAME_DLG_FILTER=
 LAST_PAGE_ID_DLG_FILTER=1504
-OBJECT_DIALOG_WITH=1189
+OBJECT_DIALOG_WITH=1190
 OBJECT_DIALOG_WITH_dpi96=595
-OBJECT_DIALOG_HEIGHT=613
+OBJECT_DIALOG_HEIGHT=614
 OBJECT_DIALOG_HEIGHT_dpi96=307
+LAST_PAGE_NAME_DLG_VARIABLE=
+LAST_PAGE_ID_DLG_VARIABLE=21296
 
 [DB_EXPLORER_SEARCH_FILTER]
 SEARCH_CASE_SENSITIVE=0
@@ -2545,7 +2564,15 @@ PARENT=
 
 [DEVICE_EXPLORER_COLUMNLIST_CHANNELS]
 ScreenDPIinSection=192
-ColumnCount=0
+ColumnCount=4
+Column_0=0, 306
+Column_0_dpi96=0, 153
+Column_1=1245185, 132
+Column_1_dpi96=1245185, 66
+Column_2=1245186, 66
+Column_2_dpi96=1245186, 33
+Column_3=1245187, 106
+Column_3_dpi96=1245187, 53
 ColumnIdSort=-1
 SortUpward=1
 
@@ -2577,37 +2604,76 @@ SortUpward=1
 
 [DEVICE_EXPLORER_COLUMNLIST_NETWORKS]
 ScreenDPIinSection=192
-ColumnCount=0
+ColumnCount=6
+Column_0=34, 64
+Column_0_dpi96=34, 32
+Column_1=0, 304
+Column_1_dpi96=0, 152
+Column_2=983041, 192
+Column_2_dpi96=983041, 96
+Column_3=983042, 530
+Column_3_dpi96=983042, 265
+Column_4=983043, 252
+Column_4_dpi96=983043, 126
+Column_5=983044, 300
+Column_5_dpi96=983044, 150
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY]
+[Dialog_MdiCfgDlg_Typ2097152]
+LastOpenedDlgType=1
+TreeWidth=240
+TreeWidth_dpi96=120
+ScreenDPIinSection=192
+WindowLeft=233
+WindowLeft_dpi96=117
+WindowTop=1495
+WindowTop_dpi96=748
+WindowWidth=2188
+WindowWidth_dpi96=1094
+WindowHeight=616
+WindowHeight_dpi96=308
+
+[InsertArrayRowColDialog]
+ScreenDPIinSection=192
+WindowLeft=1337
+WindowLeft_dpi96=669
+WindowTop=953
+WindowTop_dpi96=477
+WindowWidth=797
+WindowWidth_dpi96=399
+WindowHeight=427
+WindowHeight_dpi96=214
+
+[MEASUREMENT_DISPLAY_SELECT_DYNAMIC_COLUMNS]
+Count=0
+
+[MEASUREMENT_DISPLAY_SELECT_REDUCED]
 ScreenDPIinSection=192
 POSX=0
 POSX_dpi96=0
 POSY=0
 POSY_dpi96=0
-SIZEX=2180
-SIZEX_dpi96=1090
+SIZEX=1620
+SIZEX_dpi96=810
 SIZEY=1200
 SIZEY_dpi96=600
 SHOWTOOLBAR=1
 SHOWSTATUSBAR=1
 SHOWGRID=0
-RIGHTPANE2HEIGHT=304
-RIGHTPANE2HEIGHT_dpi96=152
+RIGHTPANE2HEIGHT=-1
+RIGHTPANE2HEIGHT_dpi96=-1
 TREEX=450
 TREEX_dpi96=225
-TREEY=1009
-TREEY_dpi96=505
+TREEY=1048
+TREEY_dpi96=524
 ACTIVEPANE=0
-SELECTED_TREENODE=Messsignale/tokio_demo
-FIRSTVISIBLE_TREENODE=Messoptionen
-TREEEXPAND_COUNT=2
+SELECTED_TREENODE=Messsignale
+FIRSTVISIBLE_TREENODE=Messsignale
+TREEEXPAND_COUNT=1
 TREEEXPAND_0=Messsignale
-TREEEXPAND_1=Rekorderliste
 LAST_FOCUSED_LISTCOLUMN=0
-LAST_FOCUSED_LISTINDEX=10
+LAST_FOCUSED_LISTINDEX=13
 LAST_TOP_LISTINDEX=0
 DAQLISTS=2
 STATUSBAR_BYTES=1
@@ -2616,46 +2682,45 @@ LABELLISTMEAMODE=0
 LABELLISTBUSSIGNALMODE=0
 TEXT_SEARCH=
 VXIIColumnsAdded=0
-SHOWONLYACTIVE=0
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_EVENTS]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_CUSTOM]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_EVENTS_CUSTOM]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_KEY]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_EVENTS_KEY]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_SYSTEM]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_EVENTS_SYSTEM]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=196608
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_SYSTEM_DEVICE]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_EVENTS_SYSTEM_DEVICE]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_KNOWN_DYNAMIC_COLUMNS_NORMAL]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_KNOWN_DYNAMIC_COLUMNS_NORMAL]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 VERSION=100
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_NORMAL]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_NORMAL]
 ScreenDPIinSection=192
 ColumnCount=8
 Column_0=65542, 100
@@ -2674,68 +2739,53 @@ Column_6=65597, 200
 Column_6_dpi96=65597, 100
 Column_7=98305, 160
 Column_7_dpi96=98305, 80
-ColumnIdSort=65542
+ColumnIdSort=-1
 SortUpward=1
 VERSION=100
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDER]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_RECORDER]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 VERSION=100
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDER_BUSLOGGING]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_RECORDER_BUSLOGGING]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDERS]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_RECORDERS]
 ScreenDPIinSection=192
-ColumnCount=6
-Column_0=327711, 400
-Column_0_dpi96=327711, 200
-Column_1=327684, 120
-Column_1_dpi96=327684, 60
-Column_2=327709, 300
-Column_2_dpi96=327709, 150
-Column_3=327695, 130
-Column_3_dpi96=327695, 65
-Column_4=327681, 400
-Column_4_dpi96=327681, 200
-Column_5=327683, 400
-Column_5_dpi96=327683, 200
+ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_SOUNDS]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_SOUNDS]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_TARA_ACTIVE_SIGNALS]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_TARA_ACTIVE_SIGNALS]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_TARA_ALL_SIGNALS]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_TARA_ALL_SIGNALS]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_COLUMNLIST_VIO]
+[MEASUREMENT_DISPLAY_SELECT_REDUCED_COLUMNLIST_VIO]
 ScreenDPIinSection=192
 ColumnCount=0
 ColumnIdSort=-1
 SortUpward=1
 
-[MEASUREMENT_DISPLAY_DYNAMIC_COLUMNS]
-Count=0
-
 [COLOR_SCHEME_LIST]
 COLOR_SCHEME0=COLOR_SCHEMEUSER_DEFINED
 SCHEMES_COUNT=1
@@ -2873,9 +2923,182 @@ MODE=12
 VALUE_COUNT=0
 HISTORY_COUNT=0
 
+[DLG_DISPLAY_PAGE]
+LAST_PAGE=Anzeigeseite
+
+[DlgDisplayElements]
+ScreenDPIinSection=192
+ColWidthType=134
+ColWidthType_dpi96=67
+ColWidthInfo=382
+ColWidthInfo_dpi96=191
+ColWidthActive=120
+ColWidthActive_dpi96=60
+ColWidthAutoSize=120
+ColWidthAutoSize_dpi96=60
+ColWidthBorder=120
+ColWidthBorder_dpi96=60
+ColWidthTransparent=154
+ColWidthTransparent_dpi96=77
+
+[MEASUREMENT_DISPLAY]
+ScreenDPIinSection=192
+POSX=0
+POSX_dpi96=0
+POSY=0
+POSY_dpi96=0
+SIZEX=2180
+SIZEX_dpi96=1090
+SIZEY=1200
+SIZEY_dpi96=600
+SHOWTOOLBAR=1
+SHOWSTATUSBAR=1
+SHOWGRID=0
+RIGHTPANE2HEIGHT=304
+RIGHTPANE2HEIGHT_dpi96=152
+TREEX=450
+TREEX_dpi96=225
+TREEY=1009
+TREEY_dpi96=505
+ACTIVEPANE=1
+SELECTED_TREENODE=Messsignale/tokio_demo
+FIRSTVISIBLE_TREENODE=Messoptionen
+TREEEXPAND_COUNT=2
+TREEEXPAND_0=Messsignale
+TREEEXPAND_1=Rekorderliste
+LAST_FOCUSED_LISTCOLUMN=0
+LAST_FOCUSED_LISTINDEX=11
+LAST_TOP_LISTINDEX=0
+DAQLISTS=2
+STATUSBAR_BYTES=1
+DIALOGFILEEXTEXPORT=vsf
+LABELLISTMEAMODE=0
+LABELLISTBUSSIGNALMODE=0
+TEXT_SEARCH=
+VXIIColumnsAdded=0
+SHOWONLYACTIVE=0
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_CUSTOM]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_KEY]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_SYSTEM]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=196608
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_SYSTEM_DEVICE]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_KNOWN_DYNAMIC_COLUMNS_NORMAL]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+VERSION=100
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_NORMAL]
+ScreenDPIinSection=192
+ColumnCount=8
+Column_0=65542, 100
+Column_0_dpi96=65542, 50
+Column_1=29, 88
+Column_1_dpi96=29, 44
+Column_2=34, 96
+Column_2_dpi96=34, 48
+Column_3=31, 460
+Column_3_dpi96=31, 230
+Column_4=65540, 160
+Column_4_dpi96=65540, 80
+Column_5=65541, 120
+Column_5_dpi96=65541, 60
+Column_6=65597, 200
+Column_6_dpi96=65597, 100
+Column_7=98305, 160
+Column_7_dpi96=98305, 80
+ColumnIdSort=65542
+SortUpward=1
+VERSION=100
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDER]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+VERSION=100
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDER_BUSLOGGING]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDERS]
+ScreenDPIinSection=192
+ColumnCount=6
+Column_0=327711, 400
+Column_0_dpi96=327711, 200
+Column_1=327684, 120
+Column_1_dpi96=327684, 60
+Column_2=327709, 300
+Column_2_dpi96=327709, 150
+Column_3=327695, 130
+Column_3_dpi96=327695, 65
+Column_4=327681, 400
+Column_4_dpi96=327681, 200
+Column_5=327683, 400
+Column_5_dpi96=327683, 200
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_SOUNDS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_TARA_ACTIVE_SIGNALS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_TARA_ALL_SIGNALS]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_COLUMNLIST_VIO]
+ScreenDPIinSection=192
+ColumnCount=0
+ColumnIdSort=-1
+SortUpward=1
+
+[MEASUREMENT_DISPLAY_DYNAMIC_COLUMNS]
+Count=0
+
 [SIGNSELWND_DYNAMIC_COLUMNS]
 Count=0
 
 [~~~~~_CONSISTENCY_CHECK_END_SECTION_~~~~~]
-GUID={E1E212EB-5105-46F9-B787-4FED32FFE2D6}
+GUID={C4CE7638-E7EC-4129-A733-2CFCEFE6DBCF}
 
diff --git a/examples/rayon_demo/CANape/rayon_demo.cna b/examples/rayon_demo/CANape/rayon_demo.cna
index 44f289d..cdf2f36 100644
--- a/examples/rayon_demo/CANape/rayon_demo.cna
+++ b/examples/rayon_demo/CANape/rayon_demo.cna
@@ -10,8 +10,8 @@ PrgDate=08.07.2024
 Description=
 CreationTime=20:42
 CreationDate=06/23/2024 ; Month/Day/Year
-ModificationTime=22:10
-ModificationDate=07/30/2024 ; Month/Day/Year
+ModificationTime=01:01
+ModificationDate=08/01/2024 ; Month/Day/Year
 Protected=0
 CurrentWindowsACP=1252
 
@@ -22,7 +22,7 @@ Count=1
 Count=0
 
 [CALIBRATION_LIST]
-Count=5
+Count=3
 
 [CALIBRATION_OBJECT_1]
 EditOffset=1
@@ -53,32 +53,10 @@ EditFormat=2
 ShowWorkingPoint=0
 FollowWorkingPoint=0
 Module=tokio_demo
-Name=Mandelbrot.x_pixels
-StimMode=0
-IsFallback=0
-
-[CALIBRATION_OBJECT_4]
-EditOffset=1
-EditFactor=2
-EditFormat=2
-ShowWorkingPoint=0
-FollowWorkingPoint=0
-Module=tokio_demo
 Name=Mandelbrot.y
 StimMode=0
 IsFallback=0
 
-[CALIBRATION_OBJECT_5]
-EditOffset=1
-EditFactor=2
-EditFormat=2
-ShowWorkingPoint=0
-FollowWorkingPoint=0
-Module=tokio_demo
-Name=Mandelbrot.y_pixels
-StimMode=0
-IsFallback=0
-
 [CANAPE_ENVIRONMENT]
 OBJECT_COUNT=0
 
@@ -101,7 +79,7 @@ OptionCSVListSeparator=0
 OptionCSVExport=0
 OptionMARMFExport=0
 OptionMARMFExtended=0
-OptionSuppressCASLRuntimeErrors=1
+OptionSuppressCASLRuntimeErrors=0
 FromTime=-1
 FromActive=0
 FromTimePartActive=0
@@ -122,7 +100,7 @@ Count=0
 Name=
 Comment=
 Maximized=0
-ActiveWindow=5
+ActiveWindow=7
 IsReportPage=0
 TimeAxisSynchronized=0
 PrintLayout=Default
@@ -131,8 +109,21 @@ GUID=DISPLAY_PAGE_f96953f1-fdfe-47a7-811e-e2231d8a8a62
 [DISPLAY_PAGE_1_DisplayElements]
 Count=0
 
+[DISPLAY_PAGE_2]
+Name=Trace
+Comment=
+Maximized=0
+ActiveWindow=0
+IsReportPage=0
+TimeAxisSynchronized=0
+PrintLayout=Default
+GUID=DISPLAY_PAGE_9f535a7c-e6c1-46eb-890b-c585d19950eb
+
+[DISPLAY_PAGE_2_DisplayElements]
+Count=0
+
 [DISPLAY_PAGES]
-Count=1
+Count=2
 Active=0
 
 [DYNAMIC_COLUMNS]
@@ -172,7 +163,7 @@ SubConfigsCount=0
 Count=0
 
 [MEASUREMENT_LIST]
-Count=12
+Count=13
 OfflineFileName=mandelbrot.mf4
 OfflineFileCount=1
 MeaCfgLabellistName=
@@ -181,7 +172,7 @@ MeaCfgLabellistName=
 Module=tokio_demo
 Name=line_1
 Disabled=0
-Mode=2147483649
+Mode=2147483650
 Rate=0
 Row=0
 Column=0
@@ -195,7 +186,7 @@ DisplayCount=1
 Module=tokio_demo
 Name=line_10
 Disabled=0
-Mode=2147483658
+Mode=2147483659
 Rate=0
 Row=0
 Column=0
@@ -213,10 +204,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-2155.24367816
-YMaxHome=20725.2643678
-YMin=-2155.24367816
-YMax=20725.2643678
+YMinHome=-137.830508475
+YMaxHome=1336.95762712
+YMin=-137.830508475
+YMax=1336.95762712
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -255,7 +246,7 @@ GUID=DISPLAY_8679b0d8-5296-42b1-a5ab-37acd5d4f255
 Module=tokio_demo
 Name=line_11
 Disabled=0
-Mode=2147483659
+Mode=2147483660
 Rate=0
 Row=0
 Column=0
@@ -273,10 +264,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-50.5494252874
-YMaxHome=22829.9586207
-YMin=-50.5494252874
-YMax=22829.9586207
+YMinHome=-2.87288135593
+YMaxHome=1471.91525424
+YMin=-2.87288135593
+YMax=1471.91525424
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -371,6 +362,73 @@ YAxis_ID=0
 AxisTemplate=
 GUID=DISPLAY_098ce908-57d2-472f-9b84-272ba87e43e3
 
+[MEASUREMENT_OBJECT_13]
+Module=tokio_demo
+Name=pixels
+Disabled=0
+Mode=2147483649
+Rate=0
+Row=0
+Column=0
+MeaReferenced=1
+MeasureWorkingPoint=0
+ShowWorkingPoint=0
+FollowWorkingPoint=0
+Array=1
+Rows=128
+Columns=256
+ArchivBy_1=Rekorder
+IsFallback=0
+HasManagedDisplay=0
+DisplayCount=1
+
+[MEASUREMENT_OBJECT_13_DISPLAY_1]
+Window=6
+Index=0
+Color=255
+ApplyColorToBackground=0
+ColorFunction=0
+ColorFunctionScope=1
+LineTyp=2
+YMinHome=0
+YMaxHome=100
+YMin=0
+YMax=255
+XOffsetNS=0
+XOffset=0
+ValueFormat=3
+BitMask=255
+ShowYAxis=1
+Width=10
+LineStyle=1
+MarkerType=0
+SRMainValue=0
+InvalidValueDrawMode=3
+LineWidth=1
+Precision=-2
+Digits=6
+Enabled=1
+StoredFocused=1
+SublMask=1
+MeaSublMask=0
+LockScaling=0
+RightAxis=0
+MapMode=2
+OverlayGridColor=0
+ShadingMode=3
+EditOffset=1
+EditFactor=2
+WAxisLabel=
+XAxisLabel=
+YAxisLabel=
+AxisCaption=
+Row=59
+Col=195
+YAxis_ID=0
+AxisTemplate=
+GUID=DISPLAY_aaea8dd8-5dda-40be-9d08-8ff3a942aa0d
+MarkerSettingValid=1
+
 [MEASUREMENT_OBJECT_1_DISPLAY_1]
 Window=2
 Index=10
@@ -379,10 +437,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-20856.2333333
-YMaxHome=2024.27471264
-YMin=-20856.2333333
-YMax=2024.27471264
+YMinHome=-1345.45762712
+YMaxHome=129.330508475
+YMin=-1345.45762712
+YMax=129.330508475
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -421,7 +479,7 @@ GUID=DISPLAY_8248761d-1406-482f-83cc-1a53b97049b8
 Module=tokio_demo
 Name=line_2
 Disabled=0
-Mode=2147483650
+Mode=2147483651
 Rate=0
 Row=0
 Column=0
@@ -439,10 +497,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-18779.1114943
-YMaxHome=4101.39655172
-YMin=-18779.1114943
-YMax=4101.39655172
+YMinHome=-1210.5
+YMaxHome=264.5
+YMin=-1210.5
+YMax=264.5
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -481,7 +539,7 @@ GUID=DISPLAY_55cb150a-79cf-4d9b-9b36-b2f1455914e3
 Module=tokio_demo
 Name=line_3
 Disabled=0
-Mode=2147483651
+Mode=2147483652
 Rate=0
 Row=0
 Column=0
@@ -499,10 +557,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-16701.9896552
-YMaxHome=6180.81609195
-YMin=-16701.9896552
-YMax=6180.81609195
+YMinHome=-1068.23389831
+YMaxHome=394.755932203
+YMin=-1068.23389831
+YMax=394.755932203
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -541,7 +599,7 @@ GUID=DISPLAY_84980ed8-3d28-4bc2-8c18-f4dc7ed8d7e8
 Module=tokio_demo
 Name=line_4
 Disabled=0
-Mode=2147483652
+Mode=2147483653
 Rate=0
 Row=0
 Column=0
@@ -559,10 +617,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-14615.2551724
-YMaxHome=8253.80689655
-YMin=-14615.2551724
-YMax=8253.80689655
+YMinHome=-960.033898305
+YMaxHome=538.350847458
+YMin=-960.033898305
+YMax=538.350847458
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -601,7 +659,7 @@ GUID=DISPLAY_22eb5e52-53fe-4922-86ea-e9211c1df1c8
 Module=tokio_demo
 Name=line_5
 Disabled=0
-Mode=2147483653
+Mode=2147483654
 Rate=0
 Row=0
 Column=0
@@ -619,10 +677,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-12545.4482759
-YMaxHome=10335.0597701
-YMin=-12545.4482759
-YMax=10335.0597701
+YMinHome=-807.957627119
+YMaxHome=666.830508475
+YMin=-807.957627119
+YMax=666.830508475
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -661,7 +719,7 @@ GUID=DISPLAY_390265db-3a4e-493c-ae93-047900aa3a0e
 Module=tokio_demo
 Name=line_6
 Disabled=0
-Mode=2147483654
+Mode=2147483655
 Rate=0
 Row=0
 Column=0
@@ -679,10 +737,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-10468.3264368
-YMaxHome=12414.4793103
-YMin=-10468.3264368
-YMax=12414.4793103
+YMinHome=-662.493220339
+YMaxHome=788.698305085
+YMin=-662.493220339
+YMax=788.698305085
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -721,7 +779,7 @@ GUID=DISPLAY_376b037b-3c93-4b45-8f6f-9953e5f73790
 Module=tokio_demo
 Name=line_7
 Disabled=0
-Mode=2147483655
+Mode=2147483656
 Rate=0
 Row=0
 Column=0
@@ -739,10 +797,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-8388.90689655
-YMaxHome=14491.6011494
-YMin=-8388.90689655
-YMax=14491.6011494
+YMinHome=-540.372881356
+YMaxHome=934.415254237
+YMin=-540.372881356
+YMax=934.415254237
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -781,7 +839,7 @@ GUID=DISPLAY_ec433a8c-c14a-409a-8d17-6bae4107c818
 Module=tokio_demo
 Name=line_8
 Disabled=0
-Mode=2147483656
+Mode=2147483657
 Rate=0
 Row=0
 Column=0
@@ -799,10 +857,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-6305.47011494
-YMaxHome=16552.145977
-YMin=-6305.47011494
-YMax=16552.145977
+YMinHome=-401.155932203
+YMaxHome=1061.83389831
+YMin=-401.155932203
+YMax=1061.83389831
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -841,7 +899,7 @@ GUID=DISPLAY_74e494f8-d8b0-4e26-81f9-02c85447fb7a
 Module=tokio_demo
 Name=line_9
 Disabled=0
-Mode=2147483657
+Mode=2147483658
 Rate=0
 Row=0
 Column=0
@@ -859,10 +917,10 @@ ApplyColorToBackground=0
 ColorFunction=0
 ColorFunctionScope=1
 LineTyp=3
-YMinHome=-4232.54482759
-YMaxHome=18638.8137931
-YMin=-4232.54482759
-YMax=18638.8137931
+YMinHome=-270.8
+YMaxHome=1192.4
+YMin=-270.8
+YMax=1192.4
 XOffsetNS=0
 XOffset=0
 ValueFormat=3
@@ -968,7 +1026,7 @@ WindowSymbols=1
 GlobalCursor=0
 GlobalCursorTime=0
 GlobalCursorTimeNs=0
-MainWindowPos=1, 190, 87, 3091, 1960 ;cmd, x, y, w, h
+MainWindowPos=1, 316, 124, 3112, 1960 ;cmd, x, y, w, h
 
 [PAR_COMMENT]
 1="Name",""
@@ -1126,14 +1184,15 @@ TreeExpand_4=Alle\Messliste\Alle Signale
 TreeExpand_5=Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l\mandelbrot
 TreeExpand_6=Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l\task
 TreeExpand_7=Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l\mainloop
-TreeExpand_8=$Alle\Geräte
-TreeExpand_9=#Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l
-TreeExpand_10=@Alle\Geräte\tokio_demo
-TreeExpand_11=$Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l
-TreeExpand_12=#Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l\mainloop\elapsed_time
-TreeExpand_13=@Alle\Messliste
-TreeExpand_14=$Alle\Messliste\Alle Signale
-TreeExpand_15=#Alle\Messliste\Alle Signale\line_1
+TreeExpand_8=Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l\pixels
+TreeExpand_9=$Alle\Geräte
+TreeExpand_10=#Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l
+TreeExpand_11=@Alle\Geräte\tokio_demo
+TreeExpand_12=$Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l
+TreeExpand_13=#Alle\Geräte\tokio_demo\tokio_demo_autodetect.a2l\task\line_6
+TreeExpand_14=@Alle\Messliste
+TreeExpand_15=$Alle\Messliste\Alle Signale
+TreeExpand_16=#Alle\Messliste\Alle Signale\line_1
 TextSearchCaseSensitive=0
 TextSearchUseMode=1
 TextSearchSearchFullText=1
@@ -1161,10 +1220,10 @@ DisplayMask=1 ; pages 1
 
 [WINDOW_2]
 XLen=7760
-XMin=6566
-XMinNs=6566080772
-XMax=6692
-XMaxNs=6692686076
+XMin=2183
+XMinNs=2183822457
+XMax=2194
+XMaxNs=2194200508
 Grid=1
 Mark=1
 YValue=0
@@ -1187,7 +1246,7 @@ YAxisWidth_dpi96=94
 RightYAxisWidth=0
 RightYAxisWidth_dpi96=0
 ObjectMode=0
-DisplayMode=2
+DisplayMode=1
 ShowSignalMode=0
 AxisScrollPos2=0
 LegendScrollPos=0
@@ -1235,14 +1294,12 @@ COL_1_dpi96=1048578, 56
 [WINDOW_3]
 ProgID=
 PROPERTIES_COUNT=1
-PROPERTY_1={"Version":"1.3.0.0","Configuration":{"ArrayWindowSubControlConfiguration":{"NumericGraphicCompositeWidth":311,"NumericGraphicCompositeHeight":132,"LegendCoordinatePoint":{"X":0,"Y":0},"LegendWidth":0,"LegendHeight":0,"LegendLayoutGroupSizeWidth":0,"LegendLayoutGroupSizeHeight":0,"NumericCoordinatePoint":{"X":1,"Y":24},"NumericWidth":309,"NumericHeight":107,"NumericLayoutGroupSizeWidth":309,"NumericLayoutGroupSizeHeight":107,"Intersection2DXWCoordinatePoint":{"X":0,"Y":0},"Intersection2DXWWidth":0,"Intersection2DXWHeight":0,"Intersection2DXWLayoutGroupSizeWidth":0,"Intersection2DXWLayoutGroupSizeHeight":0,"Intersection2DYWCoordinatePoint":{"X":0,"Y":0},"Intersection2DYWWidth":0,"Intersection2DYWHeight":0,"Intersection2DYWLayoutGroupSizeWidth":0,"Intersection2DYWLayoutGroupSizeHeight":0,"Graphic3DCoordinatePoint":{"X":0,"Y":0},"Graphic3DWidth":0,"Graphic3DHeight":0,"Graphic3DLayoutGroupSizeWidth":0,"Graphic3DLayoutGroupSizeHeight":0},"ShowCalibrationBar":true,"ShowHorizontalChartLines":false,"ShowVerticalChartLines":false,"NonSelectedIntersectionLineTransparency":0.100000024,"FocusedValueSymbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.x\":P","ValueObjectConfigurations":[{"Symbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.x_pixels\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":0,"ValueAxisMax":1.8446744073709552E+19,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.y_pixels\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":0,"ValueAxisMax":1.8446744073709552E+19,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.x\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":-1000000000000,"ValueAxisMax":1000000000000,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.y\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":-1000000000000,"ValueAxisMax":1000000000000,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.width\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":-1000000000000,"ValueAxisMax":1000000000000,"CustomAxisLabels":["","","","","",""]}],"NumericGraphicControlPosition":0,"NumericGraphicControlSelectedTab":0,"GraphicControlPosition":0,"Height2DXControl":1,"Height2DYControl":1,"Height3DControl":2,"HeightNumericControl":1,"HeightChartControl":1,"HeightLegendControl":0.44999998807907104,"Width2DXControl":1,"Width2DYControl":1,"Width3DControl":2,"WidthNumericControl":2,"WidthChartControl":2,"WidthLegendControl":0.30000001192092896,"HeightValueControl":1,"WidthValueControl":1,"HeightNumericGraphicControl":1,"WidthNumericGraphicControl":1,"Height2DChartsControl":1,"Width2DChartsControl":1,"IsXAxisHeightSynchronizedBetweenCharts":true,"SyncedXAxisHeight":NaN,"XWChartXAxisHeight":NaN,"YWChartXAxisHeight":NaN,"LegendPosition":0,"LegendViewType":0,"LegendTableColumnAttributes":[{"TypeId":"1048594","Size":40},{"TypeId":"1048601","Size":45},{"TypeId":"31","Size":100},{"TypeId":"3","Size":250},{"TypeId":"16","Size":70},{"TypeId":"1048627","Size":100},{"TypeId":"1048631","Size":100},{"TypeId":"1048634","Size":100}],"LegendTabItemAttributes":[{"TypeId":"31","Size":100}],"FlipAxes":false,"AxisDisplayNameMode":3,"ReversedAxis":[false,false],"ShowUnits":false,"ShowObjectColor":false,"SortDescending":false,"SortAttributeId":null,"ShowWorkingPointHistory":false,"NumericViewValueObjectDisplayOption":1,"ValueColumnWidth":127,"ValueColumnWidthDouble":127,"ParameterGroup":"mandelbrot","ModuleName":"tokio_demo","GroupIsFunction":false,"NumericControlAxisAttributes":[],"NumericControlColumnAttributes":[{"TypeId":"31","Size":162}],"ChartViewValueObjectDisplayOption":1,"SerializationCameraPosition":{"X":1,"Y":1,"Z":-1},"SerializationCameraTarget":{"X":0,"Y":0.5,"Z":0},"IsValueAnnotationRotated":false,"EquidistantAxisPoints":false,"BarThickness":0.6,"WorkingPointMarker":0,"LinearWorkingPointInterpolation":true,"ShowAllIntersectionLines":false,"IsValueAxisIndependent":true,"TickLabelRotationAngle":-90,"IsTickLabelRotationEnabled":false,"IsTickLabelRightAligned":false,"ShowBoundarySurface":true,"ShowBoundarySurfaceGradient":false,"ShowCursorAsCrosshair":false,"XAxisAutoRange":true,"ValueAxisAutoRange":true,"ShowAllValueAxes":false,"CurrentColumnChartType":0,"SerializationCursorCrosshairColor":{"R":0,"G":0,"B":0,"A":255},"AlignBarToZero":true,"DefaultChartViewType":2,"AttributeColumnPositioning":1}}
-OBJECTS_COUNT=5
-OBJECT_1=DEVICE:"tokio_demo":"Mandelbrot.x_pixels":P
-OBJECT_2=DEVICE:"tokio_demo":"Mandelbrot.y_pixels":P
-OBJECT_3=DEVICE:"tokio_demo":"Mandelbrot.x":P
-OBJECT_4=DEVICE:"tokio_demo":"Mandelbrot.y":P
-OBJECT_5=DEVICE:"tokio_demo":"Mandelbrot.width":P
-ObjectCount=5
+PROPERTY_1={"Version":"1.3.0.0","Configuration":{"ArrayWindowSubControlConfiguration":{"NumericGraphicCompositeWidth":311,"NumericGraphicCompositeHeight":132,"LegendCoordinatePoint":{"X":0,"Y":0},"LegendWidth":0,"LegendHeight":0,"LegendLayoutGroupSizeWidth":0,"LegendLayoutGroupSizeHeight":0,"NumericCoordinatePoint":{"X":1,"Y":24},"NumericWidth":309,"NumericHeight":107,"NumericLayoutGroupSizeWidth":309,"NumericLayoutGroupSizeHeight":107,"Intersection2DXWCoordinatePoint":{"X":0,"Y":0},"Intersection2DXWWidth":0,"Intersection2DXWHeight":0,"Intersection2DXWLayoutGroupSizeWidth":0,"Intersection2DXWLayoutGroupSizeHeight":0,"Intersection2DYWCoordinatePoint":{"X":0,"Y":0},"Intersection2DYWWidth":0,"Intersection2DYWHeight":0,"Intersection2DYWLayoutGroupSizeWidth":0,"Intersection2DYWLayoutGroupSizeHeight":0,"Graphic3DCoordinatePoint":{"X":0,"Y":0},"Graphic3DWidth":0,"Graphic3DHeight":0,"Graphic3DLayoutGroupSizeWidth":0,"Graphic3DLayoutGroupSizeHeight":0},"ShowCalibrationBar":true,"ShowHorizontalChartLines":false,"ShowVerticalChartLines":false,"NonSelectedIntersectionLineTransparency":0.100000024,"FocusedValueSymbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.width\":P","ValueObjectConfigurations":[{"Symbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.x\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":-1000000000000,"ValueAxisMax":1000000000000,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.y\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":-1000000000000,"ValueAxisMax":1000000000000,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"tokio_demo\":\"Mandelbrot.width\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":-1000000000000,"ValueAxisMax":1000000000000,"CustomAxisLabels":["","","","","",""]}],"NumericGraphicControlPosition":0,"NumericGraphicControlSelectedTab":0,"GraphicControlPosition":0,"Height2DXControl":1,"Height2DYControl":1,"Height3DControl":2,"HeightNumericControl":1,"HeightChartControl":1,"HeightLegendControl":0.44999998807907104,"Width2DXControl":1,"Width2DYControl":1,"Width3DControl":2,"WidthNumericControl":2,"WidthChartControl":2,"WidthLegendControl":0.30000001192092896,"HeightValueControl":1,"WidthValueControl":1,"HeightNumericGraphicControl":1,"WidthNumericGraphicControl":1,"Height2DChartsControl":1,"Width2DChartsControl":1,"IsXAxisHeightSynchronizedBetweenCharts":true,"SyncedXAxisHeight":NaN,"XWChartXAxisHeight":NaN,"YWChartXAxisHeight":NaN,"LegendPosition":0,"LegendViewType":0,"LegendTableColumnAttributes":[{"TypeId":"1048594","Size":40},{"TypeId":"1048601","Size":45},{"TypeId":"31","Size":100},{"TypeId":"3","Size":250},{"TypeId":"16","Size":70},{"TypeId":"1048627","Size":100},{"TypeId":"1048631","Size":100},{"TypeId":"1048634","Size":100}],"LegendTabItemAttributes":[{"TypeId":"31","Size":100}],"FlipAxes":false,"AxisDisplayNameMode":3,"ReversedAxis":[false,false],"ShowUnits":false,"ShowObjectColor":false,"SortDescending":false,"SortAttributeId":null,"ShowWorkingPointHistory":false,"NumericViewValueObjectDisplayOption":1,"ValueColumnWidth":127,"ValueColumnWidthDouble":127,"ParameterGroup":"mandelbrot","ModuleName":"tokio_demo","GroupIsFunction":false,"NumericControlAxisAttributes":[],"NumericControlColumnAttributes":[{"TypeId":"31","Size":162}],"ChartViewValueObjectDisplayOption":1,"SerializationCameraPosition":{"X":1,"Y":1,"Z":-1},"SerializationCameraTarget":{"X":0,"Y":0.5,"Z":0},"IsValueAnnotationRotated":false,"EquidistantAxisPoints":false,"BarThickness":0.6,"WorkingPointMarker":0,"LinearWorkingPointInterpolation":true,"ShowAllIntersectionLines":false,"IsValueAxisIndependent":true,"TickLabelRotationAngle":-90,"IsTickLabelRotationEnabled":false,"IsTickLabelRightAligned":false,"ShowBoundarySurface":true,"ShowBoundarySurfaceGradient":false,"ShowCursorAsCrosshair":false,"XAxisAutoRange":true,"ValueAxisAutoRange":true,"ShowAllValueAxes":false,"CurrentColumnChartType":0,"SerializationCursorCrosshairColor":{"R":0,"G":0,"B":0,"A":255},"AlignBarToZero":true,"DefaultChartViewType":2,"AttributeColumnPositioning":1}}
+OBJECTS_COUNT=3
+OBJECT_1=DEVICE:"tokio_demo":"Mandelbrot.x":P
+OBJECT_2=DEVICE:"tokio_demo":"Mandelbrot.y":P
+OBJECT_3=DEVICE:"tokio_demo":"Mandelbrot.width":P
+ObjectCount=3
 HiddenDisplayCount=0
 Title=mandelbrot
 Type=137438953472
@@ -1250,10 +1307,10 @@ Comment=mandelbrot
 Number=3
 GUID=WINDOW_b3f3f886-c975-469c-a3ac-b76ff137e36c
 ScreenDPIinSection=192
-Position=0, 1264, 36, 628, 304 ;cmd, x, y, w, h
-Position_dpi96=0, 632, 18, 314, 152 ;cmd, x, y, w, h
-Position_Page01=0, 1264, 36, 628, 304 ;cmd, x, y, w, h
-Position_Page01_dpi96=0, 632, 18, 314, 152 ;cmd, x, y, w, h
+Position=0, 856, 14, 628, 304 ;cmd, x, y, w, h
+Position_dpi96=0, 428, 7, 314, 152 ;cmd, x, y, w, h
+Position_Page01=0, 856, 14, 628, 304 ;cmd, x, y, w, h
+Position_Page01_dpi96=0, 428, 7, 314, 152 ;cmd, x, y, w, h
 FloatingWindow=0
 ShowSignalComments=1
 DisplayMask=1 ; pages 1
@@ -1261,107 +1318,9 @@ DisplayMask=1 ; pages 1
 [WINDOW_3_OBJECT_1]
 Type=2
 Module=tokio_demo
-Name=Mandelbrot.x_pixels
-Window=3
-Index=0
-Color=0
-ApplyColorToBackground=0
-ColorFunction=0
-ColorFunctionScope=1
-LineTyp=2
-YMinHome=0
-YMaxHome=4294967295
-YMin=0
-YMax=1.84467440737e+19
-XOffsetNS=0
-XOffset=0
-ValueFormat=3
-BitMask=1
-ShowYAxis=1
-Width=10
-LineStyle=1
-MarkerType=1
-SRMainValue=0
-InvalidValueDrawMode=3
-LineWidth=1
-Precision=-2
-Digits=6
-Enabled=1
-StoredFocused=0
-SublMask=0
-MeaSublMask=0
-LockScaling=0
-RightAxis=0
-MapMode=2
-OverlayGridColor=0
-ShadingMode=3
-EditOffset=1
-EditFactor=2
-WAxisLabel=
-XAxisLabel=
-YAxisLabel=
-AxisCaption=
-Row=0
-Col=0
-YAxis_ID=0
-AxisTemplate=
-GUID=DISPLAY_1ff5dd47-44f5-42db-89e8-08a22f4d39e8
-
-[WINDOW_3_OBJECT_2]
-Type=2
-Module=tokio_demo
-Name=Mandelbrot.y_pixels
-Window=3
-Index=1
-Color=0
-ApplyColorToBackground=0
-ColorFunction=0
-ColorFunctionScope=1
-LineTyp=2
-YMinHome=0
-YMaxHome=4294967295
-YMin=0
-YMax=1.84467440737e+19
-XOffsetNS=0
-XOffset=0
-ValueFormat=3
-BitMask=1
-ShowYAxis=1
-Width=10
-LineStyle=1
-MarkerType=1
-SRMainValue=0
-InvalidValueDrawMode=3
-LineWidth=1
-Precision=-2
-Digits=6
-Enabled=1
-StoredFocused=0
-SublMask=0
-MeaSublMask=0
-LockScaling=0
-RightAxis=0
-MapMode=2
-OverlayGridColor=0
-ShadingMode=3
-EditOffset=1
-EditFactor=2
-WAxisLabel=
-XAxisLabel=
-YAxisLabel=
-AxisCaption=
-Row=0
-Col=0
-YAxis_ID=0
-AxisTemplate=
-GUID=DISPLAY_f97c041e-46e8-4a63-a811-555e1c226012
-
-[WINDOW_3_OBJECT_3]
-Type=2
-Module=tokio_demo
 Name=Mandelbrot.x
 Window=3
-Index=2
+Index=0
 Color=0
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1403,14 +1362,14 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_0454d49b-3b88-48b1-8f0f-797104d95cf6
+GUID=DISPLAY_d4846727-89a3-4df0-88bd-8d05eb8bd6bd
 
-[WINDOW_3_OBJECT_4]
+[WINDOW_3_OBJECT_2]
 Type=2
 Module=tokio_demo
 Name=Mandelbrot.y
 Window=3
-Index=3
+Index=1
 Color=0
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1452,14 +1411,14 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_6dcc5454-2a28-43d6-a041-aebca1cc61e5
+GUID=DISPLAY_d914961f-ddb4-4cbc-ad92-4d3701835030
 
-[WINDOW_3_OBJECT_5]
+[WINDOW_3_OBJECT_3]
 Type=2
 Module=tokio_demo
 Name=Mandelbrot.width
 Window=3
-Index=4
+Index=2
 Color=0
 ApplyColorToBackground=0
 ColorFunction=0
@@ -1501,7 +1460,7 @@ Row=0
 Col=0
 YAxis_ID=0
 AxisTemplate=
-GUID=DISPLAY_c0dbee64-d9c2-45b2-9278-c41d41e158f9
+GUID=DISPLAY_90c9a502-2c83-44c4-b6f6-1b4d6b1997f0
 
 [WINDOW_4]
 ProgID=
@@ -1516,10 +1475,10 @@ Comment=Browser
 Number=4
 GUID=WINDOW_4186de4f-2e06-4d6f-ae00-3fc65e1d27ac
 ScreenDPIinSection=192
-Position=0, 8, 0, 1206, 834 ;cmd, x, y, w, h
-Position_dpi96=0, 4, 0, 603, 417 ;cmd, x, y, w, h
-Position_Page01=0, 8, 0, 1206, 834 ;cmd, x, y, w, h
-Position_Page01_dpi96=0, 4, 0, 603, 417 ;cmd, x, y, w, h
+Position=0, 8, 0, 824, 834 ;cmd, x, y, w, h
+Position_dpi96=0, 4, 0, 412, 417 ;cmd, x, y, w, h
+Position_Page01=0, 8, 0, 824, 834 ;cmd, x, y, w, h
+Position_Page01_dpi96=0, 4, 0, 412, 417 ;cmd, x, y, w, h
 FloatingWindow=0
 ShowSignalComments=1
 DisplayMask=1 ; pages 1
@@ -1528,8 +1487,8 @@ DisplayMask=1 ; pages 1
 ScaleFont=1
 ShowLegend=1
 ShowLegendHeader=0
-LegendPixWidth=224
-LegendPixWidth_dpi96=112
+LegendPixWidth=173
+LegendPixWidth_dpi96=87
 GridStyle=0
 DisplayColors=1
 LegendFont=0
@@ -1539,7 +1498,7 @@ ShowActivity=0
 ExceedLimitWarning=0
 OnlyHighlightOnViolation=0
 LegendScrollPos=0
-DotLinePos=199
+DotLinePos=131
 ObjectCount=0
 Title=Numerisch {DISPLAYED_FILENAME}
 Type=4
@@ -1547,10 +1506,10 @@ Comment=Ziffernfenster
 Number=5
 GUID=WINDOW_6760c75f-8b7e-4372-a9eb-e5c31d03826a
 ScreenDPIinSection=192
-Position=0, 1264, 498, 906, 178 ;cmd, x, y, w, h
-Position_dpi96=0, 632, 249, 453, 89 ;cmd, x, y, w, h
-Position_Page01=0, 1264, 498, 906, 178 ;cmd, x, y, w, h
-Position_Page01_dpi96=0, 632, 249, 453, 89 ;cmd, x, y, w, h
+Position=0, 856, 356, 628, 154 ;cmd, x, y, w, h
+Position_dpi96=0, 428, 178, 314, 77 ;cmd, x, y, w, h
+Position_Page01=0, 856, 356, 628, 154 ;cmd, x, y, w, h
+Position_Page01_dpi96=0, 428, 178, 314, 77 ;cmd, x, y, w, h
 FloatingWindow=0
 ShowSignalComments=1
 LEGEND_HSCROLL_POS=0
@@ -1560,11 +1519,148 @@ DisplayMask=1 ; pages 1
 [WINDOW_5_LEG_COLUMNS]
 ScreenDPIinSection=192
 COUNT=1
-COL_0=31, 224
-COL_0_dpi96=31, 112
+COL_0=31, 173
+COL_0_dpi96=31, 87
+
+[WINDOW_6]
+Title=
+Type=8192
+Comment=Kennfeld-/Kennlinienfenster
+Number=6
+GUID=WINDOW_bf277584-826d-4995-b0fd-07d6cf25da53
+ScreenDPIinSection=192
+Position=0, 1512, 14, 1064, 800 ;cmd, x, y, w, h
+Position_dpi96=0, 756, 7, 532, 400 ;cmd, x, y, w, h
+Position_Page01=0, 1512, 14, 1064, 800 ;cmd, x, y, w, h
+Position_Page01_dpi96=0, 756, 7, 532, 400 ;cmd, x, y, w, h
+FloatingWindow=0
+ShowSignalComments=1
+2DCutSplitFactor=0.5
+2DCutVerticalSplitFactor=0.5
+AlignBottom=1
+AutoZoom=0
+BarReference=0
+BarSize=60
+BoundingBoxGradient=1
+CLineTransparency=75
+ColWidth=100
+CrosshairCursor=0
+CursorColor=0
+DataWindowAreaHorizontalSplittingFactor=0
+DataWindowAreaLayout=2
+DisplayMask=1 ; pages 1
+Distance=14
+FirstColWidth=100
+FixAxis=0
+FixAxisMax=1
+FixAxisMin=0
+FlipX=0
+FlipY=0
+GridSideBarWide=0
+GridTitleHeight=10
+GridX=0
+GridY=0
+InterpolateWorkingPoint=0
+LastFocus=3D
+LeftCol=196
+LegendWindowSelectionMode=0
+LegendWindowSizeInPercent=0.107894736842
+LegendWindowVerticalSizeInPixel=82
+LwColumns=<Id:1048594,W:80><Id:1048576,W:240><Id:3,W:500><Id:16,W:140><Id:1048627,W:200><Id:1048631,W:200><Id:1048634,W:200>
+LwScrollPos=H:0,V:0
+markerMaxX=0
+markerMaxY=0
+markerMinX=0
+markerMinY=0
+Mirror=0
+ObjectCount=0
+Phi=45
+Psi=135
+ScreenDPI=192
+ShowAllCLines=0
+ShowBoundingBox=1
+ShowLegend=1
+ShowLegendWindowHeader=1
+ShowValueModificationWindow=0
+ShowWorkingPointHistory=0
+SideAndTopHeaderContent=0
+SplitFactor=0.666666666667
+SplittedDataWindowArea=1
+SplitVerticalFactor=0.666666666667
+TopRow=44
+WireModel=0
+WorkingPointColor=16711680
+WorkingPointMarker=0
+WorkingPointSize=100
+
+[WINDOW_7]
+ProgID=CNPTRACE.TraceCtrl.1
+PROPERTIES_COUNT=22
+PROPERTY_1=DeviceItems={"CaptureEvents":"1","ShowEvents":"0","NodeCount":"1","Node0":{"DeviceName":"tokio_demo","CaptureEvents":"1","ShowEvents":"1","NodeCount":"3","Node0":{"Channel":"2","DisplayColor":{"Color":"0","UseColor":"false"},"CaptureEvents":"1","ShowEvents":"1","NodeCount":"0"},"Node1":{"Channel":"3","DisplayColor":{"Color":"0","UseColor":"false"},"CaptureEvents":"1","ShowEvents":"1","NodeCount":"0"},"Node2":{"Channel":"4","DisplayColor":{"Color":"0","UseColor":"false"},"CaptureEvents":"1","ShowEvents":"1","NodeCount":"0"}}}
+PROPERTY_2=NetworkItems={"Items":"0"}
+PROPERTY_3=ColumnConfigs={"ConfigCount":"1","Config0":{"Layout":"1","Name":"Initial","Column0":{"Width":"210","Position":"0","Name":"Time","IsDefaultName":"1"},"Column1":{"Width":"237","Position":"1","Name":"Channel","IsDefaultName":"1"},"Column2":{"Width":"60","Position":"2","Name":"ID","IsDefaultName":"1"},"Column3":{"Width":"90","Position":"3","Name":"Name","IsDefaultName":"1"},"Column5":{"Width":"60","Position":"5","Name":"Dir","IsDefaultName":"1"},"Column6":{"Width":"100","Position":"6","Name":"Length","IsDefaultName":"1"},"Column7":{"Width":"817","Position":"7","Name":"Data","IsDefaultName":"1"},"Column16":{"Width":"150","Position":"4","Name":"Type","IsDefaultName":"1"},"Column52":{"Width":"300","Position":"8","Name":"Protocol Interpretation","IsDefaultName":"1"}},"Active":"0","ActiveLayout":"1"}
+PROPERTY_4=PinningEvents={"EventCount":"0"}
+PROPERTY_5=ExpandedEvents={"EventCount":"0"}
+PROPERTY_6=AnalysisGroups={"GroupCount":"1","Group0":{"Enabled":"1","Expanded":"1","Name":"Filtergruppe 0","FilterCount":"2","Filter0":{"Stop":"1","Enabled":"1","ConditionCount":"0"},"Filter1":{"Stop":"0","Enabled":"0","ConditionCount":"0"}}}
+PROPERTY_7=AnalysisDataChangeFilter=0
+PROPERTY_8=SequenceFilters={"IsEnabled":"1","FilterCount":"0"}
+PROPERTY_9=SearchPatterns={"EventCount":"0"}
+PROPERTY_10=ExplorerConfig={"VSplitPos":"300","VSplitExpanded":"true","HSplitPos":"580","HSplitExpanded":"false","ActiveExplorerView":"1","ActiveSearchType":"0"}
+PROPERTY_11=ContinuousMode=1
+PROPERTY_12=AbsoluteTimeMode=1
+PROPERTY_13=HighPrioritySBClient=0
+PROPERTY_14=EventFading=0
+PROPERTY_15=ByteFading=0
+PROPERTY_16=BufferEntries=10000
+PROPERTY_17=ClearStart=true
+PROPERTY_18=OnlyMeasurement=false
+PROPERTY_19=CopyColumnTitles=true
+PROPERTY_20=LoggingEnabled=false
+PROPERTY_21=LoggingFilePath=
+PROPERTY_22=LoggingOverwriteOnConfigLoad=false
+OBJECTS_COUNT=0
+ObjectCount=0
+HiddenDisplayCount=0
+TraceChannelCount=2
+ColumnCount=9
+Column_0=0, 210
+Column_1=256, 237
+Column_2=257, 60
+Column_3=4, 90
+Column_4=1281, 150
+Column_5=1, 60
+Column_6=2, 100
+Column_7=3, 817
+Column_8=513, 300
+DeltaTimeEnabled=0
+Title=Trace-Fenster {DISPLAYED_FILENAME}
+Type=16384
+Comment=ActiveX-Fenster
+Number=7
+GUID=WINDOW_4026211d-ce3d-4659-a53a-05e21b1750c4
+ScreenDPIinSection=192
+Position=0, 52, 86, 2478, 1240 ;cmd, x, y, w, h
+Position_dpi96=0, 26, 43, 1239, 620 ;cmd, x, y, w, h
+Position_Page02=0, 52, 86, 2478, 1240 ;cmd, x, y, w, h
+Position_Page02_dpi96=0, 26, 43, 1239, 620 ;cmd, x, y, w, h
+FloatingWindow=0
+ShowSignalComments=1
+DisplayMask=2 ; pages 2
+
+[WINDOW_7_CHANNEL_1]
+Module=tokio_demo
+Channel=0
+CustomColorFlag=0
+Color=0
+
+[WINDOW_7_CHANNEL_2]
+Module=tokio_demo
+Channel=1
+CustomColorFlag=0
+Color=0
 
 [WINDOWS]
-Count=5
+Count=7
 
 [Y_COMMON_AXIS_LIST]
 Count=0
diff --git a/examples/rayon_demo/CANape/rayon_demo.cnaxml b/examples/rayon_demo/CANape/rayon_demo.cnaxml
index c0e3381..7371b5f 100644
--- a/examples/rayon_demo/CANape/rayon_demo.cnaxml
+++ b/examples/rayon_demo/CANape/rayon_demo.cnaxml
@@ -200,7 +200,7 @@
       <property name="ManualClosedPanelsBarVisibility">false</property>
       <property name="RedrawContentWhenResizing">false</property>
       <property name="ShowFloatWindowsInTaskbar">false</property>
-      <property name="RestoreLayoutOptions.FloatPanelsRestoreOffset" OwnerType="DevExpress.Xpf.Docking.RestoreLayoutOptions" DependencyPropertyType="System.Windows.Point">96,189</property>
+      <property name="RestoreLayoutOptions.FloatPanelsRestoreOffset" OwnerType="DevExpress.Xpf.Docking.RestoreLayoutOptions" DependencyPropertyType="System.Windows.Point">159,207.5</property>
     </property>
   </XtraSerializer>
 </Root>
\ No newline at end of file
diff --git a/examples/rayon_demo/CANape/tokio_demo.HEX b/examples/rayon_demo/CANape/tokio_demo.HEX
index 588fb82..4ba42de 100644
--- a/examples/rayon_demo/CANape/tokio_demo.HEX
+++ b/examples/rayon_demo/CANape/tokio_demo.HEX
@@ -1,6 +1,6 @@
 :020000020000FC
 :020000040000FA
 :02000004800179
-:2000000052B81E85EB51F0BFF2D24D621058D13FBA490C022B87963FB80B0000D00700002B
+:18000000000000000000E0BF0000000000000000000000000000084001
 :00000001FF
 
\ No newline at end of file
diff --git a/examples/rayon_demo/mandelbrot.a2l b/examples/rayon_demo/mandelbrot.a2l
index 066a3ef..34fab4a 100644
--- a/examples/rayon_demo/mandelbrot.a2l
+++ b/examples/rayon_demo/mandelbrot.a2l
@@ -110,27 +110,28 @@
             OPTIONAL_LEVEL1_CMD GET_VERSION
             /end PROTOCOL_LAYER
             /begin DAQ
-            DYNAMIC 0 12 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID
+            DYNAMIC 0 13 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID
             /begin TIMESTAMP_SUPPORTED
                 0x1 SIZE_DWORD UNIT_1US TIMESTAMP_FIXED
             /end TIMESTAMP_SUPPORTED
 
 /begin EVENT "mainloop" "mainloop" 0 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_1" "task_1" 1 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_2" "task_2" 2 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_3" "task_3" 3 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_4" "task_4" 4 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_5" "task_5" 5 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_6" "task_6" 6 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_7" "task_7" 7 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_8" "task_8" 8 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_9" "task_9" 9 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_10" "task_10" 10 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_11" "task_11" 11 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "pixels" "pixels" 1 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_1" "task_1" 2 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_2" "task_2" 3 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_3" "task_3" 4 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_4" "task_4" 5 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_5" "task_5" 6 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_6" "task_6" 7 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_7" "task_7" 8 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_8" "task_8" 9 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_9" "task_9" 10 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_10" "task_10" 11 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_11" "task_11" 12 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
 
             /end DAQ
 
-/begin XCP_ON_UDP_IP 0x104 5555 ADDRESS "127.0.0.1" /end XCP_ON_UDP_IP
+/begin XCP_ON_UDP_IP 0x104 5555 ADDRESS "192.168.0.83" /end XCP_ON_UDP_IP
 
         /end IF_DATA
 
@@ -145,21 +146,25 @@ Mandelbrot.y
 
 /begin COMPU_METHOD elapsed_time.Conv "" LINEAR "%6.3" "s" COEFFS_LINEAR 1 0 /end COMPU_METHOD
 /begin MEASUREMENT elapsed_time "duration of image calculation" FLOAT64_IEEE elapsed_time.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "s" ECU_ADDRESS 0x4 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_1 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x1011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_10 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xA011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 10 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_11 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xB011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 11 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_2 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x2011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_3 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x3011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_4 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x4011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_5 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x5011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 5 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_6 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x6011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 6 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_7 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x7011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 7 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_8 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x8011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 8 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_9 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x9011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 9 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT wait_counter "loop counter" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x10 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT frame_counter "frame counter" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x10 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_1 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x2011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_10 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xB011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 11 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_11 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xC011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 12 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_2 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x3011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_3 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x4011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_4 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x5011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 5 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_5 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x6011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 6 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_6 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x7011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 7 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_7 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x8011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 8 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_8 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x9011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 9 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_9 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xA011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 10 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT pixels "pixel array" UBYTE NO_COMPU_METHOD 0 0 0 255 PHYS_UNIT "" ECU_ADDRESS 0x10000 ECU_ADDRESS_EXTENSION 2 MATRIX_DIM 256 128 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin GROUP mainloop "" /begin REF_MEASUREMENT
 elapsed_time
-wait_counter
+frame_counter
+/end REF_MEASUREMENT /end GROUP
+/begin GROUP pixels "" /begin REF_MEASUREMENT
+pixels
 /end REF_MEASUREMENT /end GROUP
 /begin GROUP task "" /begin REF_MEASUREMENT
 line_1
diff --git a/examples/rayon_demo/mandelbrot.png b/examples/rayon_demo/mandelbrot.png
index 85c3043..2ae9a06 100644
Binary files a/examples/rayon_demo/mandelbrot.png and b/examples/rayon_demo/mandelbrot.png differ
diff --git a/examples/rayon_demo/src/main.rs b/examples/rayon_demo/src/main.rs
index 25ed41d..0d20a98 100644
--- a/examples/rayon_demo/src/main.rs
+++ b/examples/rayon_demo/src/main.rs
@@ -14,8 +14,9 @@ use serde::{Deserialize, Serialize};
 use xcp::*;
 use xcp_type_description_derive::XcpTypeDescription;
 
-const X_RES: usize = 3000;
-const Y_RES: usize = 2000;
+// Arrays measured may not exxed 2^15
+const X_RES: usize = 256;
+const Y_RES: usize = 128;
 
 #[derive(Debug, Copy, Clone, Serialize, Deserialize, XcpTypeDescription)]
 struct Mandelbrot {
@@ -40,18 +41,8 @@ const MANDELBROT: Mandelbrot = Mandelbrot {
 //---------------------------------------------------------------------------------------
 // Image rendering
 
-/// Write the buffer `pixels`, whose dimensions are given by `bounds`, to the file named `filename`.
+/// Write the buffer `pixels` to the file named `filename`.
 fn write_image(filename: &str, pixels: &[u8]) -> Result<(), std::io::Error> {
-    // Black and white
-    // let output = File::create(filename)?;
-    // let encoder = PNGEncoder::new(output);
-    // encoder.encode(
-    //     &pixels,
-    //     X_RES as u32,
-    //     Y_RES as u32,
-    //     ColorType::Gray(8),
-    // )?;
-
     // Rainbox color map (credits to CoPilot)
     let mut color_map = Vec::with_capacity(256);
     for i in 0..256 {
@@ -69,7 +60,7 @@ fn write_image(filename: &str, pixels: &[u8]) -> Result<(), std::io::Error> {
         color_map.push(rgb);
     }
 
-    // Color
+    // Create rgb image buffer and write to file
     let mut imgbuf = ImageBuffer::new(X_RES as u32, Y_RES as u32);
     for (x, y, rgb_pixel) in imgbuf.enumerate_pixels_mut() {
         *rgb_pixel = color_map[pixels[y as usize * X_RES as usize + x as usize] as usize];
@@ -159,15 +150,15 @@ fn main() {
     println!("xcp_lite rayon mandelbrot demo");
 
     env_logger::Builder::new()
-        .filter_level(log::LevelFilter::Info)
+        .filter_level(log::LevelFilter::Debug)
         .init();
 
-    const BIND_ADDR: [u8; 4] = [127, 0, 0, 1]; // [192, 168, 0, 83]; // [127, 0, 0, 1];
+    const BIND_ADDR: [u8; 4] = [192, 168, 0, 83]; // [172, 19, 11, 24]; // [192, 168, 0, 83]; // [127, 0, 0, 1];
     XcpBuilder::new("mandelbrot")
-        .set_log_level(XcpLogLevel::Info)
+        .set_log_level(XcpLogLevel::Debug)
         .enable_a2l(true)
         .set_epk("EPK")
-        .start_server(XcpTransportLayer::Udp, BIND_ADDR, 5555, 1464)
+        .start_server(XcpTransportLayer::Udp, BIND_ADDR, 5555, 8000 - 20 - 8)
         .unwrap();
 
     let mandelbrot = Xcp::create_calseg("mandelbrot", &MANDELBROT, true);
@@ -179,12 +170,14 @@ fn main() {
     // Create event for this worker thread and register variable index, which is the upper left corner of the rectangle
     let event = daq_create_event!("mainloop");
     let mut elapsed_time: f64 = 0.0;
-    let mut wait_counter: u32 = 0;
+    let mut frame_counter: u32 = 0;
     daq_register!(elapsed_time, event, "duration of image calculation", "s");
-    daq_register!(wait_counter, event, "loop counter", "");
+    daq_register!(frame_counter, event, "frame counter", "");
 
+    // Recalculate image in a loop with 10 ms pause
+    let mut first = true;
     loop {
-        thread::sleep(Duration::from_micros(1000));
+        thread::sleep(Duration::from_micros(1000000)); // 1ms
         let start_time = std::time::Instant::now();
 
         let lower_right = Complex {
@@ -204,27 +197,34 @@ fn main() {
             render(band, y, X_RES, band_upper_left, band_lower_right);
         });
 
-        // Measure run time
+        // Measure run time and frame count
         elapsed_time = start_time.elapsed().as_secs_f64();
+        frame_counter += 1;
         event.trigger();
-        println!("Image rendered, duration = {:.3} s", elapsed_time);
 
         // Measure the pixel array from heap, with an individual event
-        //daq_event!(pixels, "pixels");
-
-        // Render image to png
-        write_image("mandelbrot.png", &pixels).expect("error writing PNG file");
-        println!("Image written to mandelbrot.png");
-
-        // Write A2L file
-        Xcp::get().write_a2l();
-
-        // Wait until parameter change and recalculate image
-        while !mandelbrot.sync() {
-            thread::sleep(Duration::from_millis(100));
-            wait_counter += 1;
-            event.trigger();
+        daq_event_for_ref!(
+            pixels,
+            RegistryDataType::Ubyte,
+            X_RES as u16,
+            Y_RES as u16,
+            "pixel array"
+        );
+        // println!(
+        //     "Pixel array measured, frame {} {:.4}s",
+        //     frame_counter, elapsed_time
+        // );
+
+        // On first iteration or after parameter changes: render image and write to file
+        if first || mandelbrot.sync() {
+            write_image("mandelbrot.png", &pixels).expect("error writing PNG file");
+            println!(
+                "Image written to mandelbrot.png, frame {} {:.4}s",
+                frame_counter, elapsed_time
+            );
         }
+
+        first = false;
     }
 
     //Xcp::get().write_a2l();
diff --git a/examples/tokio_demo/tokio_demo_autodetect.a2l b/examples/tokio_demo/tokio_demo_autodetect.a2l
index abe32b4..34fab4a 100644
--- a/examples/tokio_demo/tokio_demo_autodetect.a2l
+++ b/examples/tokio_demo/tokio_demo_autodetect.a2l
@@ -66,7 +66,7 @@
         /end MEMORY_SEGMENT
      
         /begin MEMORY_SEGMENT
-            mandelbrot "" DATA FLASH INTERN 0x80010000 32 -1 -1 -1 -1 -1
+            mandelbrot "" DATA FLASH INTERN 0x80010000 24 -1 -1 -1 -1 -1
             /begin IF_DATA XCP
                 /begin SEGMENT /* index: */ 1 /* pages: */ 2 /* ext: */ 0 0 0
                 /begin CHECKSUM XCP_ADD_44 MAX_BLOCK_SIZE 0xFFFF EXTERNAL_FUNCTION "" /end CHECKSUM
@@ -110,23 +110,24 @@
             OPTIONAL_LEVEL1_CMD GET_VERSION
             /end PROTOCOL_LAYER
             /begin DAQ
-            DYNAMIC 0 12 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID
+            DYNAMIC 0 13 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID
             /begin TIMESTAMP_SUPPORTED
                 0x1 SIZE_DWORD UNIT_1US TIMESTAMP_FIXED
             /end TIMESTAMP_SUPPORTED
 
 /begin EVENT "mainloop" "mainloop" 0 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_1" "task_1" 1 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_2" "task_2" 2 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_3" "task_3" 3 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_4" "task_4" 4 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_5" "task_5" 5 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_6" "task_6" 6 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_7" "task_7" 7 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_8" "task_8" 8 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_9" "task_9" 9 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_10" "task_10" 10 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task_11" "task_11" 11 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "pixels" "pixels" 1 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_1" "task_1" 2 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_2" "task_2" 3 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_3" "task_3" 4 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_4" "task_4" 5 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_5" "task_5" 6 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_6" "task_6" 7 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_7" "task_7" 8 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_8" "task_8" 9 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_9" "task_9" 10 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_10" "task_10" 11 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task_11" "task_11" 12 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
 
             /end DAQ
 
@@ -136,34 +137,34 @@
 
 /begin CHARACTERISTIC Mandelbrot.width "" VALUE 0x80010010 F64 0 NO_COMPU_METHOD -1000000000000 1000000000000 /end CHARACTERISTIC
 /begin CHARACTERISTIC Mandelbrot.x "" VALUE 0x80010000 F64 0 NO_COMPU_METHOD -1000000000000 1000000000000 /end CHARACTERISTIC
-/begin CHARACTERISTIC Mandelbrot.x_pixels "" VALUE 0x80010018 U32 0 NO_COMPU_METHOD 0 4294967295 /end CHARACTERISTIC
 /begin CHARACTERISTIC Mandelbrot.y "" VALUE 0x80010008 F64 0 NO_COMPU_METHOD -1000000000000 1000000000000 /end CHARACTERISTIC
-/begin CHARACTERISTIC Mandelbrot.y_pixels "" VALUE 0x8001001C U32 0 NO_COMPU_METHOD 0 4294967295 /end CHARACTERISTIC
 /begin GROUP mandelbrot "" /begin REF_CHARACTERISTIC
 Mandelbrot.width
 Mandelbrot.x
-Mandelbrot.x_pixels
 Mandelbrot.y
-Mandelbrot.y_pixels
 /end REF_CHARACTERISTIC /end GROUP
 
 /begin COMPU_METHOD elapsed_time.Conv "" LINEAR "%6.3" "s" COEFFS_LINEAR 1 0 /end COMPU_METHOD
 /begin MEASUREMENT elapsed_time "duration of image calculation" FLOAT64_IEEE elapsed_time.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "s" ECU_ADDRESS 0x4 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_1 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x1011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_10 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xA011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 10 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_11 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xB011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 11 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_2 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x2011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_3 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x3011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_4 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x4011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_5 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x5011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 5 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_6 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x6011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 6 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_7 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x7011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 7 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_8 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x8011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 8 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT line_9 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x9011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 9 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT wait_counter "loop counter" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x10 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT frame_counter "frame counter" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x10 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_1 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x2011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_10 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xB011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 11 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_11 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xC011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 12 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_2 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x3011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_3 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x4011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_4 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x5011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 5 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_5 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x6011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 6 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_6 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x7011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 7 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_7 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x8011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 8 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_8 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x9011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 9 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT line_9 "" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0xA011E ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 10 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT pixels "pixel array" UBYTE NO_COMPU_METHOD 0 0 0 255 PHYS_UNIT "" ECU_ADDRESS 0x10000 ECU_ADDRESS_EXTENSION 2 MATRIX_DIM 256 128 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin GROUP mainloop "" /begin REF_MEASUREMENT
 elapsed_time
-wait_counter
+frame_counter
+/end REF_MEASUREMENT /end GROUP
+/begin GROUP pixels "" /begin REF_MEASUREMENT
+pixels
 /end REF_MEASUREMENT /end GROUP
 /begin GROUP task "" /begin REF_MEASUREMENT
 line_1
diff --git a/src/daq/daq_event.rs b/src/daq/daq_event.rs
index ad2a1ac..cc96b86 100644
--- a/src/daq/daq_event.rs
+++ b/src/daq/daq_event.rs
@@ -6,6 +6,58 @@ use log::{debug, error, info, trace, warn};
 
 use crate::{reg::RegistryMeasurement, xcp::*, RegistryDataType};
 
+//----------------------------------------------------------------------------------------------
+// XcpEvent
+
+impl Xcp {
+    // Create a measurement event and a measurement variable directly associated to the event with memory offset 0
+    pub fn create_measurement_object(
+        &self,
+        name: &'static str,
+        data_type: RegistryDataType,
+        x_dim: u16,
+        y_dim: u16,
+        comment: &'static str,
+    ) -> XcpEvent {
+        let event = self.create_event(name, false);
+        self.get_registry()
+            .lock()
+            .unwrap()
+            .add_measurement(RegistryMeasurement::new(
+                name.to_string(),
+                data_type,
+                x_dim,
+                y_dim,
+                event,
+                0,   // byte_offset
+                1.0, // factor
+                0.0, // offset
+                comment,
+                "", // unit
+            ));
+        event
+    }
+}
+
+/// Create a single instance XCP event and register the given variable once, trigger the event
+#[allow(unused_macros)]
+#[macro_export]
+macro_rules! daq_event_for_ref {
+
+    ( $id:expr, $data_type: expr, $x_dim: expr, $comment:expr ) => {{
+        lazy_static::lazy_static! {
+            static ref XCP_EVENT__: XcpEvent = Xcp::get().create_measurement_object(stringify!($id), $data_type, $x_dim, 1, $comment);
+        }
+        XCP_EVENT__.trigger(&(*$id) as *const _ as *const u8, 0 );
+    }};
+    ( $id:expr, $data_type: expr, $x_dim: expr, $y_dim: expr, $comment:expr ) => {{
+        lazy_static::lazy_static! {
+            static ref XCP_EVENT__: XcpEvent = Xcp::get().create_measurement_object(stringify!($id), $data_type, $x_dim, $y_dim, $comment);
+        }
+        XCP_EVENT__.trigger(&(*$id) as *const _ as *const u8, 0);
+    }};
+}
+
 //----------------------------------------------------------------------------------------------
 // DaqEvent
 
@@ -69,7 +121,8 @@ impl<const N: usize> DaqEvent<N> {
         name: &'static str,
         size: usize,
         datatype: RegistryDataType,
-        dim: usize,
+        x_dim: u16,
+        y_dim: u16,
         factor: f64,
         offset: f64,
         unit: &'static str,
@@ -90,7 +143,8 @@ impl<const N: usize> DaqEvent<N> {
             .add_measurement(RegistryMeasurement::new(
                 name.to_string(),
                 datatype,
-                dim,
+                x_dim,
+                y_dim,
                 event,
                 event_offset,
                 factor,
@@ -108,7 +162,8 @@ impl<const N: usize> DaqEvent<N> {
         name: &'static str,
         ptr: *const u8,
         datatype: RegistryDataType,
-        dim: usize,
+        x_dim: u16,
+        y_dim: u16,
         factor: f64,
         offset: f64,
         unit: &'static str,
@@ -136,7 +191,8 @@ impl<const N: usize> DaqEvent<N> {
             .add_measurement(RegistryMeasurement::new(
                 name.to_string(),
                 datatype,
-                dim,
+                x_dim,
+                y_dim,
                 self.event,
                 event_offset,
                 factor,
@@ -159,6 +215,7 @@ impl<const N: usize> DaqEvent<N> {
 #[allow(unused_macros)]
 #[macro_export]
 macro_rules! daq_create_event {
+    // Without capture buffer
     ( $name:expr, $capacity: literal ) => {{
         // Scope for lazy static XCP_EVENT__, create the XCP event only once
         lazy_static::lazy_static! {
@@ -167,6 +224,7 @@ macro_rules! daq_create_event {
         // Create the DAQ event every time the thread is running through this code
         DaqEvent::<$capacity>::new_from(&XCP_EVENT__)
     }};
+    // With capture buffer capacity
     ( $name:expr ) => {{
         lazy_static::lazy_static! {
             static ref XCP_EVENT__: XcpEvent = Xcp::get().create_event($name, false);
@@ -196,7 +254,8 @@ macro_rules! daq_capture {
                     stringify!($id),
                     std::mem::size_of_val(&$id),
                     $id.get_type(),
-                    1, // dim
+                    1, // x_dim
+                    1, // y_dim
                     $factor,
                     $offset,
                     $unit,
@@ -226,7 +285,8 @@ macro_rules! daq_capture {
                     stringify!($id),
                     std::mem::size_of_val(&$id),
                     $id.get_type(),
-                    1, // dim
+                    1, // x_dim
+                    1, // y_dim
                     1.0,
                     0.0,
                     $unit,
@@ -255,7 +315,8 @@ macro_rules! daq_capture {
                     stringify!($id),
                     std::mem::size_of_val(&$id),
                     $id.get_type(),
-                    1, // dim
+                    1, // x_dim
+                    1, // y_dim
                     1.0,
                     0.0,
                     "",
@@ -291,7 +352,8 @@ macro_rules! daq_serialize {
                     stringify!($id),
                     std::mem::size_of_val(&$id),
                     RegistryDataType::Blob,
-                    $daq_event.buffer.len(),  // dim
+                    $daq_event.buffer.len() as u16,  // x_dim
+                    1, // y_dim
                     1.0,
                     0.0,
                     "",
@@ -333,6 +395,7 @@ macro_rules! daq_register {
                 &$id as *const _ as *const u8,
                 $id.get_type(),
                 1,
+                1,
                 $factor,
                 $offset,
                 $unit,
@@ -358,6 +421,7 @@ macro_rules! daq_register {
                 &$id as *const _ as *const u8,
                 $id.get_type(),
                 1,
+                1,
                 1.0,
                 0.0,
                 $unit,
@@ -383,6 +447,7 @@ macro_rules! daq_register {
                 &$id as *const _ as *const u8,
                 $id.get_type(),
                 1,
+                1,
                 1.0,
                 0.0,
                 "",
@@ -411,12 +476,13 @@ macro_rules! daq_register_array {
             )
             .is_ok()
         {
-            let dim = std::mem::size_of_val(&$id) / std::mem::size_of_val(&$id[0]);
+            let dim = (std::mem::size_of_val(&$id) / std::mem::size_of_val(&$id[0])) as u16;
             $daq_event.add_stack(
                 stringify!($id),
                 &$id as *const _ as *const u8,
                 ($id[0]).get_type(),
                 dim,
+                1,
                 1.0,
                 0.0,
                 "",
@@ -475,7 +541,8 @@ macro_rules! daq_capture_instance {
                 stringify!($id),
                 std::mem::size_of_val(&$id),
                 $id.get_type(),
-                1,
+                1, // x_dim
+                1, // y_dim
                 $factor,
                 $offset,
                 $unit,
@@ -497,7 +564,8 @@ macro_rules! daq_capture_instance {
                 stringify!($id),
                 std::mem::size_of_val(&$id),
                 $id.get_type(),
-                1,
+                1, // x_dim
+                1, // y_dim
                 1.0,
                 0.0,
                 $unit,
@@ -519,7 +587,8 @@ macro_rules! daq_capture_instance {
                 stringify!($id),
                 std::mem::size_of_val(&$id),
                 $id.get_type(),
-                1,
+                1, // x_dim
+                1, // y_dim
                 1.0,
                 0.0,
                 "",
@@ -549,6 +618,7 @@ macro_rules! daq_register_instance {
                 &$id as *const _ as *const u8,
                 $id.get_type(),
                 1,
+                1,
                 1.0,
                 0.0,
                 "",
diff --git a/src/main.rs b/src/main.rs
index a2c342a..8ea5117 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -57,8 +57,8 @@ struct Args {
     #[arg(short, long, default_value_t = 5555)]
     port: u16,
 
-    /// Segment size (UDP MTU)
-    #[arg(short, long, default_value_t = 7500)]
+    /// XCP segment size (jumbo frames supported with MTU up to 8000 bytes -> segment_size <= (OPTION_MTU-20-8), OPTION_MTU defined in main_cfg.h )
+    #[arg(short, long, default_value_t = 8000-20-8)]
     segment_size: u16,
 
     /// Don't create A2L file
@@ -330,7 +330,8 @@ fn main() {
     let xcp_builder = XcpBuilder::new("xcp_lite")
         .set_log_level(log_level)
         .enable_a2l(!args.no_a2l)
-        //.set_epk(build_info::format!("{}", $.timestamp));
+        // .set_segment_size(1500-20-8) // no jumbo frames
+        // .set_epk(build_info::format!("{}", $.timestamp)); // EPK from build info
         .set_epk("EPK_");
 
     let xcp = match xcp_builder.start_server(
@@ -344,7 +345,7 @@ fn main() {
         args.segment_size,
     ) {
         Err(res) => {
-            error!("XCP initialization failed: {:?}", res);
+            error!("XCP server initialization failed: {:?}", res);
             return;
         }
         Ok(xcp) => xcp,
@@ -387,26 +388,34 @@ fn main() {
 
     // Mainloop
     xcp_println!("Main task starts");
+
     let mut mainloop_counter: u64 = 0;
-    let mut mainloop_counter2 = Box::new(0u64);
+    let mut mainloop_array = Box::new([[0u8; 16]; 16]);
 
-    let mut mainloop_event = daq_create_event!("mainloop", 8);
+    let mainloop_event = daq_create_event!("mainloop", 8);
     daq_register!(mainloop_counter, mainloop_event, "counter on stack", "");
 
     loop {
-        // @@@@ Dev: Terminate after 3s to check shutdown and drop behaviour
-        // if START_TIME.elapsed().as_secs() > 3 {
-        //     break;
-        // }
         // @@@@ Dev: Terminate mainloop for shutdown if calibration parameter run is false, for test automation
         if !calseg.run {
             break;
         }
         thread::sleep(Duration::from_millis(50));
 
-        mainloop_counter += 1;
-        *mainloop_counter2 += 1;
-        daq_capture!(mainloop_counter2, mainloop_event, "counter on heap", "");
+        mainloop_counter += 1; // Stack
+        mainloop_array[0][0] = mainloop_counter as u8; // Heap
+
+        // Measure directly from stack with event "mainloop"
+        mainloop_event.trigger();
+
+        // Measure directly from heap with individual event "mainloop_array"
+        daq_event_for_ref!(
+            mainloop_array,
+            RegistryDataType::AUint64,
+            16,
+            16,
+            "array on heap"
+        );
 
         // Check if the XCP server is still alive
         // Optional
@@ -415,9 +424,8 @@ fn main() {
             break;
         }
 
-        // Sync and trigger mainloop event
+        // Sync
         calseg.sync();
-        mainloop_event.trigger();
 
         // @@@@ Dev:
         // Finalize A2l after 2s delay
diff --git a/src/reg/registry.rs b/src/reg/registry.rs
index b7a17bd..8949cdf 100644
--- a/src/reg/registry.rs
+++ b/src/reg/registry.rs
@@ -325,7 +325,8 @@ impl RegistryEpk {
 pub struct RegistryMeasurement {
     name: String,
     datatype: RegistryDataType, // Basic types Ubyte, SByte, AUint64, Float64Ieee, ...  or Blob
-    dim: usize, // 1 = basic type (A2L MEASUREMENT), >1 = array[dim] of basic type (A2L MEASUREMENT with MATRIX_DIM)
+    x_dim: u16, // 1 = basic type (A2L MEASUREMENT), >1 = array[dim] of basic type (A2L MEASUREMENT with MATRIX_DIM x (max u16))
+    y_dim: u16, // 1 = basic type (A2L MEASUREMENT), >1 = array[x_dim,y_dim] of basic type (A2L MEASUREMENT with MATRIX_DIM x,y (max u16))
     event: XcpEvent,
     event_offset: i16, // Address offset (signed) relative to event memory context (XCP_ADDR_EXT_DYN)
     factor: f64,
@@ -339,7 +340,8 @@ impl RegistryMeasurement {
     pub fn new(
         name: String,
         datatype: RegistryDataType,
-        dim: usize,
+        x_dim: u16,
+        y_dim: u16,
         event: XcpEvent,
         event_offset: i16,
         factor: f64,
@@ -350,7 +352,8 @@ impl RegistryMeasurement {
         RegistryMeasurement {
             name,
             datatype,
-            dim,
+            x_dim,
+            y_dim,
             event,
             event_offset,
             factor,
@@ -367,9 +370,14 @@ impl RegistryMeasurement {
     pub fn datatype(&self) -> RegistryDataType {
         self.datatype
     }
-
-    pub fn dim(&self) -> usize {
-        self.dim
+    pub fn dim(&self) -> u16 {
+        self.x_dim * self.y_dim
+    }
+    pub fn x_dim(&self) -> u16 {
+        self.x_dim
+    }
+    pub fn y_dim(&self) -> u16 {
+        self.y_dim
     }
 
     pub fn event(&self) -> XcpEvent {
@@ -679,10 +687,11 @@ impl Registry {
     ///
     pub fn add_measurement(&mut self, mut m: RegistryMeasurement) {
         debug!(
-            "add_measurement: {} type={:?}[{}] event={}+({})",
+            "add_measurement: {} type={:?}[{},{}] event={}+({})",
             m.name,
             m.datatype,
-            m.dim,
+            m.x_dim,
+            m.y_dim,
             m.event.get_num(),
             m.event_offset
         );
diff --git a/src/reg/registry/a2l_writer.rs b/src/reg/registry/a2l_writer.rs
index 01c8b77..bbf9498 100644
--- a/src/reg/registry/a2l_writer.rs
+++ b/src/reg/registry/a2l_writer.rs
@@ -144,13 +144,15 @@ impl GenerateA2l for RegistryMeasurement {
         let max = self.datatype.get_max();
         let offset = self.offset;
         let type_str = self.datatype.get_type_str();
-        let dim = self.dim;
+        let x_dim = self.x_dim;
+        let y_dim = self.y_dim;
+
         let min = self.datatype.get_min();
         let event = self.event.get_num();
 
         // Dynamic object as CHARACTERISTIC ASCII string with IDL annotation
         if self.datatype == RegistryDataType::Blob {
-            let buffer_size = self.dim;
+            let buffer_size = self.x_dim * self.y_dim;
 
             let annotation = format!(
                 r#"
@@ -184,8 +186,12 @@ impl GenerateA2l for RegistryMeasurement {
             )
         } else {
             // Measurement signals or array of signals
-            let matrix_dim = if dim > 1 {
-                format!("MATRIX_DIM {} ", dim)
+            let matrix_dim = if x_dim > 1 && y_dim > 1 {
+                format!("MATRIX_DIM {} {} ", x_dim, y_dim)
+            } else if x_dim > 1 {
+                format!("MATRIX_DIM {} ", x_dim)
+            } else if y_dim > 1 {
+                format!("MATRIX_DIM {} ", y_dim)
             } else {
                 "".to_string()
             };
diff --git a/src/xcp.rs b/src/xcp.rs
index 5812db8..94849d9 100644
--- a/src/xcp.rs
+++ b/src/xcp.rs
@@ -131,6 +131,14 @@ impl XcpEvent {
     /// The buffer must match its registry description, to avoid corrupt data given to the XCP tool
     #[allow(clippy::not_unsafe_ptr_arg_deref)]
     pub fn trigger(self, base: *const u8, len: u32) -> u8 {
+        trace!(
+            "Trigger event {} num={}, index={}, base=0x{:X}, len={}",
+            self.get_name(),
+            self.get_num(),
+            self.get_index(),
+            base as u64,
+            len
+        );
         // @@@@ unsafe - C library call
         // @@@@ unsafe - Transfering a pointer and its valid memory range to XCPlite FFI
         unsafe {
@@ -212,6 +220,7 @@ impl EventList {
                 XCP_EVENT_MAP[e.event.num as usize] = i as u16; // New external event number is index pointer to sorted list
             }
         }
+        trace!("Event map: {:?}", unsafe { XCP_EVENT_MAP });
 
         // Register all events
         let r = Xcp::get().get_registry();
diff --git a/xcp_lite.a2l b/xcp_lite.a2l
index cae52ba..a85f891 100644
--- a/xcp_lite.a2l
+++ b/xcp_lite.a2l
@@ -130,24 +130,25 @@
             OPTIONAL_LEVEL1_CMD GET_VERSION
             /end PROTOCOL_LAYER
             /begin DAQ
-            DYNAMIC 0 13 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID
+            DYNAMIC 0 14 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID
             /begin TIMESTAMP_SUPPORTED
                 0x1 SIZE_DWORD UNIT_1US TIMESTAMP_FIXED
             /end TIMESTAMP_SUPPORTED
 
 /begin EVENT "mainloop" "mainloop" 0 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task1" "task1" 1 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task1_points" "task1_po" 2 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_1" "task2_in" 3 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_2" "task2_in" 4 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_3" "task2_in" 5 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_4" "task2_in" 6 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_5" "task2_in" 7 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_6" "task2_in" 8 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_7" "task2_in" 9 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_8" "task2_in" 10 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_inst_9" "task2_in" 11 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
-/begin EVENT "task2_static" "task2_st" 12 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "mainloop_counter2" "mainloop" 1 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task1" "task1" 2 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task1_points" "task1_po" 3 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_1" "task2_in" 4 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_2" "task2_in" 5 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_3" "task2_in" 6 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_4" "task2_in" 7 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_5" "task2_in" 8 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_6" "task2_in" 9 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_7" "task2_in" 10 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_8" "task2_in" 11 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_inst_9" "task2_in" 12 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
+/begin EVENT "task2_static" "task2_st" 13 DAQ 0xFF 0 0 0 CONSISTENCY EVENT /end EVENT
 
             /end DAQ
 
@@ -202,35 +203,35 @@ CalPage2.ampl
 CalPage2.period
 /end REF_CHARACTERISTIC /end GROUP
 
-/begin MEASUREMENT array1 "" FLOAT64_IEEE NO_COMPU_METHOD 0 0 -1000000000000 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x1F7F4 ECU_ADDRESS_EXTENSION 2 MATRIX_DIM 256 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT array1 "" FLOAT64_IEEE NO_COMPU_METHOD 0 0 -1000000000000 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x2F7F4 ECU_ADDRESS_EXTENSION 2 MATRIX_DIM 256 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel "sine: f64" FLOAT64_IEEE channel.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xC0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 12 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel "sine: f64" FLOAT64_IEEE channel.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xD0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 13 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_1.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_1 "sine: f64" FLOAT64_IEEE channel_1.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x30000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_1 "sine: f64" FLOAT64_IEEE channel_1.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x40000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_2.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_2 "sine: f64" FLOAT64_IEEE channel_2.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x40000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_2 "sine: f64" FLOAT64_IEEE channel_2.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x50000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 5 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_3.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_3 "sine: f64" FLOAT64_IEEE channel_3.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x50000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 5 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_3 "sine: f64" FLOAT64_IEEE channel_3.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x60000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 6 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_4.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_4 "sine: f64" FLOAT64_IEEE channel_4.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x60000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 6 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_4 "sine: f64" FLOAT64_IEEE channel_4.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x70000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 7 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_5.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_5 "sine: f64" FLOAT64_IEEE channel_5.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x70000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 7 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_5 "sine: f64" FLOAT64_IEEE channel_5.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x80000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 8 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_6.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_6 "sine: f64" FLOAT64_IEEE channel_6.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x80000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 8 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_6 "sine: f64" FLOAT64_IEEE channel_6.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x90000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 9 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_7.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_7 "sine: f64" FLOAT64_IEEE channel_7.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0x90000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 9 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_7 "sine: f64" FLOAT64_IEEE channel_7.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xA0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 10 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_8.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_8 "sine: f64" FLOAT64_IEEE channel_8.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xA0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 10 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_8 "sine: f64" FLOAT64_IEEE channel_8.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xB0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 11 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin COMPU_METHOD channel_9.Conv "" LINEAR "%6.3" "Volt" COEFFS_LINEAR 1 0 /end COMPU_METHOD
-/begin MEASUREMENT channel_9 "sine: f64" FLOAT64_IEEE channel_9.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xB0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 11 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter "" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x1F7E0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter_u16 "wrapping counter: u16" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x1F7E6 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter_u32 "wrapping counter: u32" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x1F7E8 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter_u64 "wrapping counter: u64" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x1F7EC ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT counter_u8 "wrapping counter: u8" UBYTE NO_COMPU_METHOD 0 0 0 255 PHYS_UNIT "" ECU_ADDRESS 0x1F7E5 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT channel_9 "sine: f64" FLOAT64_IEEE channel_9.Conv 0 0 -1000000000000 1000000000000 PHYS_UNIT "Volt" ECU_ADDRESS 0xC0000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 12 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter "" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x2F7E0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter_u16 "wrapping counter: u16" UWORD NO_COMPU_METHOD 0 0 0 65535 PHYS_UNIT "" ECU_ADDRESS 0x2F7E6 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter_u32 "wrapping counter: u32" ULONG NO_COMPU_METHOD 0 0 0 4294967295 PHYS_UNIT "" ECU_ADDRESS 0x2F7E8 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter_u64 "wrapping counter: u64" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x2F7EC ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT counter_u8 "wrapping counter: u8" UBYTE NO_COMPU_METHOD 0 0 0 255 PHYS_UNIT "" ECU_ADDRESS 0x2F7E5 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin MEASUREMENT mainloop_counter "counter on stack" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0xFFF0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT mainloop_counter2 "counter on heap" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin CHARACTERISTIC point_cloud "struct serializer demo" ASCII 0x20000 U8 0 NO_COMPU_METHOD 0 255 READ_ONLY NUMBER 64 ECU_ADDRESS_EXTENSION 2 
+/begin MEASUREMENT mainloop_counter2 "counter on heap" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0x10000 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin CHARACTERISTIC point_cloud "struct serializer demo" ASCII 0x30000 U8 0 NO_COMPU_METHOD 0 255 READ_ONLY NUMBER 64 ECU_ADDRESS_EXTENSION 2 
 /begin ANNOTATION ANNOTATION_LABEL "ObjectDescription" ANNOTATION_ORIGIN "application/dds" /begin ANNOTATION_TEXT
         "<DynamicObject> "
         "<RootType>Vector::PointCloud</RootType>"
@@ -247,9 +248,11 @@ CalPage2.period
 /end ANNOTATION_TEXT /end ANNOTATION
 /begin ANNOTATION ANNOTATION_LABEL "IsVlsd" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT  "true" /end ANNOTATION_TEXT /end ANNOTATION
 /begin ANNOTATION ANNOTATION_LABEL "MaxBufferNeeded" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "64" /end ANNOTATION_TEXT /end ANNOTATION
- /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
+ /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
 /begin GROUP mainloop "" /begin REF_MEASUREMENT
 mainloop_counter
+/end REF_MEASUREMENT /end GROUP
+/begin GROUP mainloop_counter2 "" /begin REF_MEASUREMENT
 mainloop_counter2
 /end REF_MEASUREMENT /end GROUP
 /begin GROUP task1 "" /begin REF_MEASUREMENT