You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2023/08/29 12:31:42 UTC

[plc4x] branch feature/iec-60870-5-104 created (now 9cafc2f9f0)

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a change to branch feature/iec-60870-5-104
in repository https://gitbox.apache.org/repos/asf/plc4x.git


      at 9cafc2f9f0 feat(plc4j/iec-60870): Finished implementing the decoding of most of the datatypes as well as the timestamp handling

This branch includes the following new commits:

     new 9cafc2f9f0 feat(plc4j/iec-60870): Finished implementing the decoding of most of the datatypes as well as the timestamp handling

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[plc4x] 01/01: feat(plc4j/iec-60870): Finished implementing the decoding of most of the datatypes as well as the timestamp handling

Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/iec-60870-5-104
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 9cafc2f9f03b80981d755e7454a8d4d1e2268946
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Tue Aug 29 14:31:32 2023 +0200

    feat(plc4j/iec-60870): Finished implementing the decoding of most of the datatypes as well as the timestamp handling
---
 .../org/apache/plc4x/java/api/value/PlcValue.java  |    6 +
 plc4j/drivers/iec-60870/pom.xml                    |    4 +
 .../plc4x/java/iec608705104/readwrite/ASDU.java    |    4 +-
 .../iec608705104/readwrite/InformationObject.java  |  371 +-
 .../InformationObjectWithSevenByteTime.java        |  230 +
 ...jectWithSevenByteTime_BITSTRING_OF_32_BIT.java} |   48 +-
 ...ithSevenByteTime_DOUBLE_POINT_INFORMATION.java} |   48 +-
 ...venByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java} |   54 +-
 ...ObjectWithSevenByteTime_INTEGRATED_TOTALS.java} |   50 +-
 ...nByteTime_MEASURED_VALUE_NORMALISED_VALUE.java} |   55 +-
 ...SevenByteTime_MEASURED_VALUE_SCALED_VALUE.java} |   54 +-
 ...EASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} |   53 +-
 ...RCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java} |   48 +-
 ...CKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java} |   57 +-
 ...ithSevenByteTime_SINGLE_POINT_INFORMATION.java} |   48 +-
 ...thSevenByteTime_STEP_POSITION_INFORMATION.java} |   49 +-
 .../InformationObjectWithTreeByteTime.java         |  226 +
 ...bjectWithTreeByteTime_BITSTRING_OF_32_BIT.java} |   49 +-
 ...WithTreeByteTime_DOUBLE_POINT_INFORMATION.java} |   49 +-
 ...reeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java} |   48 +-
 ...nObjectWithTreeByteTime_INTEGRATED_TOTALS.java} |   48 +-
 ...eByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java} |   48 +-
 ...hTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java} |   50 +-
 ...EASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} |   48 +-
 ...RCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java} |   53 +-
 ...CKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java} |   48 +-
 ...WithTreeByteTime_SINGLE_POINT_INFORMATION.java} |   49 +-
 ...ithTreeByteTime_STEP_POSITION_INFORMATION.java} |   48 +-
 .../readwrite/InformationObjectWithoutTime.java    |  355 ++
 ...ionObjectWithoutTime_ACK_FILE_ACK_SECTION.java} |   44 +-
 ...bjectWithoutTime_BITSTRING_32_BIT_COMMAND.java} |   48 +-
 ...tionObjectWithoutTime_BITSTRING_OF_32_BIT.java} |   44 +-
 ...ECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java} |   56 +-
 ...WithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java} |   47 +-
 ...WithoutTime_COUNTER_INTERROGATION_COMMAND.java} |   47 +-
 ...jectWithoutTime_DELAY_ACQUISITION_COMMAND.java} |   48 +-
 ...=> InformationObjectWithoutTime_DIRECTORY.java} |   42 +-
 ...formationObjectWithoutTime_DOUBLE_COMMAND.java} |   43 +-
 ...bjectWithoutTime_DOUBLE_POINT_INFORMATION.java} |   48 +-
 ...onObjectWithoutTime_END_OF_INITIALISATION.java} |   46 +-
 ...> InformationObjectWithoutTime_FILE_READY.java} |   42 +-
 ...mationObjectWithoutTime_INTEGRATED_TOTALS.java} |   44 +-
 ...onObjectWithoutTime_INTERROGATION_COMMAND.java} |   46 +-
 ...jectWithoutTime_LAST_SECTION_LAST_SEGMENT.java} |   48 +-
 ...thoutTime_MEASURED_VALUE_NORMALISED_VALUE.java} |   47 +-
 ...RMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java} |   52 +-
 ...ctWithoutTime_MEASURED_VALUE_SCALED_VALUE.java} |   46 +-
 ...EASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} |   55 +-
 ..._INFORMATION_WITH_STATUS_CHANGE_DETECTION.java} |   52 +-
 ...ionObjectWithoutTime_PARAMETER_ACTIVATION.java} |   46 +-
 ...METER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java} |   55 +-
 ...PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java} |   55 +-
 ...ASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java} |   52 +-
 ...InformationObjectWithoutTime_READ_COMMAND.java} |   42 +-
 ...ObjectWithoutTime_REGULATING_STEP_COMMAND.java} |   47 +-
 ...onObjectWithoutTime_RESET_PROCESS_COMMAND.java} |   46 +-
 ...nformationObjectWithoutTime_SECTION_READY.java} |   43 +-
 ...a => InformationObjectWithoutTime_SEGMENT.java} |   42 +-
 ...utTime_SET_POINT_COMMAND_NORMALISED_VALUE.java} |   48 +-
 ...ithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java} |   47 +-
 ...POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java} |   54 +-
 ...formationObjectWithoutTime_SINGLE_COMMAND.java} |   43 +-
 ...bjectWithoutTime_SINGLE_POINT_INFORMATION.java} |   48 +-
 ...jectWithoutTime_STEP_POSITION_INFORMATION.java} |   46 +-
 ...InformationObjectWithoutTime_TEST_COMMAND.java} |   42 +-
 ...OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java |  132 -
 ...ct_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java |  126 -
 ...SED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java |  138 -
 ...LED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java |  137 -
 ...NT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java |  144 -
 ...TING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java |  126 -
 ...ct_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java |  126 -
 ...ject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java |  126 -
 .../readwrite/SevenOctetBinaryTime.java            |  328 +-
 .../readwrite/ThreeOctetBinaryTime.java            |  102 +-
 .../iec608705104/readwrite/TwoOctetBinaryTime.java |   40 +-
 .../iec608705104/readwrite/TypeIdentification.java |  165 +-
 .../readwrite/Iec60870514PlcDriver.java            |   10 -
 .../readwrite/protocol/Iec608705104Protocol.java   |   75 +
 .../readwrite/protocol/Iec608705104TagParser.java  |  526 ++
 .../readwrite/tag/Iec608705104Tag.java             |   61 +
 .../IEC608705104ParserSerializerTest.java          |    2 +-
 .../org/apache/plc4x/java/spi/values/PlcNull.java  |   15 +
 .../plc4x/java/spi/values/PlcValueAdapter.java     |   28 +-
 .../protocols/iec608705104/iec-60870-5-104.mspec   |  696 +-
 .../protocols/iec608705104/IEC-60870-5-104.xml     | 6636 ++++++++++++--------
 86 files changed, 7785 insertions(+), 5953 deletions(-)

diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/value/PlcValue.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/value/PlcValue.java
index e5436aad4a..914a43c4ed 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/value/PlcValue.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/value/PlcValue.java
@@ -149,4 +149,10 @@ public interface PlcValue {
 
     Map<String, ? extends PlcValue> getStruct();
 
+    Map<String, PlcValue> getMetaData();
+
+    boolean hasMetaData(String key);
+
+    PlcValue getMetaData(String key);
+
 }
diff --git a/plc4j/drivers/iec-60870/pom.xml b/plc4j/drivers/iec-60870/pom.xml
index e5c206ba23..db89bbef38 100644
--- a/plc4j/drivers/iec-60870/pom.xml
+++ b/plc4j/drivers/iec-60870/pom.xml
@@ -141,6 +141,10 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x</groupId>
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ASDU.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ASDU.java
index 698be607d6..c5d9b7e956 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ASDU.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ASDU.java
@@ -288,7 +288,9 @@ public class ASDU implements Message {
             new DataReaderComplexDefault<>(
                 () ->
                     InformationObject.staticParse(
-                        readBuffer, (TypeIdentification) (typeIdentification)),
+                        readBuffer,
+                        (TypeIdentification) (typeIdentification),
+                        (byte) (typeIdentification.getNumTimeBytes())),
                 readBuffer),
             numberOfObjects,
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject.java
index d08b0ad14c..ed5974b7f7 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject.java
@@ -38,7 +38,7 @@ import org.apache.plc4x.java.spi.generation.*;
 public abstract class InformationObject implements Message {
 
   // Abstract accessors for discriminator values.
-  public abstract TypeIdentification getTypeIdentification();
+  public abstract Byte getNumTimeByte();
 
   // Properties.
   protected final int address;
@@ -95,9 +95,9 @@ public abstract class InformationObject implements Message {
   public static InformationObject staticParse(ReadBuffer readBuffer, Object... args)
       throws ParseException {
     PositionAware positionAware = readBuffer;
-    if ((args == null) || (args.length != 1)) {
+    if ((args == null) || (args.length != 2)) {
       throw new PlcRuntimeException(
-          "Wrong number of arguments, expected 1, but got " + args.length);
+          "Wrong number of arguments, expected 2, but got " + args.length);
     }
     TypeIdentification typeIdentification;
     if (args[0] instanceof TypeIdentification) {
@@ -110,11 +110,22 @@ public abstract class InformationObject implements Message {
               + " was "
               + args[0].getClass().getName());
     }
-    return staticParse(readBuffer, typeIdentification);
+    Byte numTimeByte;
+    if (args[1] instanceof Byte) {
+      numTimeByte = (Byte) args[1];
+    } else if (args[1] instanceof String) {
+      numTimeByte = Byte.valueOf((String) args[1]);
+    } else {
+      throw new PlcRuntimeException(
+          "Argument 1 expected to be of type Byte or a string which is parseable but was "
+              + args[1].getClass().getName());
+    }
+    return staticParse(readBuffer, typeIdentification, numTimeByte);
   }
 
   public static InformationObject staticParse(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
     readBuffer.pullContext("InformationObject");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -127,353 +138,25 @@ public abstract class InformationObject implements Message {
 
     // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
     InformationObjectBuilder builder = null;
-    if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION)) {
-      builder =
-          InformationObject_SINGLE_POINT_INFORMATION.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION)) {
-      builder =
-          InformationObject_DOUBLE_POINT_INFORMATION.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.STEP_POSITION_INFORMATION)) {
-      builder =
-          InformationObject_STEP_POSITION_INFORMATION.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.STEP_POSITION_INFORMATION_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT)) {
-      builder =
-          InformationObject_BITSTRING_OF_32_BIT.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE)) {
-      builder =
-          InformationObject_MEASURED_VALUE_NORMALISED_VALUE.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.MEASURED_VALUE_SCALED_VALUE)) {
-      builder =
-          InformationObject_MEASURED_VALUE_SCALED_VALUE.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG)) {
-      builder =
-          InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) {
-      builder =
-          InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.INTEGRATED_TOTALS)) {
-      builder =
-          InformationObject_INTEGRATED_TOTALS.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.INTEGRATED_TOTALS_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification
-            .PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
-      builder =
-          InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)) {
-      builder =
-          InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR)) {
-      builder =
-          InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification
-            .PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SINGLE_COMMAND)) {
-      builder =
-          InformationObject_SINGLE_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.DOUBLE_COMMAND)) {
-      builder =
-          InformationObject_DOUBLE_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.REGULATING_STEP_COMMAND)) {
-      builder =
-          InformationObject_REGULATING_STEP_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.SET_POINT_COMMAND_NORMALISED_VALUE)) {
-      builder =
-          InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.SET_POINT_COMMAND_SCALED_VALUE)) {
-      builder =
-          InformationObject_SET_POINT_COMMAND_SCALED_VALUE.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER)) {
-      builder =
-          InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.BITSTRING_32_BIT_COMMAND)) {
-      builder =
-          InformationObject_BITSTRING_32_BIT_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification
-            .MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.END_OF_INITIALISATION)) {
-      builder =
-          InformationObject_END_OF_INITIALISATION.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.INTERROGATION_COMMAND)) {
-      builder =
-          InformationObject_INTERROGATION_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.COUNTER_INTERROGATION_COMMAND)) {
-      builder =
-          InformationObject_COUNTER_INTERROGATION_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.READ_COMMAND)) {
-      builder =
-          InformationObject_READ_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.CLOCK_SYNCHRONISATION_COMMAND)) {
-      builder =
-          InformationObject_CLOCK_SYNCHRONISATION_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.TEST_COMMAND)) {
-      builder =
-          InformationObject_TEST_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.RESET_PROCESS_COMMAND)) {
-      builder =
-          InformationObject_RESET_PROCESS_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.DELAY_ACQUISITION_COMMAND)) {
-      builder =
-          InformationObject_DELAY_ACQUISITION_COMMAND.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      builder =
-          InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE)) {
-      builder =
-          InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE)) {
-      builder =
-          InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification,
-        TypeIdentification.PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER)) {
-      builder =
-          InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.PARAMETER_ACTIVATION)) {
-      builder =
-          InformationObject_PARAMETER_ACTIVATION.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.FILE_READY)) {
-      builder =
-          InformationObject_FILE_READY.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SECTION_READY)) {
-      builder =
-          InformationObject_SECTION_READY.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION)) {
-      builder =
-          InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
-              .staticParseInformationObjectBuilder(readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.LAST_SECTION_LAST_SEGMENT)) {
-      builder =
-          InformationObject_LAST_SECTION_LAST_SEGMENT.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(
-        typeIdentification, TypeIdentification.ACK_FILE_ACK_SECTION)) {
+    if (EvaluationHelper.equals(numTimeByte, (byte) 0)) {
       builder =
-          InformationObject_ACK_FILE_ACK_SECTION.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SEGMENT)) {
+          InformationObjectWithoutTime.staticParseInformationObjectBuilder(
+              readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(numTimeByte, (byte) 3)) {
       builder =
-          InformationObject_SEGMENT.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
-    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.DIRECTORY)) {
+          InformationObjectWithTreeByteTime.staticParseInformationObjectBuilder(
+              readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(numTimeByte, (byte) 7)) {
       builder =
-          InformationObject_DIRECTORY.staticParseInformationObjectBuilder(
-              readBuffer, typeIdentification);
+          InformationObjectWithSevenByteTime.staticParseInformationObjectBuilder(
+              readBuffer, typeIdentification, numTimeByte);
     }
     if (builder == null) {
       throw new ParseException(
           "Unsupported case for discriminated type"
               + " parameters ["
-              + "typeIdentification="
-              + typeIdentification
+              + "numTimeByte="
+              + numTimeByte
               + "]");
     }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime.java
new file mode 100644
index 0000000000..f32fe7cbd3
--- /dev/null
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime.java
@@ -0,0 +1,230 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.iec608705104.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public abstract class InformationObjectWithSevenByteTime extends InformationObject
+    implements Message {
+
+  // Accessors for discriminator values.
+  public Byte getNumTimeByte() {
+    return (byte) 7;
+  }
+
+  // Abstract accessors for discriminator values.
+  public abstract TypeIdentification getTypeIdentification();
+
+  public InformationObjectWithSevenByteTime(int address) {
+    super(address);
+  }
+
+  public abstract SevenOctetBinaryTime getCp56Time2a();
+
+  protected abstract void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
+      throws SerializationException;
+
+  @Override
+  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime");
+
+    // Switch field (Serialize the sub-type)
+    serializeInformationObjectWithSevenByteTimeChild(writeBuffer);
+
+    writeBuffer.popContext("InformationObjectWithSevenByteTime");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    InformationObjectWithSevenByteTime _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Length of sub-type elements will be added by sub-type...
+
+    return lengthInBits;
+  }
+
+  public static InformationObjectBuilder staticParseInformationObjectBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+    InformationObjectWithSevenByteTimeBuilder builder = null;
+    if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_INTEGRATED_TOTALS
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification
+            .PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
+      builder =
+          InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
+              .staticParseInformationObjectWithSevenByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    }
+    if (builder == null) {
+      throw new ParseException(
+          "Unsupported case for discriminated type"
+              + " parameters ["
+              + "typeIdentification="
+              + typeIdentification
+              + "]");
+    }
+
+    readBuffer.closeContext("InformationObjectWithSevenByteTime");
+    // Create the instance
+    return new InformationObjectWithSevenByteTimeBuilderImpl(builder);
+  }
+
+  public interface InformationObjectWithSevenByteTimeBuilder {
+    InformationObjectWithSevenByteTime build(int address);
+  }
+
+  public static class InformationObjectWithSevenByteTimeBuilderImpl
+      implements InformationObject.InformationObjectBuilder {
+    private final InformationObjectWithSevenByteTimeBuilder builder;
+
+    public InformationObjectWithSevenByteTimeBuilderImpl(
+        InformationObjectWithSevenByteTimeBuilder builder) {
+      this.builder = builder;
+    }
+
+    public InformationObjectWithSevenByteTime build(int address) {
+      return builder.build(address);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof InformationObjectWithSevenByteTime)) {
+      return false;
+    }
+    InformationObjectWithSevenByteTime that = (InformationObjectWithSevenByteTime) o;
+    return super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT.java
similarity index 75%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT.java
index 58e0d3af2c..cd1574c5f6 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
   protected final QualityDescriptor qds;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT(
       int address,
       BinaryStateInformation bsi,
       QualityDescriptor qds,
@@ -72,11 +72,11 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT");
 
     // Simple Field (bsi)
     writeSimpleField(
@@ -99,7 +99,7 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext("InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT");
   }
 
   @Override
@@ -110,7 +110,7 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (bsi)
@@ -125,9 +125,11 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -152,31 +154,31 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext("InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT");
     // Create the instance
-    return new InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_BITSTRING_OF_32_BITBuilderImpl(
         bsi, qds, cp56Time2a);
   }
 
-  public static class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithSevenByteTime_BITSTRING_OF_32_BITBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final BinaryStateInformation bsi;
     private final QualityDescriptor qds;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_BITSTRING_OF_32_BITBuilderImpl(
         BinaryStateInformation bsi, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) {
       this.bsi = bsi;
       this.qds = qds;
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
-          informationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT build(int address) {
+      InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT
+          informationObjectWithSevenByteTime_BITSTRING_OF_32_BIT =
+              new InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT(
                   address, bsi, qds, cp56Time2a);
-      return informationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_BITSTRING_OF_32_BIT;
     }
   }
 
@@ -185,11 +187,11 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o instanceof InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT)) {
       return false;
     }
-    InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT that =
+        (InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT) o;
     return (getBsi() == that.getBsi())
         && (getQds() == that.getQds())
         && (getCp56Time2a() == that.getCp56Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION.java
index 52eaf71965..74a2f61174 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
   protected final DoublePointInformation diq;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION(
       int address, DoublePointInformation diq, SevenOctetBinaryTime cp56Time2a) {
     super(address);
     this.diq = diq;
@@ -63,11 +63,11 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION");
 
     // Simple Field (diq)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext("InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (diq)
@@ -106,9 +106,11 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,29 +128,29 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext("InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION");
     // Create the instance
-    return new InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl(
         diq, cp56Time2a);
   }
 
-  public static class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final DoublePointInformation diq;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl(
         DoublePointInformation diq, SevenOctetBinaryTime cp56Time2a) {
       this.diq = diq;
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-          informationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION build(int address) {
+      InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION
+          informationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION =
+              new InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION(
                   address, diq, cp56Time2a);
-      return informationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION;
     }
   }
 
@@ -157,11 +159,11 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o instanceof InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION)) {
       return false;
     }
-    InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION that =
+        (InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION) o;
     return (getDiq() == that.getDiq())
         && (getCp56Time2a() == that.getCp56Time2a())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java
similarity index 70%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java
index dd1f6d4fc0..6ab2be7e8a 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56T
   protected final TwoOctetBinaryTime cp16Time2a;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT(
       int address, TwoOctetBinaryTime cp16Time2a, SevenOctetBinaryTime cp56Time2a) {
     super(address);
     this.cp16Time2a = cp16Time2a;
@@ -63,12 +63,11 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56T
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext(
-        "InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT");
 
     // Simple Field (cp16Time2a)
     writeSimpleField(
@@ -84,8 +83,7 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56T
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext(
-        "InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext("InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT");
   }
 
   @Override
@@ -96,7 +94,7 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56T
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (cp16Time2a)
@@ -108,10 +106,11 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56T
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext(
-        "InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -129,32 +128,29 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56T
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext(
-        "InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext("InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT");
     // Create the instance
-    return new InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl(
         cp16Time2a, cp56Time2a);
   }
 
-  public static
-  class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final TwoOctetBinaryTime cp16Time2a;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl(
         TwoOctetBinaryTime cp16Time2a, SevenOctetBinaryTime cp56Time2a) {
       this.cp16Time2a = cp16Time2a;
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A build(
-        int address) {
-      InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-          informationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT build(int address) {
+      InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT
+          informationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT =
+              new InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT(
                   address, cp16Time2a, cp56Time2a);
-      return informationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT;
     }
   }
 
@@ -163,11 +159,11 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56T
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o instanceof InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT)) {
       return false;
     }
-    InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT that =
+        (InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT) o;
     return (getCp16Time2a() == that.getCp16Time2a())
         && (getCp56Time2a() == that.getCp56Time2a())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_INTEGRATED_TOTALS.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_INTEGRATED_TOTALS.java
index 5e903ec3cb..a59939472b 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_INTEGRATED_TOTALS.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extends InformationObject
-    implements Message {
+public class InformationObjectWithSevenByteTime_INTEGRATED_TOTALS
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extend
   protected final BinaryCounterReading bcr;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_INTEGRATED_TOTALS(
       int address, BinaryCounterReading bcr, SevenOctetBinaryTime cp56Time2a) {
     super(address);
     this.bcr = bcr;
@@ -63,11 +63,11 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extend
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime_INTEGRATED_TOTALS");
 
     // Simple Field (bcr)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extend
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext("InformationObjectWithSevenByteTime_INTEGRATED_TOTALS");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extend
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_INTEGRATED_TOTALS _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (bcr)
@@ -106,9 +106,11 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extend
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime_INTEGRATED_TOTALS");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,29 +128,27 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extend
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext("InformationObjectWithSevenByteTime_INTEGRATED_TOTALS");
     // Create the instance
-    return new InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
-        bcr, cp56Time2a);
+    return new InformationObjectWithSevenByteTime_INTEGRATED_TOTALSBuilderImpl(bcr, cp56Time2a);
   }
 
-  public static class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithSevenByteTime_INTEGRATED_TOTALSBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final BinaryCounterReading bcr;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_INTEGRATED_TOTALSBuilderImpl(
         BinaryCounterReading bcr, SevenOctetBinaryTime cp56Time2a) {
       this.bcr = bcr;
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A
-          informationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A(
-                  address, bcr, cp56Time2a);
-      return informationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A;
+    public InformationObjectWithSevenByteTime_INTEGRATED_TOTALS build(int address) {
+      InformationObjectWithSevenByteTime_INTEGRATED_TOTALS
+          informationObjectWithSevenByteTime_INTEGRATED_TOTALS =
+              new InformationObjectWithSevenByteTime_INTEGRATED_TOTALS(address, bcr, cp56Time2a);
+      return informationObjectWithSevenByteTime_INTEGRATED_TOTALS;
     }
   }
 
@@ -157,11 +157,11 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extend
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o instanceof InformationObjectWithSevenByteTime_INTEGRATED_TOTALS)) {
       return false;
     }
-    InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_INTEGRATED_TOTALS that =
+        (InformationObjectWithSevenByteTime_INTEGRATED_TOTALS) o;
     return (getBcr() == that.getBcr())
         && (getCp56Time2a() == that.getCp56Time2a())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE.java
similarity index 72%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE.java
index 9cda1ef918..d9777474a1 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP5
   protected final QualityDescriptor qds;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE(
       int address, NormalizedValue nva, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) {
     super(address);
     this.nva = nva;
@@ -69,12 +69,11 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP5
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext(
-        "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE");
 
     // Simple Field (nva)
     writeSimpleField(
@@ -97,8 +96,7 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP5
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext(
-        "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE");
   }
 
   @Override
@@ -109,7 +107,7 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP5
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nva)
@@ -124,10 +122,11 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP5
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext(
-        "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -152,34 +151,31 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP5
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext(
-        "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl(
         nva, qds, cp56Time2a);
   }
 
-  public static
-  class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final NormalizedValue nva;
     private final QualityDescriptor qds;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl(
         NormalizedValue nva, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) {
       this.nva = nva;
       this.qds = qds;
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A build(
-        int address) {
-      InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A
-          informationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE build(int address) {
+      InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE
+          informationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE =
+              new InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE(
                   address, nva, qds, cp56Time2a);
-      return informationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE;
     }
   }
 
@@ -188,12 +184,11 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP5
     if (this == o) {
       return true;
     }
-    if (!(o
-        instanceof InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o instanceof InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE that =
+        (InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE) o;
     return (getNva() == that.getNva())
         && (getQds() == that.getQds())
         && (getCp56Time2a() == that.getCp56Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE.java
similarity index 73%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE.java
index 432540a227..176e20ae5e 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIM
   protected final QualityDescriptor qds;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE(
       int address, ScaledValue sva, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) {
     super(address);
     this.sva = sva;
@@ -69,12 +69,11 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIM
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext(
-        "InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE");
 
     // Simple Field (sva)
     writeSimpleField(
@@ -97,8 +96,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIM
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext(
-        "InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE");
   }
 
   @Override
@@ -109,7 +107,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIM
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (sva)
@@ -124,10 +122,11 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIM
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext(
-        "InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -151,34 +150,31 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIM
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext(
-        "InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl(
         sva, qds, cp56Time2a);
   }
 
-  public static
-  class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final ScaledValue sva;
     private final QualityDescriptor qds;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl(
         ScaledValue sva, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) {
       this.sva = sva;
       this.qds = qds;
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A build(
-        int address) {
-      InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A
-          informationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE build(int address) {
+      InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE
+          informationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE =
+              new InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE(
                   address, sva, qds, cp56Time2a);
-      return informationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE;
     }
   }
 
@@ -187,11 +183,11 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIM
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o instanceof InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE that =
+        (InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE) o;
     return (getSva() == that.getSva())
         && (getQds() == that.getQds())
         && (getCp56Time2a() == that.getCp56Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
similarity index 72%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
index c94b7a4639..7b4bcc751b 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
   protected final QualityDescriptor qds;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(
       int address, float value, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) {
     super(address);
     this.value = value;
@@ -69,12 +69,12 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A");
+        "InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
 
     // Simple Field (value)
     writeSimpleField(
@@ -98,7 +98,7 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     writeBuffer.popContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A");
+        "InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
   }
 
   @Override
@@ -109,8 +109,7 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A _value =
-        this;
+    InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (value)
@@ -125,10 +124,12 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
     readBuffer.pullContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A");
+        "InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -151,34 +152,33 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     readBuffer.closeContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A");
+        "InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         value, qds, cp56Time2a);
   }
 
   public static
-  class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  class InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final float value;
     private final QualityDescriptor qds;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         float value, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) {
       this.value = value;
       this.qds = qds;
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A
-        build(int address) {
-      InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A
-          informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER build(
+        int address) {
+      InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+          informationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER =
+              new InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(
                   address, value, qds, cp56Time2a);
-      return informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER;
     }
   }
 
@@ -188,12 +188,11 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
       return true;
     }
     if (!(o
-        instanceof
-        InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A)) {
+        instanceof InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER that =
+        (InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) o;
     return (getValue() == that.getValue())
         && (getQds() == that.getQds())
         && (getCp56Time2a() == that.getCp56Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java
similarity index 75%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java
index 63a42d1d18..b02bea929c 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java
@@ -36,8 +36,8 @@ import org.apache.plc4x.java.spi.generation.*;
 // Code generated by code-generation. DO NOT EDIT.
 
 public
-class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+class InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -52,7 +52,7 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
   protected final SevenOctetBinaryTime cp56Time2a;
 
   public
-  InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A(
+  InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT(
       int address,
       OutputCircuitInformation oci,
       QualityDescriptorForPointsOfProtectionEquipment qdp,
@@ -82,12 +82,12 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext(
-        "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+        "InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT");
 
     // Simple Field (oci)
     writeSimpleField(
@@ -118,7 +118,7 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     writeBuffer.popContext(
-        "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+        "InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT");
   }
 
   @Override
@@ -129,7 +129,7 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
+    InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
         _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -148,10 +148,12 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
     readBuffer.pullContext(
-        "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+        "InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -185,22 +187,22 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     readBuffer.closeContext(
-        "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+        "InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT");
     // Create the instance
-    return new InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl(
         oci, qdp, cp16Time2a, cp56Time2a);
   }
 
   public static
-  class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  class InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final OutputCircuitInformation oci;
     private final QualityDescriptorForPointsOfProtectionEquipment qdp;
     private final TwoOctetBinaryTime cp16Time2a;
     private final SevenOctetBinaryTime cp56Time2a;
 
     public
-    InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl(
         OutputCircuitInformation oci,
         QualityDescriptorForPointsOfProtectionEquipment qdp,
         TwoOctetBinaryTime cp16Time2a,
@@ -212,13 +214,13 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
     }
 
     public
-    InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
+    InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
         build(int address) {
-      InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-          informationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A(
+      InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
+          informationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT =
+              new InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT(
                   address, oci, qdp, cp16Time2a, cp56Time2a);
-      return informationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT;
     }
   }
 
@@ -229,12 +231,12 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
     }
     if (!(o
         instanceof
-        InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
+        InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT)) {
       return false;
     }
-    InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
+    InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
         that =
-            (InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)
+            (InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT)
                 o;
     return (getOci() == that.getOci())
         && (getQdp() == that.getQdp())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java
similarity index 74%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java
index 23d145a21b..d29250d63f 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -49,7 +49,7 @@ public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
   protected final TwoOctetBinaryTime cp16Time2a;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT(
       int address,
       SingleEventOfProtectionEquipment sep,
       QualityDescriptorForPointsOfProtectionEquipment qdp,
@@ -79,11 +79,12 @@ public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext(
+        "InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT");
 
     // Simple Field (sep)
     writeSimpleField(
@@ -113,7 +114,8 @@ public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext(
+        "InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT");
   }
 
   @Override
@@ -124,7 +126,7 @@ public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (sep)
@@ -142,9 +144,12 @@ public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext(
+        "InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -177,20 +182,23 @@ public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext(
+        "InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT");
     // Create the instance
-    return new InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl(
         sep, qdp, cp16Time2a, cp56Time2a);
   }
 
-  public static class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static
+  class InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final SingleEventOfProtectionEquipment sep;
     private final QualityDescriptorForPointsOfProtectionEquipment qdp;
     private final TwoOctetBinaryTime cp16Time2a;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public
+    InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl(
         SingleEventOfProtectionEquipment sep,
         QualityDescriptorForPointsOfProtectionEquipment qdp,
         TwoOctetBinaryTime cp16Time2a,
@@ -201,12 +209,13 @@ public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
-          informationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT build(
+        int address) {
+      InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT
+          informationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT =
+              new InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT(
                   address, sep, qdp, cp16Time2a, cp56Time2a);
-      return informationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT;
     }
   }
 
@@ -215,11 +224,13 @@ public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o
+        instanceof
+        InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT)) {
       return false;
     }
-    InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT that =
+        (InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT) o;
     return (getSep() == that.getSep())
         && (getQdp() == that.getQdp())
         && (getCp16Time2a() == that.getCp16Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION.java
index 4c2228bc26..ea806686ad 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
   protected final SinglePointInformation siq;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION(
       int address, SinglePointInformation siq, SevenOctetBinaryTime cp56Time2a) {
     super(address);
     this.siq = siq;
@@ -63,11 +63,11 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION");
 
     // Simple Field (siq)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext("InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (siq)
@@ -106,9 +106,11 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,29 +128,29 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext("InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION");
     // Create the instance
-    return new InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATIONBuilderImpl(
         siq, cp56Time2a);
   }
 
-  public static class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATIONBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final SinglePointInformation siq;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATIONBuilderImpl(
         SinglePointInformation siq, SevenOctetBinaryTime cp56Time2a) {
       this.siq = siq;
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-          informationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION build(int address) {
+      InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION
+          informationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION =
+              new InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION(
                   address, siq, cp56Time2a);
-      return informationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION;
     }
   }
 
@@ -157,11 +159,11 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o instanceof InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION)) {
       return false;
     }
-    InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION that =
+        (InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION) o;
     return (getSiq() == that.getSiq())
         && (getCp56Time2a() == that.getCp56Time2a())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION.java
similarity index 74%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION.java
index 0d8ac8cdc5..4eacb0fc46 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
+public class InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION
+    extends InformationObjectWithSevenByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2
   protected final QualityDescriptor qds;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A(
+  public InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION(
       int address,
       ValueWithTransientStateIndication vti,
       QualityDescriptor qds,
@@ -72,11 +72,11 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.pushContext("InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION");
 
     // Simple Field (vti)
     writeSimpleField(
@@ -99,7 +99,7 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    writeBuffer.popContext("InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION");
   }
 
   @Override
@@ -110,7 +110,7 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A _value = this;
+    InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (vti)
@@ -125,9 +125,11 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+  public static InformationObjectWithSevenByteTimeBuilder
+      staticParseInformationObjectWithSevenByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -152,20 +154,19 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A");
+    readBuffer.closeContext("InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION");
     // Create the instance
-    return new InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    return new InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATIONBuilderImpl(
         vti, qds, cp56Time2a);
   }
 
-  public static
-  class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATIONBuilderImpl
+      implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder {
     private final ValueWithTransientStateIndication vti;
     private final QualityDescriptor qds;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl(
+    public InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATIONBuilderImpl(
         ValueWithTransientStateIndication vti,
         QualityDescriptor qds,
         SevenOctetBinaryTime cp56Time2a) {
@@ -174,12 +175,12 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A
-          informationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A(
+    public InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION build(int address) {
+      InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION
+          informationObjectWithSevenByteTime_STEP_POSITION_INFORMATION =
+              new InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION(
                   address, vti, qds, cp56Time2a);
-      return informationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A;
+      return informationObjectWithSevenByteTime_STEP_POSITION_INFORMATION;
     }
   }
 
@@ -188,11 +189,11 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) {
+    if (!(o instanceof InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION)) {
       return false;
     }
-    InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A) o;
+    InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION that =
+        (InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION) o;
     return (getVti() == that.getVti())
         && (getQds() == that.getQds())
         && (getCp56Time2a() == that.getCp56Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime.java
new file mode 100644
index 0000000000..cd85315749
--- /dev/null
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime.java
@@ -0,0 +1,226 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.iec608705104.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public abstract class InformationObjectWithTreeByteTime extends InformationObject
+    implements Message {
+
+  // Accessors for discriminator values.
+  public Byte getNumTimeByte() {
+    return (byte) 3;
+  }
+
+  // Abstract accessors for discriminator values.
+  public abstract TypeIdentification getTypeIdentification();
+
+  public InformationObjectWithTreeByteTime(int address) {
+    super(address);
+  }
+
+  public abstract ThreeOctetBinaryTime getCp24Time2a();
+
+  protected abstract void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
+      throws SerializationException;
+
+  @Override
+  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime");
+
+    // Switch field (Serialize the sub-type)
+    serializeInformationObjectWithTreeByteTimeChild(writeBuffer);
+
+    writeBuffer.popContext("InformationObjectWithTreeByteTime");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    InformationObjectWithTreeByteTime _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Length of sub-type elements will be added by sub-type...
+
+    return lengthInBits;
+  }
+
+  public static InformationObjectBuilder staticParseInformationObjectBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+    InformationObjectWithTreeByteTimeBuilder builder = null;
+    if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.STEP_POSITION_INFORMATION_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.INTEGRATED_TOTALS_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_INTEGRATED_TOTALS
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification
+            .PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
+      builder =
+          InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
+              .staticParseInformationObjectWithTreeByteTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    }
+    if (builder == null) {
+      throw new ParseException(
+          "Unsupported case for discriminated type"
+              + " parameters ["
+              + "typeIdentification="
+              + typeIdentification
+              + "]");
+    }
+
+    readBuffer.closeContext("InformationObjectWithTreeByteTime");
+    // Create the instance
+    return new InformationObjectWithTreeByteTimeBuilderImpl(builder);
+  }
+
+  public interface InformationObjectWithTreeByteTimeBuilder {
+    InformationObjectWithTreeByteTime build(int address);
+  }
+
+  public static class InformationObjectWithTreeByteTimeBuilderImpl
+      implements InformationObject.InformationObjectBuilder {
+    private final InformationObjectWithTreeByteTimeBuilder builder;
+
+    public InformationObjectWithTreeByteTimeBuilderImpl(
+        InformationObjectWithTreeByteTimeBuilder builder) {
+      this.builder = builder;
+    }
+
+    public InformationObjectWithTreeByteTime build(int address) {
+      return builder.build(address);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof InformationObjectWithTreeByteTime)) {
+      return false;
+    }
+    InformationObjectWithTreeByteTime that = (InformationObjectWithTreeByteTime) o;
+    return super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT.java
similarity index 75%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT.java
index 7bf46b0f13..895e899889 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends InformationObject
-    implements Message {
+public class InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends Informa
   protected final QualityDescriptor qds;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT(
       int address,
       BinaryStateInformation bsi,
       QualityDescriptor qds,
@@ -72,11 +72,11 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends Informa
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG");
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT");
 
     // Simple Field (bsi)
     writeSimpleField(
@@ -99,7 +99,7 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends Informa
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG");
+    writeBuffer.popContext("InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT");
   }
 
   @Override
@@ -110,7 +110,7 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends Informa
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (bsi)
@@ -125,9 +125,11 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends Informa
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG");
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -152,30 +154,31 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends Informa
                 () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG");
+    readBuffer.closeContext("InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT");
     // Create the instance
-    return new InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAGBuilderImpl(bsi, qds, cp24Time2a);
+    return new InformationObjectWithTreeByteTime_BITSTRING_OF_32_BITBuilderImpl(
+        bsi, qds, cp24Time2a);
   }
 
-  public static class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithTreeByteTime_BITSTRING_OF_32_BITBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final BinaryStateInformation bsi;
     private final QualityDescriptor qds;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_BITSTRING_OF_32_BITBuilderImpl(
         BinaryStateInformation bsi, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) {
       this.bsi = bsi;
       this.qds = qds;
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG build(int address) {
-      InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG
-          informationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG =
-              new InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG(
+    public InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT build(int address) {
+      InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT
+          informationObjectWithTreeByteTime_BITSTRING_OF_32_BIT =
+              new InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT(
                   address, bsi, qds, cp24Time2a);
-      return informationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_BITSTRING_OF_32_BIT;
     }
   }
 
@@ -184,11 +187,11 @@ public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends Informa
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG)) {
+    if (!(o instanceof InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT)) {
       return false;
     }
-    InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG that =
-        (InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT that =
+        (InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT) o;
     return (getBsi() == that.getBsi())
         && (getQds() == that.getQds())
         && (getCp24Time2a() == that.getCp24Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION.java
index bec5445595..c1f76aefd2 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends InformationObject
-    implements Message {
+public class InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends In
   protected final DoublePointInformation diq;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION(
       int address, DoublePointInformation diq, ThreeOctetBinaryTime cp24Time2a) {
     super(address);
     this.diq = diq;
@@ -63,11 +63,11 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends In
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG");
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION");
 
     // Simple Field (diq)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends In
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG");
+    writeBuffer.popContext("InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends In
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (diq)
@@ -106,9 +106,11 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends In
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG");
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,28 +128,29 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends In
                 () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG");
+    readBuffer.closeContext("InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION");
     // Create the instance
-    return new InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl(diq, cp24Time2a);
+    return new InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl(
+        diq, cp24Time2a);
   }
 
-  public static class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final DoublePointInformation diq;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl(
         DoublePointInformation diq, ThreeOctetBinaryTime cp24Time2a) {
       this.diq = diq;
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG build(int address) {
-      InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG
-          informationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG =
-              new InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG(
+    public InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION build(int address) {
+      InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION
+          informationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION =
+              new InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION(
                   address, diq, cp24Time2a);
-      return informationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION;
     }
   }
 
@@ -156,11 +159,11 @@ public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends In
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG)) {
+    if (!(o instanceof InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION)) {
       return false;
     }
-    InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG that =
-        (InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION that =
+        (InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION) o;
     return (getDiq() == that.getDiq())
         && (getCp24Time2a() == that.getCp24Time2a())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java
index c39ac875d5..542b12d1b2 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG extends InformationObject
-    implements Message {
+public class InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG exten
   protected final TwoOctetBinaryTime cp16Time2a;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT(
       int address, TwoOctetBinaryTime cp16Time2a, ThreeOctetBinaryTime cp24Time2a) {
     super(address);
     this.cp16Time2a = cp16Time2a;
@@ -63,11 +63,11 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG exten
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT");
 
     // Simple Field (cp16Time2a)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG exten
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+    writeBuffer.popContext("InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG exten
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (cp16Time2a)
@@ -106,9 +106,11 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG exten
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,29 +128,29 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG exten
                 () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+    readBuffer.closeContext("InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT");
     // Create the instance
-    return new InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl(
+    return new InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl(
         cp16Time2a, cp24Time2a);
   }
 
-  public static class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final TwoOctetBinaryTime cp16Time2a;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl(
         TwoOctetBinaryTime cp16Time2a, ThreeOctetBinaryTime cp24Time2a) {
       this.cp16Time2a = cp16Time2a;
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG build(int address) {
-      InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
-          informationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG =
-              new InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG(
+    public InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT build(int address) {
+      InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT
+          informationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT =
+              new InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT(
                   address, cp16Time2a, cp24Time2a);
-      return informationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT;
     }
   }
 
@@ -157,11 +159,11 @@ public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG exten
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
+    if (!(o instanceof InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT)) {
       return false;
     }
-    InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG that =
-        (InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT that =
+        (InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT) o;
     return (getCp16Time2a() == that.getCp16Time2a())
         && (getCp24Time2a() == that.getCp24Time2a())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_INTEGRATED_TOTALS.java
similarity index 72%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_INTEGRATED_TOTALS.java
index f855f9f539..0a1e9de6ff 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_INTEGRATED_TOTALS.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends InformationObject
-    implements Message {
+public class InformationObjectWithTreeByteTime_INTEGRATED_TOTALS
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends Informati
   protected final BinaryCounterReading bcr;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_INTEGRATED_TOTALS(
       int address, BinaryCounterReading bcr, ThreeOctetBinaryTime cp24Time2a) {
     super(address);
     this.bcr = bcr;
@@ -63,11 +63,11 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends Informati
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG");
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime_INTEGRATED_TOTALS");
 
     // Simple Field (bcr)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends Informati
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG");
+    writeBuffer.popContext("InformationObjectWithTreeByteTime_INTEGRATED_TOTALS");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends Informati
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_INTEGRATED_TOTALS _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (bcr)
@@ -106,9 +106,11 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends Informati
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG");
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime_INTEGRATED_TOTALS");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,27 +128,27 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends Informati
                 () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG");
+    readBuffer.closeContext("InformationObjectWithTreeByteTime_INTEGRATED_TOTALS");
     // Create the instance
-    return new InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAGBuilderImpl(bcr, cp24Time2a);
+    return new InformationObjectWithTreeByteTime_INTEGRATED_TOTALSBuilderImpl(bcr, cp24Time2a);
   }
 
-  public static class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithTreeByteTime_INTEGRATED_TOTALSBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final BinaryCounterReading bcr;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_INTEGRATED_TOTALSBuilderImpl(
         BinaryCounterReading bcr, ThreeOctetBinaryTime cp24Time2a) {
       this.bcr = bcr;
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG build(int address) {
-      InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG
-          informationObject_INTEGRATED_TOTALS_WITH_TIME_TAG =
-              new InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG(address, bcr, cp24Time2a);
-      return informationObject_INTEGRATED_TOTALS_WITH_TIME_TAG;
+    public InformationObjectWithTreeByteTime_INTEGRATED_TOTALS build(int address) {
+      InformationObjectWithTreeByteTime_INTEGRATED_TOTALS
+          informationObjectWithTreeByteTime_INTEGRATED_TOTALS =
+              new InformationObjectWithTreeByteTime_INTEGRATED_TOTALS(address, bcr, cp24Time2a);
+      return informationObjectWithTreeByteTime_INTEGRATED_TOTALS;
     }
   }
 
@@ -155,11 +157,11 @@ public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends Informati
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG)) {
+    if (!(o instanceof InformationObjectWithTreeByteTime_INTEGRATED_TOTALS)) {
       return false;
     }
-    InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG that =
-        (InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_INTEGRATED_TOTALS that =
+        (InformationObjectWithTreeByteTime_INTEGRATED_TOTALS) o;
     return (getBcr() == that.getBcr())
         && (getCp24Time2a() == that.getCp24Time2a())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java
similarity index 73%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java
index 323f6ec202..492eeba182 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
-    extends InformationObject implements Message {
+public class InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
   protected final QualityDescriptor qds;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE(
       int address, NormalizedValue nva, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) {
     super(address);
     this.nva = nva;
@@ -69,11 +69,11 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG");
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE");
 
     // Simple Field (nva)
     writeSimpleField(
@@ -96,7 +96,7 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG");
+    writeBuffer.popContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE");
   }
 
   @Override
@@ -107,7 +107,7 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nva)
@@ -122,9 +122,11 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG");
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -149,31 +151,31 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
                 () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG");
+    readBuffer.closeContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAGBuilderImpl(
+    return new InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUEBuilderImpl(
         nva, qds, cp24Time2a);
   }
 
-  public static class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUEBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final NormalizedValue nva;
     private final QualityDescriptor qds;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUEBuilderImpl(
         NormalizedValue nva, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) {
       this.nva = nva;
       this.qds = qds;
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG build(int address) {
-      InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
-          informationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG =
-              new InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG(
+    public InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE build(int address) {
+      InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE
+          informationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE =
+              new InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE(
                   address, nva, qds, cp24Time2a);
-      return informationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE;
     }
   }
 
@@ -182,11 +184,11 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG)) {
+    if (!(o instanceof InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG that =
-        (InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE that =
+        (InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE) o;
     return (getNva() == that.getNva())
         && (getQds() == that.getQds())
         && (getCp24Time2a() == that.getCp24Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java
similarity index 73%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java
index b0f8ec1a9f..b9502c4452 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java
@@ -35,12 +35,12 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends InformationObject
-    implements Message {
+public class InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
-    return TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG;
+    return TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG;
   }
 
   // Properties.
@@ -48,7 +48,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends
   protected final QualityDescriptor qds;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG(
+  public InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE(
       int address, ScaledValue sva, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) {
     super(address);
     this.sva = sva;
@@ -69,11 +69,11 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG");
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE");
 
     // Simple Field (sva)
     writeSimpleField(
@@ -96,7 +96,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG");
+    writeBuffer.popContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE");
   }
 
   @Override
@@ -107,7 +107,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (sva)
@@ -122,9 +122,11 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG");
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -148,31 +150,31 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends
                 () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG");
+    readBuffer.closeContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAGBuilderImpl(
+    return new InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl(
         sva, qds, cp24Time2a);
   }
 
-  public static class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final ScaledValue sva;
     private final QualityDescriptor qds;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl(
         ScaledValue sva, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) {
       this.sva = sva;
       this.qds = qds;
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG build(int address) {
-      InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG
-          informationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG =
-              new InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG(
+    public InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE build(int address) {
+      InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE
+          informationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE =
+              new InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE(
                   address, sva, qds, cp24Time2a);
-      return informationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG;
+      return informationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE;
     }
   }
 
@@ -181,11 +183,11 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG)) {
+    if (!(o instanceof InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG that =
-        (InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE that =
+        (InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE) o;
     return (getSva() == that.getSva())
         && (getQds() == that.getQds())
         && (getCp24Time2a() == that.getCp24Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
similarity index 73%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
index 421df5ec81..098b47b99c 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG
-    extends InformationObject implements Message {
+public class InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
   protected final QualityDescriptor qds;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(
       int address, float value, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) {
     super(address);
     this.value = value;
@@ -69,12 +69,12 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
 
     // Simple Field (value)
     writeSimpleField(
@@ -98,7 +98,7 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     writeBuffer.popContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
   }
 
   @Override
@@ -109,7 +109,7 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (value)
@@ -124,10 +124,12 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
     readBuffer.pullContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -150,33 +152,33 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     readBuffer.closeContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAGBuilderImpl(
+    return new InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         value, qds, cp24Time2a);
   }
 
   public static
-  class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  class InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final float value;
     private final QualityDescriptor qds;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         float value, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) {
       this.value = value;
       this.qds = qds;
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG build(
+    public InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER build(
         int address) {
-      InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG
-          informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG =
-              new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG(
+      InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+          informationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER =
+              new InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(
                   address, value, qds, cp24Time2a);
-      return informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER;
     }
   }
 
@@ -186,11 +188,11 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_T
       return true;
     }
     if (!(o
-        instanceof InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG)) {
+        instanceof InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG that =
-        (InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER that =
+        (InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) o;
     return (getValue() == that.getValue())
         && (getQds() == that.getQds())
         && (getCp24Time2a() == that.getCp24Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java
similarity index 75%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java
index 8131142672..43104d5ae9 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java
@@ -36,8 +36,8 @@ import org.apache.plc4x.java.spi.generation.*;
 // Code generated by code-generation. DO NOT EDIT.
 
 public
-class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
-    extends InformationObject implements Message {
+class InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -51,7 +51,8 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
   protected final TwoOctetBinaryTime cp16Time2a;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG(
+  public
+  InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT(
       int address,
       OutputCircuitInformation oci,
       QualityDescriptorForPointsOfProtectionEquipment qdp,
@@ -81,12 +82,12 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext(
-        "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT");
 
     // Simple Field (oci)
     writeSimpleField(
@@ -117,7 +118,7 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     writeBuffer.popContext(
-        "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT");
   }
 
   @Override
@@ -128,7 +129,7 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
+    InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
         _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -147,10 +148,12 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
     readBuffer.pullContext(
-        "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -184,22 +187,22 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     readBuffer.closeContext(
-        "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT");
     // Create the instance
-    return new InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl(
+    return new InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl(
         oci, qdp, cp16Time2a, cp24Time2a);
   }
 
   public static
-  class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  class InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final OutputCircuitInformation oci;
     private final QualityDescriptorForPointsOfProtectionEquipment qdp;
     private final TwoOctetBinaryTime cp16Time2a;
     private final ThreeOctetBinaryTime cp24Time2a;
 
     public
-    InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl(
+    InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl(
         OutputCircuitInformation oci,
         QualityDescriptorForPointsOfProtectionEquipment qdp,
         TwoOctetBinaryTime cp16Time2a,
@@ -210,13 +213,14 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
+    public
+    InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
         build(int address) {
-      InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
-          informationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG =
-              new InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG(
+      InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
+          informationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT =
+              new InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT(
                   address, oci, qdp, cp16Time2a, cp24Time2a);
-      return informationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT;
     }
   }
 
@@ -227,12 +231,13 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN
     }
     if (!(o
         instanceof
-        InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
+        InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT)) {
       return false;
     }
-    InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG that =
-        (InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)
-            o;
+    InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT
+        that =
+            (InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT)
+                o;
     return (getOci() == that.getOci())
         && (getQdp() == that.getQdp())
         && (getCp16Time2a() == that.getCp16Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java
similarity index 76%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java
index b3989c9181..c018db14ee 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
-    extends InformationObject implements Message {
+public class InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -49,7 +49,7 @@ public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_
   protected final TwoOctetBinaryTime cp16Time2a;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT(
       int address,
       SingleEventOfProtectionEquipment sep,
       QualityDescriptorForPointsOfProtectionEquipment qdp,
@@ -79,12 +79,12 @@ public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext(
-        "InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT");
 
     // Simple Field (sep)
     writeSimpleField(
@@ -115,7 +115,7 @@ public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     writeBuffer.popContext(
-        "InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT");
   }
 
   @Override
@@ -126,7 +126,7 @@ public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (sep)
@@ -144,10 +144,12 @@ public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
     readBuffer.pullContext(
-        "InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -181,21 +183,21 @@ public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     readBuffer.closeContext(
-        "InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG");
+        "InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT");
     // Create the instance
-    return new InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl(
+    return new InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl(
         sep, qdp, cp16Time2a, cp24Time2a);
   }
 
   public static
-  class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  class InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final SingleEventOfProtectionEquipment sep;
     private final QualityDescriptorForPointsOfProtectionEquipment qdp;
     private final TwoOctetBinaryTime cp16Time2a;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl(
         SingleEventOfProtectionEquipment sep,
         QualityDescriptorForPointsOfProtectionEquipment qdp,
         TwoOctetBinaryTime cp16Time2a,
@@ -206,13 +208,13 @@ public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG build(
+    public InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT build(
         int address) {
-      InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG
-          informationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG =
-              new InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG(
+      InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT
+          informationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT =
+              new InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT(
                   address, sep, qdp, cp16Time2a, cp24Time2a);
-      return informationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT;
     }
   }
 
@@ -222,11 +224,11 @@ public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_
       return true;
     }
     if (!(o
-        instanceof InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) {
+        instanceof InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT)) {
       return false;
     }
-    InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG that =
-        (InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT that =
+        (InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT) o;
     return (getSep() == that.getSep())
         && (getQdp() == that.getQdp())
         && (getCp16Time2a() == that.getCp16Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION.java
index b02400b976..6d4fd3e06e 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends InformationObject
-    implements Message {
+public class InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends In
   protected final SinglePointInformation siq;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION(
       int address, SinglePointInformation siq, ThreeOctetBinaryTime cp24Time2a) {
     super(address);
     this.siq = siq;
@@ -63,11 +63,11 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends In
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG");
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION");
 
     // Simple Field (siq)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends In
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG");
+    writeBuffer.popContext("InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends In
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (siq)
@@ -106,9 +106,11 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends In
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG");
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,28 +128,29 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends In
                 () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG");
+    readBuffer.closeContext("InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION");
     // Create the instance
-    return new InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl(siq, cp24Time2a);
+    return new InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATIONBuilderImpl(
+        siq, cp24Time2a);
   }
 
-  public static class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATIONBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final SinglePointInformation siq;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATIONBuilderImpl(
         SinglePointInformation siq, ThreeOctetBinaryTime cp24Time2a) {
       this.siq = siq;
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG build(int address) {
-      InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG
-          informationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG =
-              new InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG(
+    public InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION build(int address) {
+      InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION
+          informationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION =
+              new InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION(
                   address, siq, cp24Time2a);
-      return informationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION;
     }
   }
 
@@ -156,11 +159,11 @@ public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends In
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG)) {
+    if (!(o instanceof InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION)) {
       return false;
     }
-    InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG that =
-        (InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION that =
+        (InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION) o;
     return (getSiq() == that.getSiq())
         && (getCp24Time2a() == that.getCp24Time2a())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION.java
similarity index 75%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION.java
index e480cbd49b..70e9073446 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends InformationObject
-    implements Message {
+public class InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION
+    extends InformationObjectWithTreeByteTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends I
   protected final QualityDescriptor qds;
   protected final ThreeOctetBinaryTime cp24Time2a;
 
-  public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG(
+  public InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION(
       int address,
       ValueWithTransientStateIndication vti,
       QualityDescriptor qds,
@@ -72,11 +72,11 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends I
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG");
+    writeBuffer.pushContext("InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION");
 
     // Simple Field (vti)
     writeSimpleField(
@@ -99,7 +99,7 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends I
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG");
+    writeBuffer.popContext("InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION");
   }
 
   @Override
@@ -110,7 +110,7 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends I
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG _value = this;
+    InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (vti)
@@ -125,9 +125,11 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends I
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG");
+  public static InformationObjectWithTreeByteTimeBuilder
+      staticParseInformationObjectWithTreeByteTimeBuilder(
+          ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+          throws ParseException {
+    readBuffer.pullContext("InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -152,19 +154,19 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends I
                 () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG");
+    readBuffer.closeContext("InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION");
     // Create the instance
-    return new InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAGBuilderImpl(
+    return new InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATIONBuilderImpl(
         vti, qds, cp24Time2a);
   }
 
-  public static class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAGBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATIONBuilderImpl
+      implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder {
     private final ValueWithTransientStateIndication vti;
     private final QualityDescriptor qds;
     private final ThreeOctetBinaryTime cp24Time2a;
 
-    public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAGBuilderImpl(
+    public InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATIONBuilderImpl(
         ValueWithTransientStateIndication vti,
         QualityDescriptor qds,
         ThreeOctetBinaryTime cp24Time2a) {
@@ -173,12 +175,12 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends I
       this.cp24Time2a = cp24Time2a;
     }
 
-    public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG build(int address) {
-      InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG
-          informationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG =
-              new InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG(
+    public InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION build(int address) {
+      InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION
+          informationObjectWithTreeByteTime_STEP_POSITION_INFORMATION =
+              new InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION(
                   address, vti, qds, cp24Time2a);
-      return informationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG;
+      return informationObjectWithTreeByteTime_STEP_POSITION_INFORMATION;
     }
   }
 
@@ -187,11 +189,11 @@ public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends I
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG)) {
+    if (!(o instanceof InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION)) {
       return false;
     }
-    InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG that =
-        (InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG) o;
+    InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION that =
+        (InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION) o;
     return (getVti() == that.getVti())
         && (getQds() == that.getQds())
         && (getCp24Time2a() == that.getCp24Time2a())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime.java
new file mode 100644
index 0000000000..f057c2339a
--- /dev/null
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime.java
@@ -0,0 +1,355 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.java.iec608705104.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public abstract class InformationObjectWithoutTime extends InformationObject implements Message {
+
+  // Accessors for discriminator values.
+  public Byte getNumTimeByte() {
+    return (byte) 0;
+  }
+
+  // Abstract accessors for discriminator values.
+  public abstract TypeIdentification getTypeIdentification();
+
+  public InformationObjectWithoutTime(int address) {
+    super(address);
+  }
+
+  protected abstract void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
+      throws SerializationException;
+
+  @Override
+  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("InformationObjectWithoutTime");
+
+    // Switch field (Serialize the sub-type)
+    serializeInformationObjectWithoutTimeChild(writeBuffer);
+
+    writeBuffer.popContext("InformationObjectWithoutTime");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    InformationObjectWithoutTime _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Length of sub-type elements will be added by sub-type...
+
+    return lengthInBits;
+  }
+
+  public static InformationObjectBuilder staticParseInformationObjectBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+    InformationObjectWithoutTimeBuilder builder = null;
+    if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION)) {
+      builder =
+          InformationObjectWithoutTime_SINGLE_POINT_INFORMATION
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION)) {
+      builder =
+          InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.STEP_POSITION_INFORMATION)) {
+      builder =
+          InformationObjectWithoutTime_STEP_POSITION_INFORMATION
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT)) {
+      builder =
+          InformationObjectWithoutTime_BITSTRING_OF_32_BIT
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE)) {
+      builder =
+          InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.MEASURED_VALUE_SCALED_VALUE)) {
+      builder =
+          InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) {
+      builder =
+          InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.INTEGRATED_TOTALS)) {
+      builder =
+          InformationObjectWithoutTime_INTEGRATED_TOTALS
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)) {
+      builder =
+          InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR)) {
+      builder =
+          InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SINGLE_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_SINGLE_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.DOUBLE_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_DOUBLE_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.REGULATING_STEP_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_REGULATING_STEP_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.SET_POINT_COMMAND_NORMALISED_VALUE)) {
+      builder =
+          InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.SET_POINT_COMMAND_SCALED_VALUE)) {
+      builder =
+          InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER)) {
+      builder =
+          InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.BITSTRING_32_BIT_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.END_OF_INITIALISATION)) {
+      builder =
+          InformationObjectWithoutTime_END_OF_INITIALISATION
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.INTERROGATION_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_INTERROGATION_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.COUNTER_INTERROGATION_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.READ_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_READ_COMMAND.staticParseInformationObjectWithoutTimeBuilder(
+              readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.CLOCK_SYNCHRONISATION_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.TEST_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_TEST_COMMAND.staticParseInformationObjectWithoutTimeBuilder(
+              readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.RESET_PROCESS_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_RESET_PROCESS_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.DELAY_ACQUISITION_COMMAND)) {
+      builder =
+          InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE)) {
+      builder =
+          InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE)) {
+      builder =
+          InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification,
+        TypeIdentification.PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER)) {
+      builder =
+          InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.PARAMETER_ACTIVATION)) {
+      builder =
+          InformationObjectWithoutTime_PARAMETER_ACTIVATION
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.FILE_READY)) {
+      builder =
+          InformationObjectWithoutTime_FILE_READY.staticParseInformationObjectWithoutTimeBuilder(
+              readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SECTION_READY)) {
+      builder =
+          InformationObjectWithoutTime_SECTION_READY.staticParseInformationObjectWithoutTimeBuilder(
+              readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION)) {
+      builder =
+          InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.LAST_SECTION_LAST_SEGMENT)) {
+      builder =
+          InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(
+        typeIdentification, TypeIdentification.ACK_FILE_ACK_SECTION)) {
+      builder =
+          InformationObjectWithoutTime_ACK_FILE_ACK_SECTION
+              .staticParseInformationObjectWithoutTimeBuilder(
+                  readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SEGMENT)) {
+      builder =
+          InformationObjectWithoutTime_SEGMENT.staticParseInformationObjectWithoutTimeBuilder(
+              readBuffer, typeIdentification, numTimeByte);
+    } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.DIRECTORY)) {
+      builder =
+          InformationObjectWithoutTime_DIRECTORY.staticParseInformationObjectWithoutTimeBuilder(
+              readBuffer, typeIdentification, numTimeByte);
+    }
+    if (builder == null) {
+      throw new ParseException(
+          "Unsupported case for discriminated type"
+              + " parameters ["
+              + "typeIdentification="
+              + typeIdentification
+              + "]");
+    }
+
+    readBuffer.closeContext("InformationObjectWithoutTime");
+    // Create the instance
+    return new InformationObjectWithoutTimeBuilderImpl(builder);
+  }
+
+  public interface InformationObjectWithoutTimeBuilder {
+    InformationObjectWithoutTime build(int address);
+  }
+
+  public static class InformationObjectWithoutTimeBuilderImpl
+      implements InformationObject.InformationObjectBuilder {
+    private final InformationObjectWithoutTimeBuilder builder;
+
+    public InformationObjectWithoutTimeBuilderImpl(InformationObjectWithoutTimeBuilder builder) {
+      this.builder = builder;
+    }
+
+    public InformationObjectWithoutTime build(int address) {
+      return builder.build(address);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof InformationObjectWithoutTime)) {
+      return false;
+    }
+    InformationObjectWithoutTime that = (InformationObjectWithoutTime) o;
+    return super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_ACK_FILE_ACK_SECTION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_ACK_FILE_ACK_SECTION.java
similarity index 76%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_ACK_FILE_ACK_SECTION.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_ACK_FILE_ACK_SECTION.java
index 7a0338422f..caaecdb574 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_ACK_FILE_ACK_SECTION.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_ACK_FILE_ACK_SECTION.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject implements Message {
+public class InformationObjectWithoutTime_ACK_FILE_ACK_SECTION extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +48,7 @@ public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject im
   protected final NameOfSection nos;
   protected final AcknowledgeFileOrSectionQualifier afq;
 
-  public InformationObject_ACK_FILE_ACK_SECTION(
+  public InformationObjectWithoutTime_ACK_FILE_ACK_SECTION(
       int address, NameOfFile nof, NameOfSection nos, AcknowledgeFileOrSectionQualifier afq) {
     super(address);
     this.nof = nof;
@@ -68,11 +69,11 @@ public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject im
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_ACK_FILE_ACK_SECTION");
+    writeBuffer.pushContext("InformationObjectWithoutTime_ACK_FILE_ACK_SECTION");
 
     // Simple Field (nof)
     writeSimpleField(
@@ -95,7 +96,7 @@ public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject im
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_ACK_FILE_ACK_SECTION");
+    writeBuffer.popContext("InformationObjectWithoutTime_ACK_FILE_ACK_SECTION");
   }
 
   @Override
@@ -106,7 +107,7 @@ public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject im
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_ACK_FILE_ACK_SECTION _value = this;
+    InformationObjectWithoutTime_ACK_FILE_ACK_SECTION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nof)
@@ -121,9 +122,10 @@ public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject im
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_ACK_FILE_ACK_SECTION");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_ACK_FILE_ACK_SECTION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -146,28 +148,29 @@ public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject im
                 () -> AcknowledgeFileOrSectionQualifier.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_ACK_FILE_ACK_SECTION");
+    readBuffer.closeContext("InformationObjectWithoutTime_ACK_FILE_ACK_SECTION");
     // Create the instance
-    return new InformationObject_ACK_FILE_ACK_SECTIONBuilderImpl(nof, nos, afq);
+    return new InformationObjectWithoutTime_ACK_FILE_ACK_SECTIONBuilderImpl(nof, nos, afq);
   }
 
-  public static class InformationObject_ACK_FILE_ACK_SECTIONBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_ACK_FILE_ACK_SECTIONBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NameOfFile nof;
     private final NameOfSection nos;
     private final AcknowledgeFileOrSectionQualifier afq;
 
-    public InformationObject_ACK_FILE_ACK_SECTIONBuilderImpl(
+    public InformationObjectWithoutTime_ACK_FILE_ACK_SECTIONBuilderImpl(
         NameOfFile nof, NameOfSection nos, AcknowledgeFileOrSectionQualifier afq) {
       this.nof = nof;
       this.nos = nos;
       this.afq = afq;
     }
 
-    public InformationObject_ACK_FILE_ACK_SECTION build(int address) {
-      InformationObject_ACK_FILE_ACK_SECTION informationObject_ACK_FILE_ACK_SECTION =
-          new InformationObject_ACK_FILE_ACK_SECTION(address, nof, nos, afq);
-      return informationObject_ACK_FILE_ACK_SECTION;
+    public InformationObjectWithoutTime_ACK_FILE_ACK_SECTION build(int address) {
+      InformationObjectWithoutTime_ACK_FILE_ACK_SECTION
+          informationObjectWithoutTime_ACK_FILE_ACK_SECTION =
+              new InformationObjectWithoutTime_ACK_FILE_ACK_SECTION(address, nof, nos, afq);
+      return informationObjectWithoutTime_ACK_FILE_ACK_SECTION;
     }
   }
 
@@ -176,10 +179,11 @@ public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject im
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_ACK_FILE_ACK_SECTION)) {
+    if (!(o instanceof InformationObjectWithoutTime_ACK_FILE_ACK_SECTION)) {
       return false;
     }
-    InformationObject_ACK_FILE_ACK_SECTION that = (InformationObject_ACK_FILE_ACK_SECTION) o;
+    InformationObjectWithoutTime_ACK_FILE_ACK_SECTION that =
+        (InformationObjectWithoutTime_ACK_FILE_ACK_SECTION) o;
     return (getNof() == that.getNof())
         && (getNos() == that.getNos())
         && (getAfq() == that.getAfq())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_32_BIT_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND.java
similarity index 67%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_32_BIT_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND.java
index 0bb4d7e0e4..76a57b6375 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_32_BIT_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +46,8 @@ public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObjec
   // Properties.
   protected final BinaryStateInformation bsi;
 
-  public InformationObject_BITSTRING_32_BIT_COMMAND(int address, BinaryStateInformation bsi) {
+  public InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND(
+      int address, BinaryStateInformation bsi) {
     super(address);
     this.bsi = bsi;
   }
@@ -56,11 +57,11 @@ public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObjec
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_BITSTRING_32_BIT_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND");
 
     // Simple Field (bsi)
     writeSimpleField(
@@ -69,7 +70,7 @@ public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObjec
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_BITSTRING_32_BIT_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND");
   }
 
   @Override
@@ -80,7 +81,7 @@ public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObjec
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_BITSTRING_32_BIT_COMMAND _value = this;
+    InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (bsi)
@@ -89,9 +90,10 @@ public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObjec
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_BITSTRING_32_BIT_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -102,23 +104,25 @@ public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObjec
                 () -> BinaryStateInformation.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_BITSTRING_32_BIT_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND");
     // Create the instance
-    return new InformationObject_BITSTRING_32_BIT_COMMANDBuilderImpl(bsi);
+    return new InformationObjectWithoutTime_BITSTRING_32_BIT_COMMANDBuilderImpl(bsi);
   }
 
-  public static class InformationObject_BITSTRING_32_BIT_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_BITSTRING_32_BIT_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final BinaryStateInformation bsi;
 
-    public InformationObject_BITSTRING_32_BIT_COMMANDBuilderImpl(BinaryStateInformation bsi) {
+    public InformationObjectWithoutTime_BITSTRING_32_BIT_COMMANDBuilderImpl(
+        BinaryStateInformation bsi) {
       this.bsi = bsi;
     }
 
-    public InformationObject_BITSTRING_32_BIT_COMMAND build(int address) {
-      InformationObject_BITSTRING_32_BIT_COMMAND informationObject_BITSTRING_32_BIT_COMMAND =
-          new InformationObject_BITSTRING_32_BIT_COMMAND(address, bsi);
-      return informationObject_BITSTRING_32_BIT_COMMAND;
+    public InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND build(int address) {
+      InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND
+          informationObjectWithoutTime_BITSTRING_32_BIT_COMMAND =
+              new InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND(address, bsi);
+      return informationObjectWithoutTime_BITSTRING_32_BIT_COMMAND;
     }
   }
 
@@ -127,11 +131,11 @@ public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObjec
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_BITSTRING_32_BIT_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND)) {
       return false;
     }
-    InformationObject_BITSTRING_32_BIT_COMMAND that =
-        (InformationObject_BITSTRING_32_BIT_COMMAND) o;
+    InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND that =
+        (InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND) o;
     return (getBsi() == that.getBsi()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_OF_32_BIT.java
similarity index 73%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_OF_32_BIT.java
index 9c7f11da3d..a7c5b99f30 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_OF_32_BIT.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject implements Message {
+public class InformationObjectWithoutTime_BITSTRING_OF_32_BIT extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +47,7 @@ public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject imp
   protected final BinaryStateInformation bsi;
   protected final QualityDescriptor qds;
 
-  public InformationObject_BITSTRING_OF_32_BIT(
+  public InformationObjectWithoutTime_BITSTRING_OF_32_BIT(
       int address, BinaryStateInformation bsi, QualityDescriptor qds) {
     super(address);
     this.bsi = bsi;
@@ -62,11 +63,11 @@ public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject imp
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_BITSTRING_OF_32_BIT");
+    writeBuffer.pushContext("InformationObjectWithoutTime_BITSTRING_OF_32_BIT");
 
     // Simple Field (bsi)
     writeSimpleField(
@@ -82,7 +83,7 @@ public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject imp
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_BITSTRING_OF_32_BIT");
+    writeBuffer.popContext("InformationObjectWithoutTime_BITSTRING_OF_32_BIT");
   }
 
   @Override
@@ -93,7 +94,7 @@ public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject imp
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_BITSTRING_OF_32_BIT _value = this;
+    InformationObjectWithoutTime_BITSTRING_OF_32_BIT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (bsi)
@@ -105,9 +106,10 @@ public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject imp
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_BITSTRING_OF_32_BIT");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_BITSTRING_OF_32_BIT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -125,26 +127,27 @@ public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject imp
                 () -> QualityDescriptor.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_BITSTRING_OF_32_BIT");
+    readBuffer.closeContext("InformationObjectWithoutTime_BITSTRING_OF_32_BIT");
     // Create the instance
-    return new InformationObject_BITSTRING_OF_32_BITBuilderImpl(bsi, qds);
+    return new InformationObjectWithoutTime_BITSTRING_OF_32_BITBuilderImpl(bsi, qds);
   }
 
-  public static class InformationObject_BITSTRING_OF_32_BITBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_BITSTRING_OF_32_BITBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final BinaryStateInformation bsi;
     private final QualityDescriptor qds;
 
-    public InformationObject_BITSTRING_OF_32_BITBuilderImpl(
+    public InformationObjectWithoutTime_BITSTRING_OF_32_BITBuilderImpl(
         BinaryStateInformation bsi, QualityDescriptor qds) {
       this.bsi = bsi;
       this.qds = qds;
     }
 
-    public InformationObject_BITSTRING_OF_32_BIT build(int address) {
-      InformationObject_BITSTRING_OF_32_BIT informationObject_BITSTRING_OF_32_BIT =
-          new InformationObject_BITSTRING_OF_32_BIT(address, bsi, qds);
-      return informationObject_BITSTRING_OF_32_BIT;
+    public InformationObjectWithoutTime_BITSTRING_OF_32_BIT build(int address) {
+      InformationObjectWithoutTime_BITSTRING_OF_32_BIT
+          informationObjectWithoutTime_BITSTRING_OF_32_BIT =
+              new InformationObjectWithoutTime_BITSTRING_OF_32_BIT(address, bsi, qds);
+      return informationObjectWithoutTime_BITSTRING_OF_32_BIT;
     }
   }
 
@@ -153,10 +156,11 @@ public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject imp
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_BITSTRING_OF_32_BIT)) {
+    if (!(o instanceof InformationObjectWithoutTime_BITSTRING_OF_32_BIT)) {
       return false;
     }
-    InformationObject_BITSTRING_OF_32_BIT that = (InformationObject_BITSTRING_OF_32_BIT) o;
+    InformationObjectWithoutTime_BITSTRING_OF_32_BIT that =
+        (InformationObjectWithoutTime_BITSTRING_OF_32_BIT) o;
     return (getBsi() == that.getBsi()) && (getQds() == that.getQds()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java
index c91ac591b1..de7009ad53 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
-    extends InformationObject implements Message {
+public class InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +48,7 @@ public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
   protected final NameOfSection nos;
   protected final SelectAndCallQualifier scq;
 
-  public InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION(
+  public InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION(
       int address, NameOfFile nof, NameOfSection nos, SelectAndCallQualifier scq) {
     super(address);
     this.nof = nof;
@@ -69,11 +69,12 @@ public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION");
+    writeBuffer.pushContext(
+        "InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION");
 
     // Simple Field (nof)
     writeSimpleField(
@@ -96,7 +97,8 @@ public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION");
+    writeBuffer.popContext(
+        "InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION");
   }
 
   @Override
@@ -107,7 +109,7 @@ public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION _value = this;
+    InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nof)
@@ -122,9 +124,11 @@ public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext(
+        "InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -147,31 +151,35 @@ public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
                 () -> SelectAndCallQualifier.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION");
+    readBuffer.closeContext(
+        "InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION");
     // Create the instance
-    return new InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl(
+    return new InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl(
         nof, nos, scq);
   }
 
-  public static class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static
+  class InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NameOfFile nof;
     private final NameOfSection nos;
     private final SelectAndCallQualifier scq;
 
-    public InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl(
+    public
+    InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl(
         NameOfFile nof, NameOfSection nos, SelectAndCallQualifier scq) {
       this.nof = nof;
       this.nos = nos;
       this.scq = scq;
     }
 
-    public InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION build(int address) {
-      InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
-          informationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION =
-              new InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION(
+    public InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION build(
+        int address) {
+      InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
+          informationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION =
+              new InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION(
                   address, nof, nos, scq);
-      return informationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION;
+      return informationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION;
     }
   }
 
@@ -180,11 +188,13 @@ public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION)) {
+    if (!(o
+        instanceof
+        InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION)) {
       return false;
     }
-    InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION that =
-        (InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION) o;
+    InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION that =
+        (InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION) o;
     return (getNof() == that.getNof())
         && (getNos() == that.getNos())
         && (getScq() == that.getScq())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CLOCK_SYNCHRONISATION_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java
similarity index 68%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CLOCK_SYNCHRONISATION_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java
index a215820083..f3e906ac87 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CLOCK_SYNCHRONISATION_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +46,7 @@ public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends Information
   // Properties.
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_CLOCK_SYNCHRONISATION_COMMAND(
+  public InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND(
       int address, SevenOctetBinaryTime cp56Time2a) {
     super(address);
     this.cp56Time2a = cp56Time2a;
@@ -57,11 +57,11 @@ public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends Information
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_CLOCK_SYNCHRONISATION_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND");
 
     // Simple Field (cp56Time2a)
     writeSimpleField(
@@ -70,7 +70,7 @@ public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends Information
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_CLOCK_SYNCHRONISATION_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND");
   }
 
   @Override
@@ -81,7 +81,7 @@ public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends Information
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_CLOCK_SYNCHRONISATION_COMMAND _value = this;
+    InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (cp56Time2a)
@@ -90,9 +90,10 @@ public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends Information
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_CLOCK_SYNCHRONISATION_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -103,25 +104,25 @@ public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends Information
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_CLOCK_SYNCHRONISATION_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND");
     // Create the instance
-    return new InformationObject_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl(cp56Time2a);
+    return new InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl(cp56Time2a);
   }
 
-  public static class InformationObject_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl(
+    public InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl(
         SevenOctetBinaryTime cp56Time2a) {
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_CLOCK_SYNCHRONISATION_COMMAND build(int address) {
-      InformationObject_CLOCK_SYNCHRONISATION_COMMAND
-          informationObject_CLOCK_SYNCHRONISATION_COMMAND =
-              new InformationObject_CLOCK_SYNCHRONISATION_COMMAND(address, cp56Time2a);
-      return informationObject_CLOCK_SYNCHRONISATION_COMMAND;
+    public InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND build(int address) {
+      InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND
+          informationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND =
+              new InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND(address, cp56Time2a);
+      return informationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND;
     }
   }
 
@@ -130,11 +131,11 @@ public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends Information
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_CLOCK_SYNCHRONISATION_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND)) {
       return false;
     }
-    InformationObject_CLOCK_SYNCHRONISATION_COMMAND that =
-        (InformationObject_CLOCK_SYNCHRONISATION_COMMAND) o;
+    InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND that =
+        (InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND) o;
     return (getCp56Time2a() == that.getCp56Time2a()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_COUNTER_INTERROGATION_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND.java
similarity index 68%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_COUNTER_INTERROGATION_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND.java
index d122f2efc5..02835514d3 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_COUNTER_INTERROGATION_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_COUNTER_INTERROGATION_COMMAND extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +46,7 @@ public class InformationObject_COUNTER_INTERROGATION_COMMAND extends Information
   // Properties.
   protected final QualifierOfCounterInterrogationCommand qcc;
 
-  public InformationObject_COUNTER_INTERROGATION_COMMAND(
+  public InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND(
       int address, QualifierOfCounterInterrogationCommand qcc) {
     super(address);
     this.qcc = qcc;
@@ -57,11 +57,11 @@ public class InformationObject_COUNTER_INTERROGATION_COMMAND extends Information
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_COUNTER_INTERROGATION_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND");
 
     // Simple Field (qcc)
     writeSimpleField(
@@ -70,7 +70,7 @@ public class InformationObject_COUNTER_INTERROGATION_COMMAND extends Information
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_COUNTER_INTERROGATION_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND");
   }
 
   @Override
@@ -81,7 +81,7 @@ public class InformationObject_COUNTER_INTERROGATION_COMMAND extends Information
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_COUNTER_INTERROGATION_COMMAND _value = this;
+    InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (qcc)
@@ -90,9 +90,10 @@ public class InformationObject_COUNTER_INTERROGATION_COMMAND extends Information
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_COUNTER_INTERROGATION_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -103,25 +104,25 @@ public class InformationObject_COUNTER_INTERROGATION_COMMAND extends Information
                 () -> QualifierOfCounterInterrogationCommand.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_COUNTER_INTERROGATION_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND");
     // Create the instance
-    return new InformationObject_COUNTER_INTERROGATION_COMMANDBuilderImpl(qcc);
+    return new InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMANDBuilderImpl(qcc);
   }
 
-  public static class InformationObject_COUNTER_INTERROGATION_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final QualifierOfCounterInterrogationCommand qcc;
 
-    public InformationObject_COUNTER_INTERROGATION_COMMANDBuilderImpl(
+    public InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMANDBuilderImpl(
         QualifierOfCounterInterrogationCommand qcc) {
       this.qcc = qcc;
     }
 
-    public InformationObject_COUNTER_INTERROGATION_COMMAND build(int address) {
-      InformationObject_COUNTER_INTERROGATION_COMMAND
-          informationObject_COUNTER_INTERROGATION_COMMAND =
-              new InformationObject_COUNTER_INTERROGATION_COMMAND(address, qcc);
-      return informationObject_COUNTER_INTERROGATION_COMMAND;
+    public InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND build(int address) {
+      InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND
+          informationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND =
+              new InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND(address, qcc);
+      return informationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND;
     }
   }
 
@@ -130,11 +131,11 @@ public class InformationObject_COUNTER_INTERROGATION_COMMAND extends Information
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_COUNTER_INTERROGATION_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND)) {
       return false;
     }
-    InformationObject_COUNTER_INTERROGATION_COMMAND that =
-        (InformationObject_COUNTER_INTERROGATION_COMMAND) o;
+    InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND that =
+        (InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND) o;
     return (getQcc() == that.getQcc()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DELAY_ACQUISITION_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND.java
similarity index 67%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DELAY_ACQUISITION_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND.java
index e88ce7e164..17a30cad02 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DELAY_ACQUISITION_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +46,8 @@ public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObje
   // Properties.
   protected final TwoOctetBinaryTime cp16Time2a;
 
-  public InformationObject_DELAY_ACQUISITION_COMMAND(int address, TwoOctetBinaryTime cp16Time2a) {
+  public InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND(
+      int address, TwoOctetBinaryTime cp16Time2a) {
     super(address);
     this.cp16Time2a = cp16Time2a;
   }
@@ -56,11 +57,11 @@ public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObje
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_DELAY_ACQUISITION_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND");
 
     // Simple Field (cp16Time2a)
     writeSimpleField(
@@ -69,7 +70,7 @@ public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObje
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_DELAY_ACQUISITION_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND");
   }
 
   @Override
@@ -80,7 +81,7 @@ public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObje
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_DELAY_ACQUISITION_COMMAND _value = this;
+    InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (cp16Time2a)
@@ -89,9 +90,10 @@ public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObje
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_DELAY_ACQUISITION_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -102,23 +104,25 @@ public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObje
                 () -> TwoOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_DELAY_ACQUISITION_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND");
     // Create the instance
-    return new InformationObject_DELAY_ACQUISITION_COMMANDBuilderImpl(cp16Time2a);
+    return new InformationObjectWithoutTime_DELAY_ACQUISITION_COMMANDBuilderImpl(cp16Time2a);
   }
 
-  public static class InformationObject_DELAY_ACQUISITION_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_DELAY_ACQUISITION_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final TwoOctetBinaryTime cp16Time2a;
 
-    public InformationObject_DELAY_ACQUISITION_COMMANDBuilderImpl(TwoOctetBinaryTime cp16Time2a) {
+    public InformationObjectWithoutTime_DELAY_ACQUISITION_COMMANDBuilderImpl(
+        TwoOctetBinaryTime cp16Time2a) {
       this.cp16Time2a = cp16Time2a;
     }
 
-    public InformationObject_DELAY_ACQUISITION_COMMAND build(int address) {
-      InformationObject_DELAY_ACQUISITION_COMMAND informationObject_DELAY_ACQUISITION_COMMAND =
-          new InformationObject_DELAY_ACQUISITION_COMMAND(address, cp16Time2a);
-      return informationObject_DELAY_ACQUISITION_COMMAND;
+    public InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND build(int address) {
+      InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND
+          informationObjectWithoutTime_DELAY_ACQUISITION_COMMAND =
+              new InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND(address, cp16Time2a);
+      return informationObjectWithoutTime_DELAY_ACQUISITION_COMMAND;
     }
   }
 
@@ -127,11 +131,11 @@ public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObje
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_DELAY_ACQUISITION_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND)) {
       return false;
     }
-    InformationObject_DELAY_ACQUISITION_COMMAND that =
-        (InformationObject_DELAY_ACQUISITION_COMMAND) o;
+    InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND that =
+        (InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND) o;
     return (getCp16Time2a() == that.getCp16Time2a()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DIRECTORY.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DIRECTORY.java
similarity index 80%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DIRECTORY.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DIRECTORY.java
index 25ec67ab64..85cd4795b8 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DIRECTORY.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DIRECTORY.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_DIRECTORY extends InformationObject implements Message {
+public class InformationObjectWithoutTime_DIRECTORY extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +49,7 @@ public class InformationObject_DIRECTORY extends InformationObject implements Me
   protected final StatusOfFile sof;
   protected final SevenOctetBinaryTime cp56Time2a;
 
-  public InformationObject_DIRECTORY(
+  public InformationObjectWithoutTime_DIRECTORY(
       int address,
       NameOfFile nof,
       LengthOfFile lof,
@@ -78,11 +79,11 @@ public class InformationObject_DIRECTORY extends InformationObject implements Me
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_DIRECTORY");
+    writeBuffer.pushContext("InformationObjectWithoutTime_DIRECTORY");
 
     // Simple Field (nof)
     writeSimpleField(
@@ -112,7 +113,7 @@ public class InformationObject_DIRECTORY extends InformationObject implements Me
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_DIRECTORY");
+    writeBuffer.popContext("InformationObjectWithoutTime_DIRECTORY");
   }
 
   @Override
@@ -123,7 +124,7 @@ public class InformationObject_DIRECTORY extends InformationObject implements Me
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_DIRECTORY _value = this;
+    InformationObjectWithoutTime_DIRECTORY _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nof)
@@ -141,9 +142,10 @@ public class InformationObject_DIRECTORY extends InformationObject implements Me
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_DIRECTORY");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_DIRECTORY");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -172,19 +174,19 @@ public class InformationObject_DIRECTORY extends InformationObject implements Me
                 () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_DIRECTORY");
+    readBuffer.closeContext("InformationObjectWithoutTime_DIRECTORY");
     // Create the instance
-    return new InformationObject_DIRECTORYBuilderImpl(nof, lof, sof, cp56Time2a);
+    return new InformationObjectWithoutTime_DIRECTORYBuilderImpl(nof, lof, sof, cp56Time2a);
   }
 
-  public static class InformationObject_DIRECTORYBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_DIRECTORYBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NameOfFile nof;
     private final LengthOfFile lof;
     private final StatusOfFile sof;
     private final SevenOctetBinaryTime cp56Time2a;
 
-    public InformationObject_DIRECTORYBuilderImpl(
+    public InformationObjectWithoutTime_DIRECTORYBuilderImpl(
         NameOfFile nof, LengthOfFile lof, StatusOfFile sof, SevenOctetBinaryTime cp56Time2a) {
       this.nof = nof;
       this.lof = lof;
@@ -192,10 +194,10 @@ public class InformationObject_DIRECTORY extends InformationObject implements Me
       this.cp56Time2a = cp56Time2a;
     }
 
-    public InformationObject_DIRECTORY build(int address) {
-      InformationObject_DIRECTORY informationObject_DIRECTORY =
-          new InformationObject_DIRECTORY(address, nof, lof, sof, cp56Time2a);
-      return informationObject_DIRECTORY;
+    public InformationObjectWithoutTime_DIRECTORY build(int address) {
+      InformationObjectWithoutTime_DIRECTORY informationObjectWithoutTime_DIRECTORY =
+          new InformationObjectWithoutTime_DIRECTORY(address, nof, lof, sof, cp56Time2a);
+      return informationObjectWithoutTime_DIRECTORY;
     }
   }
 
@@ -204,10 +206,10 @@ public class InformationObject_DIRECTORY extends InformationObject implements Me
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_DIRECTORY)) {
+    if (!(o instanceof InformationObjectWithoutTime_DIRECTORY)) {
       return false;
     }
-    InformationObject_DIRECTORY that = (InformationObject_DIRECTORY) o;
+    InformationObjectWithoutTime_DIRECTORY that = (InformationObjectWithoutTime_DIRECTORY) o;
     return (getNof() == that.getNof())
         && (getLof() == that.getLof())
         && (getSof() == that.getSof())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_COMMAND.java
similarity index 70%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_COMMAND.java
index 1ab45934be..0553beb336 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_COMMAND.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_DOUBLE_COMMAND extends InformationObject implements Message {
+public class InformationObjectWithoutTime_DOUBLE_COMMAND extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -45,7 +46,7 @@ public class InformationObject_DOUBLE_COMMAND extends InformationObject implemen
   // Properties.
   protected final DoubleCommand dco;
 
-  public InformationObject_DOUBLE_COMMAND(int address, DoubleCommand dco) {
+  public InformationObjectWithoutTime_DOUBLE_COMMAND(int address, DoubleCommand dco) {
     super(address);
     this.dco = dco;
   }
@@ -55,11 +56,11 @@ public class InformationObject_DOUBLE_COMMAND extends InformationObject implemen
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_DOUBLE_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_DOUBLE_COMMAND");
 
     // Simple Field (dco)
     writeSimpleField(
@@ -68,7 +69,7 @@ public class InformationObject_DOUBLE_COMMAND extends InformationObject implemen
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_DOUBLE_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_DOUBLE_COMMAND");
   }
 
   @Override
@@ -79,7 +80,7 @@ public class InformationObject_DOUBLE_COMMAND extends InformationObject implemen
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_DOUBLE_COMMAND _value = this;
+    InformationObjectWithoutTime_DOUBLE_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (dco)
@@ -88,9 +89,10 @@ public class InformationObject_DOUBLE_COMMAND extends InformationObject implemen
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_DOUBLE_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_DOUBLE_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -100,23 +102,23 @@ public class InformationObject_DOUBLE_COMMAND extends InformationObject implemen
             new DataReaderComplexDefault<>(() -> DoubleCommand.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_DOUBLE_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_DOUBLE_COMMAND");
     // Create the instance
-    return new InformationObject_DOUBLE_COMMANDBuilderImpl(dco);
+    return new InformationObjectWithoutTime_DOUBLE_COMMANDBuilderImpl(dco);
   }
 
-  public static class InformationObject_DOUBLE_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_DOUBLE_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final DoubleCommand dco;
 
-    public InformationObject_DOUBLE_COMMANDBuilderImpl(DoubleCommand dco) {
+    public InformationObjectWithoutTime_DOUBLE_COMMANDBuilderImpl(DoubleCommand dco) {
       this.dco = dco;
     }
 
-    public InformationObject_DOUBLE_COMMAND build(int address) {
-      InformationObject_DOUBLE_COMMAND informationObject_DOUBLE_COMMAND =
-          new InformationObject_DOUBLE_COMMAND(address, dco);
-      return informationObject_DOUBLE_COMMAND;
+    public InformationObjectWithoutTime_DOUBLE_COMMAND build(int address) {
+      InformationObjectWithoutTime_DOUBLE_COMMAND informationObjectWithoutTime_DOUBLE_COMMAND =
+          new InformationObjectWithoutTime_DOUBLE_COMMAND(address, dco);
+      return informationObjectWithoutTime_DOUBLE_COMMAND;
     }
   }
 
@@ -125,10 +127,11 @@ public class InformationObject_DOUBLE_COMMAND extends InformationObject implemen
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_DOUBLE_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_DOUBLE_COMMAND)) {
       return false;
     }
-    InformationObject_DOUBLE_COMMAND that = (InformationObject_DOUBLE_COMMAND) o;
+    InformationObjectWithoutTime_DOUBLE_COMMAND that =
+        (InformationObjectWithoutTime_DOUBLE_COMMAND) o;
     return (getDco() == that.getDco()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION.java
similarity index 67%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION.java
index 7782b91b78..ea64e859d3 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +46,8 @@ public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObjec
   // Properties.
   protected final DoublePointInformation diq;
 
-  public InformationObject_DOUBLE_POINT_INFORMATION(int address, DoublePointInformation diq) {
+  public InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION(
+      int address, DoublePointInformation diq) {
     super(address);
     this.diq = diq;
   }
@@ -56,11 +57,11 @@ public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObjec
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_DOUBLE_POINT_INFORMATION");
+    writeBuffer.pushContext("InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION");
 
     // Simple Field (diq)
     writeSimpleField(
@@ -69,7 +70,7 @@ public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObjec
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_DOUBLE_POINT_INFORMATION");
+    writeBuffer.popContext("InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION");
   }
 
   @Override
@@ -80,7 +81,7 @@ public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObjec
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_DOUBLE_POINT_INFORMATION _value = this;
+    InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (diq)
@@ -89,9 +90,10 @@ public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObjec
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_DOUBLE_POINT_INFORMATION");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -102,23 +104,25 @@ public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObjec
                 () -> DoublePointInformation.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_DOUBLE_POINT_INFORMATION");
+    readBuffer.closeContext("InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION");
     // Create the instance
-    return new InformationObject_DOUBLE_POINT_INFORMATIONBuilderImpl(diq);
+    return new InformationObjectWithoutTime_DOUBLE_POINT_INFORMATIONBuilderImpl(diq);
   }
 
-  public static class InformationObject_DOUBLE_POINT_INFORMATIONBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_DOUBLE_POINT_INFORMATIONBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final DoublePointInformation diq;
 
-    public InformationObject_DOUBLE_POINT_INFORMATIONBuilderImpl(DoublePointInformation diq) {
+    public InformationObjectWithoutTime_DOUBLE_POINT_INFORMATIONBuilderImpl(
+        DoublePointInformation diq) {
       this.diq = diq;
     }
 
-    public InformationObject_DOUBLE_POINT_INFORMATION build(int address) {
-      InformationObject_DOUBLE_POINT_INFORMATION informationObject_DOUBLE_POINT_INFORMATION =
-          new InformationObject_DOUBLE_POINT_INFORMATION(address, diq);
-      return informationObject_DOUBLE_POINT_INFORMATION;
+    public InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION build(int address) {
+      InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION
+          informationObjectWithoutTime_DOUBLE_POINT_INFORMATION =
+              new InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION(address, diq);
+      return informationObjectWithoutTime_DOUBLE_POINT_INFORMATION;
     }
   }
 
@@ -127,11 +131,11 @@ public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObjec
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_DOUBLE_POINT_INFORMATION)) {
+    if (!(o instanceof InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION)) {
       return false;
     }
-    InformationObject_DOUBLE_POINT_INFORMATION that =
-        (InformationObject_DOUBLE_POINT_INFORMATION) o;
+    InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION that =
+        (InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION) o;
     return (getDiq() == that.getDiq()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_END_OF_INITIALISATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_END_OF_INITIALISATION.java
similarity index 68%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_END_OF_INITIALISATION.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_END_OF_INITIALISATION.java
index 1b845c19f6..246e452ef7 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_END_OF_INITIALISATION.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_END_OF_INITIALISATION.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_END_OF_INITIALISATION extends InformationObject implements Message {
+public class InformationObjectWithoutTime_END_OF_INITIALISATION extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -45,7 +46,8 @@ public class InformationObject_END_OF_INITIALISATION extends InformationObject i
   // Properties.
   protected final CauseOfInitialization coi;
 
-  public InformationObject_END_OF_INITIALISATION(int address, CauseOfInitialization coi) {
+  public InformationObjectWithoutTime_END_OF_INITIALISATION(
+      int address, CauseOfInitialization coi) {
     super(address);
     this.coi = coi;
   }
@@ -55,11 +57,11 @@ public class InformationObject_END_OF_INITIALISATION extends InformationObject i
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_END_OF_INITIALISATION");
+    writeBuffer.pushContext("InformationObjectWithoutTime_END_OF_INITIALISATION");
 
     // Simple Field (coi)
     writeSimpleField(
@@ -68,7 +70,7 @@ public class InformationObject_END_OF_INITIALISATION extends InformationObject i
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_END_OF_INITIALISATION");
+    writeBuffer.popContext("InformationObjectWithoutTime_END_OF_INITIALISATION");
   }
 
   @Override
@@ -79,7 +81,7 @@ public class InformationObject_END_OF_INITIALISATION extends InformationObject i
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_END_OF_INITIALISATION _value = this;
+    InformationObjectWithoutTime_END_OF_INITIALISATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (coi)
@@ -88,9 +90,10 @@ public class InformationObject_END_OF_INITIALISATION extends InformationObject i
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_END_OF_INITIALISATION");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_END_OF_INITIALISATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -101,23 +104,25 @@ public class InformationObject_END_OF_INITIALISATION extends InformationObject i
                 () -> CauseOfInitialization.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_END_OF_INITIALISATION");
+    readBuffer.closeContext("InformationObjectWithoutTime_END_OF_INITIALISATION");
     // Create the instance
-    return new InformationObject_END_OF_INITIALISATIONBuilderImpl(coi);
+    return new InformationObjectWithoutTime_END_OF_INITIALISATIONBuilderImpl(coi);
   }
 
-  public static class InformationObject_END_OF_INITIALISATIONBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_END_OF_INITIALISATIONBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final CauseOfInitialization coi;
 
-    public InformationObject_END_OF_INITIALISATIONBuilderImpl(CauseOfInitialization coi) {
+    public InformationObjectWithoutTime_END_OF_INITIALISATIONBuilderImpl(
+        CauseOfInitialization coi) {
       this.coi = coi;
     }
 
-    public InformationObject_END_OF_INITIALISATION build(int address) {
-      InformationObject_END_OF_INITIALISATION informationObject_END_OF_INITIALISATION =
-          new InformationObject_END_OF_INITIALISATION(address, coi);
-      return informationObject_END_OF_INITIALISATION;
+    public InformationObjectWithoutTime_END_OF_INITIALISATION build(int address) {
+      InformationObjectWithoutTime_END_OF_INITIALISATION
+          informationObjectWithoutTime_END_OF_INITIALISATION =
+              new InformationObjectWithoutTime_END_OF_INITIALISATION(address, coi);
+      return informationObjectWithoutTime_END_OF_INITIALISATION;
     }
   }
 
@@ -126,10 +131,11 @@ public class InformationObject_END_OF_INITIALISATION extends InformationObject i
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_END_OF_INITIALISATION)) {
+    if (!(o instanceof InformationObjectWithoutTime_END_OF_INITIALISATION)) {
       return false;
     }
-    InformationObject_END_OF_INITIALISATION that = (InformationObject_END_OF_INITIALISATION) o;
+    InformationObjectWithoutTime_END_OF_INITIALISATION that =
+        (InformationObjectWithoutTime_END_OF_INITIALISATION) o;
     return (getCoi() == that.getCoi()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_FILE_READY.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_FILE_READY.java
similarity index 78%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_FILE_READY.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_FILE_READY.java
index 189a3d11ff..128d9028a4 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_FILE_READY.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_FILE_READY.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_FILE_READY extends InformationObject implements Message {
+public class InformationObjectWithoutTime_FILE_READY extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +48,7 @@ public class InformationObject_FILE_READY extends InformationObject implements M
   protected final LengthOfFile lof;
   protected final FileReadyQualifier frq;
 
-  public InformationObject_FILE_READY(
+  public InformationObjectWithoutTime_FILE_READY(
       int address, NameOfFile nof, LengthOfFile lof, FileReadyQualifier frq) {
     super(address);
     this.nof = nof;
@@ -68,11 +69,11 @@ public class InformationObject_FILE_READY extends InformationObject implements M
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_FILE_READY");
+    writeBuffer.pushContext("InformationObjectWithoutTime_FILE_READY");
 
     // Simple Field (nof)
     writeSimpleField(
@@ -95,7 +96,7 @@ public class InformationObject_FILE_READY extends InformationObject implements M
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_FILE_READY");
+    writeBuffer.popContext("InformationObjectWithoutTime_FILE_READY");
   }
 
   @Override
@@ -106,7 +107,7 @@ public class InformationObject_FILE_READY extends InformationObject implements M
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_FILE_READY _value = this;
+    InformationObjectWithoutTime_FILE_READY _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nof)
@@ -121,9 +122,10 @@ public class InformationObject_FILE_READY extends InformationObject implements M
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_FILE_READY");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_FILE_READY");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -146,28 +148,28 @@ public class InformationObject_FILE_READY extends InformationObject implements M
                 () -> FileReadyQualifier.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_FILE_READY");
+    readBuffer.closeContext("InformationObjectWithoutTime_FILE_READY");
     // Create the instance
-    return new InformationObject_FILE_READYBuilderImpl(nof, lof, frq);
+    return new InformationObjectWithoutTime_FILE_READYBuilderImpl(nof, lof, frq);
   }
 
-  public static class InformationObject_FILE_READYBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_FILE_READYBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NameOfFile nof;
     private final LengthOfFile lof;
     private final FileReadyQualifier frq;
 
-    public InformationObject_FILE_READYBuilderImpl(
+    public InformationObjectWithoutTime_FILE_READYBuilderImpl(
         NameOfFile nof, LengthOfFile lof, FileReadyQualifier frq) {
       this.nof = nof;
       this.lof = lof;
       this.frq = frq;
     }
 
-    public InformationObject_FILE_READY build(int address) {
-      InformationObject_FILE_READY informationObject_FILE_READY =
-          new InformationObject_FILE_READY(address, nof, lof, frq);
-      return informationObject_FILE_READY;
+    public InformationObjectWithoutTime_FILE_READY build(int address) {
+      InformationObjectWithoutTime_FILE_READY informationObjectWithoutTime_FILE_READY =
+          new InformationObjectWithoutTime_FILE_READY(address, nof, lof, frq);
+      return informationObjectWithoutTime_FILE_READY;
     }
   }
 
@@ -176,10 +178,10 @@ public class InformationObject_FILE_READY extends InformationObject implements M
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_FILE_READY)) {
+    if (!(o instanceof InformationObjectWithoutTime_FILE_READY)) {
       return false;
     }
-    InformationObject_FILE_READY that = (InformationObject_FILE_READY) o;
+    InformationObjectWithoutTime_FILE_READY that = (InformationObjectWithoutTime_FILE_READY) o;
     return (getNof() == that.getNof())
         && (getLof() == that.getLof())
         && (getFrq() == that.getFrq())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTEGRATED_TOTALS.java
similarity index 69%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTEGRATED_TOTALS.java
index 5dfea6d56a..bef7e98183 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTEGRATED_TOTALS.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_INTEGRATED_TOTALS extends InformationObject implements Message {
+public class InformationObjectWithoutTime_INTEGRATED_TOTALS extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -45,7 +46,7 @@ public class InformationObject_INTEGRATED_TOTALS extends InformationObject imple
   // Properties.
   protected final BinaryCounterReading bcr;
 
-  public InformationObject_INTEGRATED_TOTALS(int address, BinaryCounterReading bcr) {
+  public InformationObjectWithoutTime_INTEGRATED_TOTALS(int address, BinaryCounterReading bcr) {
     super(address);
     this.bcr = bcr;
   }
@@ -55,11 +56,11 @@ public class InformationObject_INTEGRATED_TOTALS extends InformationObject imple
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_INTEGRATED_TOTALS");
+    writeBuffer.pushContext("InformationObjectWithoutTime_INTEGRATED_TOTALS");
 
     // Simple Field (bcr)
     writeSimpleField(
@@ -68,7 +69,7 @@ public class InformationObject_INTEGRATED_TOTALS extends InformationObject imple
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_INTEGRATED_TOTALS");
+    writeBuffer.popContext("InformationObjectWithoutTime_INTEGRATED_TOTALS");
   }
 
   @Override
@@ -79,7 +80,7 @@ public class InformationObject_INTEGRATED_TOTALS extends InformationObject imple
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_INTEGRATED_TOTALS _value = this;
+    InformationObjectWithoutTime_INTEGRATED_TOTALS _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (bcr)
@@ -88,9 +89,10 @@ public class InformationObject_INTEGRATED_TOTALS extends InformationObject imple
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_INTEGRATED_TOTALS");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_INTEGRATED_TOTALS");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -101,23 +103,24 @@ public class InformationObject_INTEGRATED_TOTALS extends InformationObject imple
                 () -> BinaryCounterReading.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_INTEGRATED_TOTALS");
+    readBuffer.closeContext("InformationObjectWithoutTime_INTEGRATED_TOTALS");
     // Create the instance
-    return new InformationObject_INTEGRATED_TOTALSBuilderImpl(bcr);
+    return new InformationObjectWithoutTime_INTEGRATED_TOTALSBuilderImpl(bcr);
   }
 
-  public static class InformationObject_INTEGRATED_TOTALSBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_INTEGRATED_TOTALSBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final BinaryCounterReading bcr;
 
-    public InformationObject_INTEGRATED_TOTALSBuilderImpl(BinaryCounterReading bcr) {
+    public InformationObjectWithoutTime_INTEGRATED_TOTALSBuilderImpl(BinaryCounterReading bcr) {
       this.bcr = bcr;
     }
 
-    public InformationObject_INTEGRATED_TOTALS build(int address) {
-      InformationObject_INTEGRATED_TOTALS informationObject_INTEGRATED_TOTALS =
-          new InformationObject_INTEGRATED_TOTALS(address, bcr);
-      return informationObject_INTEGRATED_TOTALS;
+    public InformationObjectWithoutTime_INTEGRATED_TOTALS build(int address) {
+      InformationObjectWithoutTime_INTEGRATED_TOTALS
+          informationObjectWithoutTime_INTEGRATED_TOTALS =
+              new InformationObjectWithoutTime_INTEGRATED_TOTALS(address, bcr);
+      return informationObjectWithoutTime_INTEGRATED_TOTALS;
     }
   }
 
@@ -126,10 +129,11 @@ public class InformationObject_INTEGRATED_TOTALS extends InformationObject imple
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_INTEGRATED_TOTALS)) {
+    if (!(o instanceof InformationObjectWithoutTime_INTEGRATED_TOTALS)) {
       return false;
     }
-    InformationObject_INTEGRATED_TOTALS that = (InformationObject_INTEGRATED_TOTALS) o;
+    InformationObjectWithoutTime_INTEGRATED_TOTALS that =
+        (InformationObjectWithoutTime_INTEGRATED_TOTALS) o;
     return (getBcr() == that.getBcr()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTERROGATION_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTERROGATION_COMMAND.java
similarity index 68%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTERROGATION_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTERROGATION_COMMAND.java
index 98a3c91cdf..13bdfc0c68 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTERROGATION_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTERROGATION_COMMAND.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_INTERROGATION_COMMAND extends InformationObject implements Message {
+public class InformationObjectWithoutTime_INTERROGATION_COMMAND extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -45,7 +46,8 @@ public class InformationObject_INTERROGATION_COMMAND extends InformationObject i
   // Properties.
   protected final QualifierOfInterrogation qoi;
 
-  public InformationObject_INTERROGATION_COMMAND(int address, QualifierOfInterrogation qoi) {
+  public InformationObjectWithoutTime_INTERROGATION_COMMAND(
+      int address, QualifierOfInterrogation qoi) {
     super(address);
     this.qoi = qoi;
   }
@@ -55,11 +57,11 @@ public class InformationObject_INTERROGATION_COMMAND extends InformationObject i
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_INTERROGATION_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_INTERROGATION_COMMAND");
 
     // Simple Field (qoi)
     writeSimpleField(
@@ -68,7 +70,7 @@ public class InformationObject_INTERROGATION_COMMAND extends InformationObject i
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_INTERROGATION_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_INTERROGATION_COMMAND");
   }
 
   @Override
@@ -79,7 +81,7 @@ public class InformationObject_INTERROGATION_COMMAND extends InformationObject i
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_INTERROGATION_COMMAND _value = this;
+    InformationObjectWithoutTime_INTERROGATION_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (qoi)
@@ -88,9 +90,10 @@ public class InformationObject_INTERROGATION_COMMAND extends InformationObject i
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_INTERROGATION_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_INTERROGATION_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -101,23 +104,25 @@ public class InformationObject_INTERROGATION_COMMAND extends InformationObject i
                 () -> QualifierOfInterrogation.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_INTERROGATION_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_INTERROGATION_COMMAND");
     // Create the instance
-    return new InformationObject_INTERROGATION_COMMANDBuilderImpl(qoi);
+    return new InformationObjectWithoutTime_INTERROGATION_COMMANDBuilderImpl(qoi);
   }
 
-  public static class InformationObject_INTERROGATION_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_INTERROGATION_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final QualifierOfInterrogation qoi;
 
-    public InformationObject_INTERROGATION_COMMANDBuilderImpl(QualifierOfInterrogation qoi) {
+    public InformationObjectWithoutTime_INTERROGATION_COMMANDBuilderImpl(
+        QualifierOfInterrogation qoi) {
       this.qoi = qoi;
     }
 
-    public InformationObject_INTERROGATION_COMMAND build(int address) {
-      InformationObject_INTERROGATION_COMMAND informationObject_INTERROGATION_COMMAND =
-          new InformationObject_INTERROGATION_COMMAND(address, qoi);
-      return informationObject_INTERROGATION_COMMAND;
+    public InformationObjectWithoutTime_INTERROGATION_COMMAND build(int address) {
+      InformationObjectWithoutTime_INTERROGATION_COMMAND
+          informationObjectWithoutTime_INTERROGATION_COMMAND =
+              new InformationObjectWithoutTime_INTERROGATION_COMMAND(address, qoi);
+      return informationObjectWithoutTime_INTERROGATION_COMMAND;
     }
   }
 
@@ -126,10 +131,11 @@ public class InformationObject_INTERROGATION_COMMAND extends InformationObject i
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_INTERROGATION_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_INTERROGATION_COMMAND)) {
       return false;
     }
-    InformationObject_INTERROGATION_COMMAND that = (InformationObject_INTERROGATION_COMMAND) o;
+    InformationObjectWithoutTime_INTERROGATION_COMMAND that =
+        (InformationObjectWithoutTime_INTERROGATION_COMMAND) o;
     return (getQoi() == that.getQoi()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_LAST_SECTION_LAST_SEGMENT.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT.java
similarity index 77%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_LAST_SECTION_LAST_SEGMENT.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT.java
index e13913bd36..99b3c1dda4 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_LAST_SECTION_LAST_SEGMENT.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -49,7 +49,7 @@ public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObje
   protected final LastSectionOrSegmentQualifier lsq;
   protected final Checksum chs;
 
-  public InformationObject_LAST_SECTION_LAST_SEGMENT(
+  public InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT(
       int address,
       NameOfFile nof,
       NameOfSection nos,
@@ -79,11 +79,11 @@ public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObje
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_LAST_SECTION_LAST_SEGMENT");
+    writeBuffer.pushContext("InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT");
 
     // Simple Field (nof)
     writeSimpleField(
@@ -113,7 +113,7 @@ public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObje
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_LAST_SECTION_LAST_SEGMENT");
+    writeBuffer.popContext("InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT");
   }
 
   @Override
@@ -124,7 +124,7 @@ public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObje
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_LAST_SECTION_LAST_SEGMENT _value = this;
+    InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nof)
@@ -142,9 +142,10 @@ public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObje
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_LAST_SECTION_LAST_SEGMENT");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -173,19 +174,20 @@ public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObje
             new DataReaderComplexDefault<>(() -> Checksum.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_LAST_SECTION_LAST_SEGMENT");
+    readBuffer.closeContext("InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT");
     // Create the instance
-    return new InformationObject_LAST_SECTION_LAST_SEGMENTBuilderImpl(nof, nos, lsq, chs);
+    return new InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENTBuilderImpl(
+        nof, nos, lsq, chs);
   }
 
-  public static class InformationObject_LAST_SECTION_LAST_SEGMENTBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENTBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NameOfFile nof;
     private final NameOfSection nos;
     private final LastSectionOrSegmentQualifier lsq;
     private final Checksum chs;
 
-    public InformationObject_LAST_SECTION_LAST_SEGMENTBuilderImpl(
+    public InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENTBuilderImpl(
         NameOfFile nof, NameOfSection nos, LastSectionOrSegmentQualifier lsq, Checksum chs) {
       this.nof = nof;
       this.nos = nos;
@@ -193,10 +195,12 @@ public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObje
       this.chs = chs;
     }
 
-    public InformationObject_LAST_SECTION_LAST_SEGMENT build(int address) {
-      InformationObject_LAST_SECTION_LAST_SEGMENT informationObject_LAST_SECTION_LAST_SEGMENT =
-          new InformationObject_LAST_SECTION_LAST_SEGMENT(address, nof, nos, lsq, chs);
-      return informationObject_LAST_SECTION_LAST_SEGMENT;
+    public InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT build(int address) {
+      InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT
+          informationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT =
+              new InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT(
+                  address, nof, nos, lsq, chs);
+      return informationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT;
     }
   }
 
@@ -205,11 +209,11 @@ public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObje
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_LAST_SECTION_LAST_SEGMENT)) {
+    if (!(o instanceof InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT)) {
       return false;
     }
-    InformationObject_LAST_SECTION_LAST_SEGMENT that =
-        (InformationObject_LAST_SECTION_LAST_SEGMENT) o;
+    InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT that =
+        (InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT) o;
     return (getNof() == that.getNof())
         && (getNos() == that.getNos())
         && (getLsq() == that.getLsq())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE.java
index df43e03361..9aed1a3719 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends Informati
   protected final NormalizedValue nva;
   protected final QualityDescriptor qds;
 
-  public InformationObject_MEASURED_VALUE_NORMALISED_VALUE(
+  public InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE(
       int address, NormalizedValue nva, QualityDescriptor qds) {
     super(address);
     this.nva = nva;
@@ -63,11 +63,11 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends Informati
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_MEASURED_VALUE_NORMALISED_VALUE");
+    writeBuffer.pushContext("InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE");
 
     // Simple Field (nva)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends Informati
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_MEASURED_VALUE_NORMALISED_VALUE");
+    writeBuffer.popContext("InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends Informati
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_NORMALISED_VALUE _value = this;
+    InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nva)
@@ -106,9 +106,10 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends Informati
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_MEASURED_VALUE_NORMALISED_VALUE");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,27 +127,27 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends Informati
                 () -> QualityDescriptor.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_MEASURED_VALUE_NORMALISED_VALUE");
+    readBuffer.closeContext("InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl(nva, qds);
+    return new InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl(nva, qds);
   }
 
-  public static class InformationObject_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NormalizedValue nva;
     private final QualityDescriptor qds;
 
-    public InformationObject_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl(
+    public InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl(
         NormalizedValue nva, QualityDescriptor qds) {
       this.nva = nva;
       this.qds = qds;
     }
 
-    public InformationObject_MEASURED_VALUE_NORMALISED_VALUE build(int address) {
-      InformationObject_MEASURED_VALUE_NORMALISED_VALUE
-          informationObject_MEASURED_VALUE_NORMALISED_VALUE =
-              new InformationObject_MEASURED_VALUE_NORMALISED_VALUE(address, nva, qds);
-      return informationObject_MEASURED_VALUE_NORMALISED_VALUE;
+    public InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE build(int address) {
+      InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE
+          informationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE =
+              new InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE(address, nva, qds);
+      return informationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE;
     }
   }
 
@@ -155,11 +156,11 @@ public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends Informati
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_MEASURED_VALUE_NORMALISED_VALUE)) {
+    if (!(o instanceof InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_NORMALISED_VALUE that =
-        (InformationObject_MEASURED_VALUE_NORMALISED_VALUE) o;
+    InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE that =
+        (InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE) o;
     return (getNva() == that.getNva()) && (getQds() == that.getQds()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java
similarity index 65%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java
index af19f65f4f..25499838dc 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR
-    extends InformationObject implements Message {
+public class InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +46,7 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_D
   // Properties.
   protected final NormalizedValue nva;
 
-  public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR(
+  public InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR(
       int address, NormalizedValue nva) {
     super(address);
     this.nva = nva;
@@ -57,12 +57,12 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_D
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext(
-        "InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR");
+        "InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR");
 
     // Simple Field (nva)
     writeSimpleField(
@@ -72,7 +72,7 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_D
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     writeBuffer.popContext(
-        "InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR");
+        "InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR");
   }
 
   @Override
@@ -83,7 +83,8 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_D
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR _value = this;
+    InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR _value =
+        this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nva)
@@ -92,10 +93,11 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_D
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
     readBuffer.pullContext(
-        "InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR");
+        "InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -107,29 +109,30 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_D
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     readBuffer.closeContext(
-        "InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR");
+        "InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl(
+    return new InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl(
         nva);
   }
 
   public static
-  class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  class InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NormalizedValue nva;
 
-    public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl(
+    public
+    InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl(
         NormalizedValue nva) {
       this.nva = nva;
     }
 
-    public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR build(
-        int address) {
-      InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR
-          informationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR =
-              new InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR(
+    public InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR
+        build(int address) {
+      InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR
+          informationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR =
+              new InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR(
                   address, nva);
-      return informationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR;
+      return informationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR;
     }
   }
 
@@ -139,11 +142,12 @@ public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_D
       return true;
     }
     if (!(o
-        instanceof InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR)) {
+        instanceof
+        InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR that =
-        (InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR) o;
+    InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR that =
+        (InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR) o;
     return (getNva() == that.getNva()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE.java
index 2f7d4ce75f..a0f722a4a8 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationOb
   protected final ScaledValue sva;
   protected final QualityDescriptor qds;
 
-  public InformationObject_MEASURED_VALUE_SCALED_VALUE(
+  public InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE(
       int address, ScaledValue sva, QualityDescriptor qds) {
     super(address);
     this.sva = sva;
@@ -63,11 +63,11 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationOb
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_MEASURED_VALUE_SCALED_VALUE");
+    writeBuffer.pushContext("InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE");
 
     // Simple Field (sva)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationOb
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_MEASURED_VALUE_SCALED_VALUE");
+    writeBuffer.popContext("InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationOb
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_SCALED_VALUE _value = this;
+    InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (sva)
@@ -106,9 +106,10 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationOb
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_MEASURED_VALUE_SCALED_VALUE");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -125,26 +126,27 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationOb
                 () -> QualityDescriptor.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_MEASURED_VALUE_SCALED_VALUE");
+    readBuffer.closeContext("InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_SCALED_VALUEBuilderImpl(sva, qds);
+    return new InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl(sva, qds);
   }
 
-  public static class InformationObject_MEASURED_VALUE_SCALED_VALUEBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final ScaledValue sva;
     private final QualityDescriptor qds;
 
-    public InformationObject_MEASURED_VALUE_SCALED_VALUEBuilderImpl(
+    public InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl(
         ScaledValue sva, QualityDescriptor qds) {
       this.sva = sva;
       this.qds = qds;
     }
 
-    public InformationObject_MEASURED_VALUE_SCALED_VALUE build(int address) {
-      InformationObject_MEASURED_VALUE_SCALED_VALUE informationObject_MEASURED_VALUE_SCALED_VALUE =
-          new InformationObject_MEASURED_VALUE_SCALED_VALUE(address, sva, qds);
-      return informationObject_MEASURED_VALUE_SCALED_VALUE;
+    public InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE build(int address) {
+      InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE
+          informationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE =
+              new InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE(address, sva, qds);
+      return informationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE;
     }
   }
 
@@ -153,11 +155,11 @@ public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationOb
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_MEASURED_VALUE_SCALED_VALUE)) {
+    if (!(o instanceof InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_SCALED_VALUE that =
-        (InformationObject_MEASURED_VALUE_SCALED_VALUE) o;
+    InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE that =
+        (InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE) o;
     return (getSva() == that.getSva()) && (getQds() == that.getQds()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
similarity index 67%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
index 982bf34032..0f071ec714 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extend
   protected final float value;
   protected final QualityDescriptor qds;
 
-  public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(
+  public InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(
       int address, float value, QualityDescriptor qds) {
     super(address);
     this.value = value;
@@ -63,11 +63,12 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extend
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
+    writeBuffer.pushContext(
+        "InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
 
     // Simple Field (value)
     writeSimpleField(
@@ -83,7 +84,8 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extend
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
+    writeBuffer.popContext(
+        "InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
   }
 
   @Override
@@ -94,7 +96,7 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extend
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER _value = this;
+    InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (value)
@@ -106,9 +108,11 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extend
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext(
+        "InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -123,27 +127,32 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extend
                 () -> QualityDescriptor.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
+    readBuffer.closeContext(
+        "InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER");
     // Create the instance
-    return new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(value, qds);
+    return new InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
+        value, qds);
   }
 
-  public static class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static
+  class InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final float value;
     private final QualityDescriptor qds;
 
-    public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
+    public InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         float value, QualityDescriptor qds) {
       this.value = value;
       this.qds = qds;
     }
 
-    public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER build(int address) {
-      InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
-          informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER =
-              new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(address, value, qds);
-      return informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER;
+    public InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER build(
+        int address) {
+      InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER
+          informationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER =
+              new InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(
+                  address, value, qds);
+      return informationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER;
     }
   }
 
@@ -152,11 +161,11 @@ public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extend
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) {
+    if (!(o instanceof InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) {
       return false;
     }
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER that =
-        (InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) o;
+    InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER that =
+        (InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) o;
     return (getValue() == that.getValue())
         && (getQds() == that.getQds())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java
similarity index 69%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java
index 964ae9eaf2..c95e80a3d8 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java
@@ -35,8 +35,9 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION
-    extends InformationObject implements Message {
+public
+class InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +48,7 @@ public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANG
   protected final StatusChangeDetection scd;
   protected final QualityDescriptor qds;
 
-  public InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION(
+  public InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION(
       int address, StatusChangeDetection scd, QualityDescriptor qds) {
     super(address);
     this.scd = scd;
@@ -63,12 +64,12 @@ public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANG
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext(
-        "InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION");
+        "InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION");
 
     // Simple Field (scd)
     writeSimpleField(
@@ -85,7 +86,7 @@ public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANG
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     writeBuffer.popContext(
-        "InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION");
+        "InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION");
   }
 
   @Override
@@ -96,7 +97,8 @@ public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANG
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION _value = this;
+    InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION
+        _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (scd)
@@ -108,10 +110,11 @@ public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANG
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
     readBuffer.pullContext(
-        "InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION");
+        "InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -130,32 +133,32 @@ public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANG
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     readBuffer.closeContext(
-        "InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION");
+        "InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION");
     // Create the instance
-    return new InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl(
+    return new InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl(
         scd, qds);
   }
 
   public static
-  class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  class InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final StatusChangeDetection scd;
     private final QualityDescriptor qds;
 
     public
-    InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl(
+    InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl(
         StatusChangeDetection scd, QualityDescriptor qds) {
       this.scd = scd;
       this.qds = qds;
     }
 
-    public InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION build(
-        int address) {
-      InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION
-          informationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION =
-              new InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION(
+    public InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION
+        build(int address) {
+      InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION
+          informationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION =
+              new InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION(
                   address, scd, qds);
-      return informationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION;
+      return informationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION;
     }
   }
 
@@ -166,11 +169,12 @@ public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANG
     }
     if (!(o
         instanceof
-        InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)) {
+        InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)) {
       return false;
     }
-    InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION that =
-        (InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION) o;
+    InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION that =
+        (InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)
+            o;
     return (getScd() == that.getScd()) && (getQds() == that.getQds()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_ACTIVATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_ACTIVATION.java
similarity index 68%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_ACTIVATION.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_ACTIVATION.java
index 8d757bbdec..7b39f30c1d 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_ACTIVATION.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_ACTIVATION.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_PARAMETER_ACTIVATION extends InformationObject implements Message {
+public class InformationObjectWithoutTime_PARAMETER_ACTIVATION extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -45,7 +46,8 @@ public class InformationObject_PARAMETER_ACTIVATION extends InformationObject im
   // Properties.
   protected final QualifierOfParameterActivation qpa;
 
-  public InformationObject_PARAMETER_ACTIVATION(int address, QualifierOfParameterActivation qpa) {
+  public InformationObjectWithoutTime_PARAMETER_ACTIVATION(
+      int address, QualifierOfParameterActivation qpa) {
     super(address);
     this.qpa = qpa;
   }
@@ -55,11 +57,11 @@ public class InformationObject_PARAMETER_ACTIVATION extends InformationObject im
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_PARAMETER_ACTIVATION");
+    writeBuffer.pushContext("InformationObjectWithoutTime_PARAMETER_ACTIVATION");
 
     // Simple Field (qpa)
     writeSimpleField(
@@ -68,7 +70,7 @@ public class InformationObject_PARAMETER_ACTIVATION extends InformationObject im
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_PARAMETER_ACTIVATION");
+    writeBuffer.popContext("InformationObjectWithoutTime_PARAMETER_ACTIVATION");
   }
 
   @Override
@@ -79,7 +81,7 @@ public class InformationObject_PARAMETER_ACTIVATION extends InformationObject im
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PARAMETER_ACTIVATION _value = this;
+    InformationObjectWithoutTime_PARAMETER_ACTIVATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (qpa)
@@ -88,9 +90,10 @@ public class InformationObject_PARAMETER_ACTIVATION extends InformationObject im
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_PARAMETER_ACTIVATION");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_PARAMETER_ACTIVATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -101,23 +104,25 @@ public class InformationObject_PARAMETER_ACTIVATION extends InformationObject im
                 () -> QualifierOfParameterActivation.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_PARAMETER_ACTIVATION");
+    readBuffer.closeContext("InformationObjectWithoutTime_PARAMETER_ACTIVATION");
     // Create the instance
-    return new InformationObject_PARAMETER_ACTIVATIONBuilderImpl(qpa);
+    return new InformationObjectWithoutTime_PARAMETER_ACTIVATIONBuilderImpl(qpa);
   }
 
-  public static class InformationObject_PARAMETER_ACTIVATIONBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_PARAMETER_ACTIVATIONBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final QualifierOfParameterActivation qpa;
 
-    public InformationObject_PARAMETER_ACTIVATIONBuilderImpl(QualifierOfParameterActivation qpa) {
+    public InformationObjectWithoutTime_PARAMETER_ACTIVATIONBuilderImpl(
+        QualifierOfParameterActivation qpa) {
       this.qpa = qpa;
     }
 
-    public InformationObject_PARAMETER_ACTIVATION build(int address) {
-      InformationObject_PARAMETER_ACTIVATION informationObject_PARAMETER_ACTIVATION =
-          new InformationObject_PARAMETER_ACTIVATION(address, qpa);
-      return informationObject_PARAMETER_ACTIVATION;
+    public InformationObjectWithoutTime_PARAMETER_ACTIVATION build(int address) {
+      InformationObjectWithoutTime_PARAMETER_ACTIVATION
+          informationObjectWithoutTime_PARAMETER_ACTIVATION =
+              new InformationObjectWithoutTime_PARAMETER_ACTIVATION(address, qpa);
+      return informationObjectWithoutTime_PARAMETER_ACTIVATION;
     }
   }
 
@@ -126,10 +131,11 @@ public class InformationObject_PARAMETER_ACTIVATION extends InformationObject im
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_PARAMETER_ACTIVATION)) {
+    if (!(o instanceof InformationObjectWithoutTime_PARAMETER_ACTIVATION)) {
       return false;
     }
-    InformationObject_PARAMETER_ACTIVATION that = (InformationObject_PARAMETER_ACTIVATION) o;
+    InformationObjectWithoutTime_PARAMETER_ACTIVATION that =
+        (InformationObjectWithoutTime_PARAMETER_ACTIVATION) o;
     return (getQpa() == that.getQpa()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java
similarity index 69%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java
index e10515167a..8b162e688b 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
-    extends InformationObject implements Message {
+public class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
   protected final NormalizedValue nva;
   protected final QualifierOfParameterOfMeasuredValues qpm;
 
-  public InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE(
+  public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE(
       int address, NormalizedValue nva, QualifierOfParameterOfMeasuredValues qpm) {
     super(address);
     this.nva = nva;
@@ -63,11 +63,12 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE");
+    writeBuffer.pushContext(
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE");
 
     // Simple Field (nva)
     writeSimpleField(
@@ -83,7 +84,8 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE");
+    writeBuffer.popContext(
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE");
   }
 
   @Override
@@ -94,7 +96,7 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE _value = this;
+    InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nva)
@@ -106,9 +108,11 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext(
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,28 +130,32 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
                 () -> QualifierOfParameterOfMeasuredValues.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE");
+    readBuffer.closeContext(
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE");
     // Create the instance
-    return new InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl(nva, qpm);
+    return new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl(
+        nva, qpm);
   }
 
-  public static class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static
+  class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NormalizedValue nva;
     private final QualifierOfParameterOfMeasuredValues qpm;
 
-    public InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl(
+    public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl(
         NormalizedValue nva, QualifierOfParameterOfMeasuredValues qpm) {
       this.nva = nva;
       this.qpm = qpm;
     }
 
-    public InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE build(int address) {
-      InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
-          informationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE =
-              new InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE(
+    public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE build(
+        int address) {
+      InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
+          informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE =
+              new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE(
                   address, nva, qpm);
-      return informationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE;
+      return informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE;
     }
   }
 
@@ -156,11 +164,12 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE)) {
+    if (!(o
+        instanceof InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE)) {
       return false;
     }
-    InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE that =
-        (InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE) o;
+    InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE that =
+        (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE) o;
     return (getNva() == that.getNva()) && (getQpm() == that.getQpm()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java
similarity index 69%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java
index 587dd5f51e..09ed9df81e 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends
   protected final ScaledValue sva;
   protected final QualifierOfParameterOfMeasuredValues qpm;
 
-  public InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE(
+  public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE(
       int address, ScaledValue sva, QualifierOfParameterOfMeasuredValues qpm) {
     super(address);
     this.sva = sva;
@@ -63,11 +63,12 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE");
+    writeBuffer.pushContext(
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE");
 
     // Simple Field (sva)
     writeSimpleField(
@@ -83,7 +84,8 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE");
+    writeBuffer.popContext(
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE");
   }
 
   @Override
@@ -94,7 +96,7 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE _value = this;
+    InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (sva)
@@ -106,9 +108,11 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext(
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -125,27 +129,32 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends
                 () -> QualifierOfParameterOfMeasuredValues.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE");
+    readBuffer.closeContext(
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE");
     // Create the instance
-    return new InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl(sva, qpm);
+    return new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl(
+        sva, qpm);
   }
 
-  public static class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static
+  class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final ScaledValue sva;
     private final QualifierOfParameterOfMeasuredValues qpm;
 
-    public InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl(
+    public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl(
         ScaledValue sva, QualifierOfParameterOfMeasuredValues qpm) {
       this.sva = sva;
       this.qpm = qpm;
     }
 
-    public InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE build(int address) {
-      InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE
-          informationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE =
-              new InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE(address, sva, qpm);
-      return informationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE;
+    public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE build(
+        int address) {
+      InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE
+          informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE =
+              new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE(
+                  address, sva, qpm);
+      return informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE;
     }
   }
 
@@ -154,11 +163,11 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE)) {
+    if (!(o instanceof InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE)) {
       return false;
     }
-    InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE that =
-        (InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE) o;
+    InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE that =
+        (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE) o;
     return (getSva() == that.getSva()) && (getQpm() == that.getQpm()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java
similarity index 69%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java
index fb7aca161a..6ad3b0fda8 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER
-    extends InformationObject implements Message {
+public class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT
   protected final float value;
   protected final QualifierOfParameterOfMeasuredValues qpm;
 
-  public InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER(
+  public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER(
       int address, float value, QualifierOfParameterOfMeasuredValues qpm) {
     super(address);
     this.value = value;
@@ -63,12 +63,12 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext(
-        "InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER");
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER");
 
     // Simple Field (value)
     writeSimpleField(
@@ -85,7 +85,7 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     writeBuffer.popContext(
-        "InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER");
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER");
   }
 
   @Override
@@ -96,7 +96,8 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER _value = this;
+    InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER _value =
+        this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (value)
@@ -108,10 +109,11 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
     readBuffer.pullContext(
-        "InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER");
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -127,31 +129,32 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
     readBuffer.closeContext(
-        "InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER");
+        "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER");
     // Create the instance
-    return new InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
+    return new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         value, qpm);
   }
 
   public static
-  class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final float value;
     private final QualifierOfParameterOfMeasuredValues qpm;
 
-    public InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
+    public
+    InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         float value, QualifierOfParameterOfMeasuredValues qpm) {
       this.value = value;
       this.qpm = qpm;
     }
 
-    public InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER build(
-        int address) {
-      InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER
-          informationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER =
-              new InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER(
+    public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER
+        build(int address) {
+      InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER
+          informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER =
+              new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER(
                   address, value, qpm);
-      return informationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER;
+      return informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER;
     }
   }
 
@@ -161,11 +164,12 @@ public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT
       return true;
     }
     if (!(o
-        instanceof InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER)) {
+        instanceof
+        InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER)) {
       return false;
     }
-    InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER that =
-        (InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER) o;
+    InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER that =
+        (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER) o;
     return (getValue() == that.getValue())
         && (getQpm() == that.getQpm())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_READ_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_READ_COMMAND.java
similarity index 66%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_READ_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_READ_COMMAND.java
index 98e287bf7c..b72e67555d 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_READ_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_READ_COMMAND.java
@@ -35,25 +35,26 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_READ_COMMAND extends InformationObject implements Message {
+public class InformationObjectWithoutTime_READ_COMMAND extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
     return TypeIdentification.READ_COMMAND;
   }
 
-  public InformationObject_READ_COMMAND(int address) {
+  public InformationObjectWithoutTime_READ_COMMAND(int address) {
     super(address);
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_READ_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_READ_COMMAND");
 
-    writeBuffer.popContext("InformationObject_READ_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_READ_COMMAND");
   }
 
   @Override
@@ -64,32 +65,33 @@ public class InformationObject_READ_COMMAND extends InformationObject implements
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_READ_COMMAND _value = this;
+    InformationObjectWithoutTime_READ_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_READ_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_READ_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    readBuffer.closeContext("InformationObject_READ_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_READ_COMMAND");
     // Create the instance
-    return new InformationObject_READ_COMMANDBuilderImpl();
+    return new InformationObjectWithoutTime_READ_COMMANDBuilderImpl();
   }
 
-  public static class InformationObject_READ_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_READ_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
 
-    public InformationObject_READ_COMMANDBuilderImpl() {}
+    public InformationObjectWithoutTime_READ_COMMANDBuilderImpl() {}
 
-    public InformationObject_READ_COMMAND build(int address) {
-      InformationObject_READ_COMMAND informationObject_READ_COMMAND =
-          new InformationObject_READ_COMMAND(address);
-      return informationObject_READ_COMMAND;
+    public InformationObjectWithoutTime_READ_COMMAND build(int address) {
+      InformationObjectWithoutTime_READ_COMMAND informationObjectWithoutTime_READ_COMMAND =
+          new InformationObjectWithoutTime_READ_COMMAND(address);
+      return informationObjectWithoutTime_READ_COMMAND;
     }
   }
 
@@ -98,10 +100,10 @@ public class InformationObject_READ_COMMAND extends InformationObject implements
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_READ_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_READ_COMMAND)) {
       return false;
     }
-    InformationObject_READ_COMMAND that = (InformationObject_READ_COMMAND) o;
+    InformationObjectWithoutTime_READ_COMMAND that = (InformationObjectWithoutTime_READ_COMMAND) o;
     return super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_REGULATING_STEP_COMMAND.java
similarity index 67%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_REGULATING_STEP_COMMAND.java
index ffccf6ede2..13d24a7fb0 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_REGULATING_STEP_COMMAND.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_REGULATING_STEP_COMMAND
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +46,8 @@ public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject
   // Properties.
   protected final RegulatingStepCommand rco;
 
-  public InformationObject_REGULATING_STEP_COMMAND(int address, RegulatingStepCommand rco) {
+  public InformationObjectWithoutTime_REGULATING_STEP_COMMAND(
+      int address, RegulatingStepCommand rco) {
     super(address);
     this.rco = rco;
   }
@@ -56,11 +57,11 @@ public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_REGULATING_STEP_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_REGULATING_STEP_COMMAND");
 
     // Simple Field (rco)
     writeSimpleField(
@@ -69,7 +70,7 @@ public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_REGULATING_STEP_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_REGULATING_STEP_COMMAND");
   }
 
   @Override
@@ -80,7 +81,7 @@ public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_REGULATING_STEP_COMMAND _value = this;
+    InformationObjectWithoutTime_REGULATING_STEP_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (rco)
@@ -89,9 +90,10 @@ public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_REGULATING_STEP_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_REGULATING_STEP_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -102,23 +104,25 @@ public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject
                 () -> RegulatingStepCommand.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_REGULATING_STEP_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_REGULATING_STEP_COMMAND");
     // Create the instance
-    return new InformationObject_REGULATING_STEP_COMMANDBuilderImpl(rco);
+    return new InformationObjectWithoutTime_REGULATING_STEP_COMMANDBuilderImpl(rco);
   }
 
-  public static class InformationObject_REGULATING_STEP_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_REGULATING_STEP_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final RegulatingStepCommand rco;
 
-    public InformationObject_REGULATING_STEP_COMMANDBuilderImpl(RegulatingStepCommand rco) {
+    public InformationObjectWithoutTime_REGULATING_STEP_COMMANDBuilderImpl(
+        RegulatingStepCommand rco) {
       this.rco = rco;
     }
 
-    public InformationObject_REGULATING_STEP_COMMAND build(int address) {
-      InformationObject_REGULATING_STEP_COMMAND informationObject_REGULATING_STEP_COMMAND =
-          new InformationObject_REGULATING_STEP_COMMAND(address, rco);
-      return informationObject_REGULATING_STEP_COMMAND;
+    public InformationObjectWithoutTime_REGULATING_STEP_COMMAND build(int address) {
+      InformationObjectWithoutTime_REGULATING_STEP_COMMAND
+          informationObjectWithoutTime_REGULATING_STEP_COMMAND =
+              new InformationObjectWithoutTime_REGULATING_STEP_COMMAND(address, rco);
+      return informationObjectWithoutTime_REGULATING_STEP_COMMAND;
     }
   }
 
@@ -127,10 +131,11 @@ public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_REGULATING_STEP_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_REGULATING_STEP_COMMAND)) {
       return false;
     }
-    InformationObject_REGULATING_STEP_COMMAND that = (InformationObject_REGULATING_STEP_COMMAND) o;
+    InformationObjectWithoutTime_REGULATING_STEP_COMMAND that =
+        (InformationObjectWithoutTime_REGULATING_STEP_COMMAND) o;
     return (getRco() == that.getRco()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_RESET_PROCESS_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_RESET_PROCESS_COMMAND.java
similarity index 68%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_RESET_PROCESS_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_RESET_PROCESS_COMMAND.java
index 8103bb987c..25389bf161 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_RESET_PROCESS_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_RESET_PROCESS_COMMAND.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject implements Message {
+public class InformationObjectWithoutTime_RESET_PROCESS_COMMAND extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -45,7 +46,8 @@ public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject i
   // Properties.
   protected final QualifierOfResetProcessCommand qrp;
 
-  public InformationObject_RESET_PROCESS_COMMAND(int address, QualifierOfResetProcessCommand qrp) {
+  public InformationObjectWithoutTime_RESET_PROCESS_COMMAND(
+      int address, QualifierOfResetProcessCommand qrp) {
     super(address);
     this.qrp = qrp;
   }
@@ -55,11 +57,11 @@ public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject i
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_RESET_PROCESS_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_RESET_PROCESS_COMMAND");
 
     // Simple Field (qrp)
     writeSimpleField(
@@ -68,7 +70,7 @@ public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject i
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_RESET_PROCESS_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_RESET_PROCESS_COMMAND");
   }
 
   @Override
@@ -79,7 +81,7 @@ public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject i
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_RESET_PROCESS_COMMAND _value = this;
+    InformationObjectWithoutTime_RESET_PROCESS_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (qrp)
@@ -88,9 +90,10 @@ public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject i
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_RESET_PROCESS_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_RESET_PROCESS_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -101,23 +104,25 @@ public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject i
                 () -> QualifierOfResetProcessCommand.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_RESET_PROCESS_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_RESET_PROCESS_COMMAND");
     // Create the instance
-    return new InformationObject_RESET_PROCESS_COMMANDBuilderImpl(qrp);
+    return new InformationObjectWithoutTime_RESET_PROCESS_COMMANDBuilderImpl(qrp);
   }
 
-  public static class InformationObject_RESET_PROCESS_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_RESET_PROCESS_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final QualifierOfResetProcessCommand qrp;
 
-    public InformationObject_RESET_PROCESS_COMMANDBuilderImpl(QualifierOfResetProcessCommand qrp) {
+    public InformationObjectWithoutTime_RESET_PROCESS_COMMANDBuilderImpl(
+        QualifierOfResetProcessCommand qrp) {
       this.qrp = qrp;
     }
 
-    public InformationObject_RESET_PROCESS_COMMAND build(int address) {
-      InformationObject_RESET_PROCESS_COMMAND informationObject_RESET_PROCESS_COMMAND =
-          new InformationObject_RESET_PROCESS_COMMAND(address, qrp);
-      return informationObject_RESET_PROCESS_COMMAND;
+    public InformationObjectWithoutTime_RESET_PROCESS_COMMAND build(int address) {
+      InformationObjectWithoutTime_RESET_PROCESS_COMMAND
+          informationObjectWithoutTime_RESET_PROCESS_COMMAND =
+              new InformationObjectWithoutTime_RESET_PROCESS_COMMAND(address, qrp);
+      return informationObjectWithoutTime_RESET_PROCESS_COMMAND;
     }
   }
 
@@ -126,10 +131,11 @@ public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject i
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_RESET_PROCESS_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_RESET_PROCESS_COMMAND)) {
       return false;
     }
-    InformationObject_RESET_PROCESS_COMMAND that = (InformationObject_RESET_PROCESS_COMMAND) o;
+    InformationObjectWithoutTime_RESET_PROCESS_COMMAND that =
+        (InformationObjectWithoutTime_RESET_PROCESS_COMMAND) o;
     return (getQrp() == that.getQrp()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SECTION_READY.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SECTION_READY.java
similarity index 79%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SECTION_READY.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SECTION_READY.java
index 7347c6c59d..1fc25ef1b7 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SECTION_READY.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SECTION_READY.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SECTION_READY extends InformationObject implements Message {
+public class InformationObjectWithoutTime_SECTION_READY extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -48,7 +49,7 @@ public class InformationObject_SECTION_READY extends InformationObject implement
   protected final LengthOfFile lof;
   protected final SectionReadyQualifier srq;
 
-  public InformationObject_SECTION_READY(
+  public InformationObjectWithoutTime_SECTION_READY(
       int address, NameOfFile nof, NameOfSection nos, LengthOfFile lof, SectionReadyQualifier srq) {
     super(address);
     this.nof = nof;
@@ -74,11 +75,11 @@ public class InformationObject_SECTION_READY extends InformationObject implement
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SECTION_READY");
+    writeBuffer.pushContext("InformationObjectWithoutTime_SECTION_READY");
 
     // Simple Field (nof)
     writeSimpleField(
@@ -108,7 +109,7 @@ public class InformationObject_SECTION_READY extends InformationObject implement
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SECTION_READY");
+    writeBuffer.popContext("InformationObjectWithoutTime_SECTION_READY");
   }
 
   @Override
@@ -119,7 +120,7 @@ public class InformationObject_SECTION_READY extends InformationObject implement
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SECTION_READY _value = this;
+    InformationObjectWithoutTime_SECTION_READY _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nof)
@@ -137,9 +138,10 @@ public class InformationObject_SECTION_READY extends InformationObject implement
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SECTION_READY");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_SECTION_READY");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -168,19 +170,19 @@ public class InformationObject_SECTION_READY extends InformationObject implement
                 () -> SectionReadyQualifier.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SECTION_READY");
+    readBuffer.closeContext("InformationObjectWithoutTime_SECTION_READY");
     // Create the instance
-    return new InformationObject_SECTION_READYBuilderImpl(nof, nos, lof, srq);
+    return new InformationObjectWithoutTime_SECTION_READYBuilderImpl(nof, nos, lof, srq);
   }
 
-  public static class InformationObject_SECTION_READYBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_SECTION_READYBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NameOfFile nof;
     private final NameOfSection nos;
     private final LengthOfFile lof;
     private final SectionReadyQualifier srq;
 
-    public InformationObject_SECTION_READYBuilderImpl(
+    public InformationObjectWithoutTime_SECTION_READYBuilderImpl(
         NameOfFile nof, NameOfSection nos, LengthOfFile lof, SectionReadyQualifier srq) {
       this.nof = nof;
       this.nos = nos;
@@ -188,10 +190,10 @@ public class InformationObject_SECTION_READY extends InformationObject implement
       this.srq = srq;
     }
 
-    public InformationObject_SECTION_READY build(int address) {
-      InformationObject_SECTION_READY informationObject_SECTION_READY =
-          new InformationObject_SECTION_READY(address, nof, nos, lof, srq);
-      return informationObject_SECTION_READY;
+    public InformationObjectWithoutTime_SECTION_READY build(int address) {
+      InformationObjectWithoutTime_SECTION_READY informationObjectWithoutTime_SECTION_READY =
+          new InformationObjectWithoutTime_SECTION_READY(address, nof, nos, lof, srq);
+      return informationObjectWithoutTime_SECTION_READY;
     }
   }
 
@@ -200,10 +202,11 @@ public class InformationObject_SECTION_READY extends InformationObject implement
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SECTION_READY)) {
+    if (!(o instanceof InformationObjectWithoutTime_SECTION_READY)) {
       return false;
     }
-    InformationObject_SECTION_READY that = (InformationObject_SECTION_READY) o;
+    InformationObjectWithoutTime_SECTION_READY that =
+        (InformationObjectWithoutTime_SECTION_READY) o;
     return (getNof() == that.getNof())
         && (getNos() == that.getNos())
         && (getLof() == that.getLof())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SEGMENT.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SEGMENT.java
similarity index 78%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SEGMENT.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SEGMENT.java
index 87da39bfcf..aad2e54b43 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SEGMENT.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SEGMENT.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SEGMENT extends InformationObject implements Message {
+public class InformationObjectWithoutTime_SEGMENT extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +48,7 @@ public class InformationObject_SEGMENT extends InformationObject implements Mess
   protected final NameOfSection nos;
   protected final LengthOfSegment los;
 
-  public InformationObject_SEGMENT(
+  public InformationObjectWithoutTime_SEGMENT(
       int address, NameOfFile nof, NameOfSection nos, LengthOfSegment los) {
     super(address);
     this.nof = nof;
@@ -68,11 +69,11 @@ public class InformationObject_SEGMENT extends InformationObject implements Mess
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SEGMENT");
+    writeBuffer.pushContext("InformationObjectWithoutTime_SEGMENT");
 
     // Simple Field (nof)
     writeSimpleField(
@@ -95,7 +96,7 @@ public class InformationObject_SEGMENT extends InformationObject implements Mess
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SEGMENT");
+    writeBuffer.popContext("InformationObjectWithoutTime_SEGMENT");
   }
 
   @Override
@@ -106,7 +107,7 @@ public class InformationObject_SEGMENT extends InformationObject implements Mess
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SEGMENT _value = this;
+    InformationObjectWithoutTime_SEGMENT _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nof)
@@ -121,9 +122,10 @@ public class InformationObject_SEGMENT extends InformationObject implements Mess
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SEGMENT");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_SEGMENT");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -146,28 +148,28 @@ public class InformationObject_SEGMENT extends InformationObject implements Mess
                 () -> LengthOfSegment.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SEGMENT");
+    readBuffer.closeContext("InformationObjectWithoutTime_SEGMENT");
     // Create the instance
-    return new InformationObject_SEGMENTBuilderImpl(nof, nos, los);
+    return new InformationObjectWithoutTime_SEGMENTBuilderImpl(nof, nos, los);
   }
 
-  public static class InformationObject_SEGMENTBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_SEGMENTBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NameOfFile nof;
     private final NameOfSection nos;
     private final LengthOfSegment los;
 
-    public InformationObject_SEGMENTBuilderImpl(
+    public InformationObjectWithoutTime_SEGMENTBuilderImpl(
         NameOfFile nof, NameOfSection nos, LengthOfSegment los) {
       this.nof = nof;
       this.nos = nos;
       this.los = los;
     }
 
-    public InformationObject_SEGMENT build(int address) {
-      InformationObject_SEGMENT informationObject_SEGMENT =
-          new InformationObject_SEGMENT(address, nof, nos, los);
-      return informationObject_SEGMENT;
+    public InformationObjectWithoutTime_SEGMENT build(int address) {
+      InformationObjectWithoutTime_SEGMENT informationObjectWithoutTime_SEGMENT =
+          new InformationObjectWithoutTime_SEGMENT(address, nof, nos, los);
+      return informationObjectWithoutTime_SEGMENT;
     }
   }
 
@@ -176,10 +178,10 @@ public class InformationObject_SEGMENT extends InformationObject implements Mess
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SEGMENT)) {
+    if (!(o instanceof InformationObjectWithoutTime_SEGMENT)) {
       return false;
     }
-    InformationObject_SEGMENT that = (InformationObject_SEGMENT) o;
+    InformationObjectWithoutTime_SEGMENT that = (InformationObjectWithoutTime_SEGMENT) o;
     return (getNof() == that.getNof())
         && (getNos() == that.getNos())
         && (getLos() == that.getLos())
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE.java
similarity index 70%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE.java
index d50db76415..dc3c1070e1 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends Inform
   protected final NormalizedValue nva;
   protected final QualifierOfSetPointCommand qos;
 
-  public InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE(
+  public InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE(
       int address, NormalizedValue nva, QualifierOfSetPointCommand qos) {
     super(address);
     this.nva = nva;
@@ -63,11 +63,11 @@ public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends Inform
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE");
+    writeBuffer.pushContext("InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE");
 
     // Simple Field (nva)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends Inform
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE");
+    writeBuffer.popContext("InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends Inform
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE _value = this;
+    InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (nva)
@@ -106,9 +106,10 @@ public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends Inform
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,27 +127,28 @@ public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends Inform
                 () -> QualifierOfSetPointCommand.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE");
+    readBuffer.closeContext("InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE");
     // Create the instance
-    return new InformationObject_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl(nva, qos);
+    return new InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl(nva, qos);
   }
 
-  public static class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final NormalizedValue nva;
     private final QualifierOfSetPointCommand qos;
 
-    public InformationObject_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl(
+    public InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl(
         NormalizedValue nva, QualifierOfSetPointCommand qos) {
       this.nva = nva;
       this.qos = qos;
     }
 
-    public InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE build(int address) {
-      InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE
-          informationObject_SET_POINT_COMMAND_NORMALISED_VALUE =
-              new InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE(address, nva, qos);
-      return informationObject_SET_POINT_COMMAND_NORMALISED_VALUE;
+    public InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE build(int address) {
+      InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE
+          informationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE =
+              new InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE(
+                  address, nva, qos);
+      return informationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE;
     }
   }
 
@@ -155,11 +157,11 @@ public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends Inform
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE)) {
+    if (!(o instanceof InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE)) {
       return false;
     }
-    InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE that =
-        (InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE) o;
+    InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE that =
+        (InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE) o;
     return (getNva() == that.getNva()) && (getQos() == that.getQos()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SCALED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java
similarity index 71%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SCALED_VALUE.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java
index b22d4c5bd6..65bb43fdc2 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SCALED_VALUE.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends Informatio
   protected final ScaledValue sva;
   protected final QualifierOfSetPointCommand qos;
 
-  public InformationObject_SET_POINT_COMMAND_SCALED_VALUE(
+  public InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE(
       int address, ScaledValue sva, QualifierOfSetPointCommand qos) {
     super(address);
     this.sva = sva;
@@ -63,11 +63,11 @@ public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends Informatio
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SET_POINT_COMMAND_SCALED_VALUE");
+    writeBuffer.pushContext("InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE");
 
     // Simple Field (sva)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends Informatio
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SET_POINT_COMMAND_SCALED_VALUE");
+    writeBuffer.popContext("InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends Informatio
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SET_POINT_COMMAND_SCALED_VALUE _value = this;
+    InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (sva)
@@ -106,9 +106,10 @@ public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends Informatio
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SET_POINT_COMMAND_SCALED_VALUE");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -125,27 +126,27 @@ public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends Informatio
                 () -> QualifierOfSetPointCommand.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SET_POINT_COMMAND_SCALED_VALUE");
+    readBuffer.closeContext("InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE");
     // Create the instance
-    return new InformationObject_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl(sva, qos);
+    return new InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl(sva, qos);
   }
 
-  public static class InformationObject_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final ScaledValue sva;
     private final QualifierOfSetPointCommand qos;
 
-    public InformationObject_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl(
+    public InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl(
         ScaledValue sva, QualifierOfSetPointCommand qos) {
       this.sva = sva;
       this.qos = qos;
     }
 
-    public InformationObject_SET_POINT_COMMAND_SCALED_VALUE build(int address) {
-      InformationObject_SET_POINT_COMMAND_SCALED_VALUE
-          informationObject_SET_POINT_COMMAND_SCALED_VALUE =
-              new InformationObject_SET_POINT_COMMAND_SCALED_VALUE(address, sva, qos);
-      return informationObject_SET_POINT_COMMAND_SCALED_VALUE;
+    public InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE build(int address) {
+      InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE
+          informationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE =
+              new InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE(address, sva, qos);
+      return informationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE;
     }
   }
 
@@ -154,11 +155,11 @@ public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends Informatio
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SET_POINT_COMMAND_SCALED_VALUE)) {
+    if (!(o instanceof InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE)) {
       return false;
     }
-    InformationObject_SET_POINT_COMMAND_SCALED_VALUE that =
-        (InformationObject_SET_POINT_COMMAND_SCALED_VALUE) o;
+    InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE that =
+        (InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE) o;
     return (getSva() == that.getSva()) && (getQos() == that.getQos()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java
similarity index 68%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java
index 0e4e80664e..37518ec473 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
-    extends InformationObject implements Message {
+public class InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
   protected final float value;
   protected final QualifierOfSetPointCommand qos;
 
-  public InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER(
+  public InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER(
       int address, float value, QualifierOfSetPointCommand qos) {
     super(address);
     this.value = value;
@@ -63,11 +63,12 @@ public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER");
+    writeBuffer.pushContext(
+        "InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER");
 
     // Simple Field (value)
     writeSimpleField(
@@ -83,7 +84,8 @@ public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER");
+    writeBuffer.popContext(
+        "InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER");
   }
 
   @Override
@@ -94,7 +96,7 @@ public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER _value = this;
+    InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (value)
@@ -106,9 +108,11 @@ public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext(
+        "InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -123,29 +127,32 @@ public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
                 () -> QualifierOfSetPointCommand.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER");
+    readBuffer.closeContext(
+        "InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER");
     // Create the instance
-    return new InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
+    return new InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         value, qos);
   }
 
-  public static class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static
+  class InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final float value;
     private final QualifierOfSetPointCommand qos;
 
-    public InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
+    public InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl(
         float value, QualifierOfSetPointCommand qos) {
       this.value = value;
       this.qos = qos;
     }
 
-    public InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER build(int address) {
-      InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
-          informationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER =
-              new InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER(
+    public InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER build(
+        int address) {
+      InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
+          informationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER =
+              new InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER(
                   address, value, qos);
-      return informationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER;
+      return informationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER;
     }
   }
 
@@ -154,11 +161,12 @@ public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER)) {
+    if (!(o
+        instanceof InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER)) {
       return false;
     }
-    InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER that =
-        (InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER) o;
+    InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER that =
+        (InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER) o;
     return (getValue() == that.getValue())
         && (getQos() == that.getQos())
         && super.equals(that)
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_COMMAND.java
similarity index 70%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_COMMAND.java
index 722956e01e..14c944c974 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_COMMAND.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SINGLE_COMMAND extends InformationObject implements Message {
+public class InformationObjectWithoutTime_SINGLE_COMMAND extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -45,7 +46,7 @@ public class InformationObject_SINGLE_COMMAND extends InformationObject implemen
   // Properties.
   protected final SingleCommand sco;
 
-  public InformationObject_SINGLE_COMMAND(int address, SingleCommand sco) {
+  public InformationObjectWithoutTime_SINGLE_COMMAND(int address, SingleCommand sco) {
     super(address);
     this.sco = sco;
   }
@@ -55,11 +56,11 @@ public class InformationObject_SINGLE_COMMAND extends InformationObject implemen
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SINGLE_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_SINGLE_COMMAND");
 
     // Simple Field (sco)
     writeSimpleField(
@@ -68,7 +69,7 @@ public class InformationObject_SINGLE_COMMAND extends InformationObject implemen
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SINGLE_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_SINGLE_COMMAND");
   }
 
   @Override
@@ -79,7 +80,7 @@ public class InformationObject_SINGLE_COMMAND extends InformationObject implemen
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SINGLE_COMMAND _value = this;
+    InformationObjectWithoutTime_SINGLE_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (sco)
@@ -88,9 +89,10 @@ public class InformationObject_SINGLE_COMMAND extends InformationObject implemen
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SINGLE_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_SINGLE_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -100,23 +102,23 @@ public class InformationObject_SINGLE_COMMAND extends InformationObject implemen
             new DataReaderComplexDefault<>(() -> SingleCommand.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SINGLE_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_SINGLE_COMMAND");
     // Create the instance
-    return new InformationObject_SINGLE_COMMANDBuilderImpl(sco);
+    return new InformationObjectWithoutTime_SINGLE_COMMANDBuilderImpl(sco);
   }
 
-  public static class InformationObject_SINGLE_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_SINGLE_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final SingleCommand sco;
 
-    public InformationObject_SINGLE_COMMANDBuilderImpl(SingleCommand sco) {
+    public InformationObjectWithoutTime_SINGLE_COMMANDBuilderImpl(SingleCommand sco) {
       this.sco = sco;
     }
 
-    public InformationObject_SINGLE_COMMAND build(int address) {
-      InformationObject_SINGLE_COMMAND informationObject_SINGLE_COMMAND =
-          new InformationObject_SINGLE_COMMAND(address, sco);
-      return informationObject_SINGLE_COMMAND;
+    public InformationObjectWithoutTime_SINGLE_COMMAND build(int address) {
+      InformationObjectWithoutTime_SINGLE_COMMAND informationObjectWithoutTime_SINGLE_COMMAND =
+          new InformationObjectWithoutTime_SINGLE_COMMAND(address, sco);
+      return informationObjectWithoutTime_SINGLE_COMMAND;
     }
   }
 
@@ -125,10 +127,11 @@ public class InformationObject_SINGLE_COMMAND extends InformationObject implemen
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SINGLE_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_SINGLE_COMMAND)) {
       return false;
     }
-    InformationObject_SINGLE_COMMAND that = (InformationObject_SINGLE_COMMAND) o;
+    InformationObjectWithoutTime_SINGLE_COMMAND that =
+        (InformationObjectWithoutTime_SINGLE_COMMAND) o;
     return (getSco() == that.getSco()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_POINT_INFORMATION.java
similarity index 67%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_POINT_INFORMATION.java
index cd8ce729bf..a7ab233ad0 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_POINT_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_SINGLE_POINT_INFORMATION
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -46,7 +46,8 @@ public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObjec
   // Properties.
   protected final SinglePointInformation siq;
 
-  public InformationObject_SINGLE_POINT_INFORMATION(int address, SinglePointInformation siq) {
+  public InformationObjectWithoutTime_SINGLE_POINT_INFORMATION(
+      int address, SinglePointInformation siq) {
     super(address);
     this.siq = siq;
   }
@@ -56,11 +57,11 @@ public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObjec
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SINGLE_POINT_INFORMATION");
+    writeBuffer.pushContext("InformationObjectWithoutTime_SINGLE_POINT_INFORMATION");
 
     // Simple Field (siq)
     writeSimpleField(
@@ -69,7 +70,7 @@ public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObjec
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_SINGLE_POINT_INFORMATION");
+    writeBuffer.popContext("InformationObjectWithoutTime_SINGLE_POINT_INFORMATION");
   }
 
   @Override
@@ -80,7 +81,7 @@ public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObjec
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_SINGLE_POINT_INFORMATION _value = this;
+    InformationObjectWithoutTime_SINGLE_POINT_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (siq)
@@ -89,9 +90,10 @@ public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObjec
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SINGLE_POINT_INFORMATION");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_SINGLE_POINT_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -102,23 +104,25 @@ public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObjec
                 () -> SinglePointInformation.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_SINGLE_POINT_INFORMATION");
+    readBuffer.closeContext("InformationObjectWithoutTime_SINGLE_POINT_INFORMATION");
     // Create the instance
-    return new InformationObject_SINGLE_POINT_INFORMATIONBuilderImpl(siq);
+    return new InformationObjectWithoutTime_SINGLE_POINT_INFORMATIONBuilderImpl(siq);
   }
 
-  public static class InformationObject_SINGLE_POINT_INFORMATIONBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_SINGLE_POINT_INFORMATIONBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final SinglePointInformation siq;
 
-    public InformationObject_SINGLE_POINT_INFORMATIONBuilderImpl(SinglePointInformation siq) {
+    public InformationObjectWithoutTime_SINGLE_POINT_INFORMATIONBuilderImpl(
+        SinglePointInformation siq) {
       this.siq = siq;
     }
 
-    public InformationObject_SINGLE_POINT_INFORMATION build(int address) {
-      InformationObject_SINGLE_POINT_INFORMATION informationObject_SINGLE_POINT_INFORMATION =
-          new InformationObject_SINGLE_POINT_INFORMATION(address, siq);
-      return informationObject_SINGLE_POINT_INFORMATION;
+    public InformationObjectWithoutTime_SINGLE_POINT_INFORMATION build(int address) {
+      InformationObjectWithoutTime_SINGLE_POINT_INFORMATION
+          informationObjectWithoutTime_SINGLE_POINT_INFORMATION =
+              new InformationObjectWithoutTime_SINGLE_POINT_INFORMATION(address, siq);
+      return informationObjectWithoutTime_SINGLE_POINT_INFORMATION;
     }
   }
 
@@ -127,11 +131,11 @@ public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObjec
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_SINGLE_POINT_INFORMATION)) {
+    if (!(o instanceof InformationObjectWithoutTime_SINGLE_POINT_INFORMATION)) {
       return false;
     }
-    InformationObject_SINGLE_POINT_INFORMATION that =
-        (InformationObject_SINGLE_POINT_INFORMATION) o;
+    InformationObjectWithoutTime_SINGLE_POINT_INFORMATION that =
+        (InformationObjectWithoutTime_SINGLE_POINT_INFORMATION) o;
     return (getSiq() == that.getSiq()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_STEP_POSITION_INFORMATION.java
similarity index 72%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_STEP_POSITION_INFORMATION.java
index a7d9f70dcc..fa7eefa850 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_STEP_POSITION_INFORMATION.java
@@ -35,8 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_STEP_POSITION_INFORMATION extends InformationObject
-    implements Message {
+public class InformationObjectWithoutTime_STEP_POSITION_INFORMATION
+    extends InformationObjectWithoutTime implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -47,7 +47,7 @@ public class InformationObject_STEP_POSITION_INFORMATION extends InformationObje
   protected final ValueWithTransientStateIndication vti;
   protected final QualityDescriptor qds;
 
-  public InformationObject_STEP_POSITION_INFORMATION(
+  public InformationObjectWithoutTime_STEP_POSITION_INFORMATION(
       int address, ValueWithTransientStateIndication vti, QualityDescriptor qds) {
     super(address);
     this.vti = vti;
@@ -63,11 +63,11 @@ public class InformationObject_STEP_POSITION_INFORMATION extends InformationObje
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_STEP_POSITION_INFORMATION");
+    writeBuffer.pushContext("InformationObjectWithoutTime_STEP_POSITION_INFORMATION");
 
     // Simple Field (vti)
     writeSimpleField(
@@ -83,7 +83,7 @@ public class InformationObject_STEP_POSITION_INFORMATION extends InformationObje
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_STEP_POSITION_INFORMATION");
+    writeBuffer.popContext("InformationObjectWithoutTime_STEP_POSITION_INFORMATION");
   }
 
   @Override
@@ -94,7 +94,7 @@ public class InformationObject_STEP_POSITION_INFORMATION extends InformationObje
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_STEP_POSITION_INFORMATION _value = this;
+    InformationObjectWithoutTime_STEP_POSITION_INFORMATION _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (vti)
@@ -106,9 +106,10 @@ public class InformationObject_STEP_POSITION_INFORMATION extends InformationObje
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_STEP_POSITION_INFORMATION");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_STEP_POSITION_INFORMATION");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -126,26 +127,27 @@ public class InformationObject_STEP_POSITION_INFORMATION extends InformationObje
                 () -> QualityDescriptor.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_STEP_POSITION_INFORMATION");
+    readBuffer.closeContext("InformationObjectWithoutTime_STEP_POSITION_INFORMATION");
     // Create the instance
-    return new InformationObject_STEP_POSITION_INFORMATIONBuilderImpl(vti, qds);
+    return new InformationObjectWithoutTime_STEP_POSITION_INFORMATIONBuilderImpl(vti, qds);
   }
 
-  public static class InformationObject_STEP_POSITION_INFORMATIONBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_STEP_POSITION_INFORMATIONBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final ValueWithTransientStateIndication vti;
     private final QualityDescriptor qds;
 
-    public InformationObject_STEP_POSITION_INFORMATIONBuilderImpl(
+    public InformationObjectWithoutTime_STEP_POSITION_INFORMATIONBuilderImpl(
         ValueWithTransientStateIndication vti, QualityDescriptor qds) {
       this.vti = vti;
       this.qds = qds;
     }
 
-    public InformationObject_STEP_POSITION_INFORMATION build(int address) {
-      InformationObject_STEP_POSITION_INFORMATION informationObject_STEP_POSITION_INFORMATION =
-          new InformationObject_STEP_POSITION_INFORMATION(address, vti, qds);
-      return informationObject_STEP_POSITION_INFORMATION;
+    public InformationObjectWithoutTime_STEP_POSITION_INFORMATION build(int address) {
+      InformationObjectWithoutTime_STEP_POSITION_INFORMATION
+          informationObjectWithoutTime_STEP_POSITION_INFORMATION =
+              new InformationObjectWithoutTime_STEP_POSITION_INFORMATION(address, vti, qds);
+      return informationObjectWithoutTime_STEP_POSITION_INFORMATION;
     }
   }
 
@@ -154,11 +156,11 @@ public class InformationObject_STEP_POSITION_INFORMATION extends InformationObje
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_STEP_POSITION_INFORMATION)) {
+    if (!(o instanceof InformationObjectWithoutTime_STEP_POSITION_INFORMATION)) {
       return false;
     }
-    InformationObject_STEP_POSITION_INFORMATION that =
-        (InformationObject_STEP_POSITION_INFORMATION) o;
+    InformationObjectWithoutTime_STEP_POSITION_INFORMATION that =
+        (InformationObjectWithoutTime_STEP_POSITION_INFORMATION) o;
     return (getVti() == that.getVti()) && (getQds() == that.getQds()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_TEST_COMMAND.java
similarity index 70%
rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND.java
rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_TEST_COMMAND.java
index 831d27dc72..bcb0ab7734 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_TEST_COMMAND.java
@@ -35,7 +35,8 @@ import org.apache.plc4x.java.spi.generation.*;
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class InformationObject_TEST_COMMAND extends InformationObject implements Message {
+public class InformationObjectWithoutTime_TEST_COMMAND extends InformationObjectWithoutTime
+    implements Message {
 
   // Accessors for discriminator values.
   public TypeIdentification getTypeIdentification() {
@@ -45,7 +46,7 @@ public class InformationObject_TEST_COMMAND extends InformationObject implements
   // Properties.
   protected final FixedTestBitPatternTwoOctet fbp;
 
-  public InformationObject_TEST_COMMAND(int address, FixedTestBitPatternTwoOctet fbp) {
+  public InformationObjectWithoutTime_TEST_COMMAND(int address, FixedTestBitPatternTwoOctet fbp) {
     super(address);
     this.fbp = fbp;
   }
@@ -55,11 +56,11 @@ public class InformationObject_TEST_COMMAND extends InformationObject implements
   }
 
   @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
+  protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer)
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_TEST_COMMAND");
+    writeBuffer.pushContext("InformationObjectWithoutTime_TEST_COMMAND");
 
     // Simple Field (fbp)
     writeSimpleField(
@@ -68,7 +69,7 @@ public class InformationObject_TEST_COMMAND extends InformationObject implements
         new DataWriterComplexDefault<>(writeBuffer),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    writeBuffer.popContext("InformationObject_TEST_COMMAND");
+    writeBuffer.popContext("InformationObjectWithoutTime_TEST_COMMAND");
   }
 
   @Override
@@ -79,7 +80,7 @@ public class InformationObject_TEST_COMMAND extends InformationObject implements
   @Override
   public int getLengthInBits() {
     int lengthInBits = super.getLengthInBits();
-    InformationObject_TEST_COMMAND _value = this;
+    InformationObjectWithoutTime_TEST_COMMAND _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Simple field (fbp)
@@ -88,9 +89,10 @@ public class InformationObject_TEST_COMMAND extends InformationObject implements
     return lengthInBits;
   }
 
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_TEST_COMMAND");
+  public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder(
+      ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte)
+      throws ParseException {
+    readBuffer.pullContext("InformationObjectWithoutTime_TEST_COMMAND");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
@@ -101,23 +103,23 @@ public class InformationObject_TEST_COMMAND extends InformationObject implements
                 () -> FixedTestBitPatternTwoOctet.staticParse(readBuffer), readBuffer),
             WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
-    readBuffer.closeContext("InformationObject_TEST_COMMAND");
+    readBuffer.closeContext("InformationObjectWithoutTime_TEST_COMMAND");
     // Create the instance
-    return new InformationObject_TEST_COMMANDBuilderImpl(fbp);
+    return new InformationObjectWithoutTime_TEST_COMMANDBuilderImpl(fbp);
   }
 
-  public static class InformationObject_TEST_COMMANDBuilderImpl
-      implements InformationObject.InformationObjectBuilder {
+  public static class InformationObjectWithoutTime_TEST_COMMANDBuilderImpl
+      implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder {
     private final FixedTestBitPatternTwoOctet fbp;
 
-    public InformationObject_TEST_COMMANDBuilderImpl(FixedTestBitPatternTwoOctet fbp) {
+    public InformationObjectWithoutTime_TEST_COMMANDBuilderImpl(FixedTestBitPatternTwoOctet fbp) {
       this.fbp = fbp;
     }
 
-    public InformationObject_TEST_COMMAND build(int address) {
-      InformationObject_TEST_COMMAND informationObject_TEST_COMMAND =
-          new InformationObject_TEST_COMMAND(address, fbp);
-      return informationObject_TEST_COMMAND;
+    public InformationObjectWithoutTime_TEST_COMMAND build(int address) {
+      InformationObjectWithoutTime_TEST_COMMAND informationObjectWithoutTime_TEST_COMMAND =
+          new InformationObjectWithoutTime_TEST_COMMAND(address, fbp);
+      return informationObjectWithoutTime_TEST_COMMAND;
     }
   }
 
@@ -126,10 +128,10 @@ public class InformationObject_TEST_COMMAND extends InformationObject implements
     if (this == o) {
       return true;
     }
-    if (!(o instanceof InformationObject_TEST_COMMAND)) {
+    if (!(o instanceof InformationObjectWithoutTime_TEST_COMMAND)) {
       return false;
     }
-    InformationObject_TEST_COMMAND that = (InformationObject_TEST_COMMAND) o;
+    InformationObjectWithoutTime_TEST_COMMAND that = (InformationObjectWithoutTime_TEST_COMMAND) o;
     return (getFbp() == that.getFbp()) && super.equals(that) && true;
   }
 
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
deleted file mode 100644
index e3f7aa934d..0000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.iec608705104.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public class InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
-
-  // Accessors for discriminator values.
-  public TypeIdentification getTypeIdentification() {
-    return TypeIdentification.BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-  }
-
-  public InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) {
-    super(address);
-  }
-
-  @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
-      throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext(
-        "InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-
-    writeBuffer.popContext(
-        "InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = super.getLengthInBits();
-    InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    return lengthInBits;
-  }
-
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext(
-        "InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    readBuffer.closeContext(
-        "InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    // Create the instance
-    return new InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl();
-  }
-
-  public static
-  class InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
-
-    public InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {}
-
-    public InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A build(
-        int address) {
-      InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A
-          informationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A(address);
-      return informationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      return false;
-    }
-    InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A) o;
-    return super.equals(that) && true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
-    try {
-      writeBufferBoxBased.writeSerializable(this);
-    } catch (SerializationException e) {
-      throw new RuntimeException(e);
-    }
-    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
-  }
-}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
deleted file mode 100644
index 40b1fb94c1..0000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.iec608705104.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public class InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A extends InformationObject
-    implements Message {
-
-  // Accessors for discriminator values.
-  public TypeIdentification getTypeIdentification() {
-    return TypeIdentification.DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-  }
-
-  public InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) {
-    super(address);
-  }
-
-  @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
-      throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-
-    writeBuffer.popContext("InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = super.getLengthInBits();
-    InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    return lengthInBits;
-  }
-
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    readBuffer.closeContext("InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    // Create the instance
-    return new InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl();
-  }
-
-  public static class InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
-
-    public InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {}
-
-    public InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-          informationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A(address);
-      return informationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      return false;
-    }
-    InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A) o;
-    return super.equals(that) && true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
-    try {
-      writeBufferBoxBased.writeSerializable(this);
-    } catch (SerializationException e) {
-      throw new RuntimeException(e);
-    }
-    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
-  }
-}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
deleted file mode 100644
index bd88a27f1f..0000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.iec608705104.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
-
-  // Accessors for discriminator values.
-  public TypeIdentification getTypeIdentification() {
-    return TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-  }
-
-  public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A(
-      int address) {
-    super(address);
-  }
-
-  @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
-      throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext(
-        "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-
-    writeBuffer.popContext(
-        "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A _value =
-        this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    return lengthInBits;
-  }
-
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext(
-        "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    readBuffer.closeContext(
-        "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    // Create the instance
-    return new InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl();
-  }
-
-  public static
-  class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
-
-    public
-    InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {}
-
-    public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A build(
-        int address) {
-      InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-          informationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A(
-                  address);
-      return informationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o
-        instanceof
-        InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      return false;
-    }
-    InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A) o;
-    return super.equals(that) && true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
-    try {
-      writeBufferBoxBased.writeSerializable(this);
-    } catch (SerializationException e) {
-      throw new RuntimeException(e);
-    }
-    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
-  }
-}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
deleted file mode 100644
index a1f9a03fd3..0000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.iec608705104.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public class InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
-
-  // Accessors for discriminator values.
-  public TypeIdentification getTypeIdentification() {
-    return TypeIdentification.MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-  }
-
-  public InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A(
-      int address) {
-    super(address);
-  }
-
-  @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
-      throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext(
-        "InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-
-    writeBuffer.popContext(
-        "InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    return lengthInBits;
-  }
-
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext(
-        "InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    readBuffer.closeContext(
-        "InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    // Create the instance
-    return new InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl();
-  }
-
-  public static
-  class InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
-
-    public
-    InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {}
-
-    public InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A build(
-        int address) {
-      InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-          informationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A(
-                  address);
-      return informationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o
-        instanceof
-        InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      return false;
-    }
-    InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A) o;
-    return super.equals(that) && true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
-    try {
-      writeBufferBoxBased.writeSerializable(this);
-    } catch (SerializationException e) {
-      throw new RuntimeException(e);
-    }
-    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
-  }
-}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
deleted file mode 100644
index 2058c6e64e..0000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.iec608705104.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public
-class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
-
-  // Accessors for discriminator values.
-  public TypeIdentification getTypeIdentification() {
-    return TypeIdentification
-        .MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-  }
-
-  public
-  InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A(
-      int address) {
-    super(address);
-  }
-
-  @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
-      throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-
-    writeBuffer.popContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = super.getLengthInBits();
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A
-        _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    return lengthInBits;
-  }
-
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    readBuffer.closeContext(
-        "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    // Create the instance
-    return new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl();
-  }
-
-  public static
-  class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
-
-    public
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {}
-
-    public
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A
-        build(int address) {
-      InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A
-          informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A(
-                  address);
-      return informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o
-        instanceof
-        InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      return false;
-    }
-    InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A
-        that =
-            (InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A)
-                o;
-    return super.equals(that) && true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
-    try {
-      writeBufferBoxBased.writeSerializable(this);
-    } catch (SerializationException e) {
-      throw new RuntimeException(e);
-    }
-    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
-  }
-}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
deleted file mode 100644
index 8826f270c4..0000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.iec608705104.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public class InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A
-    extends InformationObject implements Message {
-
-  // Accessors for discriminator values.
-  public TypeIdentification getTypeIdentification() {
-    return TypeIdentification.REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-  }
-
-  public InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) {
-    super(address);
-  }
-
-  @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
-      throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-
-    writeBuffer.popContext("InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = super.getLengthInBits();
-    InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    return lengthInBits;
-  }
-
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    readBuffer.closeContext("InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    // Create the instance
-    return new InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl();
-  }
-
-  public static class InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
-
-    public InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {}
-
-    public InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A
-          informationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A(address);
-      return informationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      return false;
-    }
-    InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A) o;
-    return super.equals(that) && true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
-    try {
-      writeBufferBoxBased.writeSerializable(this);
-    } catch (SerializationException e) {
-      throw new RuntimeException(e);
-    }
-    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
-  }
-}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
deleted file mode 100644
index 419a35b558..0000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.iec608705104.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public class InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A extends InformationObject
-    implements Message {
-
-  // Accessors for discriminator values.
-  public TypeIdentification getTypeIdentification() {
-    return TypeIdentification.SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-  }
-
-  public InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) {
-    super(address);
-  }
-
-  @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
-      throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-
-    writeBuffer.popContext("InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = super.getLengthInBits();
-    InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    return lengthInBits;
-  }
-
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    readBuffer.closeContext("InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    // Create the instance
-    return new InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl();
-  }
-
-  public static class InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
-
-    public InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {}
-
-    public InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A
-          informationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A(address);
-      return informationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      return false;
-    }
-    InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A) o;
-    return super.equals(that) && true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
-    try {
-      writeBufferBoxBased.writeSerializable(this);
-    } catch (SerializationException e) {
-      throw new RuntimeException(e);
-    }
-    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
-  }
-}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
deleted file mode 100644
index 75bebdbd1a..0000000000
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.iec608705104.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public class InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A extends InformationObject
-    implements Message {
-
-  // Accessors for discriminator values.
-  public TypeIdentification getTypeIdentification() {
-    return TypeIdentification.TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-  }
-
-  public InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) {
-    super(address);
-  }
-
-  @Override
-  protected void serializeInformationObjectChild(WriteBuffer writeBuffer)
-      throws SerializationException {
-    PositionAware positionAware = writeBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-
-    writeBuffer.popContext("InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-  }
-
-  @Override
-  public int getLengthInBytes() {
-    return (int) Math.ceil((float) getLengthInBits() / 8.0);
-  }
-
-  @Override
-  public int getLengthInBits() {
-    int lengthInBits = super.getLengthInBits();
-    InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    return lengthInBits;
-  }
-
-  public static InformationObjectBuilder staticParseInformationObjectBuilder(
-      ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException {
-    readBuffer.pullContext("InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    PositionAware positionAware = readBuffer;
-    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
-    readBuffer.closeContext("InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A");
-    // Create the instance
-    return new InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl();
-  }
-
-  public static class InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl
-      implements InformationObject.InformationObjectBuilder {
-
-    public InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {}
-
-    public InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A build(int address) {
-      InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A
-          informationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A =
-              new InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A(address);
-      return informationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A)) {
-      return false;
-    }
-    InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A that =
-        (InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A) o;
-    return super.equals(that) && true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
-    try {
-      writeBufferBoxBased.writeSerializable(this);
-    } catch (SerializationException e) {
-      throw new RuntimeException(e);
-    }
-    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
-  }
-}
diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/SevenOctetBinaryTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/SevenOctetBinaryTime.java
index c53951ed10..efdcd9720c 100644
--- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/SevenOctetBinaryTime.java
+++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/SevenOctetBinaryTime.java
@@ -38,15 +38,79 @@ import org.apache.plc4x.java.spi.generation.*;
 public class SevenOctetBinaryTime implements Message {
 
   // Properties.
-  protected final byte[] value;
+  protected final int milliseconds;
+  protected final boolean invalid;
+  protected final boolean substituted;
+  protected final byte minutes;
+  protected final boolean daylightSaving;
+  protected final byte hour;
+  protected final byte dayOfWeek;
+  protected final byte day;
+  protected final byte month;
+  protected final byte year;
 
-  public SevenOctetBinaryTime(byte[] value) {
+  public SevenOctetBinaryTime(
+      int milliseconds,
+      boolean invalid,
+      boolean substituted,
+      byte minutes,
+      boolean daylightSaving,
+      byte hour,
+      byte dayOfWeek,
+      byte day,
+      byte month,
+      byte year) {
     super();
-    this.value = value;
+    this.milliseconds = milliseconds;
+    this.invalid = invalid;
+    this.substituted = substituted;
+    this.minutes = minutes;
+    this.daylightSaving = daylightSaving;
+    this.hour = hour;
+    this.dayOfWeek = dayOfWeek;
+    this.day = day;
+    this.month = month;
+    this.year = year;
   }
 
-  public byte[] getValue() {
-    return value;
+  public int getMilliseconds() {
+    return milliseconds;
+  }
+
+  public boolean getInvalid() {
+    return invalid;
+  }
... 9857 lines suppressed ...