diff --git a/java/jdevices/src/main/java/MARTE2_STREAMSetup.java b/java/jdevices/src/main/java/MARTE2_STREAMSetup.java
index 741b7417b5..c96d5710db 100644
--- a/java/jdevices/src/main/java/MARTE2_STREAMSetup.java
+++ b/java/jdevices/src/main/java/MARTE2_STREAMSetup.java
@@ -686,7 +686,7 @@ private void initComponents() {
         deviceField389 = new DeviceField();
         deviceField390 = new DeviceField();
 
-        setDeviceProvider("spilds.rfx.local:8100");
+        setDeviceProvider("localhost:8100");
         setDeviceTitle("MARTe2 Stream");
         setDeviceType("MARTE2_STREAM");
         setHeight(500);
@@ -757,7 +757,7 @@ private void initComponents() {
         deviceField2.setOffsetNid(31);
         jPanel3.add(deviceField2);
 
-        deviceChoice1.setChoiceItems(new String[] {"float32", "float64", "int16", "int32", "uint16", "uint32"});
+        deviceChoice1.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice1.setIdentifier("");
         deviceChoice1.setLabelString("Type: ");
         deviceChoice1.setOffsetNid(28);
@@ -787,7 +787,7 @@ private void initComponents() {
         deviceField3.setOffsetNid(41);
         jPanel4.add(deviceField3);
 
-        deviceChoice2.setChoiceItems(new String[] {"float32", "float64", "int16", "int32", "uint16", "uint32"});
+        deviceChoice2.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64", "uint32"});
         deviceChoice2.setIdentifier("");
         deviceChoice2.setLabelString("Type: ");
         deviceChoice2.setOffsetNid(38);
@@ -817,7 +817,7 @@ private void initComponents() {
         deviceField4.setOffsetNid(51);
         jPanel5.add(deviceField4);
 
-        deviceChoice3.setChoiceItems(new String[] {"float32", "float64", "int16", "int32", "uint16", "uint32"});
+        deviceChoice3.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice3.setIdentifier("");
         deviceChoice3.setLabelString("Type: ");
         deviceChoice3.setOffsetNid(48);
@@ -847,7 +847,7 @@ private void initComponents() {
         deviceField5.setOffsetNid(61);
         jPanel6.add(deviceField5);
 
-        deviceChoice4.setChoiceItems(new String[] {"float32", "float64", "int16", "int32", "uint16", "uint32"});
+        deviceChoice4.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice4.setIdentifier("");
         deviceChoice4.setLabelString("Type: ");
         deviceChoice4.setOffsetNid(58);
@@ -877,7 +877,7 @@ private void initComponents() {
         deviceField6.setOffsetNid(71);
         jPanel7.add(deviceField6);
 
-        deviceChoice5.setChoiceItems(new String[] {"float32", "float64", "int16", "int32", "uint16", "uint32"});
+        deviceChoice5.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice5.setIdentifier("");
         deviceChoice5.setLabelString("Type: ");
         deviceChoice5.setOffsetNid(68);
@@ -907,7 +907,7 @@ private void initComponents() {
         deviceField7.setOffsetNid(81);
         jPanel8.add(deviceField7);
 
-        deviceChoice6.setChoiceItems(new String[] {"float32", "float64", "int16", "int32", "uint16", "uint32"});
+        deviceChoice6.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice6.setIdentifier("");
         deviceChoice6.setLabelString("Type: ");
         deviceChoice6.setOffsetNid(68);
@@ -937,7 +937,7 @@ private void initComponents() {
         deviceField8.setOffsetNid(91);
         jPanel9.add(deviceField8);
 
-        deviceChoice7.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice7.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice7.setIdentifier("");
         deviceChoice7.setLabelString("Type: ");
         deviceChoice7.setOffsetNid(88);
@@ -967,7 +967,7 @@ private void initComponents() {
         deviceField9.setOffsetNid(101);
         jPanel10.add(deviceField9);
 
-        deviceChoice8.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice8.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice8.setIdentifier("");
         deviceChoice8.setLabelString("Type: ");
         deviceChoice8.setOffsetNid(98);
@@ -997,7 +997,7 @@ private void initComponents() {
         deviceField23.setOffsetNid(111);
         jPanel13.add(deviceField23);
 
-        deviceChoice10.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice10.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice10.setIdentifier("");
         deviceChoice10.setLabelString("Type: ");
         deviceChoice10.setOffsetNid(108);
@@ -1028,7 +1028,7 @@ private void initComponents() {
         deviceField25.setOffsetNid(121);
         jPanel14.add(deviceField25);
 
-        deviceChoice11.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice11.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice11.setIdentifier("");
         deviceChoice11.setLabelString("Type: ");
         deviceChoice11.setOffsetNid(118);
@@ -1059,7 +1059,7 @@ private void initComponents() {
         deviceField27.setOffsetNid(131);
         jPanel15.add(deviceField27);
 
-        deviceChoice12.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice12.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice12.setIdentifier("");
         deviceChoice12.setLabelString("Type: ");
         deviceChoice12.setOffsetNid(128);
@@ -1090,7 +1090,7 @@ private void initComponents() {
         deviceField29.setOffsetNid(141);
         jPanel16.add(deviceField29);
 
-        deviceChoice13.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice13.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice13.setIdentifier("");
         deviceChoice13.setLabelString("Type: ");
         deviceChoice13.setOffsetNid(138);
@@ -1121,7 +1121,7 @@ private void initComponents() {
         deviceField31.setOffsetNid(151);
         jPanel17.add(deviceField31);
 
-        deviceChoice14.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice14.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice14.setIdentifier("");
         deviceChoice14.setLabelString("Type: ");
         deviceChoice14.setOffsetNid(148);
@@ -1152,7 +1152,7 @@ private void initComponents() {
         deviceField33.setOffsetNid(161);
         jPanel18.add(deviceField33);
 
-        deviceChoice15.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice15.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice15.setIdentifier("");
         deviceChoice15.setLabelString("Type: ");
         deviceChoice15.setOffsetNid(158);
@@ -1183,7 +1183,7 @@ private void initComponents() {
         deviceField35.setOffsetNid(171);
         jPanel19.add(deviceField35);
 
-        deviceChoice16.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice16.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice16.setIdentifier("");
         deviceChoice16.setLabelString("Type: ");
         deviceChoice16.setOffsetNid(168);
@@ -1214,7 +1214,7 @@ private void initComponents() {
         deviceField37.setOffsetNid(181);
         jPanel20.add(deviceField37);
 
-        deviceChoice17.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice17.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice17.setIdentifier("");
         deviceChoice17.setLabelString("Type: ");
         deviceChoice17.setOffsetNid(178);
@@ -1245,7 +1245,7 @@ private void initComponents() {
         deviceField39.setOffsetNid(191);
         jPanel21.add(deviceField39);
 
-        deviceChoice18.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice18.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice18.setIdentifier("");
         deviceChoice18.setLabelString("Type: ");
         deviceChoice18.setOffsetNid(188);
@@ -1276,7 +1276,7 @@ private void initComponents() {
         deviceField41.setOffsetNid(201);
         jPanel22.add(deviceField41);
 
-        deviceChoice19.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice19.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice19.setIdentifier("");
         deviceChoice19.setLabelString("Type: ");
         deviceChoice19.setOffsetNid(198);
@@ -1307,7 +1307,7 @@ private void initComponents() {
         deviceField43.setOffsetNid(211);
         jPanel23.add(deviceField43);
 
-        deviceChoice20.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice20.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice20.setIdentifier("");
         deviceChoice20.setLabelString("Type: ");
         deviceChoice20.setOffsetNid(208);
@@ -1338,7 +1338,7 @@ private void initComponents() {
         deviceField45.setOffsetNid(221);
         jPanel24.add(deviceField45);
 
-        deviceChoice21.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice21.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice21.setIdentifier("");
         deviceChoice21.setLabelString("Type: ");
         deviceChoice21.setOffsetNid(218);
@@ -1369,7 +1369,7 @@ private void initComponents() {
         deviceField47.setOffsetNid(231);
         jPanel25.add(deviceField47);
 
-        deviceChoice22.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice22.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice22.setIdentifier("");
         deviceChoice22.setLabelString("Type: ");
         deviceChoice22.setOffsetNid(228);
@@ -1400,7 +1400,7 @@ private void initComponents() {
         deviceField49.setOffsetNid(241);
         jPanel26.add(deviceField49);
 
-        deviceChoice23.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice23.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice23.setIdentifier("");
         deviceChoice23.setLabelString("Type: ");
         deviceChoice23.setOffsetNid(238);
@@ -1431,7 +1431,7 @@ private void initComponents() {
         deviceField51.setOffsetNid(251);
         jPanel27.add(deviceField51);
 
-        deviceChoice24.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice24.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice24.setIdentifier("");
         deviceChoice24.setLabelString("Type: ");
         deviceChoice24.setOffsetNid(248);
@@ -1462,7 +1462,7 @@ private void initComponents() {
         deviceField53.setOffsetNid(261);
         jPanel28.add(deviceField53);
 
-        deviceChoice25.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice25.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice25.setIdentifier("");
         deviceChoice25.setLabelString("Type: ");
         deviceChoice25.setOffsetNid(258);
@@ -1493,7 +1493,7 @@ private void initComponents() {
         deviceField55.setOffsetNid(271);
         jPanel29.add(deviceField55);
 
-        deviceChoice26.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice26.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice26.setIdentifier("");
         deviceChoice26.setLabelString("Type: ");
         deviceChoice26.setOffsetNid(268);
@@ -1524,7 +1524,7 @@ private void initComponents() {
         deviceField57.setOffsetNid(281);
         jPanel30.add(deviceField57);
 
-        deviceChoice27.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice27.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice27.setIdentifier("");
         deviceChoice27.setLabelString("Type: ");
         deviceChoice27.setOffsetNid(278);
@@ -1555,7 +1555,7 @@ private void initComponents() {
         deviceField59.setOffsetNid(291);
         jPanel31.add(deviceField59);
 
-        deviceChoice28.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice28.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice28.setIdentifier("");
         deviceChoice28.setLabelString("Type: ");
         deviceChoice28.setOffsetNid(288);
@@ -1586,7 +1586,7 @@ private void initComponents() {
         deviceField61.setOffsetNid(301);
         jPanel32.add(deviceField61);
 
-        deviceChoice29.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice29.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice29.setIdentifier("");
         deviceChoice29.setLabelString("Type: ");
         deviceChoice29.setOffsetNid(298);
@@ -1617,7 +1617,7 @@ private void initComponents() {
         deviceField63.setOffsetNid(311);
         jPanel33.add(deviceField63);
 
-        deviceChoice30.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice30.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice30.setIdentifier("");
         deviceChoice30.setLabelString("Type: ");
         deviceChoice30.setOffsetNid(308);
@@ -1648,7 +1648,7 @@ private void initComponents() {
         deviceField65.setOffsetNid(321);
         jPanel34.add(deviceField65);
 
-        deviceChoice31.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice31.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice31.setIdentifier("");
         deviceChoice31.setLabelString("Type: ");
         deviceChoice31.setOffsetNid(318);
@@ -1679,7 +1679,7 @@ private void initComponents() {
         deviceField67.setOffsetNid(331);
         jPanel35.add(deviceField67);
 
-        deviceChoice32.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice32.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice32.setIdentifier("");
         deviceChoice32.setLabelString("Type: ");
         deviceChoice32.setOffsetNid(328);
@@ -1710,7 +1710,7 @@ private void initComponents() {
         deviceField69.setOffsetNid(341);
         jPanel36.add(deviceField69);
 
-        deviceChoice33.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice33.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice33.setIdentifier("");
         deviceChoice33.setLabelString("Type: ");
         deviceChoice33.setOffsetNid(338);
@@ -1741,7 +1741,7 @@ private void initComponents() {
         deviceField71.setOffsetNid(351);
         jPanel37.add(deviceField71);
 
-        deviceChoice34.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice34.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice34.setIdentifier("");
         deviceChoice34.setLabelString("Type: ");
         deviceChoice34.setOffsetNid(348);
@@ -1772,7 +1772,7 @@ private void initComponents() {
         deviceField73.setOffsetNid(361);
         jPanel38.add(deviceField73);
 
-        deviceChoice35.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice35.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice35.setIdentifier("");
         deviceChoice35.setLabelString("Type: ");
         deviceChoice35.setOffsetNid(358);
@@ -1803,7 +1803,7 @@ private void initComponents() {
         deviceField75.setOffsetNid(371);
         jPanel39.add(deviceField75);
 
-        deviceChoice36.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice36.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice36.setIdentifier("");
         deviceChoice36.setLabelString("Type: ");
         deviceChoice36.setOffsetNid(368);
@@ -1834,7 +1834,7 @@ private void initComponents() {
         deviceField77.setOffsetNid(381);
         jPanel40.add(deviceField77);
 
-        deviceChoice37.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice37.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice37.setIdentifier("");
         deviceChoice37.setLabelString("Type: ");
         deviceChoice37.setOffsetNid(378);
@@ -1865,7 +1865,7 @@ private void initComponents() {
         deviceField79.setOffsetNid(391);
         jPanel41.add(deviceField79);
 
-        deviceChoice38.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice38.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice38.setIdentifier("");
         deviceChoice38.setLabelString("Type: ");
         deviceChoice38.setOffsetNid(388);
@@ -1896,7 +1896,7 @@ private void initComponents() {
         deviceField81.setOffsetNid(401);
         jPanel42.add(deviceField81);
 
-        deviceChoice39.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice39.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice39.setIdentifier("");
         deviceChoice39.setLabelString("Type: ");
         deviceChoice39.setOffsetNid(398);
@@ -1927,7 +1927,7 @@ private void initComponents() {
         deviceField83.setOffsetNid(411);
         jPanel43.add(deviceField83);
 
-        deviceChoice40.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice40.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice40.setIdentifier("");
         deviceChoice40.setLabelString("Type: ");
         deviceChoice40.setOffsetNid(408);
@@ -1958,7 +1958,7 @@ private void initComponents() {
         deviceField85.setOffsetNid(421);
         jPanel44.add(deviceField85);
 
-        deviceChoice41.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice41.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice41.setIdentifier("");
         deviceChoice41.setLabelString("Type: ");
         deviceChoice41.setOffsetNid(418);
@@ -1989,7 +1989,7 @@ private void initComponents() {
         deviceField87.setOffsetNid(431);
         jPanel45.add(deviceField87);
 
-        deviceChoice42.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice42.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice42.setIdentifier("");
         deviceChoice42.setLabelString("Type: ");
         deviceChoice42.setOffsetNid(428);
@@ -2020,7 +2020,7 @@ private void initComponents() {
         deviceField89.setOffsetNid(441);
         jPanel46.add(deviceField89);
 
-        deviceChoice43.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice43.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice43.setIdentifier("");
         deviceChoice43.setLabelString("Type: ");
         deviceChoice43.setOffsetNid(438);
@@ -2051,7 +2051,7 @@ private void initComponents() {
         deviceField91.setOffsetNid(451);
         jPanel47.add(deviceField91);
 
-        deviceChoice44.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice44.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice44.setIdentifier("");
         deviceChoice44.setLabelString("Type: ");
         deviceChoice44.setOffsetNid(448);
@@ -2082,7 +2082,7 @@ private void initComponents() {
         deviceField93.setOffsetNid(461);
         jPanel48.add(deviceField93);
 
-        deviceChoice45.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice45.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice45.setIdentifier("");
         deviceChoice45.setLabelString("Type: ");
         deviceChoice45.setOffsetNid(458);
@@ -2113,7 +2113,7 @@ private void initComponents() {
         deviceField95.setOffsetNid(471);
         jPanel49.add(deviceField95);
 
-        deviceChoice46.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice46.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice46.setIdentifier("");
         deviceChoice46.setLabelString("Type: ");
         deviceChoice46.setOffsetNid(468);
@@ -2144,7 +2144,7 @@ private void initComponents() {
         deviceField97.setOffsetNid(481);
         jPanel50.add(deviceField97);
 
-        deviceChoice47.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice47.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice47.setIdentifier("");
         deviceChoice47.setLabelString("Type: ");
         deviceChoice47.setOffsetNid(478);
@@ -2175,7 +2175,7 @@ private void initComponents() {
         deviceField99.setOffsetNid(491);
         jPanel51.add(deviceField99);
 
-        deviceChoice48.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice48.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice48.setIdentifier("");
         deviceChoice48.setLabelString("Type: ");
         deviceChoice48.setOffsetNid(488);
@@ -2206,7 +2206,7 @@ private void initComponents() {
         deviceField101.setOffsetNid(501);
         jPanel52.add(deviceField101);
 
-        deviceChoice49.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice49.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice49.setIdentifier("");
         deviceChoice49.setLabelString("Type: ");
         deviceChoice49.setOffsetNid(498);
@@ -2237,7 +2237,7 @@ private void initComponents() {
         deviceField103.setOffsetNid(511);
         jPanel53.add(deviceField103);
 
-        deviceChoice50.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice50.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice50.setIdentifier("");
         deviceChoice50.setLabelString("Type: ");
         deviceChoice50.setOffsetNid(508);
@@ -2268,7 +2268,7 @@ private void initComponents() {
         deviceField105.setOffsetNid(521);
         jPanel54.add(deviceField105);
 
-        deviceChoice51.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice51.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice51.setIdentifier("");
         deviceChoice51.setLabelString("Type: ");
         deviceChoice51.setOffsetNid(518);
@@ -2299,7 +2299,7 @@ private void initComponents() {
         deviceField107.setOffsetNid(531);
         jPanel55.add(deviceField107);
 
-        deviceChoice52.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice52.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice52.setIdentifier("");
         deviceChoice52.setLabelString("Type: ");
         deviceChoice52.setOffsetNid(528);
@@ -2330,7 +2330,7 @@ private void initComponents() {
         deviceField109.setOffsetNid(541);
         jPanel56.add(deviceField109);
 
-        deviceChoice53.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice53.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice53.setIdentifier("");
         deviceChoice53.setLabelString("Type: ");
         deviceChoice53.setOffsetNid(538);
@@ -2361,7 +2361,7 @@ private void initComponents() {
         deviceField111.setOffsetNid(551);
         jPanel57.add(deviceField111);
 
-        deviceChoice54.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice54.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice54.setIdentifier("");
         deviceChoice54.setLabelString("Type: ");
         deviceChoice54.setOffsetNid(548);
@@ -2392,7 +2392,7 @@ private void initComponents() {
         deviceField113.setOffsetNid(561);
         jPanel58.add(deviceField113);
 
-        deviceChoice55.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice55.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice55.setIdentifier("");
         deviceChoice55.setLabelString("Type: ");
         deviceChoice55.setOffsetNid(558);
@@ -2423,7 +2423,7 @@ private void initComponents() {
         deviceField115.setOffsetNid(571);
         jPanel59.add(deviceField115);
 
-        deviceChoice56.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice56.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice56.setIdentifier("");
         deviceChoice56.setLabelString("Type: ");
         deviceChoice56.setOffsetNid(568);
@@ -2454,7 +2454,7 @@ private void initComponents() {
         deviceField117.setOffsetNid(581);
         jPanel60.add(deviceField117);
 
-        deviceChoice57.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice57.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice57.setIdentifier("");
         deviceChoice57.setLabelString("Type: ");
         deviceChoice57.setOffsetNid(578);
@@ -2485,7 +2485,7 @@ private void initComponents() {
         deviceField119.setOffsetNid(591);
         jPanel61.add(deviceField119);
 
-        deviceChoice58.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice58.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice58.setIdentifier("");
         deviceChoice58.setLabelString("Type: ");
         deviceChoice58.setOffsetNid(588);
@@ -2516,7 +2516,7 @@ private void initComponents() {
         deviceField121.setOffsetNid(601);
         jPanel62.add(deviceField121);
 
-        deviceChoice59.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice59.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice59.setIdentifier("");
         deviceChoice59.setLabelString("Type: ");
         deviceChoice59.setOffsetNid(598);
@@ -2547,7 +2547,7 @@ private void initComponents() {
         deviceField123.setOffsetNid(611);
         jPanel63.add(deviceField123);
 
-        deviceChoice60.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice60.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice60.setIdentifier("");
         deviceChoice60.setLabelString("Type: ");
         deviceChoice60.setOffsetNid(608);
@@ -2578,7 +2578,7 @@ private void initComponents() {
         deviceField125.setOffsetNid(621);
         jPanel64.add(deviceField125);
 
-        deviceChoice61.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice61.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice61.setIdentifier("");
         deviceChoice61.setLabelString("Type: ");
         deviceChoice61.setOffsetNid(618);
@@ -2609,7 +2609,7 @@ private void initComponents() {
         deviceField127.setOffsetNid(631);
         jPanel65.add(deviceField127);
 
-        deviceChoice62.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice62.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice62.setIdentifier("");
         deviceChoice62.setLabelString("Type: ");
         deviceChoice62.setOffsetNid(628);
@@ -2640,7 +2640,7 @@ private void initComponents() {
         deviceField129.setOffsetNid(641);
         jPanel66.add(deviceField129);
 
-        deviceChoice63.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice63.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice63.setIdentifier("");
         deviceChoice63.setLabelString("Type: ");
         deviceChoice63.setOffsetNid(638);
@@ -2671,7 +2671,7 @@ private void initComponents() {
         deviceField131.setOffsetNid(651);
         jPanel67.add(deviceField131);
 
-        deviceChoice64.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice64.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice64.setIdentifier("");
         deviceChoice64.setLabelString("Type: ");
         deviceChoice64.setOffsetNid(648);
@@ -2702,7 +2702,7 @@ private void initComponents() {
         deviceField133.setOffsetNid(661);
         jPanel68.add(deviceField133);
 
-        deviceChoice65.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice65.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice65.setIdentifier("");
         deviceChoice65.setLabelString("Type: ");
         deviceChoice65.setOffsetNid(658);
@@ -2733,7 +2733,7 @@ private void initComponents() {
         deviceField135.setOffsetNid(671);
         jPanel69.add(deviceField135);
 
-        deviceChoice66.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice66.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice66.setIdentifier("");
         deviceChoice66.setLabelString("Type: ");
         deviceChoice66.setOffsetNid(668);
@@ -2764,7 +2764,7 @@ private void initComponents() {
         deviceField137.setOffsetNid(681);
         jPanel70.add(deviceField137);
 
-        deviceChoice67.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice67.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice67.setIdentifier("");
         deviceChoice67.setLabelString("Type: ");
         deviceChoice67.setOffsetNid(678);
@@ -2795,7 +2795,7 @@ private void initComponents() {
         deviceField139.setOffsetNid(691);
         jPanel71.add(deviceField139);
 
-        deviceChoice68.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice68.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice68.setIdentifier("");
         deviceChoice68.setLabelString("Type: ");
         deviceChoice68.setOffsetNid(688);
@@ -2826,7 +2826,7 @@ private void initComponents() {
         deviceField141.setOffsetNid(701);
         jPanel72.add(deviceField141);
 
-        deviceChoice69.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice69.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice69.setIdentifier("");
         deviceChoice69.setLabelString("Type: ");
         deviceChoice69.setOffsetNid(698);
@@ -2857,7 +2857,7 @@ private void initComponents() {
         deviceField143.setOffsetNid(711);
         jPanel73.add(deviceField143);
 
-        deviceChoice70.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice70.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice70.setIdentifier("");
         deviceChoice70.setLabelString("Type: ");
         deviceChoice70.setOffsetNid(708);
@@ -2888,7 +2888,7 @@ private void initComponents() {
         deviceField145.setOffsetNid(721);
         jPanel74.add(deviceField145);
 
-        deviceChoice71.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice71.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice71.setIdentifier("");
         deviceChoice71.setLabelString("Type: ");
         deviceChoice71.setOffsetNid(718);
@@ -2919,7 +2919,7 @@ private void initComponents() {
         deviceField147.setOffsetNid(731);
         jPanel75.add(deviceField147);
 
-        deviceChoice72.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice72.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice72.setIdentifier("");
         deviceChoice72.setLabelString("Type: ");
         deviceChoice72.setOffsetNid(728);
@@ -2950,7 +2950,7 @@ private void initComponents() {
         deviceField149.setOffsetNid(741);
         jPanel76.add(deviceField149);
 
-        deviceChoice73.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice73.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice73.setIdentifier("");
         deviceChoice73.setLabelString("Type: ");
         deviceChoice73.setOffsetNid(738);
@@ -2981,7 +2981,7 @@ private void initComponents() {
         deviceField151.setOffsetNid(751);
         jPanel77.add(deviceField151);
 
-        deviceChoice74.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice74.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice74.setIdentifier("");
         deviceChoice74.setLabelString("Type: ");
         deviceChoice74.setOffsetNid(748);
@@ -3012,7 +3012,7 @@ private void initComponents() {
         deviceField153.setOffsetNid(761);
         jPanel78.add(deviceField153);
 
-        deviceChoice75.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice75.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice75.setIdentifier("");
         deviceChoice75.setLabelString("Type: ");
         deviceChoice75.setOffsetNid(758);
@@ -3043,7 +3043,7 @@ private void initComponents() {
         deviceField155.setOffsetNid(771);
         jPanel79.add(deviceField155);
 
-        deviceChoice76.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice76.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice76.setIdentifier("");
         deviceChoice76.setLabelString("Type: ");
         deviceChoice76.setOffsetNid(768);
@@ -3074,7 +3074,7 @@ private void initComponents() {
         deviceField157.setOffsetNid(781);
         jPanel80.add(deviceField157);
 
-        deviceChoice77.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice77.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice77.setIdentifier("");
         deviceChoice77.setLabelString("Type: ");
         deviceChoice77.setOffsetNid(778);
@@ -3105,7 +3105,7 @@ private void initComponents() {
         deviceField159.setOffsetNid(791);
         jPanel81.add(deviceField159);
 
-        deviceChoice78.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice78.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice78.setIdentifier("");
         deviceChoice78.setLabelString("Type: ");
         deviceChoice78.setOffsetNid(788);
@@ -3136,7 +3136,7 @@ private void initComponents() {
         deviceField161.setOffsetNid(801);
         jPanel82.add(deviceField161);
 
-        deviceChoice79.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice79.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice79.setIdentifier("");
         deviceChoice79.setLabelString("Type: ");
         deviceChoice79.setOffsetNid(798);
@@ -3167,7 +3167,7 @@ private void initComponents() {
         deviceField163.setOffsetNid(811);
         jPanel83.add(deviceField163);
 
-        deviceChoice80.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice80.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice80.setIdentifier("");
         deviceChoice80.setLabelString("Type: ");
         deviceChoice80.setOffsetNid(808);
@@ -3198,7 +3198,7 @@ private void initComponents() {
         deviceField165.setOffsetNid(821);
         jPanel84.add(deviceField165);
 
-        deviceChoice81.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice81.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice81.setIdentifier("");
         deviceChoice81.setLabelString("Type: ");
         deviceChoice81.setOffsetNid(818);
@@ -3229,7 +3229,7 @@ private void initComponents() {
         deviceField167.setOffsetNid(831);
         jPanel85.add(deviceField167);
 
-        deviceChoice82.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice82.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice82.setIdentifier("");
         deviceChoice82.setLabelString("Type: ");
         deviceChoice82.setOffsetNid(828);
@@ -3260,7 +3260,7 @@ private void initComponents() {
         deviceField169.setOffsetNid(841);
         jPanel86.add(deviceField169);
 
-        deviceChoice83.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice83.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice83.setIdentifier("");
         deviceChoice83.setLabelString("Type: ");
         deviceChoice83.setOffsetNid(838);
@@ -3291,7 +3291,7 @@ private void initComponents() {
         deviceField171.setOffsetNid(851);
         jPanel87.add(deviceField171);
 
-        deviceChoice84.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice84.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice84.setIdentifier("");
         deviceChoice84.setLabelString("Type: ");
         deviceChoice84.setOffsetNid(848);
@@ -3322,7 +3322,7 @@ private void initComponents() {
         deviceField173.setOffsetNid(861);
         jPanel88.add(deviceField173);
 
-        deviceChoice85.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice85.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice85.setIdentifier("");
         deviceChoice85.setLabelString("Type: ");
         deviceChoice85.setOffsetNid(858);
@@ -3353,7 +3353,7 @@ private void initComponents() {
         deviceField175.setOffsetNid(871);
         jPanel89.add(deviceField175);
 
-        deviceChoice86.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice86.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice86.setIdentifier("");
         deviceChoice86.setLabelString("Type: ");
         deviceChoice86.setOffsetNid(868);
@@ -3384,7 +3384,7 @@ private void initComponents() {
         deviceField177.setOffsetNid(881);
         jPanel90.add(deviceField177);
 
-        deviceChoice87.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice87.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice87.setIdentifier("");
         deviceChoice87.setLabelString("Type: ");
         deviceChoice87.setOffsetNid(878);
@@ -3415,7 +3415,7 @@ private void initComponents() {
         deviceField179.setOffsetNid(891);
         jPanel91.add(deviceField179);
 
-        deviceChoice88.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice88.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice88.setIdentifier("");
         deviceChoice88.setLabelString("Type: ");
         deviceChoice88.setOffsetNid(888);
@@ -3446,7 +3446,7 @@ private void initComponents() {
         deviceField181.setOffsetNid(901);
         jPanel92.add(deviceField181);
 
-        deviceChoice89.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice89.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice89.setIdentifier("");
         deviceChoice89.setLabelString("Type: ");
         deviceChoice89.setOffsetNid(898);
@@ -3477,7 +3477,7 @@ private void initComponents() {
         deviceField183.setOffsetNid(911);
         jPanel93.add(deviceField183);
 
-        deviceChoice90.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice90.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice90.setIdentifier("");
         deviceChoice90.setLabelString("Type: ");
         deviceChoice90.setOffsetNid(908);
@@ -3508,7 +3508,7 @@ private void initComponents() {
         deviceField185.setOffsetNid(921);
         jPanel94.add(deviceField185);
 
-        deviceChoice91.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice91.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice91.setIdentifier("");
         deviceChoice91.setLabelString("Type: ");
         deviceChoice91.setOffsetNid(918);
@@ -3539,7 +3539,7 @@ private void initComponents() {
         deviceField187.setOffsetNid(931);
         jPanel95.add(deviceField187);
 
-        deviceChoice92.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice92.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice92.setIdentifier("");
         deviceChoice92.setLabelString("Type: ");
         deviceChoice92.setOffsetNid(928);
@@ -3570,7 +3570,7 @@ private void initComponents() {
         deviceField189.setOffsetNid(941);
         jPanel96.add(deviceField189);
 
-        deviceChoice93.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice93.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice93.setIdentifier("");
         deviceChoice93.setLabelString("Type: ");
         deviceChoice93.setOffsetNid(938);
@@ -3601,7 +3601,7 @@ private void initComponents() {
         deviceField191.setOffsetNid(951);
         jPanel97.add(deviceField191);
 
-        deviceChoice94.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice94.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice94.setIdentifier("");
         deviceChoice94.setLabelString("Type: ");
         deviceChoice94.setOffsetNid(948);
@@ -3632,7 +3632,7 @@ private void initComponents() {
         deviceField193.setOffsetNid(961);
         jPanel98.add(deviceField193);
 
-        deviceChoice95.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice95.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice95.setIdentifier("");
         deviceChoice95.setLabelString("Type: ");
         deviceChoice95.setOffsetNid(958);
@@ -3663,7 +3663,7 @@ private void initComponents() {
         deviceField195.setOffsetNid(971);
         jPanel99.add(deviceField195);
 
-        deviceChoice96.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice96.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice96.setIdentifier("");
         deviceChoice96.setLabelString("Type: ");
         deviceChoice96.setOffsetNid(968);
@@ -3694,7 +3694,7 @@ private void initComponents() {
         deviceField197.setOffsetNid(981);
         jPanel100.add(deviceField197);
 
-        deviceChoice97.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice97.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice97.setIdentifier("");
         deviceChoice97.setLabelString("Type: ");
         deviceChoice97.setOffsetNid(978);
@@ -3725,7 +3725,7 @@ private void initComponents() {
         deviceField295.setOffsetNid(991);
         jPanel101.add(deviceField295);
 
-        deviceChoice98.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice98.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice98.setIdentifier("");
         deviceChoice98.setLabelString("Type: ");
         deviceChoice98.setOffsetNid(988);
@@ -3756,7 +3756,7 @@ private void initComponents() {
         deviceField298.setOffsetNid(1001);
         jPanel102.add(deviceField298);
 
-        deviceChoice99.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice99.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice99.setIdentifier("");
         deviceChoice99.setLabelString("Type: ");
         deviceChoice99.setOffsetNid(998);
@@ -3787,7 +3787,7 @@ private void initComponents() {
         deviceField301.setOffsetNid(1011);
         jPanel103.add(deviceField301);
 
-        deviceChoice100.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice100.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice100.setIdentifier("");
         deviceChoice100.setLabelString("Type: ");
         deviceChoice100.setOffsetNid(1008);
@@ -3818,7 +3818,7 @@ private void initComponents() {
         deviceField304.setOffsetNid(1021);
         jPanel104.add(deviceField304);
 
-        deviceChoice101.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice101.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice101.setIdentifier("");
         deviceChoice101.setLabelString("Type: ");
         deviceChoice101.setOffsetNid(1018);
@@ -3849,7 +3849,7 @@ private void initComponents() {
         deviceField307.setOffsetNid(1031);
         jPanel105.add(deviceField307);
 
-        deviceChoice102.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice102.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice102.setIdentifier("");
         deviceChoice102.setLabelString("Type: ");
         deviceChoice102.setOffsetNid(1028);
@@ -3880,7 +3880,7 @@ private void initComponents() {
         deviceField310.setOffsetNid(1041);
         jPanel106.add(deviceField310);
 
-        deviceChoice103.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice103.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice103.setIdentifier("");
         deviceChoice103.setLabelString("Type: ");
         deviceChoice103.setOffsetNid(1038);
@@ -3911,7 +3911,7 @@ private void initComponents() {
         deviceField313.setOffsetNid(1051);
         jPanel107.add(deviceField313);
 
-        deviceChoice104.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice104.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice104.setIdentifier("");
         deviceChoice104.setLabelString("Type: ");
         deviceChoice104.setOffsetNid(1048);
@@ -3942,7 +3942,7 @@ private void initComponents() {
         deviceField316.setOffsetNid(1061);
         jPanel108.add(deviceField316);
 
-        deviceChoice105.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice105.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice105.setIdentifier("");
         deviceChoice105.setLabelString("Type: ");
         deviceChoice105.setOffsetNid(1058);
@@ -3973,7 +3973,7 @@ private void initComponents() {
         deviceField319.setOffsetNid(1071);
         jPanel109.add(deviceField319);
 
-        deviceChoice106.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice106.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice106.setIdentifier("");
         deviceChoice106.setLabelString("Type: ");
         deviceChoice106.setOffsetNid(1068);
@@ -4004,7 +4004,7 @@ private void initComponents() {
         deviceField322.setOffsetNid(1081);
         jPanel110.add(deviceField322);
 
-        deviceChoice107.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice107.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice107.setIdentifier("");
         deviceChoice107.setLabelString("Type: ");
         deviceChoice107.setOffsetNid(1078);
@@ -4035,7 +4035,7 @@ private void initComponents() {
         deviceField325.setOffsetNid(1091);
         jPanel111.add(deviceField325);
 
-        deviceChoice108.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice108.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice108.setIdentifier("");
         deviceChoice108.setLabelString("Type: ");
         deviceChoice108.setOffsetNid(1088);
@@ -4066,7 +4066,7 @@ private void initComponents() {
         deviceField328.setOffsetNid(1101);
         jPanel112.add(deviceField328);
 
-        deviceChoice109.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice109.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice109.setIdentifier("");
         deviceChoice109.setLabelString("Type: ");
         deviceChoice109.setOffsetNid(1098);
@@ -4097,7 +4097,7 @@ private void initComponents() {
         deviceField331.setOffsetNid(1111);
         jPanel113.add(deviceField331);
 
-        deviceChoice110.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice110.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice110.setIdentifier("");
         deviceChoice110.setLabelString("Type: ");
         deviceChoice110.setOffsetNid(1108);
@@ -4128,7 +4128,7 @@ private void initComponents() {
         deviceField334.setOffsetNid(1121);
         jPanel114.add(deviceField334);
 
-        deviceChoice111.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice111.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice111.setIdentifier("");
         deviceChoice111.setLabelString("Type: ");
         deviceChoice111.setOffsetNid(1118);
@@ -4159,7 +4159,7 @@ private void initComponents() {
         deviceField337.setOffsetNid(1131);
         jPanel115.add(deviceField337);
 
-        deviceChoice112.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice112.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice112.setIdentifier("");
         deviceChoice112.setLabelString("Type: ");
         deviceChoice112.setOffsetNid(1128);
@@ -4190,7 +4190,7 @@ private void initComponents() {
         deviceField340.setOffsetNid(1141);
         jPanel116.add(deviceField340);
 
-        deviceChoice113.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice113.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice113.setIdentifier("");
         deviceChoice113.setLabelString("Type: ");
         deviceChoice113.setOffsetNid(1138);
@@ -4221,7 +4221,7 @@ private void initComponents() {
         deviceField343.setOffsetNid(1151);
         jPanel117.add(deviceField343);
 
-        deviceChoice114.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice114.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice114.setIdentifier("");
         deviceChoice114.setLabelString("Type: ");
         deviceChoice114.setOffsetNid(1148);
@@ -4252,7 +4252,7 @@ private void initComponents() {
         deviceField346.setOffsetNid(1161);
         jPanel118.add(deviceField346);
 
-        deviceChoice115.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice115.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice115.setIdentifier("");
         deviceChoice115.setLabelString("Type: ");
         deviceChoice115.setOffsetNid(1158);
@@ -4283,7 +4283,7 @@ private void initComponents() {
         deviceField349.setOffsetNid(1171);
         jPanel119.add(deviceField349);
 
-        deviceChoice116.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice116.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice116.setIdentifier("");
         deviceChoice116.setLabelString("Type: ");
         deviceChoice116.setOffsetNid(1168);
@@ -4314,7 +4314,7 @@ private void initComponents() {
         deviceField352.setOffsetNid(1181);
         jPanel120.add(deviceField352);
 
-        deviceChoice117.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice117.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice117.setIdentifier("");
         deviceChoice117.setLabelString("Type: ");
         deviceChoice117.setOffsetNid(1178);
@@ -4345,7 +4345,7 @@ private void initComponents() {
         deviceField355.setOffsetNid(1191);
         jPanel121.add(deviceField355);
 
-        deviceChoice118.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice118.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice118.setIdentifier("");
         deviceChoice118.setLabelString("Type: ");
         deviceChoice118.setOffsetNid(1188);
@@ -4376,7 +4376,7 @@ private void initComponents() {
         deviceField358.setOffsetNid(1201);
         jPanel122.add(deviceField358);
 
-        deviceChoice119.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice119.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice119.setIdentifier("");
         deviceChoice119.setLabelString("Type: ");
         deviceChoice119.setOffsetNid(1198);
@@ -4407,7 +4407,7 @@ private void initComponents() {
         deviceField361.setOffsetNid(1211);
         jPanel123.add(deviceField361);
 
-        deviceChoice120.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice120.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice120.setIdentifier("");
         deviceChoice120.setLabelString("Type: ");
         deviceChoice120.setOffsetNid(1208);
@@ -4438,7 +4438,7 @@ private void initComponents() {
         deviceField364.setOffsetNid(1221);
         jPanel124.add(deviceField364);
 
-        deviceChoice121.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice121.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice121.setIdentifier("");
         deviceChoice121.setLabelString("Type: ");
         deviceChoice121.setOffsetNid(1218);
@@ -4469,7 +4469,7 @@ private void initComponents() {
         deviceField367.setOffsetNid(1231);
         jPanel125.add(deviceField367);
 
-        deviceChoice122.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice122.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice122.setIdentifier("");
         deviceChoice122.setLabelString("Type: ");
         deviceChoice122.setOffsetNid(1228);
@@ -4500,7 +4500,7 @@ private void initComponents() {
         deviceField370.setOffsetNid(1241);
         jPanel126.add(deviceField370);
 
-        deviceChoice123.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice123.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice123.setIdentifier("");
         deviceChoice123.setLabelString("Type: ");
         deviceChoice123.setOffsetNid(1238);
@@ -4531,7 +4531,7 @@ private void initComponents() {
         deviceField373.setOffsetNid(1251);
         jPanel127.add(deviceField373);
 
-        deviceChoice124.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice124.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice124.setIdentifier("");
         deviceChoice124.setLabelString("Type: ");
         deviceChoice124.setOffsetNid(1248);
@@ -4562,7 +4562,7 @@ private void initComponents() {
         deviceField376.setOffsetNid(1261);
         jPanel128.add(deviceField376);
 
-        deviceChoice125.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice125.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice125.setIdentifier("");
         deviceChoice125.setLabelString("Type: ");
         deviceChoice125.setOffsetNid(1258);
@@ -4593,7 +4593,7 @@ private void initComponents() {
         deviceField379.setOffsetNid(1271);
         jPanel129.add(deviceField379);
 
-        deviceChoice126.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice126.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice126.setIdentifier("");
         deviceChoice126.setLabelString("Type: ");
         deviceChoice126.setOffsetNid(1268);
@@ -4624,7 +4624,7 @@ private void initComponents() {
         deviceField382.setOffsetNid(1281);
         jPanel130.add(deviceField382);
 
-        deviceChoice127.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice127.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice127.setIdentifier("");
         deviceChoice127.setLabelString("Type: ");
         deviceChoice127.setOffsetNid(1278);
@@ -4655,7 +4655,7 @@ private void initComponents() {
         deviceField385.setOffsetNid(1291);
         jPanel131.add(deviceField385);
 
-        deviceChoice128.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice128.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
         deviceChoice128.setIdentifier("");
         deviceChoice128.setLabelString("Type: ");
         deviceChoice128.setOffsetNid(1288);
@@ -4686,7 +4686,8 @@ private void initComponents() {
         deviceField388.setOffsetNid(1301);
         jPanel132.add(deviceField388);
 
-        deviceChoice129.setChoiceItems(new String[] {"float32", "float63", "int16", "int32", "uint16", "uint32"});
+        deviceChoice129.setChoiceItems(new String[] {"float32", "float64", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64"});
+        deviceChoice129.setConvert(true);
         deviceChoice129.setIdentifier("");
         deviceChoice129.setLabelString("Type: ");
         deviceChoice129.setOffsetNid(1298);
diff --git a/java/jdevices/src/main/java/MARTE2_STREAM_IN_ASetup.java b/java/jdevices/src/main/java/MARTE2_STREAM_IN_ASetup.java
index b560ae7f8b..d1b6dcfc68 100644
--- a/java/jdevices/src/main/java/MARTE2_STREAM_IN_ASetup.java
+++ b/java/jdevices/src/main/java/MARTE2_STREAM_IN_ASetup.java
@@ -28,1440 +28,341 @@ private void initComponents() {
 
         deviceButtons1 = new DeviceButtons();
         jPanel2 = new javax.swing.JPanel();
+        jPanel3 = new javax.swing.JPanel();
         deviceField1 = new DeviceField();
         deviceField2 = new DeviceField();
-        jScrollPane1 = new javax.swing.JScrollPane();
-        jPanel1 = new javax.swing.JPanel();
-        jPanel3 = new javax.swing.JPanel();
-        deviceField3 = new DeviceField();
         jPanel4 = new javax.swing.JPanel();
+        deviceField3 = new DeviceField();
         deviceField4 = new DeviceField();
-        jPanel5 = new javax.swing.JPanel();
         deviceField5 = new DeviceField();
-        jPanel6 = new javax.swing.JPanel();
+        jPanel13 = new javax.swing.JPanel();
+        deviceField30 = new DeviceField();
+        deviceField31 = new DeviceField();
+        jScrollPane1 = new javax.swing.JScrollPane();
+        jPanel1 = new javax.swing.JPanel();
+        jPanel5 = new javax.swing.JPanel();
         deviceField6 = new DeviceField();
-        jPanel7 = new javax.swing.JPanel();
+        deviceChoice1 = new DeviceChoice();
         deviceField7 = new DeviceField();
-        jPanel8 = new javax.swing.JPanel();
         deviceField8 = new DeviceField();
-        jPanel9 = new javax.swing.JPanel();
+        jPanel6 = new javax.swing.JPanel();
         deviceField9 = new DeviceField();
-        jPanel10 = new javax.swing.JPanel();
+        deviceChoice2 = new DeviceChoice();
         deviceField10 = new DeviceField();
-        jPanel11 = new javax.swing.JPanel();
         deviceField11 = new DeviceField();
-        jPanel12 = new javax.swing.JPanel();
+        jPanel7 = new javax.swing.JPanel();
         deviceField12 = new DeviceField();
-        jPanel13 = new javax.swing.JPanel();
+        deviceChoice3 = new DeviceChoice();
         deviceField13 = new DeviceField();
-        jPanel14 = new javax.swing.JPanel();
         deviceField14 = new DeviceField();
-        jPanel15 = new javax.swing.JPanel();
+        jPanel8 = new javax.swing.JPanel();
         deviceField15 = new DeviceField();
-        jPanel16 = new javax.swing.JPanel();
+        deviceChoice4 = new DeviceChoice();
         deviceField16 = new DeviceField();
-        jPanel17 = new javax.swing.JPanel();
         deviceField17 = new DeviceField();
-        jPanel18 = new javax.swing.JPanel();
+        jPanel9 = new javax.swing.JPanel();
         deviceField18 = new DeviceField();
-        jPanel19 = new javax.swing.JPanel();
+        deviceChoice5 = new DeviceChoice();
         deviceField19 = new DeviceField();
-        jPanel20 = new javax.swing.JPanel();
         deviceField20 = new DeviceField();
-        jPanel21 = new javax.swing.JPanel();
+        jPanel10 = new javax.swing.JPanel();
         deviceField21 = new DeviceField();
-        jPanel22 = new javax.swing.JPanel();
+        deviceChoice6 = new DeviceChoice();
         deviceField22 = new DeviceField();
-        jPanel23 = new javax.swing.JPanel();
         deviceField23 = new DeviceField();
-        jPanel24 = new javax.swing.JPanel();
+        jPanel11 = new javax.swing.JPanel();
         deviceField24 = new DeviceField();
-        jPanel25 = new javax.swing.JPanel();
+        deviceChoice7 = new DeviceChoice();
         deviceField25 = new DeviceField();
-        jPanel26 = new javax.swing.JPanel();
         deviceField26 = new DeviceField();
-        jPanel27 = new javax.swing.JPanel();
+        jPanel12 = new javax.swing.JPanel();
         deviceField27 = new DeviceField();
-        jPanel28 = new javax.swing.JPanel();
+        deviceChoice8 = new DeviceChoice();
         deviceField28 = new DeviceField();
-        jPanel29 = new javax.swing.JPanel();
         deviceField29 = new DeviceField();
-        jPanel30 = new javax.swing.JPanel();
-        deviceField30 = new DeviceField();
-        jPanel31 = new javax.swing.JPanel();
-        deviceField31 = new DeviceField();
-        jPanel32 = new javax.swing.JPanel();
-        deviceField32 = new DeviceField();
-        jPanel33 = new javax.swing.JPanel();
-        deviceField33 = new DeviceField();
-        jPanel34 = new javax.swing.JPanel();
-        deviceField34 = new DeviceField();
-        jPanel35 = new javax.swing.JPanel();
-        deviceField35 = new DeviceField();
-        jPanel36 = new javax.swing.JPanel();
-        deviceField36 = new DeviceField();
-        jPanel37 = new javax.swing.JPanel();
-        deviceField37 = new DeviceField();
-        jPanel38 = new javax.swing.JPanel();
-        deviceField38 = new DeviceField();
-        jPanel39 = new javax.swing.JPanel();
-        deviceField39 = new DeviceField();
-        jPanel40 = new javax.swing.JPanel();
-        deviceField40 = new DeviceField();
-        jPanel41 = new javax.swing.JPanel();
-        deviceField41 = new DeviceField();
-        jPanel42 = new javax.swing.JPanel();
-        deviceField42 = new DeviceField();
-        jPanel43 = new javax.swing.JPanel();
-        deviceField43 = new DeviceField();
-        jPanel44 = new javax.swing.JPanel();
-        deviceField44 = new DeviceField();
-        jPanel45 = new javax.swing.JPanel();
-        deviceField45 = new DeviceField();
-        jPanel46 = new javax.swing.JPanel();
-        deviceField46 = new DeviceField();
-        jPanel47 = new javax.swing.JPanel();
-        deviceField47 = new DeviceField();
-        jPanel48 = new javax.swing.JPanel();
-        deviceField48 = new DeviceField();
-        jPanel49 = new javax.swing.JPanel();
-        deviceField49 = new DeviceField();
-        jPanel50 = new javax.swing.JPanel();
-        deviceField50 = new DeviceField();
-        jPanel51 = new javax.swing.JPanel();
-        deviceField51 = new DeviceField();
-        jPanel52 = new javax.swing.JPanel();
-        deviceField52 = new DeviceField();
-        jPanel53 = new javax.swing.JPanel();
-        deviceField53 = new DeviceField();
-        jPanel54 = new javax.swing.JPanel();
-        deviceField54 = new DeviceField();
-        jPanel55 = new javax.swing.JPanel();
-        deviceField55 = new DeviceField();
-        jPanel56 = new javax.swing.JPanel();
-        deviceField56 = new DeviceField();
-        jPanel57 = new javax.swing.JPanel();
-        deviceField57 = new DeviceField();
-        jPanel58 = new javax.swing.JPanel();
-        deviceField58 = new DeviceField();
-        jPanel59 = new javax.swing.JPanel();
-        deviceField59 = new DeviceField();
-        jPanel60 = new javax.swing.JPanel();
-        deviceField60 = new DeviceField();
-        jPanel61 = new javax.swing.JPanel();
-        deviceField61 = new DeviceField();
-        jPanel62 = new javax.swing.JPanel();
-        deviceField62 = new DeviceField();
-        jPanel63 = new javax.swing.JPanel();
-        deviceField63 = new DeviceField();
-        jPanel64 = new javax.swing.JPanel();
-        deviceField64 = new DeviceField();
-        jPanel65 = new javax.swing.JPanel();
-        deviceField65 = new DeviceField();
-        jPanel66 = new javax.swing.JPanel();
-        deviceField66 = new DeviceField();
-        jPanel67 = new javax.swing.JPanel();
-        deviceField67 = new DeviceField();
-        jPanel68 = new javax.swing.JPanel();
-        deviceField68 = new DeviceField();
-        jPanel69 = new javax.swing.JPanel();
-        deviceField69 = new DeviceField();
-        jPanel70 = new javax.swing.JPanel();
-        deviceField70 = new DeviceField();
-        jPanel71 = new javax.swing.JPanel();
-        deviceField71 = new DeviceField();
-        jPanel72 = new javax.swing.JPanel();
-        deviceField72 = new DeviceField();
-        jPanel73 = new javax.swing.JPanel();
-        deviceField73 = new DeviceField();
-        jPanel74 = new javax.swing.JPanel();
-        deviceField74 = new DeviceField();
-        jPanel75 = new javax.swing.JPanel();
-        deviceField75 = new DeviceField();
-        jPanel76 = new javax.swing.JPanel();
-        deviceField76 = new DeviceField();
-        jPanel77 = new javax.swing.JPanel();
-        deviceField77 = new DeviceField();
-        jPanel78 = new javax.swing.JPanel();
-        deviceField78 = new DeviceField();
-        jPanel79 = new javax.swing.JPanel();
-        deviceField79 = new DeviceField();
-        jPanel80 = new javax.swing.JPanel();
-        deviceField80 = new DeviceField();
-        jPanel81 = new javax.swing.JPanel();
-        deviceField81 = new DeviceField();
-        jPanel82 = new javax.swing.JPanel();
-        deviceField82 = new DeviceField();
-        jPanel83 = new javax.swing.JPanel();
-        deviceField83 = new DeviceField();
-        jPanel84 = new javax.swing.JPanel();
-        deviceField84 = new DeviceField();
-        jPanel85 = new javax.swing.JPanel();
-        deviceField85 = new DeviceField();
-        jPanel86 = new javax.swing.JPanel();
-        deviceField86 = new DeviceField();
-        jPanel87 = new javax.swing.JPanel();
-        deviceField87 = new DeviceField();
-        jPanel88 = new javax.swing.JPanel();
-        deviceField88 = new DeviceField();
-        jPanel89 = new javax.swing.JPanel();
-        deviceField89 = new DeviceField();
-        jPanel90 = new javax.swing.JPanel();
-        deviceField90 = new DeviceField();
-        jPanel91 = new javax.swing.JPanel();
-        deviceField91 = new DeviceField();
-        jPanel92 = new javax.swing.JPanel();
-        deviceField92 = new DeviceField();
-        jPanel93 = new javax.swing.JPanel();
-        deviceField93 = new DeviceField();
-        jPanel94 = new javax.swing.JPanel();
-        deviceField94 = new DeviceField();
-        jPanel95 = new javax.swing.JPanel();
-        deviceField95 = new DeviceField();
-        jPanel96 = new javax.swing.JPanel();
-        deviceField96 = new DeviceField();
-        jPanel97 = new javax.swing.JPanel();
-        deviceField97 = new DeviceField();
-        jPanel98 = new javax.swing.JPanel();
-        deviceField98 = new DeviceField();
-        jPanel99 = new javax.swing.JPanel();
-        deviceField99 = new DeviceField();
-        jPanel100 = new javax.swing.JPanel();
-        deviceField100 = new DeviceField();
-        jPanel101 = new javax.swing.JPanel();
-        deviceField101 = new DeviceField();
-        jPanel102 = new javax.swing.JPanel();
-        deviceField102 = new DeviceField();
-        jPanel103 = new javax.swing.JPanel();
-        deviceField103 = new DeviceField();
-        jPanel104 = new javax.swing.JPanel();
-        deviceField104 = new DeviceField();
-        jPanel105 = new javax.swing.JPanel();
-        deviceField105 = new DeviceField();
-        jPanel106 = new javax.swing.JPanel();
-        deviceField106 = new DeviceField();
-        jPanel107 = new javax.swing.JPanel();
-        deviceField107 = new DeviceField();
-        jPanel108 = new javax.swing.JPanel();
-        deviceField108 = new DeviceField();
-        jPanel109 = new javax.swing.JPanel();
-        deviceField109 = new DeviceField();
-        jPanel110 = new javax.swing.JPanel();
-        deviceField110 = new DeviceField();
-        jPanel111 = new javax.swing.JPanel();
-        deviceField111 = new DeviceField();
-        jPanel112 = new javax.swing.JPanel();
-        deviceField112 = new DeviceField();
-        jPanel113 = new javax.swing.JPanel();
-        deviceField113 = new DeviceField();
-        jPanel114 = new javax.swing.JPanel();
-        deviceField114 = new DeviceField();
-        jPanel115 = new javax.swing.JPanel();
-        deviceField115 = new DeviceField();
-        jPanel116 = new javax.swing.JPanel();
-        deviceField116 = new DeviceField();
-        jPanel117 = new javax.swing.JPanel();
-        deviceField117 = new DeviceField();
-        jPanel118 = new javax.swing.JPanel();
-        deviceField118 = new DeviceField();
-        jPanel119 = new javax.swing.JPanel();
-        deviceField119 = new DeviceField();
-        jPanel120 = new javax.swing.JPanel();
-        deviceField120 = new DeviceField();
-        jPanel121 = new javax.swing.JPanel();
-        deviceField121 = new DeviceField();
-        jPanel122 = new javax.swing.JPanel();
-        deviceField122 = new DeviceField();
-        jPanel123 = new javax.swing.JPanel();
-        deviceField123 = new DeviceField();
-        jPanel124 = new javax.swing.JPanel();
-        deviceField124 = new DeviceField();
-        jPanel125 = new javax.swing.JPanel();
-        deviceField125 = new DeviceField();
-        jPanel126 = new javax.swing.JPanel();
-        deviceField126 = new DeviceField();
-        jPanel127 = new javax.swing.JPanel();
-        deviceField127 = new DeviceField();
-        jPanel128 = new javax.swing.JPanel();
-        deviceField128 = new DeviceField();
-        jPanel129 = new javax.swing.JPanel();
-        deviceField129 = new DeviceField();
-        jPanel130 = new javax.swing.JPanel();
-        deviceField130 = new DeviceField();
 
-        setDeviceProvider("spilds.rfx.local:8100");
-        setDeviceTitle("MARTe2 StreamIn");
+        setDeviceProvider("localhost:8100");
+        setDeviceTitle("Async Stream In");
         setDeviceType("MARTE2_STREAM_IN_A");
-        setHeight(500);
-        setWidth(700);
+        setHeight(400);
+        setWidth(800);
         getContentPane().add(deviceButtons1, java.awt.BorderLayout.PAGE_END);
 
+        jPanel2.setLayout(new java.awt.GridLayout(3, 1));
+
         deviceField1.setIdentifier("");
         deviceField1.setLabelString("Timebase: ");
-        deviceField1.setNumCols(15);
+        deviceField1.setNumCols(25);
         deviceField1.setOffsetNid(3);
-        jPanel2.add(deviceField1);
+        jPanel3.add(deviceField1);
 
         deviceField2.setIdentifier("");
-        deviceField2.setLabelString("Timebas Div.");
+        deviceField2.setLabelString("Timebase div: ");
         deviceField2.setNumCols(4);
-        deviceField2.setOffsetNid(1432);
-        jPanel2.add(deviceField2);
+        deviceField2.setOffsetNid(1560);
+        jPanel3.add(deviceField2);
 
-        getContentPane().add(jPanel2, java.awt.BorderLayout.PAGE_START);
-
-        jPanel1.setLayout(new java.awt.GridLayout(128, 1));
+        jPanel2.add(jPanel3);
 
         deviceField3.setIdentifier("");
-        deviceField3.setLabelString("Stream Name: ");
-        deviceField3.setNumCols(15);
-        deviceField3.setOffsetNid(34);
-        deviceField3.setTextOnly(true);
-        jPanel3.add(deviceField3);
-
-        jPanel1.add(jPanel3);
+        deviceField3.setLabelString("Num Buffers: ");
+        deviceField3.setNumCols(6);
+        deviceField3.setOffsetNid(7);
+        jPanel4.add(deviceField3);
 
         deviceField4.setIdentifier("");
-        deviceField4.setLabelString("Stream Name: ");
-        deviceField4.setNumCols(15);
-        deviceField4.setOffsetNid(45);
-        deviceField4.setTextOnly(true);
+        deviceField4.setLabelString("StackSize: ");
+        deviceField4.setOffsetNid(13);
         jPanel4.add(deviceField4);
 
-        jPanel1.add(jPanel4);
-
         deviceField5.setIdentifier("");
-        deviceField5.setLabelString("Stream Name: ");
-        deviceField5.setNumCols(15);
-        deviceField5.setOffsetNid(56);
-        deviceField5.setTextOnly(true);
-        jPanel5.add(deviceField5);
+        deviceField5.setLabelString("CPU Mask: ");
+        deviceField5.setNumCols(6);
+        deviceField5.setOffsetNid(10);
+        jPanel4.add(deviceField5);
 
-        jPanel1.add(jPanel5);
+        jPanel2.add(jPanel4);
 
-        deviceField6.setIdentifier("");
-        deviceField6.setLabelString("Stream Name: ");
-        deviceField6.setNumCols(15);
-        deviceField6.setOffsetNid(67);
-        deviceField6.setTextOnly(true);
-        jPanel6.add(deviceField6);
+        deviceField30.setIdentifier("");
+        deviceField30.setLabelString("Output trigger:");
+        deviceField30.setNumCols(25);
+        deviceField30.setOffsetNid(18);
+        jPanel13.add(deviceField30);
 
-        jPanel1.add(jPanel6);
+        deviceField31.setIdentifier("");
+        deviceField31.setLabelString("PTS: ");
+        deviceField31.setOffsetNid(20);
+        jPanel13.add(deviceField31);
+
+        jPanel2.add(jPanel13);
+
+        getContentPane().add(jPanel2, java.awt.BorderLayout.PAGE_START);
+
+        jPanel1.setLayout(new java.awt.GridLayout(8, 1));
+
+        deviceField6.setIdentifier("");
+        deviceField6.setLabelString("Dimensions: ");
+        deviceField6.setNumCols(8);
+        deviceField6.setOffsetNid(28);
+        jPanel5.add(deviceField6);
+
+        deviceChoice1.setChoiceItems(new String[] {"int8", "uint8", "int16", "uint16", "int32", "uint32", "float32", "float64"});
+        deviceChoice1.setIdentifier("");
+        deviceChoice1.setLabelString("Type: ");
+        deviceChoice1.setOffsetNid(26);
+        deviceChoice1.setUpdateIdentifier("");
+        jPanel5.add(deviceChoice1);
 
         deviceField7.setIdentifier("");
-        deviceField7.setLabelString("Stream Name: ");
+        deviceField7.setLabelString("Channel: ");
         deviceField7.setNumCols(15);
-        deviceField7.setOffsetNid(78);
+        deviceField7.setOffsetNid(35);
         deviceField7.setTextOnly(true);
-        jPanel7.add(deviceField7);
-
-        jPanel1.add(jPanel7);
+        jPanel5.add(deviceField7);
 
         deviceField8.setIdentifier("");
-        deviceField8.setLabelString("Stream Name: ");
-        deviceField8.setNumCols(15);
-        deviceField8.setOffsetNid(89);
-        deviceField8.setTextOnly(true);
-        jPanel8.add(deviceField8);
+        deviceField8.setLabelString("Seg. Len: ");
+        deviceField8.setNumCols(4);
+        deviceField8.setOffsetNid(29);
+        jPanel5.add(deviceField8);
 
-        jPanel1.add(jPanel8);
+        jPanel1.add(jPanel5);
 
         deviceField9.setIdentifier("");
-        deviceField9.setLabelString("Stream Name: ");
-        deviceField9.setNumCols(15);
-        deviceField9.setOffsetNid(100);
-        deviceField9.setTextOnly(true);
-        jPanel9.add(deviceField9);
-
-        jPanel1.add(jPanel9);
+        deviceField9.setLabelString("Dimensions: ");
+        deviceField9.setNumCols(8);
+        deviceField9.setOffsetNid(40);
+        jPanel6.add(deviceField9);
+
+        deviceChoice2.setChoiceItems(new String[] {"int8", "uint8", "int16", "uint16", "int32", "uint32", "float32", "float64"});
+        deviceChoice2.setIdentifier("");
+        deviceChoice2.setLabelString("Type: ");
+        deviceChoice2.setOffsetNid(38);
+        deviceChoice2.setUpdateIdentifier("");
+        jPanel6.add(deviceChoice2);
 
         deviceField10.setIdentifier("");
-        deviceField10.setLabelString("Stream Name: ");
+        deviceField10.setLabelString("Channel: ");
         deviceField10.setNumCols(15);
-        deviceField10.setOffsetNid(111);
+        deviceField10.setOffsetNid(47);
         deviceField10.setTextOnly(true);
-        jPanel10.add(deviceField10);
-
-        jPanel1.add(jPanel10);
+        jPanel6.add(deviceField10);
 
         deviceField11.setIdentifier("");
-        deviceField11.setLabelString("Stream Name: ");
-        deviceField11.setNumCols(15);
-        deviceField11.setOffsetNid(122);
-        deviceField11.setTextOnly(true);
-        jPanel11.add(deviceField11);
+        deviceField11.setLabelString("Seg. Len: ");
+        deviceField11.setNumCols(4);
+        deviceField11.setOffsetNid(41);
+        jPanel6.add(deviceField11);
 
-        jPanel1.add(jPanel11);
+        jPanel1.add(jPanel6);
 
         deviceField12.setIdentifier("");
-        deviceField12.setLabelString("Stream Name: ");
-        deviceField12.setNumCols(15);
-        deviceField12.setOffsetNid(133);
-        deviceField12.setTextOnly(true);
-        jPanel12.add(deviceField12);
-
-        jPanel1.add(jPanel12);
+        deviceField12.setLabelString("Dimensions: ");
+        deviceField12.setNumCols(8);
+        deviceField12.setOffsetNid(52);
+        jPanel7.add(deviceField12);
+
+        deviceChoice3.setChoiceItems(new String[] {"int8", "uint8", "int16", "uint16", "int32", "uint32", "float32", "float64"});
+        deviceChoice3.setIdentifier("");
+        deviceChoice3.setLabelString("Type: ");
+        deviceChoice3.setOffsetNid(50);
+        deviceChoice3.setUpdateIdentifier("");
+        jPanel7.add(deviceChoice3);
 
         deviceField13.setIdentifier("");
-        deviceField13.setLabelString("Stream Name: ");
+        deviceField13.setLabelString("Channel: ");
         deviceField13.setNumCols(15);
-        deviceField13.setOffsetNid(144);
+        deviceField13.setOffsetNid(59);
         deviceField13.setTextOnly(true);
-        jPanel13.add(deviceField13);
-
-        jPanel1.add(jPanel13);
+        jPanel7.add(deviceField13);
 
         deviceField14.setIdentifier("");
-        deviceField14.setLabelString("Stream Name: ");
-        deviceField14.setNumCols(15);
-        deviceField14.setOffsetNid(155);
-        deviceField14.setTextOnly(true);
-        jPanel14.add(deviceField14);
+        deviceField14.setLabelString("Seg. Len: ");
+        deviceField14.setNumCols(4);
+        deviceField14.setOffsetNid(53);
+        jPanel7.add(deviceField14);
 
-        jPanel1.add(jPanel14);
+        jPanel1.add(jPanel7);
 
         deviceField15.setIdentifier("");
-        deviceField15.setLabelString("Stream Name: ");
-        deviceField15.setNumCols(15);
-        deviceField15.setOffsetNid(166);
-        deviceField15.setTextOnly(true);
-        jPanel15.add(deviceField15);
-
-        jPanel1.add(jPanel15);
+        deviceField15.setLabelString("Dimensions: ");
+        deviceField15.setNumCols(8);
+        deviceField15.setOffsetNid(64);
+        jPanel8.add(deviceField15);
+
+        deviceChoice4.setChoiceItems(new String[] {"int8", "uint8", "int16", "uint16", "int32", "uint32", "float32", "float64"});
+        deviceChoice4.setIdentifier("");
+        deviceChoice4.setLabelString("Type: ");
+        deviceChoice4.setOffsetNid(62);
+        deviceChoice4.setUpdateIdentifier("");
+        jPanel8.add(deviceChoice4);
 
         deviceField16.setIdentifier("");
-        deviceField16.setLabelString("Stream Name: ");
+        deviceField16.setLabelString("Channel: ");
         deviceField16.setNumCols(15);
-        deviceField16.setOffsetNid(177);
+        deviceField16.setOffsetNid(71);
         deviceField16.setTextOnly(true);
-        jPanel16.add(deviceField16);
-
-        jPanel1.add(jPanel16);
+        jPanel8.add(deviceField16);
 
         deviceField17.setIdentifier("");
-        deviceField17.setLabelString("Stream Name: ");
-        deviceField17.setNumCols(15);
-        deviceField17.setOffsetNid(188);
-        deviceField17.setTextOnly(true);
-        jPanel17.add(deviceField17);
+        deviceField17.setLabelString("Seg. Len: ");
+        deviceField17.setNumCols(4);
+        deviceField17.setOffsetNid(65);
+        jPanel8.add(deviceField17);
 
-        jPanel1.add(jPanel17);
+        jPanel1.add(jPanel8);
 
         deviceField18.setIdentifier("");
-        deviceField18.setLabelString("Stream Name: ");
-        deviceField18.setNumCols(15);
-        deviceField18.setOffsetNid(199);
-        deviceField18.setTextOnly(true);
-        jPanel18.add(deviceField18);
-
-        jPanel1.add(jPanel18);
+        deviceField18.setLabelString("Dimensions: ");
+        deviceField18.setNumCols(8);
+        deviceField18.setOffsetNid(76);
+        jPanel9.add(deviceField18);
+
+        deviceChoice5.setChoiceItems(new String[] {"int8", "uint8", "int16", "uint16", "int32", "uint32", "float32", "float64"});
+        deviceChoice5.setIdentifier("");
+        deviceChoice5.setLabelString("Type: ");
+        deviceChoice5.setOffsetNid(74);
+        deviceChoice5.setUpdateIdentifier("");
+        jPanel9.add(deviceChoice5);
 
         deviceField19.setIdentifier("");
-        deviceField19.setLabelString("Stream Name: ");
+        deviceField19.setLabelString("Channel: ");
         deviceField19.setNumCols(15);
-        deviceField19.setOffsetNid(210);
+        deviceField19.setOffsetNid(83);
         deviceField19.setTextOnly(true);
-        jPanel19.add(deviceField19);
-
-        jPanel1.add(jPanel19);
+        jPanel9.add(deviceField19);
 
         deviceField20.setIdentifier("");
-        deviceField20.setLabelString("Stream Name: ");
-        deviceField20.setNumCols(15);
-        deviceField20.setOffsetNid(221);
-        deviceField20.setTextOnly(true);
-        jPanel20.add(deviceField20);
+        deviceField20.setLabelString("Seg. Len: ");
+        deviceField20.setNumCols(4);
+        deviceField20.setOffsetNid(77);
+        jPanel9.add(deviceField20);
 
-        jPanel1.add(jPanel20);
+        jPanel1.add(jPanel9);
 
         deviceField21.setIdentifier("");
-        deviceField21.setLabelString("Stream Name: ");
-        deviceField21.setNumCols(15);
-        deviceField21.setOffsetNid(232);
-        deviceField21.setTextOnly(true);
-        jPanel21.add(deviceField21);
-
-        jPanel1.add(jPanel21);
+        deviceField21.setLabelString("Dimensions: ");
+        deviceField21.setNumCols(8);
+        deviceField21.setOffsetNid(88);
+        jPanel10.add(deviceField21);
+
+        deviceChoice6.setChoiceItems(new String[] {"int8", "uint8", "int16", "uint16", "int32", "uint32", "float32", "float64"});
+        deviceChoice6.setIdentifier("");
+        deviceChoice6.setLabelString("Type: ");
+        deviceChoice6.setOffsetNid(86);
+        deviceChoice6.setUpdateIdentifier("");
+        jPanel10.add(deviceChoice6);
 
         deviceField22.setIdentifier("");
-        deviceField22.setLabelString("Stream Name: ");
+        deviceField22.setLabelString("Channel: ");
         deviceField22.setNumCols(15);
-        deviceField22.setOffsetNid(243);
+        deviceField22.setOffsetNid(95);
         deviceField22.setTextOnly(true);
-        jPanel22.add(deviceField22);
-
-        jPanel1.add(jPanel22);
+        jPanel10.add(deviceField22);
 
         deviceField23.setIdentifier("");
-        deviceField23.setLabelString("Stream Name: ");
-        deviceField23.setNumCols(15);
-        deviceField23.setOffsetNid(254);
-        deviceField23.setTextOnly(true);
-        jPanel23.add(deviceField23);
+        deviceField23.setLabelString("Seg. Len: ");
+        deviceField23.setNumCols(4);
+        deviceField23.setOffsetNid(89);
+        jPanel10.add(deviceField23);
 
-        jPanel1.add(jPanel23);
+        jPanel1.add(jPanel10);
 
         deviceField24.setIdentifier("");
-        deviceField24.setLabelString("Stream Name: ");
-        deviceField24.setNumCols(15);
-        deviceField24.setOffsetNid(265);
-        deviceField24.setTextOnly(true);
-        jPanel24.add(deviceField24);
-
-        jPanel1.add(jPanel24);
+        deviceField24.setLabelString("Dimensions: ");
+        deviceField24.setNumCols(8);
+        deviceField24.setOffsetNid(100);
+        jPanel11.add(deviceField24);
+
+        deviceChoice7.setChoiceItems(new String[] {"int8", "uint8", "int16", "uint16", "int32", "uint32", "float32", "float64"});
+        deviceChoice7.setIdentifier("");
+        deviceChoice7.setLabelString("Type: ");
+        deviceChoice7.setOffsetNid(98);
+        deviceChoice7.setUpdateIdentifier("");
+        jPanel11.add(deviceChoice7);
 
         deviceField25.setIdentifier("");
-        deviceField25.setLabelString("Stream Name: ");
+        deviceField25.setLabelString("Channel: ");
         deviceField25.setNumCols(15);
-        deviceField25.setOffsetNid(276);
+        deviceField25.setOffsetNid(107);
         deviceField25.setTextOnly(true);
-        jPanel25.add(deviceField25);
-
-        jPanel1.add(jPanel25);
+        jPanel11.add(deviceField25);
 
         deviceField26.setIdentifier("");
-        deviceField26.setLabelString("Stream Name: ");
-        deviceField26.setNumCols(15);
-        deviceField26.setOffsetNid(287);
-        deviceField26.setTextOnly(true);
-        jPanel26.add(deviceField26);
+        deviceField26.setLabelString("Seg. Len: ");
+        deviceField26.setNumCols(4);
+        deviceField26.setOffsetNid(101);
+        jPanel11.add(deviceField26);
 
-        jPanel1.add(jPanel26);
+        jPanel1.add(jPanel11);
 
         deviceField27.setIdentifier("");
-        deviceField27.setLabelString("Stream Name: ");
-        deviceField27.setNumCols(15);
-        deviceField27.setOffsetNid(298);
-        deviceField27.setTextOnly(true);
-        jPanel27.add(deviceField27);
-
-        jPanel1.add(jPanel27);
+        deviceField27.setLabelString("Dimensions: ");
+        deviceField27.setNumCols(8);
+        deviceField27.setOffsetNid(112);
+        jPanel12.add(deviceField27);
+
+        deviceChoice8.setChoiceItems(new String[] {"int8", "uint8", "int16", "uint16", "int32", "uint32", "float32", "float64"});
+        deviceChoice8.setIdentifier("");
+        deviceChoice8.setLabelString("Type: ");
+        deviceChoice8.setOffsetNid(110);
+        deviceChoice8.setUpdateIdentifier("");
+        jPanel12.add(deviceChoice8);
 
         deviceField28.setIdentifier("");
-        deviceField28.setLabelString("Stream Name: ");
+        deviceField28.setLabelString("Channel: ");
         deviceField28.setNumCols(15);
-        deviceField28.setOffsetNid(309);
+        deviceField28.setOffsetNid(119);
         deviceField28.setTextOnly(true);
-        jPanel28.add(deviceField28);
-
-        jPanel1.add(jPanel28);
+        jPanel12.add(deviceField28);
 
         deviceField29.setIdentifier("");
-        deviceField29.setLabelString("Stream Name: ");
-        deviceField29.setNumCols(15);
-        deviceField29.setOffsetNid(320);
-        deviceField29.setTextOnly(true);
-        jPanel29.add(deviceField29);
-
-        jPanel1.add(jPanel29);
-
-        deviceField30.setIdentifier("");
-        deviceField30.setLabelString("Stream Name: ");
-        deviceField30.setNumCols(15);
-        deviceField30.setOffsetNid(331);
-        deviceField30.setTextOnly(true);
-        jPanel30.add(deviceField30);
-
-        jPanel1.add(jPanel30);
-
-        deviceField31.setIdentifier("");
-        deviceField31.setLabelString("Stream Name: ");
-        deviceField31.setNumCols(15);
-        deviceField31.setOffsetNid(342);
-        deviceField31.setTextOnly(true);
-        jPanel31.add(deviceField31);
-
-        jPanel1.add(jPanel31);
-
-        deviceField32.setIdentifier("");
-        deviceField32.setLabelString("Stream Name: ");
-        deviceField32.setNumCols(15);
-        deviceField32.setOffsetNid(353);
-        deviceField32.setTextOnly(true);
-        jPanel32.add(deviceField32);
-
-        jPanel1.add(jPanel32);
-
-        deviceField33.setIdentifier("");
-        deviceField33.setLabelString("Stream Name: ");
-        deviceField33.setNumCols(15);
-        deviceField33.setOffsetNid(364);
-        deviceField33.setTextOnly(true);
-        jPanel33.add(deviceField33);
-
-        jPanel1.add(jPanel33);
-
-        deviceField34.setIdentifier("");
-        deviceField34.setLabelString("Stream Name: ");
-        deviceField34.setNumCols(15);
-        deviceField34.setOffsetNid(375);
-        deviceField34.setTextOnly(true);
-        jPanel34.add(deviceField34);
-
-        jPanel1.add(jPanel34);
-
-        deviceField35.setIdentifier("");
-        deviceField35.setLabelString("Stream Name: ");
-        deviceField35.setNumCols(15);
-        deviceField35.setOffsetNid(386);
-        deviceField35.setTextOnly(true);
-        jPanel35.add(deviceField35);
-
-        jPanel1.add(jPanel35);
-
-        deviceField36.setIdentifier("");
-        deviceField36.setLabelString("Stream Name: ");
-        deviceField36.setNumCols(15);
-        deviceField36.setOffsetNid(397);
-        deviceField36.setTextOnly(true);
-        jPanel36.add(deviceField36);
-
-        jPanel1.add(jPanel36);
-
-        deviceField37.setIdentifier("");
-        deviceField37.setLabelString("Stream Name: ");
-        deviceField37.setNumCols(15);
-        deviceField37.setOffsetNid(408);
-        deviceField37.setTextOnly(true);
-        jPanel37.add(deviceField37);
-
-        jPanel1.add(jPanel37);
-
-        deviceField38.setIdentifier("");
-        deviceField38.setLabelString("Stream Name: ");
-        deviceField38.setNumCols(15);
-        deviceField38.setOffsetNid(419);
-        deviceField38.setTextOnly(true);
-        jPanel38.add(deviceField38);
-
-        jPanel1.add(jPanel38);
-
-        deviceField39.setIdentifier("");
-        deviceField39.setLabelString("Stream Name: ");
-        deviceField39.setNumCols(15);
-        deviceField39.setOffsetNid(430);
-        deviceField39.setTextOnly(true);
-        jPanel39.add(deviceField39);
-
-        jPanel1.add(jPanel39);
-
-        deviceField40.setIdentifier("");
-        deviceField40.setLabelString("Stream Name: ");
-        deviceField40.setNumCols(15);
-        deviceField40.setOffsetNid(441);
-        deviceField40.setTextOnly(true);
-        jPanel40.add(deviceField40);
-
-        jPanel1.add(jPanel40);
-
-        deviceField41.setIdentifier("");
-        deviceField41.setLabelString("Stream Name: ");
-        deviceField41.setNumCols(15);
-        deviceField41.setOffsetNid(452);
-        deviceField41.setTextOnly(true);
-        jPanel41.add(deviceField41);
-
-        jPanel1.add(jPanel41);
-
-        deviceField42.setIdentifier("");
-        deviceField42.setLabelString("Stream Name: ");
-        deviceField42.setNumCols(15);
-        deviceField42.setOffsetNid(463);
-        deviceField42.setTextOnly(true);
-        jPanel42.add(deviceField42);
-
-        jPanel1.add(jPanel42);
-
-        deviceField43.setIdentifier("");
-        deviceField43.setLabelString("Stream Name: ");
-        deviceField43.setNumCols(15);
-        deviceField43.setOffsetNid(474);
-        deviceField43.setTextOnly(true);
-        jPanel43.add(deviceField43);
-
-        jPanel1.add(jPanel43);
-
-        deviceField44.setIdentifier("");
-        deviceField44.setLabelString("Stream Name: ");
-        deviceField44.setNumCols(15);
-        deviceField44.setOffsetNid(485);
-        deviceField44.setTextOnly(true);
-        jPanel44.add(deviceField44);
-
-        jPanel1.add(jPanel44);
-
-        deviceField45.setIdentifier("");
-        deviceField45.setLabelString("Stream Name: ");
-        deviceField45.setNumCols(15);
-        deviceField45.setOffsetNid(496);
-        deviceField45.setTextOnly(true);
-        jPanel45.add(deviceField45);
-
-        jPanel1.add(jPanel45);
-
-        deviceField46.setIdentifier("");
-        deviceField46.setLabelString("Stream Name: ");
-        deviceField46.setNumCols(15);
-        deviceField46.setOffsetNid(507);
-        deviceField46.setTextOnly(true);
-        jPanel46.add(deviceField46);
-
-        jPanel1.add(jPanel46);
-
-        deviceField47.setIdentifier("");
-        deviceField47.setLabelString("Stream Name: ");
-        deviceField47.setNumCols(15);
-        deviceField47.setOffsetNid(518);
-        deviceField47.setTextOnly(true);
-        jPanel47.add(deviceField47);
-
-        jPanel1.add(jPanel47);
-
-        deviceField48.setIdentifier("");
-        deviceField48.setLabelString("Stream Name: ");
-        deviceField48.setNumCols(15);
-        deviceField48.setOffsetNid(529);
-        deviceField48.setTextOnly(true);
-        jPanel48.add(deviceField48);
-
-        jPanel1.add(jPanel48);
-
-        deviceField49.setIdentifier("");
-        deviceField49.setLabelString("Stream Name: ");
-        deviceField49.setNumCols(15);
-        deviceField49.setOffsetNid(540);
-        deviceField49.setTextOnly(true);
-        jPanel49.add(deviceField49);
-
-        jPanel1.add(jPanel49);
-
-        deviceField50.setIdentifier("");
-        deviceField50.setLabelString("Stream Name: ");
-        deviceField50.setNumCols(15);
-        deviceField50.setOffsetNid(551);
-        deviceField50.setTextOnly(true);
-        jPanel50.add(deviceField50);
-
-        jPanel1.add(jPanel50);
-
-        deviceField51.setIdentifier("");
-        deviceField51.setLabelString("Stream Name: ");
-        deviceField51.setNumCols(15);
-        deviceField51.setOffsetNid(562);
-        deviceField51.setTextOnly(true);
-        jPanel51.add(deviceField51);
-
-        jPanel1.add(jPanel51);
-
-        deviceField52.setIdentifier("");
-        deviceField52.setLabelString("Stream Name: ");
-        deviceField52.setNumCols(15);
-        deviceField52.setOffsetNid(573);
-        deviceField52.setTextOnly(true);
-        jPanel52.add(deviceField52);
-
-        jPanel1.add(jPanel52);
-
-        deviceField53.setIdentifier("");
-        deviceField53.setLabelString("Stream Name: ");
-        deviceField53.setNumCols(15);
-        deviceField53.setOffsetNid(584);
-        deviceField53.setTextOnly(true);
-        jPanel53.add(deviceField53);
-
-        jPanel1.add(jPanel53);
-
-        deviceField54.setIdentifier("");
-        deviceField54.setLabelString("Stream Name: ");
-        deviceField54.setNumCols(15);
-        deviceField54.setOffsetNid(595);
-        deviceField54.setTextOnly(true);
-        jPanel54.add(deviceField54);
-
-        jPanel1.add(jPanel54);
-
-        deviceField55.setIdentifier("");
-        deviceField55.setLabelString("Stream Name: ");
-        deviceField55.setNumCols(15);
-        deviceField55.setOffsetNid(606);
-        deviceField55.setTextOnly(true);
-        jPanel55.add(deviceField55);
-
-        jPanel1.add(jPanel55);
-
-        deviceField56.setIdentifier("");
-        deviceField56.setLabelString("Stream Name: ");
-        deviceField56.setNumCols(15);
-        deviceField56.setOffsetNid(617);
-        deviceField56.setTextOnly(true);
-        jPanel56.add(deviceField56);
-
-        jPanel1.add(jPanel56);
-
-        deviceField57.setIdentifier("");
-        deviceField57.setLabelString("Stream Name: ");
-        deviceField57.setNumCols(15);
-        deviceField57.setOffsetNid(628);
-        deviceField57.setTextOnly(true);
-        jPanel57.add(deviceField57);
-
-        jPanel1.add(jPanel57);
-
-        deviceField58.setIdentifier("");
-        deviceField58.setLabelString("Stream Name: ");
-        deviceField58.setNumCols(15);
-        deviceField58.setOffsetNid(639);
-        deviceField58.setTextOnly(true);
-        jPanel58.add(deviceField58);
-
-        jPanel1.add(jPanel58);
-
-        deviceField59.setIdentifier("");
-        deviceField59.setLabelString("Stream Name: ");
-        deviceField59.setNumCols(15);
-        deviceField59.setOffsetNid(650);
-        deviceField59.setTextOnly(true);
-        jPanel59.add(deviceField59);
-
-        jPanel1.add(jPanel59);
-
-        deviceField60.setIdentifier("");
-        deviceField60.setLabelString("Stream Name: ");
-        deviceField60.setNumCols(15);
-        deviceField60.setOffsetNid(661);
-        deviceField60.setTextOnly(true);
-        jPanel60.add(deviceField60);
-
-        jPanel1.add(jPanel60);
-
-        deviceField61.setIdentifier("");
-        deviceField61.setLabelString("Stream Name: ");
-        deviceField61.setNumCols(15);
-        deviceField61.setOffsetNid(672);
-        deviceField61.setTextOnly(true);
-        jPanel61.add(deviceField61);
+        deviceField29.setLabelString("Seg. Len: ");
+        deviceField29.setNumCols(4);
+        deviceField29.setOffsetNid(113);
+        jPanel12.add(deviceField29);
 
-        jPanel1.add(jPanel61);
-
-        deviceField62.setIdentifier("");
-        deviceField62.setLabelString("Stream Name: ");
-        deviceField62.setNumCols(15);
-        deviceField62.setOffsetNid(683);
-        deviceField62.setTextOnly(true);
-        jPanel62.add(deviceField62);
-
-        jPanel1.add(jPanel62);
-
-        deviceField63.setIdentifier("");
-        deviceField63.setLabelString("Stream Name: ");
-        deviceField63.setNumCols(15);
-        deviceField63.setOffsetNid(694);
-        deviceField63.setTextOnly(true);
-        jPanel63.add(deviceField63);
-
-        jPanel1.add(jPanel63);
-
-        deviceField64.setIdentifier("");
-        deviceField64.setLabelString("Stream Name: ");
-        deviceField64.setNumCols(15);
-        deviceField64.setOffsetNid(705);
-        deviceField64.setTextOnly(true);
-        jPanel64.add(deviceField64);
-
-        jPanel1.add(jPanel64);
-
-        deviceField65.setIdentifier("");
-        deviceField65.setLabelString("Stream Name: ");
-        deviceField65.setNumCols(15);
-        deviceField65.setOffsetNid(716);
-        deviceField65.setTextOnly(true);
-        jPanel65.add(deviceField65);
-
-        jPanel1.add(jPanel65);
-
-        deviceField66.setIdentifier("");
-        deviceField66.setLabelString("Stream Name: ");
-        deviceField66.setNumCols(15);
-        deviceField66.setOffsetNid(727);
-        deviceField66.setTextOnly(true);
-        jPanel66.add(deviceField66);
-
-        jPanel1.add(jPanel66);
-
-        deviceField67.setIdentifier("");
-        deviceField67.setLabelString("Stream Name: ");
-        deviceField67.setNumCols(15);
-        deviceField67.setOffsetNid(738);
-        deviceField67.setTextOnly(true);
-        jPanel67.add(deviceField67);
-
-        jPanel1.add(jPanel67);
-
-        deviceField68.setIdentifier("");
-        deviceField68.setLabelString("Stream Name: ");
-        deviceField68.setNumCols(15);
-        deviceField68.setOffsetNid(749);
-        deviceField68.setTextOnly(true);
-        jPanel68.add(deviceField68);
-
-        jPanel1.add(jPanel68);
-
-        deviceField69.setIdentifier("");
-        deviceField69.setLabelString("Stream Name: ");
-        deviceField69.setNumCols(15);
-        deviceField69.setOffsetNid(760);
-        deviceField69.setTextOnly(true);
-        jPanel69.add(deviceField69);
-
-        jPanel1.add(jPanel69);
-
-        deviceField70.setIdentifier("");
-        deviceField70.setLabelString("Stream Name: ");
-        deviceField70.setNumCols(15);
-        deviceField70.setOffsetNid(771);
-        deviceField70.setTextOnly(true);
-        jPanel70.add(deviceField70);
-
-        jPanel1.add(jPanel70);
-
-        deviceField71.setIdentifier("");
-        deviceField71.setLabelString("Stream Name: ");
-        deviceField71.setNumCols(15);
-        deviceField71.setOffsetNid(782);
-        deviceField71.setTextOnly(true);
-        jPanel71.add(deviceField71);
-
-        jPanel1.add(jPanel71);
-
-        deviceField72.setIdentifier("");
-        deviceField72.setLabelString("Stream Name: ");
-        deviceField72.setNumCols(15);
-        deviceField72.setOffsetNid(793);
-        deviceField72.setTextOnly(true);
-        jPanel72.add(deviceField72);
-
-        jPanel1.add(jPanel72);
-
-        deviceField73.setIdentifier("");
-        deviceField73.setLabelString("Stream Name: ");
-        deviceField73.setNumCols(15);
-        deviceField73.setOffsetNid(804);
-        deviceField73.setTextOnly(true);
-        jPanel73.add(deviceField73);
-
-        jPanel1.add(jPanel73);
-
-        deviceField74.setIdentifier("");
-        deviceField74.setLabelString("Stream Name: ");
-        deviceField74.setNumCols(15);
-        deviceField74.setOffsetNid(815);
-        deviceField74.setTextOnly(true);
-        jPanel74.add(deviceField74);
-
-        jPanel1.add(jPanel74);
-
-        deviceField75.setIdentifier("");
-        deviceField75.setLabelString("Stream Name: ");
-        deviceField75.setNumCols(15);
-        deviceField75.setOffsetNid(826);
-        deviceField75.setTextOnly(true);
-        jPanel75.add(deviceField75);
-
-        jPanel1.add(jPanel75);
-
-        deviceField76.setIdentifier("");
-        deviceField76.setLabelString("Stream Name: ");
-        deviceField76.setNumCols(15);
-        deviceField76.setOffsetNid(837);
-        deviceField76.setTextOnly(true);
-        jPanel76.add(deviceField76);
-
-        jPanel1.add(jPanel76);
-
-        deviceField77.setIdentifier("");
-        deviceField77.setLabelString("Stream Name: ");
-        deviceField77.setNumCols(15);
-        deviceField77.setOffsetNid(848);
-        deviceField77.setTextOnly(true);
-        jPanel77.add(deviceField77);
-
-        jPanel1.add(jPanel77);
-
-        deviceField78.setIdentifier("");
-        deviceField78.setLabelString("Stream Name: ");
-        deviceField78.setNumCols(15);
-        deviceField78.setOffsetNid(859);
-        deviceField78.setTextOnly(true);
-        jPanel78.add(deviceField78);
-
-        jPanel1.add(jPanel78);
-
-        deviceField79.setIdentifier("");
-        deviceField79.setLabelString("Stream Name: ");
-        deviceField79.setNumCols(15);
-        deviceField79.setOffsetNid(870);
-        deviceField79.setTextOnly(true);
-        jPanel79.add(deviceField79);
-
-        jPanel1.add(jPanel79);
-
-        deviceField80.setIdentifier("");
-        deviceField80.setLabelString("Stream Name: ");
-        deviceField80.setNumCols(15);
-        deviceField80.setOffsetNid(881);
-        deviceField80.setTextOnly(true);
-        jPanel80.add(deviceField80);
-
-        jPanel1.add(jPanel80);
-
-        deviceField81.setIdentifier("");
-        deviceField81.setLabelString("Stream Name: ");
-        deviceField81.setNumCols(15);
-        deviceField81.setOffsetNid(892);
-        deviceField81.setTextOnly(true);
-        jPanel81.add(deviceField81);
-
-        jPanel1.add(jPanel81);
-
-        deviceField82.setIdentifier("");
-        deviceField82.setLabelString("Stream Name: ");
-        deviceField82.setNumCols(15);
-        deviceField82.setOffsetNid(903);
-        deviceField82.setTextOnly(true);
-        jPanel82.add(deviceField82);
-
-        jPanel1.add(jPanel82);
-
-        deviceField83.setIdentifier("");
-        deviceField83.setLabelString("Stream Name: ");
-        deviceField83.setNumCols(15);
-        deviceField83.setOffsetNid(914);
-        deviceField83.setTextOnly(true);
-        jPanel83.add(deviceField83);
-
-        jPanel1.add(jPanel83);
-
-        deviceField84.setIdentifier("");
-        deviceField84.setLabelString("Stream Name: ");
-        deviceField84.setNumCols(15);
-        deviceField84.setOffsetNid(925);
-        deviceField84.setTextOnly(true);
-        jPanel84.add(deviceField84);
-
-        jPanel1.add(jPanel84);
-
-        deviceField85.setIdentifier("");
-        deviceField85.setLabelString("Stream Name: ");
-        deviceField85.setNumCols(15);
-        deviceField85.setOffsetNid(936);
-        deviceField85.setTextOnly(true);
-        jPanel85.add(deviceField85);
-
-        jPanel1.add(jPanel85);
-
-        deviceField86.setIdentifier("");
-        deviceField86.setLabelString("Stream Name: ");
-        deviceField86.setNumCols(15);
-        deviceField86.setOffsetNid(947);
-        deviceField86.setTextOnly(true);
-        jPanel86.add(deviceField86);
-
-        jPanel1.add(jPanel86);
-
-        deviceField87.setIdentifier("");
-        deviceField87.setLabelString("Stream Name: ");
-        deviceField87.setNumCols(15);
-        deviceField87.setOffsetNid(958);
-        deviceField87.setTextOnly(true);
-        jPanel87.add(deviceField87);
-
-        jPanel1.add(jPanel87);
-
-        deviceField88.setIdentifier("");
-        deviceField88.setLabelString("Stream Name: ");
-        deviceField88.setNumCols(15);
-        deviceField88.setOffsetNid(969);
-        deviceField88.setTextOnly(true);
-        jPanel88.add(deviceField88);
-
-        jPanel1.add(jPanel88);
-
-        deviceField89.setIdentifier("");
-        deviceField89.setLabelString("Stream Name: ");
-        deviceField89.setNumCols(15);
-        deviceField89.setOffsetNid(980);
-        deviceField89.setTextOnly(true);
-        jPanel89.add(deviceField89);
-
-        jPanel1.add(jPanel89);
-
-        deviceField90.setIdentifier("");
-        deviceField90.setLabelString("Stream Name: ");
-        deviceField90.setNumCols(15);
-        deviceField90.setOffsetNid(991);
-        deviceField90.setTextOnly(true);
-        jPanel90.add(deviceField90);
-
-        jPanel1.add(jPanel90);
-
-        deviceField91.setIdentifier("");
-        deviceField91.setLabelString("Stream Name: ");
-        deviceField91.setNumCols(15);
-        deviceField91.setOffsetNid(1002);
-        deviceField91.setTextOnly(true);
-        jPanel91.add(deviceField91);
-
-        jPanel1.add(jPanel91);
-
-        deviceField92.setIdentifier("");
-        deviceField92.setLabelString("Stream Name: ");
-        deviceField92.setNumCols(15);
-        deviceField92.setOffsetNid(1013);
-        deviceField92.setTextOnly(true);
-        jPanel92.add(deviceField92);
-
-        jPanel1.add(jPanel92);
-
-        deviceField93.setIdentifier("");
-        deviceField93.setLabelString("Stream Name: ");
-        deviceField93.setNumCols(15);
-        deviceField93.setOffsetNid(1024);
-        deviceField93.setTextOnly(true);
-        jPanel93.add(deviceField93);
-
-        jPanel1.add(jPanel93);
-
-        deviceField94.setIdentifier("");
-        deviceField94.setLabelString("Stream Name: ");
-        deviceField94.setNumCols(15);
-        deviceField94.setOffsetNid(1035);
-        deviceField94.setTextOnly(true);
-        jPanel94.add(deviceField94);
-
-        jPanel1.add(jPanel94);
-
-        deviceField95.setIdentifier("");
-        deviceField95.setLabelString("Stream Name: ");
-        deviceField95.setNumCols(15);
-        deviceField95.setOffsetNid(1046);
-        deviceField95.setTextOnly(true);
-        jPanel95.add(deviceField95);
-
-        jPanel1.add(jPanel95);
-
-        deviceField96.setIdentifier("");
-        deviceField96.setLabelString("Stream Name: ");
-        deviceField96.setNumCols(15);
-        deviceField96.setOffsetNid(1057);
-        deviceField96.setTextOnly(true);
-        jPanel96.add(deviceField96);
-
-        jPanel1.add(jPanel96);
-
-        deviceField97.setIdentifier("");
-        deviceField97.setLabelString("Stream Name: ");
-        deviceField97.setNumCols(15);
-        deviceField97.setOffsetNid(1068);
-        deviceField97.setTextOnly(true);
-        jPanel97.add(deviceField97);
-
-        jPanel1.add(jPanel97);
-
-        deviceField98.setIdentifier("");
-        deviceField98.setLabelString("Stream Name: ");
-        deviceField98.setNumCols(15);
-        deviceField98.setOffsetNid(1079);
-        deviceField98.setTextOnly(true);
-        jPanel98.add(deviceField98);
-
-        jPanel1.add(jPanel98);
-
-        deviceField99.setIdentifier("");
-        deviceField99.setLabelString("Stream Name: ");
-        deviceField99.setNumCols(15);
-        deviceField99.setOffsetNid(1090);
-        deviceField99.setTextOnly(true);
-        jPanel99.add(deviceField99);
-
-        jPanel1.add(jPanel99);
-
-        deviceField100.setIdentifier("");
-        deviceField100.setLabelString("Stream Name: ");
-        deviceField100.setNumCols(15);
-        deviceField100.setOffsetNid(1101);
-        deviceField100.setTextOnly(true);
-        jPanel100.add(deviceField100);
-
-        jPanel1.add(jPanel100);
-
-        deviceField101.setIdentifier("");
-        deviceField101.setLabelString("Stream Name: ");
-        deviceField101.setNumCols(15);
-        deviceField101.setOffsetNid(1112);
-        deviceField101.setTextOnly(true);
-        jPanel101.add(deviceField101);
-
-        jPanel1.add(jPanel101);
-
-        deviceField102.setIdentifier("");
-        deviceField102.setLabelString("Stream Name: ");
-        deviceField102.setNumCols(15);
-        deviceField102.setOffsetNid(1123);
-        deviceField102.setTextOnly(true);
-        jPanel102.add(deviceField102);
-
-        jPanel1.add(jPanel102);
-
-        deviceField103.setIdentifier("");
-        deviceField103.setLabelString("Stream Name: ");
-        deviceField103.setNumCols(15);
-        deviceField103.setOffsetNid(1134);
-        deviceField103.setTextOnly(true);
-        jPanel103.add(deviceField103);
-
-        jPanel1.add(jPanel103);
-
-        deviceField104.setIdentifier("");
-        deviceField104.setLabelString("Stream Name: ");
-        deviceField104.setNumCols(15);
-        deviceField104.setOffsetNid(1145);
-        deviceField104.setTextOnly(true);
-        jPanel104.add(deviceField104);
-
-        jPanel1.add(jPanel104);
-
-        deviceField105.setIdentifier("");
-        deviceField105.setLabelString("Stream Name: ");
-        deviceField105.setNumCols(15);
-        deviceField105.setOffsetNid(1156);
-        deviceField105.setTextOnly(true);
-        jPanel105.add(deviceField105);
-
-        jPanel1.add(jPanel105);
-
-        deviceField106.setIdentifier("");
-        deviceField106.setLabelString("Stream Name: ");
-        deviceField106.setNumCols(15);
-        deviceField106.setOffsetNid(1167);
-        deviceField106.setTextOnly(true);
-        jPanel106.add(deviceField106);
-
-        jPanel1.add(jPanel106);
-
-        deviceField107.setIdentifier("");
-        deviceField107.setLabelString("Stream Name: ");
-        deviceField107.setNumCols(15);
-        deviceField107.setOffsetNid(1178);
-        deviceField107.setTextOnly(true);
-        jPanel107.add(deviceField107);
-
-        jPanel1.add(jPanel107);
-
-        deviceField108.setIdentifier("");
-        deviceField108.setLabelString("Stream Name: ");
-        deviceField108.setNumCols(15);
-        deviceField108.setOffsetNid(1189);
-        deviceField108.setTextOnly(true);
-        jPanel108.add(deviceField108);
-
-        jPanel1.add(jPanel108);
-
-        deviceField109.setIdentifier("");
-        deviceField109.setLabelString("Stream Name: ");
-        deviceField109.setNumCols(15);
-        deviceField109.setOffsetNid(1200);
-        deviceField109.setTextOnly(true);
-        jPanel109.add(deviceField109);
-
-        jPanel1.add(jPanel109);
-
-        deviceField110.setIdentifier("");
-        deviceField110.setLabelString("Stream Name: ");
-        deviceField110.setNumCols(15);
-        deviceField110.setOffsetNid(1211);
-        deviceField110.setTextOnly(true);
-        jPanel110.add(deviceField110);
-
-        jPanel1.add(jPanel110);
-
-        deviceField111.setIdentifier("");
-        deviceField111.setLabelString("Stream Name: ");
-        deviceField111.setNumCols(15);
-        deviceField111.setOffsetNid(1222);
-        deviceField111.setTextOnly(true);
-        jPanel111.add(deviceField111);
-
-        jPanel1.add(jPanel111);
-
-        deviceField112.setIdentifier("");
-        deviceField112.setLabelString("Stream Name: ");
-        deviceField112.setNumCols(15);
-        deviceField112.setOffsetNid(1233);
-        deviceField112.setTextOnly(true);
-        jPanel112.add(deviceField112);
-
-        jPanel1.add(jPanel112);
-
-        deviceField113.setIdentifier("");
-        deviceField113.setLabelString("Stream Name: ");
-        deviceField113.setNumCols(15);
-        deviceField113.setOffsetNid(1244);
-        jPanel113.add(deviceField113);
-
-        jPanel1.add(jPanel113);
-
-        deviceField114.setIdentifier("");
-        deviceField114.setLabelString("Stream Name: ");
-        deviceField114.setNumCols(15);
-        deviceField114.setOffsetNid(1255);
-        deviceField114.setTextOnly(true);
-        jPanel114.add(deviceField114);
-
-        jPanel1.add(jPanel114);
-
-        deviceField115.setIdentifier("");
-        deviceField115.setLabelString("Stream Name: ");
-        deviceField115.setNumCols(15);
-        deviceField115.setOffsetNid(1266);
-        deviceField115.setTextOnly(true);
-        jPanel115.add(deviceField115);
-
-        jPanel1.add(jPanel115);
-
-        deviceField116.setIdentifier("");
-        deviceField116.setLabelString("Stream Name: ");
-        deviceField116.setNumCols(15);
-        deviceField116.setOffsetNid(1277);
-        deviceField116.setTextOnly(true);
-        jPanel116.add(deviceField116);
-
-        jPanel1.add(jPanel116);
-
-        deviceField117.setIdentifier("");
-        deviceField117.setLabelString("Stream Name: ");
-        deviceField117.setNumCols(15);
-        deviceField117.setOffsetNid(1288);
-        deviceField117.setTextOnly(true);
-        jPanel117.add(deviceField117);
-
-        jPanel1.add(jPanel117);
-
-        deviceField118.setIdentifier("");
-        deviceField118.setLabelString("Stream Name: ");
-        deviceField118.setNumCols(15);
-        deviceField118.setOffsetNid(1299);
-        deviceField118.setTextOnly(true);
-        jPanel118.add(deviceField118);
-
-        jPanel1.add(jPanel118);
-
-        deviceField119.setIdentifier("");
-        deviceField119.setLabelString("Stream Name: ");
-        deviceField119.setNumCols(15);
-        deviceField119.setOffsetNid(1310);
-        deviceField119.setTextOnly(true);
-        jPanel119.add(deviceField119);
-
-        jPanel1.add(jPanel119);
-
-        deviceField120.setIdentifier("");
-        deviceField120.setLabelString("Stream Name: ");
-        deviceField120.setNumCols(15);
-        deviceField120.setOffsetNid(1321);
-        deviceField120.setTextOnly(true);
-        jPanel120.add(deviceField120);
-
-        jPanel1.add(jPanel120);
-
-        deviceField121.setIdentifier("");
-        deviceField121.setLabelString("Stream Name: ");
-        deviceField121.setNumCols(15);
-        deviceField121.setOffsetNid(1332);
-        deviceField121.setTextOnly(true);
-        jPanel121.add(deviceField121);
-
-        jPanel1.add(jPanel121);
-
-        deviceField122.setIdentifier("");
-        deviceField122.setLabelString("Stream Name: ");
-        deviceField122.setNumCols(15);
-        deviceField122.setOffsetNid(1343);
-        deviceField122.setTextOnly(true);
-        jPanel122.add(deviceField122);
-
-        jPanel1.add(jPanel122);
-
-        deviceField123.setIdentifier("");
-        deviceField123.setLabelString("Stream Name: ");
-        deviceField123.setNumCols(15);
-        deviceField123.setOffsetNid(1354);
-        deviceField123.setTextOnly(true);
-        jPanel123.add(deviceField123);
-
-        jPanel1.add(jPanel123);
-
-        deviceField124.setIdentifier("");
-        deviceField124.setLabelString("Stream Name: ");
-        deviceField124.setNumCols(15);
-        deviceField124.setOffsetNid(1365);
-        deviceField124.setTextOnly(true);
-        jPanel124.add(deviceField124);
-
-        jPanel1.add(jPanel124);
-
-        deviceField125.setIdentifier("");
-        deviceField125.setLabelString("Stream Name: ");
-        deviceField125.setNumCols(15);
-        deviceField125.setOffsetNid(1376);
-        deviceField125.setTextOnly(true);
-        jPanel125.add(deviceField125);
-
-        jPanel1.add(jPanel125);
-
-        deviceField126.setIdentifier("");
-        deviceField126.setLabelString("Stream Name: ");
-        deviceField126.setNumCols(15);
-        deviceField126.setOffsetNid(1387);
-        deviceField126.setTextOnly(true);
-        jPanel126.add(deviceField126);
-
-        jPanel1.add(jPanel126);
-
-        deviceField127.setIdentifier("");
-        deviceField127.setLabelString("Stream Name: ");
-        deviceField127.setNumCols(15);
-        deviceField127.setOffsetNid(1398);
-        deviceField127.setTextOnly(true);
-        jPanel127.add(deviceField127);
-
-        jPanel1.add(jPanel127);
-
-        deviceField128.setIdentifier("");
-        deviceField128.setLabelString("Stream Name: ");
-        deviceField128.setNumCols(15);
-        deviceField128.setOffsetNid(1409);
-        deviceField128.setTextOnly(true);
-        jPanel128.add(deviceField128);
-
-        jPanel1.add(jPanel128);
-
-        deviceField129.setIdentifier("");
-        deviceField129.setLabelString("Stream Name: ");
-        deviceField129.setNumCols(15);
-        deviceField129.setOffsetNid(1420);
-        deviceField129.setTextOnly(true);
-        jPanel129.add(deviceField129);
-
-        jPanel1.add(jPanel129);
-
-        deviceField130.setIdentifier("");
-        deviceField130.setLabelString("Stream Name: ");
-        deviceField130.setNumCols(15);
-        deviceField130.setOffsetNid(1431);
-        deviceField130.setTextOnly(true);
-        jPanel130.add(deviceField130);
-
-        jPanel1.add(jPanel130);
+        jPanel1.add(jPanel12);
 
         jScrollPane1.setViewportView(jPanel1);
 
@@ -1471,42 +372,19 @@ private void initComponents() {
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private DeviceButtons deviceButtons1;
+    private DeviceChoice deviceChoice1;
+    private DeviceChoice deviceChoice2;
+    private DeviceChoice deviceChoice3;
+    private DeviceChoice deviceChoice4;
+    private DeviceChoice deviceChoice5;
+    private DeviceChoice deviceChoice6;
+    private DeviceChoice deviceChoice7;
+    private DeviceChoice deviceChoice8;
     private DeviceField deviceField1;
     private DeviceField deviceField10;
-    private DeviceField deviceField100;
-    private DeviceField deviceField101;
-    private DeviceField deviceField102;
-    private DeviceField deviceField103;
-    private DeviceField deviceField104;
-    private DeviceField deviceField105;
-    private DeviceField deviceField106;
-    private DeviceField deviceField107;
-    private DeviceField deviceField108;
-    private DeviceField deviceField109;
     private DeviceField deviceField11;
-    private DeviceField deviceField110;
-    private DeviceField deviceField111;
-    private DeviceField deviceField112;
-    private DeviceField deviceField113;
-    private DeviceField deviceField114;
-    private DeviceField deviceField115;
-    private DeviceField deviceField116;
-    private DeviceField deviceField117;
-    private DeviceField deviceField118;
-    private DeviceField deviceField119;
     private DeviceField deviceField12;
-    private DeviceField deviceField120;
-    private DeviceField deviceField121;
-    private DeviceField deviceField122;
-    private DeviceField deviceField123;
-    private DeviceField deviceField124;
-    private DeviceField deviceField125;
-    private DeviceField deviceField126;
-    private DeviceField deviceField127;
-    private DeviceField deviceField128;
-    private DeviceField deviceField129;
     private DeviceField deviceField13;
-    private DeviceField deviceField130;
     private DeviceField deviceField14;
     private DeviceField deviceField15;
     private DeviceField deviceField16;
@@ -1527,210 +405,25 @@ private void initComponents() {
     private DeviceField deviceField3;
     private DeviceField deviceField30;
     private DeviceField deviceField31;
-    private DeviceField deviceField32;
-    private DeviceField deviceField33;
-    private DeviceField deviceField34;
-    private DeviceField deviceField35;
-    private DeviceField deviceField36;
-    private DeviceField deviceField37;
-    private DeviceField deviceField38;
-    private DeviceField deviceField39;
     private DeviceField deviceField4;
-    private DeviceField deviceField40;
-    private DeviceField deviceField41;
-    private DeviceField deviceField42;
-    private DeviceField deviceField43;
-    private DeviceField deviceField44;
-    private DeviceField deviceField45;
-    private DeviceField deviceField46;
-    private DeviceField deviceField47;
-    private DeviceField deviceField48;
-    private DeviceField deviceField49;
     private DeviceField deviceField5;
-    private DeviceField deviceField50;
-    private DeviceField deviceField51;
-    private DeviceField deviceField52;
-    private DeviceField deviceField53;
-    private DeviceField deviceField54;
-    private DeviceField deviceField55;
-    private DeviceField deviceField56;
-    private DeviceField deviceField57;
-    private DeviceField deviceField58;
-    private DeviceField deviceField59;
     private DeviceField deviceField6;
-    private DeviceField deviceField60;
-    private DeviceField deviceField61;
-    private DeviceField deviceField62;
-    private DeviceField deviceField63;
-    private DeviceField deviceField64;
-    private DeviceField deviceField65;
-    private DeviceField deviceField66;
-    private DeviceField deviceField67;
-    private DeviceField deviceField68;
-    private DeviceField deviceField69;
     private DeviceField deviceField7;
-    private DeviceField deviceField70;
-    private DeviceField deviceField71;
-    private DeviceField deviceField72;
-    private DeviceField deviceField73;
-    private DeviceField deviceField74;
-    private DeviceField deviceField75;
-    private DeviceField deviceField76;
-    private DeviceField deviceField77;
-    private DeviceField deviceField78;
-    private DeviceField deviceField79;
     private DeviceField deviceField8;
-    private DeviceField deviceField80;
-    private DeviceField deviceField81;
-    private DeviceField deviceField82;
-    private DeviceField deviceField83;
-    private DeviceField deviceField84;
-    private DeviceField deviceField85;
-    private DeviceField deviceField86;
-    private DeviceField deviceField87;
-    private DeviceField deviceField88;
-    private DeviceField deviceField89;
     private DeviceField deviceField9;
-    private DeviceField deviceField90;
-    private DeviceField deviceField91;
-    private DeviceField deviceField92;
-    private DeviceField deviceField93;
-    private DeviceField deviceField94;
-    private DeviceField deviceField95;
-    private DeviceField deviceField96;
-    private DeviceField deviceField97;
-    private DeviceField deviceField98;
-    private DeviceField deviceField99;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel10;
-    private javax.swing.JPanel jPanel100;
-    private javax.swing.JPanel jPanel101;
-    private javax.swing.JPanel jPanel102;
-    private javax.swing.JPanel jPanel103;
-    private javax.swing.JPanel jPanel104;
-    private javax.swing.JPanel jPanel105;
-    private javax.swing.JPanel jPanel106;
-    private javax.swing.JPanel jPanel107;
-    private javax.swing.JPanel jPanel108;
-    private javax.swing.JPanel jPanel109;
     private javax.swing.JPanel jPanel11;
-    private javax.swing.JPanel jPanel110;
-    private javax.swing.JPanel jPanel111;
-    private javax.swing.JPanel jPanel112;
-    private javax.swing.JPanel jPanel113;
-    private javax.swing.JPanel jPanel114;
-    private javax.swing.JPanel jPanel115;
-    private javax.swing.JPanel jPanel116;
-    private javax.swing.JPanel jPanel117;
-    private javax.swing.JPanel jPanel118;
-    private javax.swing.JPanel jPanel119;
     private javax.swing.JPanel jPanel12;
-    private javax.swing.JPanel jPanel120;
-    private javax.swing.JPanel jPanel121;
-    private javax.swing.JPanel jPanel122;
-    private javax.swing.JPanel jPanel123;
-    private javax.swing.JPanel jPanel124;
-    private javax.swing.JPanel jPanel125;
-    private javax.swing.JPanel jPanel126;
-    private javax.swing.JPanel jPanel127;
-    private javax.swing.JPanel jPanel128;
-    private javax.swing.JPanel jPanel129;
     private javax.swing.JPanel jPanel13;
-    private javax.swing.JPanel jPanel130;
-    private javax.swing.JPanel jPanel14;
-    private javax.swing.JPanel jPanel15;
-    private javax.swing.JPanel jPanel16;
-    private javax.swing.JPanel jPanel17;
-    private javax.swing.JPanel jPanel18;
-    private javax.swing.JPanel jPanel19;
     private javax.swing.JPanel jPanel2;
-    private javax.swing.JPanel jPanel20;
-    private javax.swing.JPanel jPanel21;
-    private javax.swing.JPanel jPanel22;
-    private javax.swing.JPanel jPanel23;
-    private javax.swing.JPanel jPanel24;
-    private javax.swing.JPanel jPanel25;
-    private javax.swing.JPanel jPanel26;
-    private javax.swing.JPanel jPanel27;
-    private javax.swing.JPanel jPanel28;
-    private javax.swing.JPanel jPanel29;
     private javax.swing.JPanel jPanel3;
-    private javax.swing.JPanel jPanel30;
-    private javax.swing.JPanel jPanel31;
-    private javax.swing.JPanel jPanel32;
-    private javax.swing.JPanel jPanel33;
-    private javax.swing.JPanel jPanel34;
-    private javax.swing.JPanel jPanel35;
-    private javax.swing.JPanel jPanel36;
-    private javax.swing.JPanel jPanel37;
-    private javax.swing.JPanel jPanel38;
-    private javax.swing.JPanel jPanel39;
     private javax.swing.JPanel jPanel4;
-    private javax.swing.JPanel jPanel40;
-    private javax.swing.JPanel jPanel41;
-    private javax.swing.JPanel jPanel42;
-    private javax.swing.JPanel jPanel43;
-    private javax.swing.JPanel jPanel44;
-    private javax.swing.JPanel jPanel45;
-    private javax.swing.JPanel jPanel46;
-    private javax.swing.JPanel jPanel47;
-    private javax.swing.JPanel jPanel48;
-    private javax.swing.JPanel jPanel49;
     private javax.swing.JPanel jPanel5;
-    private javax.swing.JPanel jPanel50;
-    private javax.swing.JPanel jPanel51;
-    private javax.swing.JPanel jPanel52;
-    private javax.swing.JPanel jPanel53;
-    private javax.swing.JPanel jPanel54;
-    private javax.swing.JPanel jPanel55;
-    private javax.swing.JPanel jPanel56;
-    private javax.swing.JPanel jPanel57;
-    private javax.swing.JPanel jPanel58;
-    private javax.swing.JPanel jPanel59;
     private javax.swing.JPanel jPanel6;
-    private javax.swing.JPanel jPanel60;
-    private javax.swing.JPanel jPanel61;
-    private javax.swing.JPanel jPanel62;
-    private javax.swing.JPanel jPanel63;
-    private javax.swing.JPanel jPanel64;
-    private javax.swing.JPanel jPanel65;
-    private javax.swing.JPanel jPanel66;
-    private javax.swing.JPanel jPanel67;
-    private javax.swing.JPanel jPanel68;
-    private javax.swing.JPanel jPanel69;
     private javax.swing.JPanel jPanel7;
-    private javax.swing.JPanel jPanel70;
-    private javax.swing.JPanel jPanel71;
-    private javax.swing.JPanel jPanel72;
-    private javax.swing.JPanel jPanel73;
-    private javax.swing.JPanel jPanel74;
-    private javax.swing.JPanel jPanel75;
-    private javax.swing.JPanel jPanel76;
-    private javax.swing.JPanel jPanel77;
-    private javax.swing.JPanel jPanel78;
-    private javax.swing.JPanel jPanel79;
     private javax.swing.JPanel jPanel8;
-    private javax.swing.JPanel jPanel80;
-    private javax.swing.JPanel jPanel81;
-    private javax.swing.JPanel jPanel82;
-    private javax.swing.JPanel jPanel83;
-    private javax.swing.JPanel jPanel84;
-    private javax.swing.JPanel jPanel85;
-    private javax.swing.JPanel jPanel86;
-    private javax.swing.JPanel jPanel87;
-    private javax.swing.JPanel jPanel88;
-    private javax.swing.JPanel jPanel89;
     private javax.swing.JPanel jPanel9;
-    private javax.swing.JPanel jPanel90;
-    private javax.swing.JPanel jPanel91;
-    private javax.swing.JPanel jPanel92;
-    private javax.swing.JPanel jPanel93;
-    private javax.swing.JPanel jPanel94;
-    private javax.swing.JPanel jPanel95;
-    private javax.swing.JPanel jPanel96;
-    private javax.swing.JPanel jPanel97;
-    private javax.swing.JPanel jPanel98;
-    private javax.swing.JPanel jPanel99;
     private javax.swing.JScrollPane jScrollPane1;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/java/jdevices/src/main/resources/MARTE2_STREAMSetup.form b/java/jdevices/src/main/resources/MARTE2_STREAMSetup.form
index 94218fd7f0..b2fa5df2dd 100644
--- a/java/jdevices/src/main/resources/MARTE2_STREAMSetup.form
+++ b/java/jdevices/src/main/resources/MARTE2_STREAMSetup.form
@@ -2,7 +2,7 @@
 
 <Form version="1.7" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
-    <Property name="deviceProvider" type="java.lang.String" value="spilds.rfx.local:8100"/>
+    <Property name="deviceProvider" type="java.lang.String" value="localhost:8100"/>
     <Property name="deviceTitle" type="java.lang.String" value="MARTe2 Stream"/>
     <Property name="deviceType" type="java.lang.String" value="MARTE2_STREAM"/>
     <Property name="height" type="int" value="500"/>
@@ -168,13 +168,17 @@
                 <Component class="DeviceChoice" name="deviceChoice1">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
                         <StringItem index="1" value="float64"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -224,13 +228,18 @@
                 <Component class="DeviceChoice" name="deviceChoice2">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="11">
                         <StringItem index="0" value="float32"/>
                         <StringItem index="1" value="float64"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
+                        <StringItem index="10" value="uint32"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -280,13 +289,17 @@
                 <Component class="DeviceChoice" name="deviceChoice3">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
                         <StringItem index="1" value="float64"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -336,13 +349,17 @@
                 <Component class="DeviceChoice" name="deviceChoice4">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
                         <StringItem index="1" value="float64"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -392,13 +409,17 @@
                 <Component class="DeviceChoice" name="deviceChoice5">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
                         <StringItem index="1" value="float64"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -448,13 +469,17 @@
                 <Component class="DeviceChoice" name="deviceChoice6">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
                         <StringItem index="1" value="float64"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -504,13 +529,17 @@
                 <Component class="DeviceChoice" name="deviceChoice7">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -560,13 +589,17 @@
                 <Component class="DeviceChoice" name="deviceChoice8">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -616,13 +649,17 @@
                 <Component class="DeviceChoice" name="deviceChoice10">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -673,13 +710,17 @@
                 <Component class="DeviceChoice" name="deviceChoice11">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -730,13 +771,17 @@
                 <Component class="DeviceChoice" name="deviceChoice12">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -787,13 +832,17 @@
                 <Component class="DeviceChoice" name="deviceChoice13">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -844,13 +893,17 @@
                 <Component class="DeviceChoice" name="deviceChoice14">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -901,13 +954,17 @@
                 <Component class="DeviceChoice" name="deviceChoice15">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -958,13 +1015,17 @@
                 <Component class="DeviceChoice" name="deviceChoice16">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1015,13 +1076,17 @@
                 <Component class="DeviceChoice" name="deviceChoice17">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1072,13 +1137,17 @@
                 <Component class="DeviceChoice" name="deviceChoice18">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1129,13 +1198,17 @@
                 <Component class="DeviceChoice" name="deviceChoice19">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1186,13 +1259,17 @@
                 <Component class="DeviceChoice" name="deviceChoice20">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1243,13 +1320,17 @@
                 <Component class="DeviceChoice" name="deviceChoice21">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1300,13 +1381,17 @@
                 <Component class="DeviceChoice" name="deviceChoice22">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1357,13 +1442,17 @@
                 <Component class="DeviceChoice" name="deviceChoice23">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1414,13 +1503,17 @@
                 <Component class="DeviceChoice" name="deviceChoice24">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1471,13 +1564,17 @@
                 <Component class="DeviceChoice" name="deviceChoice25">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1528,13 +1625,17 @@
                 <Component class="DeviceChoice" name="deviceChoice26">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1585,13 +1686,17 @@
                 <Component class="DeviceChoice" name="deviceChoice27">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1642,13 +1747,17 @@
                 <Component class="DeviceChoice" name="deviceChoice28">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1699,13 +1808,17 @@
                 <Component class="DeviceChoice" name="deviceChoice29">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1756,13 +1869,17 @@
                 <Component class="DeviceChoice" name="deviceChoice30">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1813,13 +1930,17 @@
                 <Component class="DeviceChoice" name="deviceChoice31">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1870,13 +1991,17 @@
                 <Component class="DeviceChoice" name="deviceChoice32">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1927,13 +2052,17 @@
                 <Component class="DeviceChoice" name="deviceChoice33">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -1984,13 +2113,17 @@
                 <Component class="DeviceChoice" name="deviceChoice34">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2041,13 +2174,17 @@
                 <Component class="DeviceChoice" name="deviceChoice35">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2098,13 +2235,17 @@
                 <Component class="DeviceChoice" name="deviceChoice36">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2155,13 +2296,17 @@
                 <Component class="DeviceChoice" name="deviceChoice37">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2212,13 +2357,17 @@
                 <Component class="DeviceChoice" name="deviceChoice38">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2269,13 +2418,17 @@
                 <Component class="DeviceChoice" name="deviceChoice39">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2326,13 +2479,17 @@
                 <Component class="DeviceChoice" name="deviceChoice40">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2383,13 +2540,17 @@
                 <Component class="DeviceChoice" name="deviceChoice41">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2440,13 +2601,17 @@
                 <Component class="DeviceChoice" name="deviceChoice42">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2497,13 +2662,17 @@
                 <Component class="DeviceChoice" name="deviceChoice43">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2554,13 +2723,17 @@
                 <Component class="DeviceChoice" name="deviceChoice44">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2611,13 +2784,17 @@
                 <Component class="DeviceChoice" name="deviceChoice45">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2668,13 +2845,17 @@
                 <Component class="DeviceChoice" name="deviceChoice46">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2725,13 +2906,17 @@
                 <Component class="DeviceChoice" name="deviceChoice47">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2782,13 +2967,17 @@
                 <Component class="DeviceChoice" name="deviceChoice48">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2839,13 +3028,17 @@
                 <Component class="DeviceChoice" name="deviceChoice49">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2896,13 +3089,17 @@
                 <Component class="DeviceChoice" name="deviceChoice50">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -2953,13 +3150,17 @@
                 <Component class="DeviceChoice" name="deviceChoice51">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3010,13 +3211,17 @@
                 <Component class="DeviceChoice" name="deviceChoice52">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3067,13 +3272,17 @@
                 <Component class="DeviceChoice" name="deviceChoice53">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3124,13 +3333,17 @@
                 <Component class="DeviceChoice" name="deviceChoice54">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3181,13 +3394,17 @@
                 <Component class="DeviceChoice" name="deviceChoice55">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3238,13 +3455,17 @@
                 <Component class="DeviceChoice" name="deviceChoice56">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3295,13 +3516,17 @@
                 <Component class="DeviceChoice" name="deviceChoice57">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3352,13 +3577,17 @@
                 <Component class="DeviceChoice" name="deviceChoice58">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3409,13 +3638,17 @@
                 <Component class="DeviceChoice" name="deviceChoice59">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3466,13 +3699,17 @@
                 <Component class="DeviceChoice" name="deviceChoice60">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3523,13 +3760,17 @@
                 <Component class="DeviceChoice" name="deviceChoice61">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3580,13 +3821,17 @@
                 <Component class="DeviceChoice" name="deviceChoice62">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3637,13 +3882,17 @@
                 <Component class="DeviceChoice" name="deviceChoice63">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3694,13 +3943,17 @@
                 <Component class="DeviceChoice" name="deviceChoice64">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3751,13 +4004,17 @@
                 <Component class="DeviceChoice" name="deviceChoice65">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3808,13 +4065,17 @@
                 <Component class="DeviceChoice" name="deviceChoice66">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3865,13 +4126,17 @@
                 <Component class="DeviceChoice" name="deviceChoice67">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3922,13 +4187,17 @@
                 <Component class="DeviceChoice" name="deviceChoice68">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -3979,13 +4248,17 @@
                 <Component class="DeviceChoice" name="deviceChoice69">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4036,13 +4309,17 @@
                 <Component class="DeviceChoice" name="deviceChoice70">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4093,13 +4370,17 @@
                 <Component class="DeviceChoice" name="deviceChoice71">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4150,13 +4431,17 @@
                 <Component class="DeviceChoice" name="deviceChoice72">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4207,13 +4492,17 @@
                 <Component class="DeviceChoice" name="deviceChoice73">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4264,13 +4553,17 @@
                 <Component class="DeviceChoice" name="deviceChoice74">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4321,13 +4614,17 @@
                 <Component class="DeviceChoice" name="deviceChoice75">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4378,13 +4675,17 @@
                 <Component class="DeviceChoice" name="deviceChoice76">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4435,13 +4736,17 @@
                 <Component class="DeviceChoice" name="deviceChoice77">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4492,13 +4797,17 @@
                 <Component class="DeviceChoice" name="deviceChoice78">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4549,13 +4858,17 @@
                 <Component class="DeviceChoice" name="deviceChoice79">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4606,13 +4919,17 @@
                 <Component class="DeviceChoice" name="deviceChoice80">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4663,13 +4980,17 @@
                 <Component class="DeviceChoice" name="deviceChoice81">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4720,13 +5041,17 @@
                 <Component class="DeviceChoice" name="deviceChoice82">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4777,13 +5102,17 @@
                 <Component class="DeviceChoice" name="deviceChoice83">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4834,13 +5163,17 @@
                 <Component class="DeviceChoice" name="deviceChoice84">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4891,13 +5224,17 @@
                 <Component class="DeviceChoice" name="deviceChoice85">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -4948,13 +5285,17 @@
                 <Component class="DeviceChoice" name="deviceChoice86">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5005,13 +5346,17 @@
                 <Component class="DeviceChoice" name="deviceChoice87">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5062,13 +5407,17 @@
                 <Component class="DeviceChoice" name="deviceChoice88">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5119,13 +5468,17 @@
                 <Component class="DeviceChoice" name="deviceChoice89">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5176,13 +5529,17 @@
                 <Component class="DeviceChoice" name="deviceChoice90">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5233,13 +5590,17 @@
                 <Component class="DeviceChoice" name="deviceChoice91">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5290,13 +5651,17 @@
                 <Component class="DeviceChoice" name="deviceChoice92">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5347,13 +5712,17 @@
                 <Component class="DeviceChoice" name="deviceChoice93">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5404,13 +5773,17 @@
                 <Component class="DeviceChoice" name="deviceChoice94">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5461,13 +5834,17 @@
                 <Component class="DeviceChoice" name="deviceChoice95">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5518,13 +5895,17 @@
                 <Component class="DeviceChoice" name="deviceChoice96">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5575,13 +5956,17 @@
                 <Component class="DeviceChoice" name="deviceChoice97">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5632,13 +6017,17 @@
                 <Component class="DeviceChoice" name="deviceChoice98">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5689,13 +6078,17 @@
                 <Component class="DeviceChoice" name="deviceChoice99">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5746,13 +6139,17 @@
                 <Component class="DeviceChoice" name="deviceChoice100">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5803,13 +6200,17 @@
                 <Component class="DeviceChoice" name="deviceChoice101">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5860,13 +6261,17 @@
                 <Component class="DeviceChoice" name="deviceChoice102">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5917,13 +6322,17 @@
                 <Component class="DeviceChoice" name="deviceChoice103">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -5974,13 +6383,17 @@
                 <Component class="DeviceChoice" name="deviceChoice104">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6031,13 +6444,17 @@
                 <Component class="DeviceChoice" name="deviceChoice105">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6088,13 +6505,17 @@
                 <Component class="DeviceChoice" name="deviceChoice106">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6145,13 +6566,17 @@
                 <Component class="DeviceChoice" name="deviceChoice107">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6202,13 +6627,17 @@
                 <Component class="DeviceChoice" name="deviceChoice108">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6259,13 +6688,17 @@
                 <Component class="DeviceChoice" name="deviceChoice109">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6316,13 +6749,17 @@
                 <Component class="DeviceChoice" name="deviceChoice110">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6373,13 +6810,17 @@
                 <Component class="DeviceChoice" name="deviceChoice111">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6430,13 +6871,17 @@
                 <Component class="DeviceChoice" name="deviceChoice112">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6487,13 +6932,17 @@
                 <Component class="DeviceChoice" name="deviceChoice113">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6544,13 +6993,17 @@
                 <Component class="DeviceChoice" name="deviceChoice114">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6601,13 +7054,17 @@
                 <Component class="DeviceChoice" name="deviceChoice115">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6658,13 +7115,17 @@
                 <Component class="DeviceChoice" name="deviceChoice116">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6715,13 +7176,17 @@
                 <Component class="DeviceChoice" name="deviceChoice117">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6772,13 +7237,17 @@
                 <Component class="DeviceChoice" name="deviceChoice118">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6829,13 +7298,17 @@
                 <Component class="DeviceChoice" name="deviceChoice119">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6886,13 +7359,17 @@
                 <Component class="DeviceChoice" name="deviceChoice120">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -6943,13 +7420,17 @@
                 <Component class="DeviceChoice" name="deviceChoice121">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -7000,13 +7481,17 @@
                 <Component class="DeviceChoice" name="deviceChoice122">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -7057,13 +7542,17 @@
                 <Component class="DeviceChoice" name="deviceChoice123">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -7114,13 +7603,17 @@
                 <Component class="DeviceChoice" name="deviceChoice124">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -7171,13 +7664,17 @@
                 <Component class="DeviceChoice" name="deviceChoice125">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -7228,13 +7725,17 @@
                 <Component class="DeviceChoice" name="deviceChoice126">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -7285,13 +7786,17 @@
                 <Component class="DeviceChoice" name="deviceChoice127">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -7342,13 +7847,17 @@
                 <Component class="DeviceChoice" name="deviceChoice128">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
                     <Property name="identifier" type="java.lang.String" value=""/>
@@ -7399,15 +7908,20 @@
                 <Component class="DeviceChoice" name="deviceChoice129">
                   <Properties>
                     <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
-                      <StringArray count="6">
+                      <StringArray count="10">
                         <StringItem index="0" value="float32"/>
-                        <StringItem index="1" value="float63"/>
-                        <StringItem index="2" value="int16"/>
-                        <StringItem index="3" value="int32"/>
-                        <StringItem index="4" value="uint16"/>
-                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="1" value="float64"/>
+                        <StringItem index="2" value="int8"/>
+                        <StringItem index="3" value="uint8"/>
+                        <StringItem index="4" value="int16"/>
+                        <StringItem index="5" value="uint16"/>
+                        <StringItem index="6" value="int32"/>
+                        <StringItem index="7" value="uint32"/>
+                        <StringItem index="8" value="int64"/>
+                        <StringItem index="9" value="uint64"/>
                       </StringArray>
                     </Property>
+                    <Property name="convert" type="boolean" value="true"/>
                     <Property name="identifier" type="java.lang.String" value=""/>
                     <Property name="labelString" type="java.lang.String" value="Type: "/>
                     <Property name="offsetNid" type="int" value="1298"/>
diff --git a/java/jdevices/src/main/resources/MARTE2_STREAM_IN_ASetup.form b/java/jdevices/src/main/resources/MARTE2_STREAM_IN_ASetup.form
new file mode 100644
index 0000000000..129c4d5d7e
--- /dev/null
+++ b/java/jdevices/src/main/resources/MARTE2_STREAM_IN_ASetup.form
@@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.7" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="deviceProvider" type="java.lang.String" value="localhost:8100"/>
+    <Property name="deviceTitle" type="java.lang.String" value="Async Stream In"/>
+    <Property name="deviceType" type="java.lang.String" value="MARTE2_STREAM_IN_A"/>
+    <Property name="height" type="int" value="400"/>
+    <Property name="width" type="int" value="800"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="2"/>
+  </SyntheticProperties>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,3,45"/>
+  </AuxValues>
+
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+  <SubComponents>
+    <Component class="DeviceButtons" name="deviceButtons1">
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Last"/>
+        </Constraint>
+      </Constraints>
+    </Component>
+    <Container class="javax.swing.JPanel" name="jPanel2">
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="First"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
+        <Property name="columns" type="int" value="1"/>
+        <Property name="rows" type="int" value="3"/>
+      </Layout>
+      <SubComponents>
+        <Container class="javax.swing.JPanel" name="jPanel3">
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+          <SubComponents>
+            <Component class="DeviceField" name="deviceField1">
+              <Properties>
+                <Property name="identifier" type="java.lang.String" value=""/>
+                <Property name="labelString" type="java.lang.String" value="Timebase: "/>
+                <Property name="numCols" type="int" value="25"/>
+                <Property name="offsetNid" type="int" value="3"/>
+              </Properties>
+            </Component>
+            <Component class="DeviceField" name="deviceField2">
+              <Properties>
+                <Property name="identifier" type="java.lang.String" value=""/>
+                <Property name="labelString" type="java.lang.String" value="Timebase div: "/>
+                <Property name="numCols" type="int" value="4"/>
+                <Property name="offsetNid" type="int" value="1560"/>
+              </Properties>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JPanel" name="jPanel4">
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+          <SubComponents>
+            <Component class="DeviceField" name="deviceField3">
+              <Properties>
+                <Property name="identifier" type="java.lang.String" value=""/>
+                <Property name="labelString" type="java.lang.String" value="Num Buffers: "/>
+                <Property name="numCols" type="int" value="6"/>
+                <Property name="offsetNid" type="int" value="7"/>
+              </Properties>
+            </Component>
+            <Component class="DeviceField" name="deviceField4">
+              <Properties>
+                <Property name="identifier" type="java.lang.String" value=""/>
+                <Property name="labelString" type="java.lang.String" value="StackSize: "/>
+                <Property name="offsetNid" type="int" value="13"/>
+              </Properties>
+            </Component>
+            <Component class="DeviceField" name="deviceField5">
+              <Properties>
+                <Property name="identifier" type="java.lang.String" value=""/>
+                <Property name="labelString" type="java.lang.String" value="CPU Mask: "/>
+                <Property name="numCols" type="int" value="6"/>
+                <Property name="offsetNid" type="int" value="10"/>
+              </Properties>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JPanel" name="jPanel13">
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+          <SubComponents>
+            <Component class="DeviceField" name="deviceField30">
+              <Properties>
+                <Property name="identifier" type="java.lang.String" value=""/>
+                <Property name="labelString" type="java.lang.String" value="Output trigger:"/>
+                <Property name="numCols" type="int" value="25"/>
+                <Property name="offsetNid" type="int" value="18"/>
+              </Properties>
+            </Component>
+            <Component class="DeviceField" name="deviceField31">
+              <Properties>
+                <Property name="identifier" type="java.lang.String" value=""/>
+                <Property name="labelString" type="java.lang.String" value="PTS: "/>
+                <Property name="offsetNid" type="int" value="20"/>
+              </Properties>
+            </Component>
+          </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
+    <Container class="javax.swing.JScrollPane" name="jScrollPane1">
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+      <SubComponents>
+        <Container class="javax.swing.JPanel" name="jPanel1">
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
+            <Property name="columns" type="int" value="1"/>
+            <Property name="rows" type="int" value="8"/>
+          </Layout>
+          <SubComponents>
+            <Container class="javax.swing.JPanel" name="jPanel5">
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+              <SubComponents>
+                <Component class="DeviceField" name="deviceField6">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Dimensions: "/>
+                    <Property name="numCols" type="int" value="8"/>
+                    <Property name="offsetNid" type="int" value="28"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceChoice" name="deviceChoice1">
+                  <Properties>
+                    <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
+                      <StringArray count="8">
+                        <StringItem index="0" value="int8"/>
+                        <StringItem index="1" value="uint8"/>
+                        <StringItem index="2" value="int16"/>
+                        <StringItem index="3" value="uint16"/>
+                        <StringItem index="4" value="int32"/>
+                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="6" value="float32"/>
+                        <StringItem index="7" value="float64"/>
+                      </StringArray>
+                    </Property>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Type: "/>
+                    <Property name="offsetNid" type="int" value="26"/>
+                    <Property name="updateIdentifier" type="java.lang.String" value=""/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField7">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Channel: "/>
+                    <Property name="numCols" type="int" value="15"/>
+                    <Property name="offsetNid" type="int" value="35"/>
+                    <Property name="textOnly" type="boolean" value="true"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField8">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Seg. Len: "/>
+                    <Property name="numCols" type="int" value="4"/>
+                    <Property name="offsetNid" type="int" value="29"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+            <Container class="javax.swing.JPanel" name="jPanel6">
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+              <SubComponents>
+                <Component class="DeviceField" name="deviceField9">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Dimensions: "/>
+                    <Property name="numCols" type="int" value="8"/>
+                    <Property name="offsetNid" type="int" value="40"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceChoice" name="deviceChoice2">
+                  <Properties>
+                    <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
+                      <StringArray count="8">
+                        <StringItem index="0" value="int8"/>
+                        <StringItem index="1" value="uint8"/>
+                        <StringItem index="2" value="int16"/>
+                        <StringItem index="3" value="uint16"/>
+                        <StringItem index="4" value="int32"/>
+                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="6" value="float32"/>
+                        <StringItem index="7" value="float64"/>
+                      </StringArray>
+                    </Property>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Type: "/>
+                    <Property name="offsetNid" type="int" value="38"/>
+                    <Property name="updateIdentifier" type="java.lang.String" value=""/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField10">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Channel: "/>
+                    <Property name="numCols" type="int" value="15"/>
+                    <Property name="offsetNid" type="int" value="47"/>
+                    <Property name="textOnly" type="boolean" value="true"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField11">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Seg. Len: "/>
+                    <Property name="numCols" type="int" value="4"/>
+                    <Property name="offsetNid" type="int" value="41"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+            <Container class="javax.swing.JPanel" name="jPanel7">
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+              <SubComponents>
+                <Component class="DeviceField" name="deviceField12">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Dimensions: "/>
+                    <Property name="numCols" type="int" value="8"/>
+                    <Property name="offsetNid" type="int" value="52"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceChoice" name="deviceChoice3">
+                  <Properties>
+                    <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
+                      <StringArray count="8">
+                        <StringItem index="0" value="int8"/>
+                        <StringItem index="1" value="uint8"/>
+                        <StringItem index="2" value="int16"/>
+                        <StringItem index="3" value="uint16"/>
+                        <StringItem index="4" value="int32"/>
+                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="6" value="float32"/>
+                        <StringItem index="7" value="float64"/>
+                      </StringArray>
+                    </Property>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Type: "/>
+                    <Property name="offsetNid" type="int" value="50"/>
+                    <Property name="updateIdentifier" type="java.lang.String" value=""/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField13">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Channel: "/>
+                    <Property name="numCols" type="int" value="15"/>
+                    <Property name="offsetNid" type="int" value="59"/>
+                    <Property name="textOnly" type="boolean" value="true"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField14">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Seg. Len: "/>
+                    <Property name="numCols" type="int" value="4"/>
+                    <Property name="offsetNid" type="int" value="53"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+            <Container class="javax.swing.JPanel" name="jPanel8">
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+              <SubComponents>
+                <Component class="DeviceField" name="deviceField15">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Dimensions: "/>
+                    <Property name="numCols" type="int" value="8"/>
+                    <Property name="offsetNid" type="int" value="64"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceChoice" name="deviceChoice4">
+                  <Properties>
+                    <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
+                      <StringArray count="8">
+                        <StringItem index="0" value="int8"/>
+                        <StringItem index="1" value="uint8"/>
+                        <StringItem index="2" value="int16"/>
+                        <StringItem index="3" value="uint16"/>
+                        <StringItem index="4" value="int32"/>
+                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="6" value="float32"/>
+                        <StringItem index="7" value="float64"/>
+                      </StringArray>
+                    </Property>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Type: "/>
+                    <Property name="offsetNid" type="int" value="62"/>
+                    <Property name="updateIdentifier" type="java.lang.String" value=""/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField16">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Channel: "/>
+                    <Property name="numCols" type="int" value="15"/>
+                    <Property name="offsetNid" type="int" value="71"/>
+                    <Property name="textOnly" type="boolean" value="true"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField17">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Seg. Len: "/>
+                    <Property name="numCols" type="int" value="4"/>
+                    <Property name="offsetNid" type="int" value="65"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+            <Container class="javax.swing.JPanel" name="jPanel9">
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+              <SubComponents>
+                <Component class="DeviceField" name="deviceField18">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Dimensions: "/>
+                    <Property name="numCols" type="int" value="8"/>
+                    <Property name="offsetNid" type="int" value="76"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceChoice" name="deviceChoice5">
+                  <Properties>
+                    <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
+                      <StringArray count="8">
+                        <StringItem index="0" value="int8"/>
+                        <StringItem index="1" value="uint8"/>
+                        <StringItem index="2" value="int16"/>
+                        <StringItem index="3" value="uint16"/>
+                        <StringItem index="4" value="int32"/>
+                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="6" value="float32"/>
+                        <StringItem index="7" value="float64"/>
+                      </StringArray>
+                    </Property>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Type: "/>
+                    <Property name="offsetNid" type="int" value="74"/>
+                    <Property name="updateIdentifier" type="java.lang.String" value=""/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField19">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Channel: "/>
+                    <Property name="numCols" type="int" value="15"/>
+                    <Property name="offsetNid" type="int" value="83"/>
+                    <Property name="textOnly" type="boolean" value="true"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField20">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Seg. Len: "/>
+                    <Property name="numCols" type="int" value="4"/>
+                    <Property name="offsetNid" type="int" value="77"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+            <Container class="javax.swing.JPanel" name="jPanel10">
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+              <SubComponents>
+                <Component class="DeviceField" name="deviceField21">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Dimensions: "/>
+                    <Property name="numCols" type="int" value="8"/>
+                    <Property name="offsetNid" type="int" value="88"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceChoice" name="deviceChoice6">
+                  <Properties>
+                    <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
+                      <StringArray count="8">
+                        <StringItem index="0" value="int8"/>
+                        <StringItem index="1" value="uint8"/>
+                        <StringItem index="2" value="int16"/>
+                        <StringItem index="3" value="uint16"/>
+                        <StringItem index="4" value="int32"/>
+                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="6" value="float32"/>
+                        <StringItem index="7" value="float64"/>
+                      </StringArray>
+                    </Property>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Type: "/>
+                    <Property name="offsetNid" type="int" value="86"/>
+                    <Property name="updateIdentifier" type="java.lang.String" value=""/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField22">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Channel: "/>
+                    <Property name="numCols" type="int" value="15"/>
+                    <Property name="offsetNid" type="int" value="95"/>
+                    <Property name="textOnly" type="boolean" value="true"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField23">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Seg. Len: "/>
+                    <Property name="numCols" type="int" value="4"/>
+                    <Property name="offsetNid" type="int" value="89"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+            <Container class="javax.swing.JPanel" name="jPanel11">
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+              <SubComponents>
+                <Component class="DeviceField" name="deviceField24">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Dimensions: "/>
+                    <Property name="numCols" type="int" value="8"/>
+                    <Property name="offsetNid" type="int" value="100"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceChoice" name="deviceChoice7">
+                  <Properties>
+                    <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
+                      <StringArray count="8">
+                        <StringItem index="0" value="int8"/>
+                        <StringItem index="1" value="uint8"/>
+                        <StringItem index="2" value="int16"/>
+                        <StringItem index="3" value="uint16"/>
+                        <StringItem index="4" value="int32"/>
+                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="6" value="float32"/>
+                        <StringItem index="7" value="float64"/>
+                      </StringArray>
+                    </Property>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Type: "/>
+                    <Property name="offsetNid" type="int" value="98"/>
+                    <Property name="updateIdentifier" type="java.lang.String" value=""/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField25">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Channel: "/>
+                    <Property name="numCols" type="int" value="15"/>
+                    <Property name="offsetNid" type="int" value="107"/>
+                    <Property name="textOnly" type="boolean" value="true"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField26">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Seg. Len: "/>
+                    <Property name="numCols" type="int" value="4"/>
+                    <Property name="offsetNid" type="int" value="101"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+            <Container class="javax.swing.JPanel" name="jPanel12">
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+              <SubComponents>
+                <Component class="DeviceField" name="deviceField27">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Dimensions: "/>
+                    <Property name="numCols" type="int" value="8"/>
+                    <Property name="offsetNid" type="int" value="112"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceChoice" name="deviceChoice8">
+                  <Properties>
+                    <Property name="choiceItems" type="[Ljava.lang.String;" editor="org.netbeans.beaninfo.editors.StringArrayEditor">
+                      <StringArray count="8">
+                        <StringItem index="0" value="int8"/>
+                        <StringItem index="1" value="uint8"/>
+                        <StringItem index="2" value="int16"/>
+                        <StringItem index="3" value="uint16"/>
+                        <StringItem index="4" value="int32"/>
+                        <StringItem index="5" value="uint32"/>
+                        <StringItem index="6" value="float32"/>
+                        <StringItem index="7" value="float64"/>
+                      </StringArray>
+                    </Property>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Type: "/>
+                    <Property name="offsetNid" type="int" value="110"/>
+                    <Property name="updateIdentifier" type="java.lang.String" value=""/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField28">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Channel: "/>
+                    <Property name="numCols" type="int" value="15"/>
+                    <Property name="offsetNid" type="int" value="119"/>
+                    <Property name="textOnly" type="boolean" value="true"/>
+                  </Properties>
+                </Component>
+                <Component class="DeviceField" name="deviceField29">
+                  <Properties>
+                    <Property name="identifier" type="java.lang.String" value=""/>
+                    <Property name="labelString" type="java.lang.String" value="Seg. Len: "/>
+                    <Property name="numCols" type="int" value="4"/>
+                    <Property name="offsetNid" type="int" value="113"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+          </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>
diff --git a/pydevices/RfxDevices/MARTE2_COMPONENT.py b/pydevices/RfxDevices/MARTE2_COMPONENT.py
index 129a706071..f91d408010 100644
--- a/pydevices/RfxDevices/MARTE2_COMPONENT.py
+++ b/pydevices/RfxDevices/MARTE2_COMPONENT.py
@@ -1827,6 +1827,7 @@ def getMarteGamInfo(self, threadMap, gams, dataSources, gamList, typeDicts):
                     mdsReaderText += '        DataExpr = "'+valExpr+'"\n'
                     mdsReaderText += '        TimebaseExpr = "dim_of(' + \
                         valExpr+')"\n'
+                    numberOfElements = 1
                     if not (np.isscalar(nodeDict['dimensions'])):
                         for currDim in nodeDict['dimensions']:
                             numberOfElements *= currDim
@@ -2269,6 +2270,8 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
                 #if startTime != 0:
                 #    dataSourceText += '        SamplePhase = ' + \
                 #        str(int(round(startTime/period)))+'\n'
+                if outputTrigger != None:
+                    dataSourceText += '        TimeSignal = 1\n'
                 dataSourceText += '      }\n'
 
             outIdx = 0
diff --git a/pydevices/RfxDevices/MARTE2_STREAM_IN_A.py b/pydevices/RfxDevices/MARTE2_STREAM_IN_A.py
index c2b1bc8be7..56e0bf132d 100644
--- a/pydevices/RfxDevices/MARTE2_STREAM_IN_A.py
+++ b/pydevices/RfxDevices/MARTE2_STREAM_IN_A.py
@@ -33,7 +33,7 @@ class MARTE2_STREAM_IN_A(MC.MARTE2_COMPONENT):
     outputs = []
     for i in range(128):
         outputs.append(
-            {'name': 'Out'+format(i+1, '03d'), 'type': 'float32', 'dimensions': 0, 'parameters': [
+            {'name': 'Out'+format(i+1, '03d'), 'type': 'float32', 'dimensions': -1, 'parameters': [
                 {'name': 'Channel', 'type': 'string', 'value': 'CH'+format(i+1, '03d')}]})
     parameters = [
         {'name': 'NumberOfBuffers', 'type': 'int32', 'value': 100},